summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2000-01-19 13:59:20 +0000
committerabs <abs@pkgsrc.org>2000-01-19 13:59:20 +0000
commitbc2316c9779afc8d478274e032a442ec29c16967 (patch)
treedabd4500640f9a295ae216796d7adccc0776768c
parentd9f43f4d225c33afd69f6fba2f28d20f820e0609 (diff)
downloadpkgsrc-bc2316c9779afc8d478274e032a442ec29c16967.tar.gz
include Makefiles with LICENSE with -R, update to 1.99
-rw-r--r--pkgtools/pkglint/Makefile4
-rw-r--r--pkgtools/pkglint/files/lintpkgsrc.112
-rwxr-xr-xpkgtools/pkglint/files/lintpkgsrc.pl12
3 files changed, 17 insertions, 11 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index 6c9c0b6c86c..93d0cb0dc97 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2000/01/14 01:02:01 abs Exp $
+# $NetBSD: Makefile,v 1.40 2000/01/19 13:59:20 abs Exp $
#
-DISTNAME= pkglint-1.98
+DISTNAME= pkglint-1.99
CATEGORIES= pkgtools devel
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkglint/files/lintpkgsrc.1 b/pkgtools/pkglint/files/lintpkgsrc.1
index c05d36f1066..f54e41cbc6a 100644
--- a/pkgtools/pkglint/files/lintpkgsrc.1
+++ b/pkgtools/pkglint/files/lintpkgsrc.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: lintpkgsrc.1,v 1.8 2000/01/14 01:02:01 abs Exp $
+.\" $NetBSD: lintpkgsrc.1,v 1.9 2000/01/19 13:59:22 abs Exp $
.\"
.\" Copyright (c) 1999 by David Brownlee (abs@netbsd.org)
.\" Absolutely no warranty.
@@ -32,10 +32,16 @@ Set basedir for binary packages, otherwise PKGSRCDIR/packages is used.
List the filenames of Makefiles as they are parsed (for debugging).
.It Fl P Ar pkgsrcdir
Set pkgsrcdir - otherwise
-.Pa /etc/mk.conf is parsed for
+.Pa /etc/mk.conf
+is parsed for
.Em PKGSRCDIR .
.It Fl R
-Report any RESTRICTED binary packages (in any subdirs of PKGSRCDIR/packages).
+Report any binary packages in any subdirs of PKGSRCDIR/packages,
+for whom the source Makefile lists
+.Em RESTRICTED
+or
+.Em LICENCE .
+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
verify the version specified in each DEPEND correctly matches a current
diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl
index 6c579f42d8f..1f69fcedd49 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.18 2000/01/14 01:02:01 abs Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.19 2000/01/19 13:59:22 abs Exp $
# Written by David Brownlee <abs@netbsd.org>.
#
@@ -20,12 +20,12 @@ use File::Find;
my( $pkgsrcdir, # Base of pkgsrc tree
%pkgver2dir, # Map package-version to category/pkgname
%pkg2ver, # Map pkgname to version
- %pkgrestricted, # RESTRICTED packages, by pkgname
+ %pkgrestricted, # RESTRICTED/LICENCE 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); # Ditto, but for RESTRICTED packages
+ @restricted_prebuiltpackages); # " but for RESTRICTED/LICENCE packages
$ENV{PATH} .= ':/usr/sbin';
@@ -80,7 +80,7 @@ if ($opt{'D'})
}
}
- # List obsolete or RESTRICTED prebuilt packages
+ # List obsolete or RESTRICTED/LICENCE prebuilt packages
#
if ($opt{'p'} || $opt{'R'})
{
@@ -524,7 +524,7 @@ sub parse_makefile
{
if ( $pkgname =~ /\$/ )
{ print "\rBogus: $pkgname (from $file)\n"; }
- if (defined($vars{'RESTRICTED'}))
+ if (defined($vars{'RESTRICTED'}) || defined($vars{'LICENSE'}))
{ $pkgrestricted{$pkgname} = 1; }
return($pkgname, %vars);
}
@@ -800,7 +800,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 prebuilt packages.
+ -R : List any RESTRICTED/LICENCE 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.