diff options
| author | hubertf <hubertf> | 1999-12-07 21:33:56 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 1999-12-07 21:33:56 +0000 |
| commit | ffab72d1c0d136d2d0d0bbaae2832f6b6eb0622f (patch) | |
| tree | ab8a2a30323834f221b841c03d373ff876dbc4a6 /pkgtools | |
| parent | a626b7b10f2760bd81c43997dacd5c44bd5f9508 (diff) | |
| download | pkgsrc-ffab72d1c0d136d2d0d0bbaae2832f6b6eb0622f.tar.gz | |
Bump to V1.81, adding code to check for existance of PLIST
(unless PLIST_SRC or NO_PKG_REGISTER are set)
Fixes PR 8953 by Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 18 |
2 files changed, 19 insertions, 3 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 02dd0d20890..2c178c15777 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.21 1999/12/06 01:14:34 hubertf Exp $ +# $NetBSD: Makefile,v 1.22 1999/12/07 21:33:56 hubertf Exp $ # -DISTNAME= pkglint-1.80 +DISTNAME= pkglint-1.81 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index c2bb1f505cb..91e868e0967 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.16 1999/11/26 03:30:39 hubertf Exp $ +# $NetBSD: pkglint.pl,v 1.17 1999/12/07 21:33:57 hubertf Exp $ # # This version contains some changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org> and @@ -115,6 +115,8 @@ $sharedocused = 0; %plistmangz = (); %plistman = (); %manlangs = (); +$seen_PLIST_SRC = 0; +$seen_NO_PKG_REGISTER = 0; %predefined = (); foreach $i (split("\n", <<EOF)) { @@ -214,6 +216,12 @@ foreach $i (@checker) { } } } +if (! -f "$portdir/pkg/PLIST" + and ! -f "$portdir/pkg/PLIST-mi" + and ! $seen_PLIST_SRC + and ! $seen_NO_PKG_REGISTER ) { + &perror("WARN: no PLIST or PLIST-mi, and PLIST_SRC and NO_PKG_REGISTER unset.\n Are you sure PLIST handling is ok?"); +} if ($committer) { if (scalar(@_ = <$portdir/work*/*>) || -d "$portdir/work*") { &perror("WARN: be sure to cleanup $portdir/work* ". @@ -650,6 +658,14 @@ sub checkmakefile { "installation of files into $localbase/share/doc.") if $osname ne "NetBSD"; # how do you get this out of PLIST? } + print "OK: checking for PLIST_SRC.\n" if ($verbose); + if ($whole =~ /\nPLIST_SRC/) { + $seen_PLIST_SRC=1; + } + print "OK: checking for NO_PKG_REGISTER.\n" if ($verbose); + if ($whole =~ /\nNO_PKG_REGISTER/) { + $seen_NO_PKG_REGISTER=1; + } # # whole file: direct use of command names |