5 files changed, 9 insertions, 32 deletions

diff --git a/devel/splint/Makefile b/devel/splint/Makefile
index be9adc772303..4204534d62aa 100644
--- a/devel/splint/Makefile
+++ b/devel/splint/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	splint
-PORTVERSION=	3.0.1.6
-PORTREVISION=	1
+PORTVERSION=	3.1.1
 CATEGORIES=	devel security
 MASTER_SITES=	http://www.splint.org/downloads/
 EXTRACT_SUFX=	.src.tgz
@@ -15,13 +14,15 @@ EXTRACT_SUFX=	.src.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for statically checking sourcecode for security vulnerabilities
 
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		splint.1
 
-post-install:
-	@${INSTALL_MAN} ${WRKSRC}/doc/splint.1 ${MANPREFIX}/man/man1
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/Headers/constants.h
 
 .include <bsd.port.mk>
diff --git a/devel/splint/distinfo b/devel/splint/distinfo
index 61e439f53667..aec514c26240 100644
--- a/devel/splint/distinfo
+++ b/devel/splint/distinfo
@@ -1 +1 @@
-MD5 (splint-3.0.1.6.src.tgz) = 3b19e62d5b3a8883ac356dff3615234c
+MD5 (splint-3.1.1.src.tgz) = 91635d98644312302f6f16abe73c2474
diff --git a/devel/splint/files/patch-src::Headers::constants.h b/devel/splint/files/patch-src::Headers::constants.h
index 90fd210e8abe..f8ee4c2f602d 100644
--- a/devel/splint/files/patch-src::Headers::constants.h
+++ b/devel/splint/files/patch-src::Headers::constants.h
@@ -5,7 +5,7 @@
  
  /*@constant observer char *DEFAULT_SYSTEMDIR; @*/
 -# define DEFAULT_SYSTEMDIR "/usr/"
-+# define DEFAULT_SYSTEMDIR "/usr/include/:/usr/lib/:/usr/local/include/:/usr/local/lib/"
++# define DEFAULT_SYSTEMDIR "/usr/include/:/usr/lib/:%%PREFIX%%/include/:%%PREFIX%%/lib/"
  
  /*@constant char DEFAULT_COMMENTCHAR; @*/
  # define DEFAULT_COMMENTCHAR '@'
diff --git a/devel/splint/files/patch-src::Makefile.in b/devel/splint/files/patch-src::Makefile.in
deleted file mode 100644
index 5ca489b2b2f4..000000000000
--- a/devel/splint/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Sat Feb 23 16:59:27 2002
-+++ src/Makefile.in	Sat Feb 23 17:00:02 2002
-@@ -603,7 +603,7 @@
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
- 	  ; then \
--	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
-+	    f=splint; \
- 	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
- 	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
- 	  else :; fi; \
diff --git a/devel/splint/files/patch-test::Makefile.in b/devel/splint/files/patch-test::Makefile.in
deleted file mode 100644
index 1185408f96ea..000000000000
--- a/devel/splint/files/patch-test::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- test/Makefile.in.orig	Mon Feb 11 14:27:16 2002
-+++ test/Makefile.in	Thu Mar  7 18:28:01 2002
-@@ -897,8 +897,8 @@
- 	mostlyclean-generic uninstall uninstall-am uninstall-info-am
- 
- 
--unexport LARCH_PATH
--unexport LCLIMPORTDIR
-+#unexport LARCH_PATH
-+#unexport LCLIMPORTDIR
- 
- .PHONY: all check
- all check: fulltest