- Update to 3.1.2

- Remove obsoleted patch
- Use DATADIR
- Take maintainership

5 files changed, 65 insertions, 77 deletions

diff --git a/devel/splint/Makefile b/devel/splint/Makefile
index e81c0e3be4ca..7360e6aa196f 100644
--- a/devel/splint/Makefile
+++ b/devel/splint/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	splint
-PORTVERSION=	3.1.1
-PORTREVISION=	2
+PORTVERSION=	3.1.2
 CATEGORIES=	devel security
 MASTER_SITES=	http://www.splint.org/downloads/
 EXTRACT_SUFX=	.src.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	A tool for statically checking sourcecode for security vulnerabilities
 
 USE_GMAKE=	yes
diff --git a/devel/splint/distinfo b/devel/splint/distinfo
index cd34ab7015da..9cf9bb8d9202 100644
--- a/devel/splint/distinfo
+++ b/devel/splint/distinfo
@@ -1,3 +1,3 @@
-MD5 (splint-3.1.1.src.tgz) = 91635d98644312302f6f16abe73c2474
-SHA256 (splint-3.1.1.src.tgz) = 410b34890c63468e9ee238ff661d8c6f145c8708b2af303eeb6e7e962e8f54d6
-SIZE (splint-3.1.1.src.tgz) = 2425108
+MD5 (splint-3.1.2.src.tgz) = 51553d1df3a17a2222c6d116cff0840f
+SHA256 (splint-3.1.2.src.tgz) = c360134a59622dbdd5c0399b98585149c05964a4c74a91e744b7809083be3cee
+SIZE (splint-3.1.2.src.tgz) = 2283320
diff --git a/devel/splint/files/patch-src::Headers::constants.h b/devel/splint/files/patch-src::Headers::constants.h
index f8ee4c2f602d..f00c0e389b42 100644
--- a/devel/splint/files/patch-src::Headers::constants.h
+++ b/devel/splint/files/patch-src::Headers::constants.h
@@ -1,11 +1,11 @@
---- src/Headers/constants.h.orig	Wed Oct 30 16:08:45 2002
-+++ src/Headers/constants.h	Wed Oct 30 16:09:42 2002
-@@ -97,7 +97,7 @@
- # define PPMRCODE "@@MR@@"  
- 
+--- src/Headers/constants.h.orig	2004-08-01 03:04:28.000000000 +0800
++++ src/Headers/constants.h	2007-07-25 21:58:56.000000000 +0800
+@@ -101,7 +101,7 @@
+ # define DEFAULT_SYSTEMDIR "/os2/"
+ # else                            
  /*@constant observer char *DEFAULT_SYSTEMDIR; @*/
 -# define DEFAULT_SYSTEMDIR "/usr/"
 +# define DEFAULT_SYSTEMDIR "/usr/include/:/usr/lib/:%%PREFIX%%/include/:%%PREFIX%%/lib/"
+ # endif
  
  /*@constant char DEFAULT_COMMENTCHAR; @*/
- # define DEFAULT_COMMENTCHAR '@'
diff --git a/devel/splint/files/patch-src::cpplib.c b/devel/splint/files/patch-src::cpplib.c
deleted file mode 100644
index 2564668ff2dc..000000000000
--- a/devel/splint/files/patch-src::cpplib.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cpplib.c.orig	Fri Jan  9 16:44:23 2004
-+++ src/cpplib.c	Fri Jan  9 16:44:51 2004
-@@ -2828,7 +2828,7 @@
-       else if (hp->type == T_CONST)
- 	ok = !CPPOPTIONS (pfile)->done_initializing;
-       else {
--	BADBRANCH;
-+	ok = FALSE; /* Redefining anything else is bad. */
-       }
- 
-       /* Print the warning if it's not ok.  */
diff --git a/devel/splint/pkg-plist b/devel/splint/pkg-plist
index f1b15c824509..69a4d60f2906 100644
--- a/devel/splint/pkg-plist
+++ b/devel/splint/pkg-plist
@@ -1,55 +1,55 @@
 bin/splint
-share/splint/imports/assert.lcl
-share/splint/imports/assert.lcs
-share/splint/imports/ctype.lcl
-share/splint/imports/ctype.lcs
-share/splint/imports/errno.lcl
-share/splint/imports/errno.lcs
-share/splint/imports/limits.lcl
-share/splint/imports/limits.lcs
-share/splint/imports/locale.lcl
-share/splint/imports/locale.lcs
-share/splint/imports/math.lcl
-share/splint/imports/math.lcs
-share/splint/imports/setjmp.lcl
-share/splint/imports/setjmp.lcs
-share/splint/imports/signal.lcl
-share/splint/imports/signal.lcs
-share/splint/imports/stdarg.lcl
-share/splint/imports/stdarg.lcs
-share/splint/imports/stdio.lcl
-share/splint/imports/stdio.lcs
-share/splint/imports/stdlib.lcl
-share/splint/imports/stdlib.lcs
-share/splint/imports/string.lcl
-share/splint/imports/string.lcs
-share/splint/imports/strings.lcl
-share/splint/imports/strings.lcs
-share/splint/imports/time.lcl
-share/splint/imports/time.lcs
-share/splint/lib/CTrait.syms
-share/splint/lib/CTraitGen.lcl
-share/splint/lib/bool.h
-share/splint/lib/file.mts
-share/splint/lib/file.xh
-share/splint/lib/filerw.mts
-share/splint/lib/filerw.xh
-share/splint/lib/lclinit.lci
-share/splint/lib/linux.h
-share/splint/lib/lslinit.lsi
-share/splint/lib/posix.h
-share/splint/lib/posix.lcd
-share/splint/lib/posixstrict.lcd
-share/splint/lib/standard.h
-share/splint/lib/standard.lcd
-share/splint/lib/standardstrict.lcd
-share/splint/lib/stdio.h
-share/splint/lib/stdlib.h
-share/splint/lib/tainted.mts
-share/splint/lib/tainted.xh
-share/splint/lib/unix.h
-share/splint/lib/unix.lcd
-share/splint/lib/unixstrict.lcd
-@dirrm share/splint/lib
-@dirrm share/splint/imports
-@dirrm share/splint
+%%DATADIR%%/imports/assert.lcl
+%%DATADIR%%/imports/assert.lcs
+%%DATADIR%%/imports/ctype.lcl
+%%DATADIR%%/imports/ctype.lcs
+%%DATADIR%%/imports/errno.lcl
+%%DATADIR%%/imports/errno.lcs
+%%DATADIR%%/imports/limits.lcl
+%%DATADIR%%/imports/limits.lcs
+%%DATADIR%%/imports/locale.lcl
+%%DATADIR%%/imports/locale.lcs
+%%DATADIR%%/imports/math.lcl
+%%DATADIR%%/imports/math.lcs
+%%DATADIR%%/imports/setjmp.lcl
+%%DATADIR%%/imports/setjmp.lcs
+%%DATADIR%%/imports/signal.lcl
+%%DATADIR%%/imports/signal.lcs
+%%DATADIR%%/imports/stdarg.lcl
+%%DATADIR%%/imports/stdarg.lcs
+%%DATADIR%%/imports/stdio.lcl
+%%DATADIR%%/imports/stdio.lcs
+%%DATADIR%%/imports/stdlib.lcl
+%%DATADIR%%/imports/stdlib.lcs
+%%DATADIR%%/imports/string.lcl
+%%DATADIR%%/imports/string.lcs
+%%DATADIR%%/imports/strings.lcl
+%%DATADIR%%/imports/strings.lcs
+%%DATADIR%%/imports/time.lcl
+%%DATADIR%%/imports/time.lcs
+%%DATADIR%%/lib/CTrait.syms
+%%DATADIR%%/lib/CTraitGen.lcl
+%%DATADIR%%/lib/bool.h
+%%DATADIR%%/lib/file.mts
+%%DATADIR%%/lib/file.xh
+%%DATADIR%%/lib/filerw.mts
+%%DATADIR%%/lib/filerw.xh
+%%DATADIR%%/lib/lclinit.lci
+%%DATADIR%%/lib/linux.h
+%%DATADIR%%/lib/lslinit.lsi
+%%DATADIR%%/lib/posix.h
+%%DATADIR%%/lib/posix.lcd
+%%DATADIR%%/lib/posixstrict.lcd
+%%DATADIR%%/lib/standard.h
+%%DATADIR%%/lib/standard.lcd
+%%DATADIR%%/lib/standardstrict.lcd
+%%DATADIR%%/lib/stdio.h
+%%DATADIR%%/lib/stdlib.h
+%%DATADIR%%/lib/tainted.mts
+%%DATADIR%%/lib/tainted.xh
+%%DATADIR%%/lib/unix.h
+%%DATADIR%%/lib/unix.lcd
+%%DATADIR%%/lib/unixstrict.lcd
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/imports
+@dirrm %%DATADIR%%