[Midnightbsd-cvs] CVS Commit: ports-mgmt/portlint: some changes to help with LICENSE

[laffer1 at midnightbsd.org]

Log Message:
-----------
some changes to help with LICENSE

Modified Files:
--------------
    mports/ports-mgmt/portlint:
        Makefile (r1.1 -> r1.2)
    mports/ports-mgmt/portlint/src:
        portlint.pl (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/ports-mgmt/portlint/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lports-mgmt/portlint/Makefile -Lports-mgmt/portlint/Makefile -u -r1.1 -r1.2
--- ports-mgmt/portlint/Makefile
+++ ports-mgmt/portlint/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	portlint
 PORTVERSION=	2.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	# none
 DISTFILES=	# none
Index: portlint.pl
===================================================================
RCS file: /home/cvs/mports/ports-mgmt/portlint/src/portlint.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lports-mgmt/portlint/src/portlint.pl -Lports-mgmt/portlint/src/portlint.pl -u -r1.1 -r1.2
--- ports-mgmt/portlint/src/portlint.pl
+++ ports-mgmt/portlint/src/portlint.pl
@@ -105,7 +105,7 @@
 	-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)
+	-M ENV	set make variables to ENV (ex. PORTSDIR=/usr/mports.work)
 	-B#	allow # contiguous blank lines (default: $contblank line)
 EOF
 		exit 0;
@@ -188,6 +188,7 @@
 	INDEXFILE PKGORIGIN CONFLICTS PKG_VERSION PKGINSTALLVER
 	PLIST_FILES OPTIONS INSTALLS_OMF USE_GETTEXT USE_RC_SUBR
 	DIST_SUBDIR ALLFILES IGNOREFILES CHECKSUM_ALGORITHMS INSTALLS_ICONS
+	LICENSE
 );
 
 my $cmd = join(' -V ', "make $makeenv MASTER_SITE_BACKUP=''", @varlist);
@@ -1303,7 +1304,7 @@
 	# whole file: BROKEN et al.
 	#
 	my ($var);
-	foreach $var (qw(IGNORE BROKEN COMMENT FORBIDDEN MANUAL_PACKAGE_BUILD NO_CDROM NO_PACKAGE RESTRICTED)) {
+	foreach $var (qw(IGNORE BROKEN COMMENT FORBIDDEN MANUAL_PACKAGE_BUILD NO_CDROM NO_PACKAGE RESTRICTED LICENSE)) {
 		print "OK: checking ${var}.\n" if ($verbose);
 		if ($whole =~ /\n${var}[+?]?=[ \t]+"/) {
 			my $lineno = &linenumber($`);
@@ -1471,6 +1472,7 @@
 				&& $curline !~ /^IGNORE(.)?=[^\n]+$i/m
 				&& $curline !~ /^BROKEN(.)?=[^\n]+$i/m
 				&& $curline !~ /^RESTRICTED(.)?=[^\n]+$i/m
+				&& $curline !~ /^LICENSE(.)?=[^\n]+$i/m
 				&& $curline !~ /^NO_PACKAGE(.)?=[^\n]+$i/m
 				&& $curline !~ /^NO_CDROM(.)?=[^\n]+$i/m
 				&& $curline !~ /^MAINTAINER(.)?=[^\n]+$i/m
@@ -1496,6 +1498,7 @@
 				&& $lm !~ /^IGNORE(.)?=[^\n]+($i\d*)/m
 				&& $lm !~ /^BROKEN(.)?=[^\n]+($i\d*)/m
 				&& $lm !~ /^RESTRICTED(.)?=[^\n]+($i\d*)/m
+				&& $lm !~ /^LICENSE(.)?=[^\n]+($i\d*)/m
 				&& $lm !~ /^NO_PACKAGE(.)?=[^\n]+($i\d*)/m
 				&& $lm !~ /^NO_CDROM(.)?=[^\n]+($i\d*)/m
 				&& $lm !~ /^MAINTAINER(.)?=[^\n]+($i\d*)/m
@@ -2479,11 +2482,11 @@
 		}
 	}
 
-	# check RESTRICTED/NO_CDROM/NO_PACKAGE
+	# check RESTRICTED/NO_CDROM/NO_PACKAGE/LICENSE
 	print "OK: checking RESTRICTED/NO_CDROM/NO_PACKAGE.\n" if ($verbose);
-	if ($committer && $tmp =~ /\n(RESTRICTED|NO_CDROM|NO_PACKAGE)[+?]?=/) {
+	if ($committer && $tmp =~ /\n(RESTRICTED|NO_CDROM|NO_PACKAGE|LICENSE)[+?]?=/) {
 		&perror("WARN", $file, -1, "\"$1\" found. do not forget to update ".
-			"ports/LEGAL.");
+			"mports/LEGAL if needed.");
 	}
 
 	# check NO_CONFIGURE/NO_PATCH