Update lintpkgsrc -R to check for NO_BIN_ON_FTP or RESTRICTED

Now 2.13

3 files changed, 11 insertions, 11 deletions

diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index 5dc3cdc2e2e..24947dadf31 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2000/07/20 13:55:28 rh Exp $
+# $NetBSD: Makefile,v 1.54 2000/08/17 16:16:01 abs Exp $
 #
 
-DISTNAME=		pkglint-2.12
+DISTNAME=		pkglint-2.13
 CATEGORIES=		pkgtools devel
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/pkgtools/pkglint/files/lintpkgsrc.1 b/pkgtools/pkglint/files/lintpkgsrc.1
index 79efef633e1..52597dce930 100644
--- a/pkgtools/pkglint/files/lintpkgsrc.1
+++ b/pkgtools/pkglint/files/lintpkgsrc.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: lintpkgsrc.1,v 1.10 2000/05/29 19:44:28 dmcmahill Exp $
+.\"	$NetBSD: lintpkgsrc.1,v 1.11 2000/08/17 16:16:02 abs Exp $
 .\"
 .\" Copyright (c) 1999 by David Brownlee (abs@netbsd.org)
 .\" Absolutely no warranty.
@@ -40,9 +40,9 @@ is parsed for
 .It Fl R
 Report any binary packages in any subdirs of PKGSRCDIR/packages,
 for whom the source Makefile lists
-.Em RESTRICTED
+.Em NO_BIN_ON_FTP
 or
-.Em LICENCE .
+.Em RESTRICTED .
 This is intended to help those making binary packages available for ftp.
 .It Fl d
 Extract the 'DEPENDS' listing from each pkgsrc package Makefile, then
diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl
index 1353a943fdf..1d761d30ead 100755
--- a/pkgtools/pkglint/files/lintpkgsrc.pl
+++ b/pkgtools/pkglint/files/lintpkgsrc.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 
-# $NetBSD: lintpkgsrc.pl,v 1.25 2000/05/29 19:44:28 dmcmahill Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.26 2000/08/17 16:16:02 abs Exp $
 
 # Written by David Brownlee <abs@netbsd.org>.
 #
@@ -21,12 +21,12 @@ my(	$pkgsrcdir,		# Base of pkgsrc tree
 	$pkgdistdir,		# Distfiles directory
 	%pkgver2dir,		# Map package-version to category/pkgname
 	%pkg2ver,		# Map pkgname to version
-	%pkgrestricted,		# RESTRICTED/LICENCE packages, by pkgname
+	%pkgrestricted,		# NO_BIN_ON_FTP/RESTRICTED packages, by pkgname
 	%default_makefile_vars,	# Default vars set for Makefiles
 	%opt,			# Command line options
 	@old_prebuiltpackages,	# List of obsolete prebuilt package paths
 	@prebuilt_pkgdirs,	# Use to follow symlinks in prebuilt pkgdirs
-	@restricted_prebuiltpackages);	# " but for RESTRICTED/LICENCE packages
+	@restricted_prebuiltpackages);	# " but for NO_BIN_ON_FTP/RESTRICTED
 
 $ENV{PATH} .= ':/usr/sbin';
 
@@ -87,7 +87,7 @@ if ($opt{'D'})
 	    }
 	}
 
-    # List obsolete or RESTRICTED/LICENCE prebuilt packages
+    # List obsolete or NO_BIN_ON_FTP/RESTRICTED prebuilt packages
     #
     if ($opt{'p'} || $opt{'R'})
 	{
@@ -557,7 +557,7 @@ sub parse_makefile
 	{
 	if ( $pkgname =~ /\$/ )
 	    { print "\rBogus: $pkgname (from $file)\n"; }
-	if (defined($vars{'RESTRICTED'}) || defined($vars{'LICENSE'}))
+	if (defined($vars{'NO_BIN_ON_FTP'}) || defined($vars{'RESTRICTED'}))
 	    { $pkgrestricted{$pkgname} = 1; }
 	return($pkgname, %vars);
 	}
@@ -834,7 +834,7 @@ opts:
   -d	     : Check 'DEPENDS' are up to date.
   -i	     : Check installed package versions against pkgsrc.
   -l	     : Pkglint every package in pkgsrc.
-  -R	     : List any RESTRICTED/LICENCE prebuilt packages.
+  -R	     : List any NO_BIN_ON_FTP/RESTRICTED prebuilt packages.
   -m	     : List md5 mismatches for files in distfiles/.
   -o	     : List old/obsolete distfiles (not referenced by any md5).
   -p	     : List old/obsolete prebuilt packages.