diff options
| author | salo <salo@pkgsrc.org> | 2004-04-12 01:02:19 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2004-04-12 01:02:19 +0000 |
| commit | c1e121865731447f4223615c7a51625fffade535 (patch) | |
| tree | eea4c23aee9e3ce69eb1224d00759bcaae88132b | |
| parent | e9453a0d9eac241e8c1cf699ef79d6d571b719d1 (diff) | |
| download | pkgsrc-c1e121865731447f4223615c7a51625fffade535.tar.gz | |
Check for pkgsrc-wip remnants. Welcome to 3.69.
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 23 |
2 files changed, 24 insertions, 3 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index a4bf94a6954..9be691cb5bf 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.180 2004/04/11 18:29:34 jschauma Exp $ +# $NetBSD: Makefile,v 1.181 2004/04/12 01:02:19 salo Exp $ # -DISTNAME= pkglint-3.68 +DISTNAME= pkglint-3.69 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 3c53c0193f8..7ed0fd20cfe 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -11,7 +11,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.98 2004/02/23 12:33:29 wiz Exp $ +# $NetBSD: pkglint.pl,v 1.99 2004/04/12 01:02:19 salo Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -82,6 +82,14 @@ if (-e <$portdir/../Packages.txt>) { exit 0; } +if (-e <$portdir/../../Packages.txt>) { + if ($portdir eq ".") { + $category = basename(dirname($ENV{'PWD'})); + } else { + $category = basename(dirname($portdir)); + } +} + # # variables for global checks. # @@ -902,6 +910,13 @@ EOF " (BUILD_)DEPENDS, use (BUILD_)DEPENDS+= instead."); } + # whole file: check for pkgsrc-wip remnants + # + if ($whole =~ /\/wip\// + && $category ne "wip") { + &perror("FATAL: possible pkgsrc-wip pathname detected."); + } + # # whole file: full path name # @@ -984,6 +999,12 @@ EOF } } + # check for pkgsrc-wip remnants in CATEGORIES + if ($tmp =~ /\nCATEGORIES=[ \t]*.*wip.*\n/ + && $category ne "wip") { + &perror("FATAL: don't forget to remove \"wip\" from CATEGORIES."); + } + # check the URL if ($tmp =~ /\nMASTER_SITES[+?]?=[ \t]*([^\n]*)\n/ && $1 !~ /^[ \t]*$/) { |