diff options
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 22 |
2 files changed, 17 insertions, 9 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 2cc332b74ba..bfd78aa8576 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.105 2001/07/07 18:21:29 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.106 2001/07/08 16:41:52 wiz Exp $ # -DISTNAME= pkglint-3.04 +DISTNAME= pkglint-3.05 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index dea1dc6d111..e45826aa8db 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.52 2001/06/09 15:36:13 wiz Exp $ +# $NetBSD: pkglint.pl,v 1.53 2001/07/08 16:41:53 wiz Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -571,7 +571,8 @@ sub checkmakefile { local($tmp, $tmp2); local($i, $j, $k, $l); local(@varnames) = (); - local($distfiles, $pkgname, $distname, $extractsufx) = ('', '', '', ''); + local($distfiles, $pkgname, $svrpkgname, $distname, + $extractsufx) = ('', '', '', '', ''); local($bogusdistfiles) = (0); local($realwrksrc, $wrksrc, $nowrksubdir) = ('', '', ''); local($includefile); @@ -838,8 +839,8 @@ EOF # check the order of items. @tocheck=split(/\s+/, <<EOF); -DISTNAME PKGNAME WRKSRC NO_WRKSUBDIR CATEGORIES MASTER_SITES MASTER_SITE_SUBDIR -EXTRACT_SUFX DISTFILES +DISTNAME PKGNAME SVR4_PKGNAME WRKSRC NO_WRKSUBDIR CATEGORIES MASTER_SITES +MASTER_SITE_SUBDIR EXTRACT_SUFX DISTFILES EOF push(@tocheck,"ONLY_FOR_ARCHS"); push(@tocheck,"NO_SRC_ON_FTP"); @@ -888,10 +889,11 @@ EOF } # check DISTFILES and related items. - $distfiles = $1 if ($tmp =~ /\nDISTFILES[+?]?=[ \t]*([^\n]+)\n/); - $pkgname = $1 if ($tmp =~ /\nPKGNAME[+?]?=[ \t]*([^\n]+)\n/); $distname = $1 if ($tmp =~ /\nDISTNAME[+?]?=[ \t]*([^\n]+)\n/); + $pkgname = $1 if ($tmp =~ /\nPKGNAME[+?]?=[ \t]*([^\n]+)\n/); + $svrpkgname = $1 if ($tmp =~ /\nSVR4_PKGNAME[+?]?=[ \t]*([^\n]+)\n/); $extractsufx = $1 if ($tmp =~ /\nEXTRACT_SUFX[+?]?=[ \t]*([^\n]+)\n/); + $distfiles = $1 if ($tmp =~ /\nDISTFILES[+?]?=[ \t]*([^\n]+)\n/); # check bogus EXTRACT_SUFX. if ($extractsufx ne '') { @@ -915,6 +917,12 @@ EOF &perror("WARN: PKGNAME is \${DISTNAME} by default, ". "you don't need to define PKGNAME."); } + if ($svrpkgname ne '') { + if (length($svrpkgname) > 5) { + &perror("FATAL: SVR4_PKGNAME should not be longer ". + "than 5 characters."); + } + } $i = ($pkgname eq '') ? $distname : $pkgname; $i =~ s/\${DISTNAME[^}]*}/$distname/g; if ($i =~ /-([^-]+)$/) { @@ -999,7 +1007,7 @@ EOF } push(@varnames, split(/\s+/, <<EOF)); -DISTNAME PKGNAME CATEGORIES MASTER_SITES MASTER_SITE_SUBDIR +DISTNAME PKGNAME SVR4_PKGNAME CATEGORIES MASTER_SITES MASTER_SITE_SUBDIR EXTRACT_SUFX DISTFILES EOF |