7 files changed, 86 insertions, 112 deletions

diff --git a/devel/splint/Makefile b/devel/splint/Makefile
index 615b6b077a15..746a0836c02a 100644
--- a/devel/splint/Makefile
+++ b/devel/splint/Makefile
@@ -6,12 +6,9 @@
 #
 
 PORTNAME=	lclint
-PORTVERSION=	2.4b
+PORTVERSION=	2.5q
 CATEGORIES=	devel
-MASTER_SITES= 	http://www.sds.lcs.mit.edu/lclint/ftp/lclint/ \
-		ftp://ftp.deva.net/pub/sources/programming/linting/ \
-		ftp://ftp.netsw.org/netsw/SoftEng/Lang/C/Tools/lclint/ \
-		ftp://ftp.uni-bielefeld.de/pub/programming/tools/lclint/
+MASTER_SITES=	http://lclint.cs.virginia.edu/
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	s.moeding@ndh.net
diff --git a/devel/splint/distinfo b/devel/splint/distinfo
index 6c63ef678592..48fb3a2e1fb4 100644
--- a/devel/splint/distinfo
+++ b/devel/splint/distinfo
@@ -1 +1 @@
-MD5 (lclint-2.4b.src.tar.gz) = 3d263a76bae212deb80295505f56fdd9
+MD5 (lclint-2.5q.src.tar.gz) = c4c798823fe25780124dfd65933fe1ed
diff --git a/devel/splint/files/patch-aa b/devel/splint/files/patch-aa
index bb849742964c..ae26be7ecbfe 100644
--- a/devel/splint/files/patch-aa
+++ b/devel/splint/files/patch-aa
@@ -1,56 +1,32 @@
-*** Makefile.in.orig	Sun Apr 19 03:06:51 1998
---- Makefile.in	Sat Jun 27 23:05:50 1998
-***************
-*** 40,49 ****
-  ### 
-  
-  ### directory for lclint libraries
-! LIBDIR     = @installdir@/lib
-  
-  ### directory for lclint standard imports
-! IMPORTSDIR = @installdir@/imports
-  
-  ### directory for lclint binary
-  INSTALLDIR = @installdir@/bin
---- 40,49 ----
-  ### 
-  
-  ### directory for lclint libraries
-! LIBDIR     = @installdir@/share/lclint-2.4b/lib
-  
-  ### directory for lclint standard imports
-! IMPORTSDIR = @installdir@/share/lclint-2.4b/imports
-  
-  ### directory for lclint binary
-  INSTALLDIR = @installdir@/bin
-***************
-*** 231,244 ****
-  dolibraries:
-  	@echo '//  Installing libraries in '$(LIBDIR)
-  	@echo "    (This will complain if the directory already exists, don't worry about it.)"
-! 	-mkdir $(LIBDIR)
-  	$(CP) $(LCLINTLIB)/* $(LIBDIR)
-  	@echo '//  Installed libraries.'
-  
-  doimports:
-  	@echo '//  Installing imports in '$(IMPORTSDIR)
-  	@echo "    (This will complain if the directory already exists, don't worry about it.)"
-! 	-mkdir $(IMPORTSDIR)
-  	$(CP) $(LCLINTIMPORTS)/* $(IMPORTSDIR)
-  	@echo '//  Installed imports.'
-  
---- 231,244 ----
-  dolibraries:
-  	@echo '//  Installing libraries in '$(LIBDIR)
-  	@echo "    (This will complain if the directory already exists, don't worry about it.)"
-! 	-mkdir -p $(LIBDIR)
-  	$(CP) $(LCLINTLIB)/* $(LIBDIR)
-  	@echo '//  Installed libraries.'
-  
-  doimports:
-  	@echo '//  Installing imports in '$(IMPORTSDIR)
-  	@echo "    (This will complain if the directory already exists, don't worry about it.)"
-! 	-mkdir -p $(IMPORTSDIR)
-  	$(CP) $(LCLINTIMPORTS)/* $(IMPORTSDIR)
-  	@echo '//  Installed imports.'
-  
+--- Makefile.in.orig	Tue May 23 17:01:30 2000
++++ Makefile.in	Sun Jun 18 12:04:23 2000
+@@ -41,10 +41,10 @@
+ ### 
+ 
+ ### directory for lclint libraries
+-LIBDIR     = @installdir@/lib
++LIBDIR     = @installdir@/share/lclint-2.5q/lib
+ 
+ ### directory for lclint standard imports
+-IMPORTSDIR = @installdir@/imports
++IMPORTSDIR = @installdir@/share/lclint-2.5q/imports
+ 
+ ### directory for lclint binary
+ INSTALLDIR = @installdir@/bin
+@@ -232,14 +232,14 @@
+ dolibraries:
+ 	@echo '//  Installing libraries in '$(LIBDIR)
+ 	@echo "    (This will complain if the directory already exists, don't worry about it.)"
+-	-mkdir $(LIBDIR)
++	-mkdir -p $(LIBDIR)
+ 	$(CP) $(LCLINTLIB)/* $(LIBDIR)
+ 	@echo '//  Installed libraries.'
+ 
+ doimports:
+ 	@echo '//  Installing imports in '$(IMPORTSDIR)
+ 	@echo "    (This will complain if the directory already exists, don't worry about it.)"
+-	-mkdir $(IMPORTSDIR)
++	-mkdir -p $(IMPORTSDIR)
+ 	$(CP) $(LCLINTIMPORTS)/* $(IMPORTSDIR)
+ 	@echo '//  Installed imports.'
+ 
diff --git a/devel/splint/files/patch-ab b/devel/splint/files/patch-ab
index ae8eb70eaa77..c9b10a435ede 100644
--- a/devel/splint/files/patch-ab
+++ b/devel/splint/files/patch-ab
@@ -1,6 +1,6 @@
---- configure.orig	Thu Jul  8 18:53:53 1999
-+++ configure	Thu Jul  8 19:00:12 1999
-@@ -511,7 +511,7 @@
+--- configure.orig	Tue May 23 17:56:23 2000
++++ configure	Sun Jun 18 12:05:08 2000
+@@ -512,7 +512,7 @@
  trap 'rm -f Makefile; exit 1' 1 3 15
  CC='$CC'
  CPP='$CPP'
diff --git a/devel/splint/pkg-descr b/devel/splint/pkg-descr
index 1c041bab056b..158ea33dc010 100644
--- a/devel/splint/pkg-descr
+++ b/devel/splint/pkg-descr
@@ -3,4 +3,4 @@ effort, LCLint can be used as a better lint.  If additional effort is
 invested adding annotations to programs, LCLint can perform stronger
 checks than can be done by any standard lint.
 
-WWW: http://www.sds.lcs.mit.edu/lclint/
+WWW: http://lclint.cs.virginia.edu/
diff --git a/devel/splint/pkg-message b/devel/splint/pkg-message
index 7368307ab8fc..ee1cbf9f283e 100644
--- a/devel/splint/pkg-message
+++ b/devel/splint/pkg-message
@@ -1,6 +1,6 @@
 
 Point your browser at
 
-	http://www.sds.lcs.mit.edu/lclint/
+	http://lclint.cs.virginia.edu/
 
 to read or download the full documentation for lclint.
diff --git a/devel/splint/pkg-plist b/devel/splint/pkg-plist
index 6fa7d9d620d2..293cf3cc872e 100644
--- a/devel/splint/pkg-plist
+++ b/devel/splint/pkg-plist
@@ -1,46 +1,47 @@
 bin/lclint
-share/lclint-2.4b/lib/CTrait.syms
-share/lclint-2.4b/lib/unix.lcd
-share/lclint-2.4b/lib/unix.h
-share/lclint-2.4b/lib/posixstrict.lcd
-share/lclint-2.4b/lib/posix.lcd
-share/lclint-2.4b/lib/posix.h
-share/lclint-2.4b/lib/lslinit.lsi
-share/lclint-2.4b/lib/lclinit.lci
-share/lclint-2.4b/lib/bool.h
-share/lclint-2.4b/lib/ansistrict.lcd
-share/lclint-2.4b/lib/ansi.lcd
-share/lclint-2.4b/lib/ansi.h
-share/lclint-2.4b/lib/CTraitGen.lcl
-share/lclint-2.4b/lib/unixstrict.lcd
-share/lclint-2.4b/imports/assert.lcl
-share/lclint-2.4b/imports/time.lcl
-share/lclint-2.4b/imports/strings.lcs
-share/lclint-2.4b/imports/strings.lcl
-share/lclint-2.4b/imports/string.lcs
-share/lclint-2.4b/imports/string.lcl
-share/lclint-2.4b/imports/stdlib.lcs
-share/lclint-2.4b/imports/stdlib.lcl
-share/lclint-2.4b/imports/stdio.lcs
-share/lclint-2.4b/imports/stdio.lcl
-share/lclint-2.4b/imports/stdarg.lcs
-share/lclint-2.4b/imports/stdarg.lcl
-share/lclint-2.4b/imports/signal.lcs
-share/lclint-2.4b/imports/signal.lcl
-share/lclint-2.4b/imports/setjmp.lcs
-share/lclint-2.4b/imports/setjmp.lcl
-share/lclint-2.4b/imports/math.lcs
-share/lclint-2.4b/imports/math.lcl
-share/lclint-2.4b/imports/locale.lcs
-share/lclint-2.4b/imports/locale.lcl
-share/lclint-2.4b/imports/limits.lcs
-share/lclint-2.4b/imports/limits.lcl
-share/lclint-2.4b/imports/errno.lcs
-share/lclint-2.4b/imports/errno.lcl
-share/lclint-2.4b/imports/ctype.lcs
-share/lclint-2.4b/imports/ctype.lcl
-share/lclint-2.4b/imports/assert.lcs
-share/lclint-2.4b/imports/time.lcs
-@dirrm share/lclint-2.4b/imports
-@dirrm share/lclint-2.4b/lib
-@dirrm share/lclint-2.4b
+share/lclint-2.5q/lib/CTrait.syms
+share/lclint-2.5q/lib/unix.lcd
+share/lclint-2.5q/lib/unix.h
+share/lclint-2.5q/lib/posixstrict.lcd
+share/lclint-2.5q/lib/posix.lcd
+share/lclint-2.5q/lib/posix.h
+share/lclint-2.5q/lib/lslinit.lsi
+share/lclint-2.5q/lib/lclinit.lci
+share/lclint-2.5q/lib/bool.h
+share/lclint-2.5q/lib/ansistrict.lcd
+share/lclint-2.5q/lib/ansi.lcd
+share/lclint-2.5q/lib/ansi.h
+share/lclint-2.5q/lib/Makefile
+share/lclint-2.5q/lib/CTraitGen.lcl
+share/lclint-2.5q/lib/unixstrict.lcd
+share/lclint-2.5q/imports/assert.lcl
+share/lclint-2.5q/imports/time.lcl
+share/lclint-2.5q/imports/strings.lcs
+share/lclint-2.5q/imports/strings.lcl
+share/lclint-2.5q/imports/string.lcs
+share/lclint-2.5q/imports/string.lcl
+share/lclint-2.5q/imports/stdlib.lcs
+share/lclint-2.5q/imports/stdlib.lcl
+share/lclint-2.5q/imports/stdio.lcs
+share/lclint-2.5q/imports/stdio.lcl
+share/lclint-2.5q/imports/stdarg.lcs
+share/lclint-2.5q/imports/stdarg.lcl
+share/lclint-2.5q/imports/signal.lcs
+share/lclint-2.5q/imports/signal.lcl
+share/lclint-2.5q/imports/setjmp.lcs
+share/lclint-2.5q/imports/setjmp.lcl
+share/lclint-2.5q/imports/math.lcs
+share/lclint-2.5q/imports/math.lcl
+share/lclint-2.5q/imports/locale.lcs
+share/lclint-2.5q/imports/locale.lcl
+share/lclint-2.5q/imports/limits.lcs
+share/lclint-2.5q/imports/limits.lcl
+share/lclint-2.5q/imports/errno.lcs
+share/lclint-2.5q/imports/errno.lcl
+share/lclint-2.5q/imports/ctype.lcs
+share/lclint-2.5q/imports/ctype.lcl
+share/lclint-2.5q/imports/assert.lcs
+share/lclint-2.5q/imports/time.lcs
+@dirrm share/lclint-2.5q/imports
+@dirrm share/lclint-2.5q/lib
+@dirrm share/lclint-2.5q