diff options
| author | hubertf <hubertf@pkgsrc.org> | 1999-12-28 00:50:17 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 1999-12-28 00:50:17 +0000 |
| commit | bd64283d89baeeb16490417ce760e98710b0e674 (patch) | |
| tree | 9613415ad997b74c0990842ab4183fc112e60885 /pkgtools | |
| parent | 433a39aedf25f351b91ac5cbe4299263ad4094ac (diff) | |
| download | pkgsrc-bd64283d89baeeb16490417ce760e98710b0e674.tar.gz | |
Fix handling of items in PATCH_* section.
Addresses PR 9049 by ITOH Yasufumi <itohy@netbsd.org>
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 24 |
2 files changed, 17 insertions, 11 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 13899613dd8..9dfea507d53 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.29 1999/12/22 22:07:29 abs Exp $ +# $NetBSD: Makefile,v 1.30 1999/12/28 00:50:17 hubertf Exp $ # -DISTNAME= pkglint-1.88 +DISTNAME= pkglint-1.89 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 91e868e0967..68ee1b53978 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.17 1999/12/07 21:33:57 hubertf Exp $ +# $NetBSD: pkglint.pl,v 1.18 1999/12/28 00:50:18 hubertf Exp $ # # This version contains some changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org> and @@ -969,21 +969,27 @@ EOF if ($tmp =~ /(PATCH_SITES|PATCH_SITE_SUBDIR|PATCHFILES|PATCH_DIST_STRIP)/) { &checkearlier($tmp, @varnames); - if ($tmp =~ /^PATCH_SITES=/) { + $tmp = "\n$tmp"; + + if ($tmp =~ /\n(PATCH_SITES)=/) { print "OK: seen PATCH_SITES.\n" if ($verbose); - $tmp =~ s/^[^\n]+\n//; + $tmp =~ s/$1[^\n]+\n//; } - if ($tmp =~ /^PATCH_SITE_SUBDIR=/) { + if ($tmp =~ /\n(PATCH_SITE_SUBDIR)=/) { print "OK: seen PATCH_SITES.\n" if ($verbose); - $tmp =~ s/^[^\n]+\n//; + $tmp =~ s/$1[^\n]+\n//; } - if ($tmp =~ /^PATCHFILES=/) { + if ($tmp =~ /\n(PATCHFILES)=/) { print "OK: seen PATCHFILES.\n" if ($verbose); - $tmp =~ s/^[^\n]+\n//; + $tmp =~ s/$1[^\n]+\n//; + } + if ($tmp =~ /\n(PATCH_DIST_ARGS)=/) { + print "OK: seen PATCH_DIST_ARGS.\n" if ($verbose); + $tmp =~ s/$1[^\n]+\n//; } - if ($tmp =~ /^PATCH_DIST_STRIP=/) { + if ($tmp =~ /\n(PATCH_DIST_STRIP)=/) { print "OK: seen PATCH_DIST_STRIP.\n" if ($verbose); - $tmp =~ s/^[^\n]+\n//; + $tmp =~ s/$1[^\n]+\n//; } &checkextra($tmp, 'PATCH_SITES'); |