2 files changed, 23 insertions, 6 deletions

diff --git a/devel/portlint/Makefile b/devel/portlint/Makefile
index e6923a60bb9d..4f76bdce8de5 100644
--- a/devel/portlint/Makefile
+++ b/devel/portlint/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	portlint
-PORTVERSION=	2.9.1
-PORTREVISION=	1
+PORTVERSION=	2.9.2
 CATEGORIES=	devel
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/devel/portlint/src/portlint.pl b/devel/portlint/src/portlint.pl
index bbb03e8ce828..1d70537eb977 100644
--- a/devel/portlint/src/portlint.pl
+++ b/devel/portlint/src/portlint.pl
@@ -17,13 +17,14 @@
 # OpenBSD and NetBSD will be accepted.
 #
 # $FreeBSD$
-# $MCom: portlint/portlint.pl,v 1.123 2006/08/06 22:36:21 marcus Exp $
+# $MCom: portlint/portlint.pl,v 1.126 2006/11/25 20:00:02 marcus Exp $
 #
 
 use vars qw/ $opt_a $opt_A $opt_b $opt_C $opt_c $opt_g $opt_h $opt_t $opt_v $opt_M $opt_N $opt_B $opt_V /;
 use Getopt::Std;
 use File::Find;
 use IPC::Open2;
+use POSIX qw(strftime);
 use strict;
 
 sub perror($$$$);
@@ -45,7 +46,7 @@ $portdir = '.';
 # version variables
 my $major = 2;
 my $minor = 9;
-my $micro = 1;
+my $micro = 2;
 
 sub l { '[{(]'; }
 sub r { '[)}]'; }
@@ -1338,6 +1339,23 @@ sub checkmakefile {
 	}
 
 	#
+	# whole file: EXPIRATION_DATE
+	#
+	print "OK: checking for valid EXPIRATION_DATE.\n" if ($verbose);
+	my $edate;
+	if (($edate) = ($whole =~ m/\nEXPIRATION_DATE\??=[ \t]*([^\n]*)\n/)) {
+		my $lineno = &linenumber($`);
+		if ($edate ne strftime("%Y-%m-%d", 0, 0, 0,
+					substr($edate, 8, 2),
+					substr($edate, 5, 2) - 1,
+					substr($edate, 0, 4) - 1900)) {
+			&perror("FATAL", $file, $lineno, "EXPIRATION_DATE ($edate) is ".
+				"either not in YYYY-MM-DD format or it is not a valid ".
+				"date.");
+		}
+	}
+
+	#
 	# whole file: IS_INTERACTIVE/NOPORTDOCS
 	#
 	print "OK: checking IS_INTERACTIVE.\n" if ($verbose);
@@ -1392,7 +1410,7 @@ sub checkmakefile {
 			USE_AUTOHEADER_VER	=> 'USE_AUTOTOOLS',
 			USE_AUTOCONF_VER	=> 'USE_AUTOTOOLS',
 			WANT_AUTOCONF_VER	=> 'USE_AUTOTOOLS',
-			__HELP__			=> 'http://people.freebsd.org/~ade/autotools.txt',
+			__HELP__			=> 'http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/using-autotools.html',
 	);
 
 	%deprecated = (
@@ -1503,7 +1521,7 @@ ruby sed sh sort sysctl touch tr which xargs xmkmf
 				&& $lm !~ /^COMMENT(.)?=[^\n]+($i\d*)/m) {
 					&perror("WARN", $file, $lineno, "possible direct use of ".
 						"command \"$sm\" found. Use $autocmdnames{$i} ".
-						"instead and set according USE_*_VER= flag");
+						"instead and set according USE_AUTOTOOLS=<tool> macro");
 			}
 		}
 	}