Update to 2.6.0

* Add some additional checks for USE_* variables included too late [1]
* Add a check for SIZE in distinfo [2]
* Fix a small style nit [2]
* Warn is USE_SIZE is used in a port's Makefile
* Check to see if a port supports WITHOUT_NLS if USE_GETTEXT is defined [3]

Submitted by:	eik [1]
		krion [2]
Requested by:	kris [3]

4 files changed, 104 insertions, 24 deletions

diff --git a/devel/portlint/Makefile b/devel/portlint/Makefile
index 809b4852e6f..ee68a6f92ed 100644
--- a/devel/portlint/Makefile
+++ b/devel/portlint/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	portlint
-PORTVERSION=	2.5.9
+PORTVERSION=	2.6.0
 CATEGORIES=	devel
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/devel/portlint/src/portlint.pl b/devel/portlint/src/portlint.pl
index f89fc235205..74d0e4216c5 100644
--- a/devel/portlint/src/portlint.pl
+++ b/devel/portlint/src/portlint.pl
@@ -17,7 +17,7 @@
 # OpenBSD and NetBSD will be accepted.
 #
 # $FreeBSD$
-# $Id: portlint.pl,v 1.43 2004/03/21 07:31:33 marcus Exp $
+# $Id: portlint.pl,v 1.44 2004/03/26 20:42:32 marcus Exp $
 #
 
 use vars qw/ $opt_a $opt_A $opt_b $opt_c $opt_h $opt_t $opt_v $opt_M $opt_N $opt_B $opt_V /;
@@ -39,8 +39,8 @@ $portdir = '.';
 
 # version variables
 my $major = 2;
-my $minor = 5;
-my $micro = 9;
+my $minor = 6;
+my $micro = 0;
 
 sub l { '[{(]'; }
 sub r { '[)}]'; }
@@ -250,12 +250,13 @@ close(IN);
 #
 # check for files.
 #
-my @checker = ($makevar{DESCR}, 'Makefile', $makevar{MD5_FILE});
+my @checker = ($makevar{DESCR}, 'Makefile', 'distinfo', $makevar{MD5_FILE});
 my %checker = (
-			   $makevar{DESCR} => 'checkdescr',
-			   'Makefile' => 'checkmakefile',
-			   $makevar{MD5_FILE} => 'TRUE'
-			  );
+				$makevar{DESCR} => 'checkdescr',
+				'Makefile' => 'checkmakefile',
+				$makevar{MD5_FILE} => 'TRUE',
+				'distinfo' => 'checkdistinfo',
+);
 if ($extrafile) {
 	my @files = (
 				 <$makevar{SCRIPTDIR}/*>,
@@ -493,6 +494,24 @@ if ($err || $warn) {
 exit $err;
 
 #
+# distinfo
+#
+sub checkdistinfo {
+		my($file) = @_;
+		my($sizefound) = 0;
+		open(IN, "< $file") || return 0;
+		while (<IN>) {
+				if ($_ =~ /^SIZE/) {
+						$sizefound = 1;
+				}
+		}
+		if (!$sizefound) {
+				&perror("WARN: $file: does not contain SIZE.");
+		}
+		close(IN);
+}
+
+#
 # pkg-descr
 #
 sub checkdescr {
@@ -693,7 +712,7 @@ sub checkplist {
 
 			if ($_ =~ /^info\/dir$/) {
 				&perror("FATAL: $file [$.]: \"info/dir\" should not be listed.".
-					"use install-info to add/remove ".
+					"Use install-info to add/remove ".
 					"an entry.");
 				$infooverwrite++;
 			}
@@ -1016,18 +1035,20 @@ sub checkmakefile {
 		print "OK: checking for USE_* used too late.\n" if ($verbose);
 		my @use_early = qw(
 			APACHE
+			BZIP2
 			GNUSTEP
 			IMAKE
 			JAVA
 			KDE(?:BASE|LIBS)_VER
-			LIBRUBY
+			(?:LIB)?RUBY
 			LINUX_PREFIX
 			OPENSSL
+			PHP
 			PYTHON
 			QT2?
 			QT_VER
-			RUBY
 			X_PREFIX
+			ZIP
 		);
 
 		my @other_early = qw(
@@ -1070,6 +1091,16 @@ sub checkmakefile {
 	}
 
 	#
+	# whole file: USE_SIZE
+	#
+	print "OK: checking USE_SIZE.\n" if ($verbose);
+	if ($whole =~ /\nUSE_SIZE/) {
+			my $lineno = &linenumber($`);
+			&perror("WARN: $file [$lineno]: use of USE_SIZE is no longer ".
+					"required.");
+	}
+
+	#
 	# whole file: MACHINE_ARCH
 	#
 	print "OK: checking MACHINE_ARCH.\n" if ($verbose);
@@ -1115,6 +1146,15 @@ sub checkmakefile {
 	}
 
 	#
+	# whole file: check for USE_GETTEXT
+	#
+	print "OK: checking for USE_GETTEXT without WITHOUT_NLS.\n" if ($verbose);
+	if ($whole =~ /\nUSE_GETTEXT/ && $whole !~ /def(?:ined)?\s*\(?WITHOUT_NLS\)?/) {
+			&perror("WARN: $file: Consider adding support for a WITHOUT_NLS ".
+					"knob to conditionally disable gettext support.");
+	}
+
+	#
 	# whole file: direct use of command names
 	#
 	my %cmdnames = ();
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index 809b4852e6f..ee68a6f92ed 100644
--- a/ports-mgmt/portlint/Makefile
+++ b/ports-mgmt/portlint/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	portlint
-PORTVERSION=	2.5.9
+PORTVERSION=	2.6.0
 CATEGORIES=	devel
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl
index f89fc235205..74d0e4216c5 100644
--- a/ports-mgmt/portlint/src/portlint.pl
+++ b/ports-mgmt/portlint/src/portlint.pl
@@ -17,7 +17,7 @@
 # OpenBSD and NetBSD will be accepted.
 #
 # $FreeBSD$
-# $Id: portlint.pl,v 1.43 2004/03/21 07:31:33 marcus Exp $
+# $Id: portlint.pl,v 1.44 2004/03/26 20:42:32 marcus Exp $
 #
 
 use vars qw/ $opt_a $opt_A $opt_b $opt_c $opt_h $opt_t $opt_v $opt_M $opt_N $opt_B $opt_V /;
@@ -39,8 +39,8 @@ $portdir = '.';
 
 # version variables
 my $major = 2;
-my $minor = 5;
-my $micro = 9;
+my $minor = 6;
+my $micro = 0;
 
 sub l { '[{(]'; }
 sub r { '[)}]'; }
@@ -250,12 +250,13 @@ close(IN);
 #
 # check for files.
 #
-my @checker = ($makevar{DESCR}, 'Makefile', $makevar{MD5_FILE});
+my @checker = ($makevar{DESCR}, 'Makefile', 'distinfo', $makevar{MD5_FILE});
 my %checker = (
-			   $makevar{DESCR} => 'checkdescr',
-			   'Makefile' => 'checkmakefile',
-			   $makevar{MD5_FILE} => 'TRUE'
-			  );
+				$makevar{DESCR} => 'checkdescr',
+				'Makefile' => 'checkmakefile',
+				$makevar{MD5_FILE} => 'TRUE',
+				'distinfo' => 'checkdistinfo',
+);
 if ($extrafile) {
 	my @files = (
 				 <$makevar{SCRIPTDIR}/*>,
@@ -493,6 +494,24 @@ if ($err || $warn) {
 exit $err;
 
 #
+# distinfo
+#
+sub checkdistinfo {
+		my($file) = @_;
+		my($sizefound) = 0;
+		open(IN, "< $file") || return 0;
+		while (<IN>) {
+				if ($_ =~ /^SIZE/) {
+						$sizefound = 1;
+				}
+		}
+		if (!$sizefound) {
+				&perror("WARN: $file: does not contain SIZE.");
+		}
+		close(IN);
+}
+
+#
 # pkg-descr
 #
 sub checkdescr {
@@ -693,7 +712,7 @@ sub checkplist {
 
 			if ($_ =~ /^info\/dir$/) {
 				&perror("FATAL: $file [$.]: \"info/dir\" should not be listed.".
-					"use install-info to add/remove ".
+					"Use install-info to add/remove ".
 					"an entry.");
 				$infooverwrite++;
 			}
@@ -1016,18 +1035,20 @@ sub checkmakefile {
 		print "OK: checking for USE_* used too late.\n" if ($verbose);
 		my @use_early = qw(
 			APACHE
+			BZIP2
 			GNUSTEP
 			IMAKE
 			JAVA
 			KDE(?:BASE|LIBS)_VER
-			LIBRUBY
+			(?:LIB)?RUBY
 			LINUX_PREFIX
 			OPENSSL
+			PHP
 			PYTHON
 			QT2?
 			QT_VER
-			RUBY
 			X_PREFIX
+			ZIP
 		);
 
 		my @other_early = qw(
@@ -1070,6 +1091,16 @@ sub checkmakefile {
 	}
 
 	#
+	# whole file: USE_SIZE
+	#
+	print "OK: checking USE_SIZE.\n" if ($verbose);
+	if ($whole =~ /\nUSE_SIZE/) {
+			my $lineno = &linenumber($`);
+			&perror("WARN: $file [$lineno]: use of USE_SIZE is no longer ".
+					"required.");
+	}
+
+	#
 	# whole file: MACHINE_ARCH
 	#
 	print "OK: checking MACHINE_ARCH.\n" if ($verbose);
@@ -1115,6 +1146,15 @@ sub checkmakefile {
 	}
 
 	#
+	# whole file: check for USE_GETTEXT
+	#
+	print "OK: checking for USE_GETTEXT without WITHOUT_NLS.\n" if ($verbose);
+	if ($whole =~ /\nUSE_GETTEXT/ && $whole !~ /def(?:ined)?\s*\(?WITHOUT_NLS\)?/) {
+			&perror("WARN: $file: Consider adding support for a WITHOUT_NLS ".
+					"knob to conditionally disable gettext support.");
+	}
+
+	#
 	# whole file: direct use of command names
 	#
 	my %cmdnames = ();