diff options
| author | rh <rh> | 2003-01-11 04:42:57 +0000 |
|---|---|---|
| committer | rh <rh> | 2003-01-11 04:42:57 +0000 |
| commit | ea1a4485b6aec5e791c1c88a22b025b0d72faeb4 (patch) | |
| tree | bb746a453fc862d42bc1ac344ba67c3b779762a4 /pkgtools | |
| parent | 2be3342806437f0d37186daf1018a141f976a9b5 (diff) | |
| download | pkgsrc-ea1a4485b6aec5e791c1c88a22b025b0d72faeb4.tar.gz | |
Update pkglint to 3.42:
* Add a PKGLOCALEDIR check to pkglint: warn if PKGLOCALEDIR is in
PLIST, USE_BUILDLINK2 is set, and USE_PKGLOCALEDIR is not set.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 17 |
2 files changed, 18 insertions, 3 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 6adca67a3f4..7480a5ed92f 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.146 2003/01/02 22:58:41 schmonz Exp $ +# $NetBSD: Makefile,v 1.147 2003/01/11 04:42:57 rh Exp $ # -DISTNAME= pkglint-3.41 +DISTNAME= pkglint-3.42 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index ddda3cc1d0e..8e7eb7ca921 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -12,7 +12,7 @@ # Freely redistributable. Absolutely no warranty. # # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp -# $NetBSD: pkglint.pl,v 1.77 2003/01/02 22:58:43 schmonz Exp $ +# $NetBSD: pkglint.pl,v 1.78 2003/01/11 04:42:57 rh Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -89,6 +89,8 @@ $sharedocused = 0; $seen_PLIST_SRC = 0; $seen_NO_PKG_REGISTER = 0; $seen_NO_CHECKSUM = 0; +$seen_USE_PKGLOCALEDIR = 0; +$seen_USE_BUILDLINK2 = 0; %predefined = (); foreach $i (split("\n", <<EOF)) { @@ -459,6 +461,11 @@ sub checkplist { $infooverwrite++; } + if ($_ =~ /\${PKGLOCALEDIR}/ && $seen_USE_BUILDLINK2 && ! $seen_USE_PKGLOCALEDIR) { + &perror("WARN: PLIST contains \${PKGLOCALEDIR}, ". + "but USE_PKGLOCALEDIR was not found."); + } + if ($curdir !~ m#^$localbase# && $curdir !~ m#^/usr/X11R6#) { &perror("WARN: $file $.: installing to ". @@ -752,6 +759,14 @@ sub checkmakefile { &perror("FATAL: USE_PKGLIBTOOL is deprecated, ". "use USE_LIBTOOL instead."); } + print "OK: checking for USE_BUILDLINK2.\n" if ($verbose); + if ($whole =~ /\nUSE_BUILDLINK2/) { + $seen_USE_BUILDLINK2=1; + } + print "OK: checking for USE_PKGLOCALEDIR.\n" if ($verbose); + if ($whole =~ /\nUSE_PKGLOCALEDIR/) { + $seen_USE_PKGLOCALEDIR=1; + } print "OK: checking USE_SSL.\n" if ($verbose); if ($whole =~ /\nUSE_SSL/) { &perror("FATAL: USE_SSL is deprecated, ". |