diff options
| author | abs <abs@pkgsrc.org> | 2003-06-15 22:19:46 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2003-06-15 22:19:46 +0000 |
| commit | 0083a179752a1411eb2d0ecf7ef239000049b26a (patch) | |
| tree | b1bb6eb7ce43534a86b0c45782c92d1a8209fefc /pkgtools | |
| parent | 28ef1a60e682d21fbc935a8eba416511f0309533 (diff) | |
| download | pkgsrc-0083a179752a1411eb2d0ecf7ef239000049b26a.tar.gz | |
Update pkglint to 3.55:
- In lintpkgsrc check for invalid PKGREVISION, and handle PKGREVISION=0
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkglint/files/lintpkgsrc.pl | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 972b3a96e42..6604ad6d6d7 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.160 2003/05/27 17:14:51 wiz Exp $ +# $NetBSD: Makefile,v 1.161 2003/06/15 22:19:46 abs Exp $ # -DISTNAME= pkglint-3.54 +DISTNAME= pkglint-3.55 WRKSRC= ${WRKDIR} CATEGORIES= pkgtools devel MASTER_SITES= # empty diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl index 2f323cc2938..d0291e658ca 100755 --- a/pkgtools/pkglint/files/lintpkgsrc.pl +++ b/pkgtools/pkglint/files/lintpkgsrc.pl @@ -1,6 +1,6 @@ #!@PREFIX@/bin/perl -# $NetBSD: lintpkgsrc.pl,v 1.77 2003/04/30 03:16:07 atatat Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.78 2003/06/15 22:19:46 abs Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -737,8 +737,13 @@ sub parse_makefile_pkgsrc if (defined $vars->{PKGREVISION} and not $vars->{PKGREVISION} =~ /^\s*$/ ) { - $pkgname .= "nb"; - $pkgname .= $vars->{PKGREVISION}; + if ($vars->{PKGREVISION} =~ /\D/) + { print "\rBogus: PKGREVISION $vars->{PKGREVISION} (from $file)\n"; } + elsif ($vars->{PKGREVISION}) + { + $pkgname .= "nb"; + $pkgname .= $vars->{PKGREVISION}; + } } if ( $pkgname =~ /\$/ ) { print "\rBogus: $pkgname (from $file)\n"; } |