diff options
| author | wiz <wiz@pkgsrc.org> | 2001-04-21 12:54:17 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2001-04-21 12:54:17 +0000 |
| commit | 3cdd73e630392437ab7dcc4920bb12f8f00b7e3b (patch) | |
| tree | 4b79eda8b6a341cc450e4e418b274c6f1c25d798 /pkgtools | |
| parent | 249c7fec91ab5020f4d6407666b0a48c5f675fb2 (diff) | |
| download | pkgsrc-3cdd73e630392437ab7dcc4920bb12f8f00b7e3b.tar.gz | |
Use the same pattern for matching patch files as in bsd.pkg.mk.
Fixes a bogus warning for at least devel/patch.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 00c74f5564f..5579cda6fcb 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.87 2001/04/19 13:25:41 wiz Exp $ +# $NetBSD: Makefile,v 1.88 2001/04/21 12:54:17 wiz Exp $ # -DISTNAME= pkglint-2.45 +DISTNAME= pkglint-2.46 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 75ada265a1f..51c204f1d9e 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.45 2001/04/19 13:25:42 wiz Exp $ +# $NetBSD: pkglint.pl,v 1.46 2001/04/21 12:54:17 wiz Exp $ # # This version contains some changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -326,7 +326,7 @@ sub checkdistinfo { &perror("FATAL: checksum of $patch differs between $portdir/$file and\n" ." $portdir/$patchdir/$patch. Rerun 'make makepatchsum'."); } - } elsif ($patch =~ /^patch-/) { + } elsif ($patch =~ /^patch-[a-z0-9]+$/) { &perror("FATAL: patchfile '$patch' is in $file\n" ." but not in $portdir/$patchdir/$patch. Rerun 'make makepatchsum'."); } @@ -335,7 +335,7 @@ sub checkdistinfo { } close(SUM); - foreach $patch ( <$portdir/$patchdir/patch-*> ) { + foreach $patch ( <$portdir/$patchdir/patch-[a-z0-9]+> ) { $patch =~ /\/([^\/]+)$/; if (! $indistinfofile{$1}) { &perror("FATAL: patchsum of '$1' is in $portdir/$patchdir/$1 but not in\n" |