diff options
| author | abs <abs@pkgsrc.org> | 2003-01-28 22:44:00 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2003-01-28 22:44:00 +0000 |
| commit | cf5f085aa24e453f4697978353e22ca45aa54d10 (patch) | |
| tree | 1aa19a30a26e3156226031c59a0fd7049814a20b /pkgtools | |
| parent | d7f69e47ce32be7271733bcdf48d28468f400ab9 (diff) | |
| download | pkgsrc-cf5f085aa24e453f4697978353e22ca45aa54d10.tar.gz | |
Update pkglint to 3.46
Check MAKE_ENV and similar variables which contain ${ use :Q or are quoted
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 6 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index d84c4483c63..0acb2f5f180 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.151 2003/01/27 17:59:01 atatat Exp $ +# $NetBSD: Makefile,v 1.152 2003/01/28 22:44:00 abs Exp $ # -DISTNAME= pkglint-3.45 +DISTNAME= pkglint-3.46 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR} NO_CHECKSUM= yes NO_CONFIGURE= yes -MAKE_ENV= PKGSRCDIR=${_PKGSRCDIR} +MAKE_ENV= PKGSRCDIR=${_PKGSRCDIR:Q} DISTVER= ${DISTNAME:S/pkglint-//} diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 5bb32fb282c..583032f47ac 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.80 2003/01/24 15:16:32 wiz Exp $ +# $NetBSD: pkglint.pl,v 1.81 2003/01/28 22:44:01 abs Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -1364,6 +1364,17 @@ EOF } } + foreach $i (grep(/^(\W+_ENV)[?+]?=/, split(/\n/, $tmp))) { + $i =~ s/^(\W+_ENV)[?+]?=[ \t]*//; + $j = $1; + foreach $k (split(/\s+/, $i)) { + if ($k !~/^".*"$/ && $k =~ /\${/ && $k !~/:Q}/) { + &perror("WARN: definition of $k in $j. ". + "should use :Q or be quoted."); + } + } + } + # check USE_X11 and USE_IMAKE if ($tmp =~ /\nUSE_IMAKE[?+]?=/ && $tmp =~ /\nUSE_X11[?+]?=/) { &perror("WARN: since you already have USE_IMAKE, ". |