diff options
| author | wiz <wiz@pkgsrc.org> | 2002-07-02 13:16:30 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2002-07-02 13:16:30 +0000 |
| commit | cb17e820a32fd471a71dbc69db96535c704cb784 (patch) | |
| tree | 622edc7cbf69f62251261b7b593e45c5cef09704 /pkgtools | |
| parent | 867d08655aec8b2a4d809e5de5c3017cad6ec244 (diff) | |
| download | pkgsrc-cb17e820a32fd471a71dbc69db96535c704cb784.tar.gz | |
3.27: Warn about missing RCS Id in distinfo, and note that IS_INTERACTIVE
is deprecated.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 19 |
2 files changed, 16 insertions, 7 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index e57328cd537..e452e1f2160 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.130 2002/06/02 21:52:28 wiz Exp $ +# $NetBSD: Makefile,v 1.131 2002/07/02 13:16:30 wiz Exp $ # -DISTNAME= pkglint-3.26 +DISTNAME= pkglint-3.27 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index df44dc9457a..284d6bde5d4 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.66 2002/04/08 13:57:14 wiz Exp $ +# $NetBSD: pkglint.pl,v 1.67 2002/07/02 13:16:32 wiz Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -285,6 +285,10 @@ sub checkdistinfo { local(%indistinfofile); open(SUM,"<$portdir/$file") || return 0; + $_ = <SUM>; + if (! /^\$NetBSD(:.*|)\$$/) { + &perror("FATAL: missing RCS Id in distinfo file: $_"); + } while(<SUM>) { next if !/^(MD5|SHA1|RMD160) \(([^)]+)\) = (.*)$/; $alg=$1; @@ -661,18 +665,23 @@ sub checkmakefile { "DISTINFO: $distinfo\n") if ($verbose); # - # whole file: IS_INTERACTIVE + # whole file: INTERACTIVE_STAGE # $whole =~ s/\n#[^\n]*/\n/g; $whole =~ s/\n\n+/\n/g; - print "OK: checking IS_INTERACTIVE.\n" if ($verbose); - if ($whole =~ /\nIS_INTERACTIVE/) { + print "OK: checking INTERACTIVE_STAGE.\n" if ($verbose); + if ($whole =~ /\nINTERACTIVE_STAGE/) { if ($whole !~ /defined\((BATCH|FOR_CDROM)\)/) { - &perror("WARN: use of IS_INTERACTIVE discouraged. ". + &perror("WARN: use of INTERACTIVE_STAGE discouraged. ". "provide batch mode by using BATCH and/or ". "FOR_CDROM."); } } + print "OK: checking IS_INTERACTIVE.\n" if ($verbose); + if ($whole =~ /\nIS_INTERACTIVE/) { + &perror("FATAL: IS_INTERACTIVE is deprecated, ". + "use INTERACTIVE_STAGE instead."); + } print "OK: checking for PLIST_SRC.\n" if ($verbose); if ($whole =~ /\nPLIST_SRC/) { $seen_PLIST_SRC=1; |