diff options
| author | wiz <wiz@pkgsrc.org> | 2002-09-24 14:01:37 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2002-09-24 14:01:37 +0000 |
| commit | c4d4a1f20a8956152351517e19b2f3dba15ce9fd (patch) | |
| tree | f1a7c93c14db5413e35b1cbafa7ff8a58c287250 /pkgtools/pkglint | |
| parent | 28d7381b958c4edd0f183b4e8f2139239d1b80f6 (diff) | |
| download | pkgsrc-c4d4a1f20a8956152351517e19b2f3dba15ce9fd.tar.gz | |
Update to 3.34: Can now also be run in Category directories and checks
correct sorting order of SUBDIR entries.
Diffstat (limited to 'pkgtools/pkglint')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 45 |
2 files changed, 45 insertions, 4 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index dba88dc9d63..d092c7bf2c8 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.137 2002/09/24 12:34:21 wiz Exp $ +# $NetBSD: Makefile,v 1.138 2002/09/24 14:01:37 wiz Exp $ # -DISTNAME= pkglint-3.33 +DISTNAME= pkglint-3.34 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 5c468269915..e8b88b5729a 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.70 2002/09/24 12:34:22 wiz Exp $ +# $NetBSD: pkglint.pl,v 1.71 2002/09/24 14:01:38 wiz Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -76,6 +76,12 @@ if (! -d $portdir) { exit 1; } +if (-e <$portdir/../Packages.txt>) { + print "OK: checking category Makefile.\n" if ($verbose); + &category_check; + exit 0; +} + # # variables for global checks. # @@ -657,7 +663,7 @@ sub checkmakefile { $i = "\n" x ($contblank + 2); if ($whole =~ /$i/) { &perror("FATAL: contiguous blank lines (> $contblank lines) found ". - "in $file at line " . int(split(/\n/, $`)) . "."); + "in $file at line " . int(@_ = split(/\n/, $`)) . "."); } # @@ -1499,4 +1505,39 @@ sub is_predefined { undef; } +sub category_check { + local($file) = "Makefile"; + local($first) = 1; + local($lastsub) = ""; + local($sub) = ""; + local($contents); + + $contents = readmakefile($file) or + &perror("FATAL: can't read $portdir/$file") and return 0; + if ($contents !~ /#(\s+)\$$rcsidstr([^\$]*)\$/) { + &perror("FATAL: no \$$rcsidstr\$ line in $file"); + } + if ($contents !~ /COMMENT=\s+\w/) { + &perror("FATAL: no COMMENT line in $file"); + } + # remove comments + foreach $n (split "\n", $contents) { + if ($n =~ /SUBDIR(\+*)=\s*(\S+)(\s*#.*|\s*)$/) { + $sub = $2; + if ($first == 0) { + if ($1 ne "+") { + &perror("FATAL: use SUBDIR+=, not SUBDIR$1="); + } + if ($lastsub ge $sub) { + &perror("FATAL: $sub should come before $lastsub"); + } + } + else { + $first = 0; + } + $lastsub = $sub; + } + } +} + sub TRUE {1;} |