* Update to 2.5.5

* Fix up the usage text
* Ignore arguments passed to REINPLACE_CMD so portlint will not complain on
  things such as ${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' [1]
* Only match libraries installed into lib when looking for .so's [2]
* Try to make the PKGCATEGORY check a little more forgiving to committers
  checking single ports [3]

PR:		60608 [1]
		60803 [2]
Submitted by:	leeym [1] [2] (based on)
		dougb [3]

3 files changed, 17 insertions, 9 deletions

diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index 581986661cc7..36c774cf8935 100644
--- a/ports-mgmt/portlint/Makefile
+++ b/ports-mgmt/portlint/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	portlint
-PORTVERSION=	2.5.4
+PORTVERSION=	2.5.5
 CATEGORIES=	devel
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/ports-mgmt/portlint/pkg-descr b/ports-mgmt/portlint/pkg-descr
index 0cd74bf02e56..eb6ae80c5f63 100644
--- a/ports-mgmt/portlint/pkg-descr
+++ b/ports-mgmt/portlint/pkg-descr
@@ -1,11 +1,12 @@
 portlint makes a small set of sanity checks for port directory.
 
-usage: portlint [-AabcCtvN] [-M ENV] [-B#] [port_directory]
+usage: portlint.pl [-AabCchvtN] [-M ENV] [-B#] [port_directory]
         -a      additional check for scripts/* and pkg/*
         -A      turn on all additional checks (equivalent to -abcNt)
         -b      warn $(VARIABLE)
-        -C      pedantic committer mode (equivalent to -abct)
         -c      committer mode
+        -C      pedantic committer mode (equivalent to -abct)
+        -h      show summary of command line options
         -v      verbose mode
         -t      nit pick about use of spaces
         -N      writing a new port
diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl
index 51668e15bc5c..5d78ead03240 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.32 2003/12/27 00:43:00 marcus Exp $
+# $Id: portlint.pl,v 1.35 2004/01/02 02:14:06 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 /;
@@ -40,7 +40,7 @@ $portdir = '.';
 # version variables
 my $major = 2;
 my $minor = 5;
-my $micro = 4;
+my $micro = 5;
 
 sub l { '[{(]'; }
 sub r { '[)}]'; }
@@ -86,12 +86,12 @@ my $re_lang_short = '(' . join('|', @lang_short) . ')-';
 my ($prog) = ($0 =~ /([^\/]+)$/);
 sub usage {
 	print STDERR <<EOF;
-usage: $prog [-AabchvtN] [-M ENV] [-B#] [port_directory]
+usage: $prog [-AabCchvtN] [-M ENV] [-B#] [port_directory]
 	-a	additional check for scripts/* and pkg-*
 	-A	turn on all additional checks (equivalent to -abcNt)
 	-b	warn \$(VARIABLE)
-	-C	pedantic committer mode (equivalent to -abct)
 	-c	committer mode
+	-C	pedantic committer mode (equivalent to -abct)
 	-h	show summary of command line options
 	-v	verbose mode
 	-t	nit pick about use of spaces
@@ -660,7 +660,8 @@ sub checkplist {
 				"please use USE_LIBTOOL in Makefile if possible");
 		}
 
-		if ($_ =~ /\.so(\.\d+)?$/ && $makevar{INSTALLS_SHLIB} eq '') {
+		if ($_ =~ m|^lib/lib[^\/]+\.so(\.\d+)?$| && 
+			$makevar{INSTALLS_SHLIB} eq '') {
 			&perror("WARN: $file [$.]: installing shared libraries, ".
 				"please define INSTALLS_SHLIB as appropriate");
 		}
@@ -1413,7 +1414,7 @@ DISTFILES DIST_SUBDIR EXTRACT_ONLY
 		" if nothing seems apropriate.");
 	}
 
-	if ($committer && $makevar{'.CURDIR'} =~ m'/([^/]+)/[^/]+/?$') {
+	if ($committer && $makevar{'.CURDIR'} =~ m'ports/([^/]+)/[^/]+/?$') {
 		if ($cat[0] ne $1 && $makevar{PKGCATEGORY} ne $1 ) {
 			&perror("FATAL: $file: category \"$1\" must be listed first");
 		}
@@ -2122,6 +2123,12 @@ sub abspathname {
 	my($s, $i, %cmdnames);
 	my($pre);
 
+	# trim all trailing backslash and newline
+	$str =~ s/\\\n\s*/ /g;
+
+	# ignore parameter string to reinplace command
+	$str =~ s/([ \t][\@-]?(?:sed|\$[\{\(]SED[\}\)]|\$[\{\(]REINPLACE_CMD[\}\)]))((?:\s+\-\w+)*\s+(?:"(?:\\"|[^"\n])*"|'(?:\\'|[^'\n])*'))+(.*)/$1$3/g; #'
+
 	# ignore parameter string to echo command
 	$str =~ s/[ \t][\@-]?(echo|\$[\{\(]ECHO[\}\)]|\$[\{\(]ECHO_MSG[\}\)])[ \t]+("(\\'|\\"|[^"])*"|'(\\'|\\"|[^"])*')[ \t]*[;\n]//; #'