Update to 2.4.1.

* Document the -V option [1]
* Properly suggest ${STRIP_CMD} (not ${STRIP}) instead of strip [2]
* Correct the version string

PR:		54993 [1]
Submitted by:	Mark Linimon <linimon@lonesome.com> [1]
		gerald [2]
Pointy hat to:	me [2] (I should have used Gerald's patch as-is)

8 files changed, 24 insertions, 14 deletions

diff --git a/devel/portlint/Makefile b/devel/portlint/Makefile
index e10bd1dde1fd..90ff590b6e6f 100644
--- a/devel/portlint/Makefile
+++ b/devel/portlint/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	portlint
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.1
 CATEGORIES=	devel
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/devel/portlint/pkg-descr b/devel/portlint/pkg-descr
index 9c4a594cd44e..82ae417ff2b5 100644
--- a/devel/portlint/pkg-descr
+++ b/devel/portlint/pkg-descr
@@ -8,4 +8,5 @@ usage: portlint [-AabctvN] [-B#] [port_directory]
         -v      verbose mode
         -t      nit pick about use of spaces
         -N      writing a new port
+        -V      print the version and exit
         -B#     allow # contiguous blank lines (default: 1 line)
diff --git a/devel/portlint/src/portlint.1 b/devel/portlint/src/portlint.1
index 4e5df9394949..1f598d9fa1e8 100644
--- a/devel/portlint/src/portlint.1
+++ b/devel/portlint/src/portlint.1
@@ -10,7 +10,7 @@
 .Nd a verifier for port directory
 .Sh SYNOPSIS
 .Nm portlint
-.Op Fl abchvtN
+.Op Fl abchvtNV
 .Op Fl M Ar ENV
 .Op Fl B Ar n
 .Op Ar dir
@@ -67,6 +67,8 @@ New port flag.
 Adds several checks specific to newly submitted port.
 If you are willing to submit the directory to be checked as a new port,
 use this option.
+.It Fl t
+Print the portlint version and exit.
 .It Fl M Ar ENV
 Set make variables to
 .Pa ENV
diff --git a/devel/portlint/src/portlint.pl b/devel/portlint/src/portlint.pl
index d6c65488a12f..b8a3238d6f15 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.3 2003/07/20 00:24:42 marcus Exp $
+# $Id: portlint.pl,v 1.6 2003/07/28 20:20:38 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,7 +39,8 @@ $portdir = '.';
 
 # version variables
 my $major = 2;
-my $minor = 3;
+my $minor = 4;
+my $micro = 1;
 
 sub l { '[{(]'; }
 sub r { '[)}]'; }
@@ -91,6 +92,7 @@ usage: $prog [-AabchvtN] [-M ENV] [-B#] [port_directory]
 	-v	verbose mode
 	-t	nit pick about use of spaces
 	-N	writing a new port
+	-V	print the version and exit
 	-M ENV	set make variables to ENV (ex. PORTSDIR=/usr/ports.work)
 	-B#	allow # contiguous blank lines (default: $contblank line)
 EOF
@@ -98,11 +100,10 @@ EOF
 }
 
 sub version {
-	print "$prog version $major.$minor\n";
+	print "$prog version $major.$minor.$micro\n";
 	exit $major;
 }
 
-
 getopts('AabchtvB:M:NV');
 
 &usage if $opt_h;
@@ -869,7 +870,7 @@ sub checkmakefile {
 	print "OK: checking direct use of command names.\n" if ($verbose);
 	foreach my $i (qw(
 awk basename cat chmod chown cp echo expr false file find gmake grep gzcat
-ldconfig ln md5 mkdir mv patch rm rmdir sed sh strip touch tr which xargs xmkmf
+ldconfig ln md5 mkdir mv patch rm rmdir sed sh touch tr which xargs xmkmf
 	)) {
 		$cmdnames{$i} = "\$\{\U$i\E\}";
 	}
@@ -877,6 +878,7 @@ ldconfig ln md5 mkdir mv patch rm rmdir sed sh strip touch tr which xargs xmkmf
 	$cmdnames{'gunzip'} = '${GUNZIP_CMD}';
 	$cmdnames{'gzip'} = '${GZIP_CMD}';
 	$cmdnames{'install'} = '${INSTALL_foobaa}';
+	$cmdnames{'strip'} = '${STRIP_CMD}';
 	#
 	# ignore parameter string to echo command.
 	# note that we leave the command as is, since we need to check the
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index e10bd1dde1fd..90ff590b6e6f 100644
--- a/ports-mgmt/portlint/Makefile
+++ b/ports-mgmt/portlint/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	portlint
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.1
 CATEGORIES=	devel
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/ports-mgmt/portlint/pkg-descr b/ports-mgmt/portlint/pkg-descr
index 9c4a594cd44e..82ae417ff2b5 100644
--- a/ports-mgmt/portlint/pkg-descr
+++ b/ports-mgmt/portlint/pkg-descr
@@ -8,4 +8,5 @@ usage: portlint [-AabctvN] [-B#] [port_directory]
         -v      verbose mode
         -t      nit pick about use of spaces
         -N      writing a new port
+        -V      print the version and exit
         -B#     allow # contiguous blank lines (default: 1 line)
diff --git a/ports-mgmt/portlint/src/portlint.1 b/ports-mgmt/portlint/src/portlint.1
index 4e5df9394949..1f598d9fa1e8 100644
--- a/ports-mgmt/portlint/src/portlint.1
+++ b/ports-mgmt/portlint/src/portlint.1
@@ -10,7 +10,7 @@
 .Nd a verifier for port directory
 .Sh SYNOPSIS
 .Nm portlint
-.Op Fl abchvtN
+.Op Fl abchvtNV
 .Op Fl M Ar ENV
 .Op Fl B Ar n
 .Op Ar dir
@@ -67,6 +67,8 @@ New port flag.
 Adds several checks specific to newly submitted port.
 If you are willing to submit the directory to be checked as a new port,
 use this option.
+.It Fl t
+Print the portlint version and exit.
 .It Fl M Ar ENV
 Set make variables to
 .Pa ENV
diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl
index d6c65488a12f..b8a3238d6f15 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.3 2003/07/20 00:24:42 marcus Exp $
+# $Id: portlint.pl,v 1.6 2003/07/28 20:20:38 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,7 +39,8 @@ $portdir = '.';
 
 # version variables
 my $major = 2;
-my $minor = 3;
+my $minor = 4;
+my $micro = 1;
 
 sub l { '[{(]'; }
 sub r { '[)}]'; }
@@ -91,6 +92,7 @@ usage: $prog [-AabchvtN] [-M ENV] [-B#] [port_directory]
 	-v	verbose mode
 	-t	nit pick about use of spaces
 	-N	writing a new port
+	-V	print the version and exit
 	-M ENV	set make variables to ENV (ex. PORTSDIR=/usr/ports.work)
 	-B#	allow # contiguous blank lines (default: $contblank line)
 EOF
@@ -98,11 +100,10 @@ EOF
 }
 
 sub version {
-	print "$prog version $major.$minor\n";
+	print "$prog version $major.$minor.$micro\n";
 	exit $major;
 }
 
-
 getopts('AabchtvB:M:NV');
 
 &usage if $opt_h;
@@ -869,7 +870,7 @@ sub checkmakefile {
 	print "OK: checking direct use of command names.\n" if ($verbose);
 	foreach my $i (qw(
 awk basename cat chmod chown cp echo expr false file find gmake grep gzcat
-ldconfig ln md5 mkdir mv patch rm rmdir sed sh strip touch tr which xargs xmkmf
+ldconfig ln md5 mkdir mv patch rm rmdir sed sh touch tr which xargs xmkmf
 	)) {
 		$cmdnames{$i} = "\$\{\U$i\E\}";
 	}
@@ -877,6 +878,7 @@ ldconfig ln md5 mkdir mv patch rm rmdir sed sh strip touch tr which xargs xmkmf
 	$cmdnames{'gunzip'} = '${GUNZIP_CMD}';
 	$cmdnames{'gzip'} = '${GZIP_CMD}';
 	$cmdnames{'install'} = '${INSTALL_foobaa}';
+	$cmdnames{'strip'} = '${STRIP_CMD}';
 	#
 	# ignore parameter string to echo command.
 	# note that we leave the command as is, since we need to check the