diff options
| author | rh <rh@pkgsrc.org> | 2003-04-19 03:05:15 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2003-04-19 03:05:15 +0000 |
| commit | 744a23620fd783490251ecbb79a00c47c4bc771a (patch) | |
| tree | 3604babf4eeef74006c90850a37775f2bc5ebb05 | |
| parent | 0b3883902e5e3d27249d8f030a20a1187ff75335 (diff) | |
| download | pkgsrc-744a23620fd783490251ecbb79a00c47c4bc771a.tar.gz | |
Update pkglint to 3.50. This version does a (slightly) better job at
Makefile variable parsing and lets "VARNAME=" override "VARNAME?="
definitions. This should also fix the current bogus warnings about
distinfo in the weekly pkgsrc output.
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 8ec3e0d5b79..9358ee63dc1 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.155 2003/03/29 12:34:10 jmmv Exp $ +# $NetBSD: Makefile,v 1.156 2003/04/19 03:05:15 rh Exp $ # -DISTNAME= pkglint-3.49 +DISTNAME= pkglint-3.50 WRKSRC= ${WRKDIR} CATEGORIES= pkgtools devel MASTER_SITES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 594e14497ee..a856b36811d 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.84 2003/03/29 12:34:11 jmmv Exp $ +# $NetBSD: pkglint.pl,v 1.85 2003/04/19 03:05:16 rh Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -732,10 +732,12 @@ sub checkmakefile { $filesdir = "files"; $filesdir = $1 if ($whole =~ /\nFILESDIR[+?]?=[ \t]*([^\n]+)\n/); + $filesdir = $1 if ($whole =~ /\nFILESDIR:?=[ \t]*([^\n]+)\n/); $filesdir =~ s/\$\{.CURDIR\}/./; $patchdir = "patches"; $patchdir = $1 if ($whole =~ /\nPATCHDIR[+?]?=[ \t]*([^\n]+)\n/); + $patchdir = $1 if ($whole =~ /\nPATCHDIR:?=[ \t]*([^\n]+)\n/); $patchdir =~ s/\$\{.CURDIR\}/./; $patchdir =~ s/\${PKGSRCDIR}/..\/../; @@ -744,14 +746,17 @@ sub checkmakefile { $pkgdir = "."; } $pkgdir = $1 if ($whole =~ /\nPKGDIR[+?]?=[ \t]*([^\n]+)\n/); + $pkgdir = $1 if ($whole =~ /\nPKGDIR:?=[ \t]*([^\n]+)\n/); $pkgdir =~ s/\$\{.CURDIR\}/./; $scriptdir = "scripts"; $scriptdir = $1 if ($whole =~ /\nSCRIPTDIR[+?]?=[ \t]*([^\n]+)\n/); + $scriptdir = $1 if ($whole =~ /\nSCRIPTDIR:?=[ \t]*([^\n]+)\n/); $scriptdir =~ s/\$\{.CURDIR\}/./; $distinfo = "distinfo"; $distinfo = $1 if ($whole =~ /\nDISTINFO_FILE[+?]?=[ \t]*([^\n]+)\n/); + $distinfo = $1 if ($whole =~ /\nDISTINFO_FILE:?=[ \t]*([^\n]+)\n/); $distinfo =~ s/\$\{.CURDIR\}/./; $distinfo =~ s/\${PKGSRCDIR}/..\/../; |