diff options
| author | abs <abs@pkgsrc.org> | 2002-02-13 08:42:11 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2002-02-13 08:42:11 +0000 |
| commit | 7dbe248d56d760b86269a9fff8d9a9143689a925 (patch) | |
| tree | ced6d263b33688d29297f6d7c996329d2594c268 /pkgtools | |
| parent | 30bd641bf7f2fd78067c83e7e1f4bd839f8c7706 (diff) | |
| download | pkgsrc-7dbe248d56d760b86269a9fff8d9a9143689a925.tar.gz | |
Update pkglint to 3.22
Handle DYNAMIC_MASTER_SITES
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 13 |
2 files changed, 11 insertions, 6 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index f780660b493..36dff2398cc 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.125 2002/01/03 11:04:49 abs Exp $ +# $NetBSD: Makefile,v 1.126 2002/02/13 08:42:11 abs Exp $ # -DISTNAME= pkglint-3.21 +DISTNAME= pkglint-3.22 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 935ba7bbd91..69ca44f43a1 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.63 2001/11/29 01:56:37 hubertf Exp $ +# $NetBSD: pkglint.pl,v 1.64 2002/02/13 08:42:12 abs Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -853,7 +853,7 @@ EOF # check the order of items. @tocheck=split(/\s+/, <<EOF); DISTNAME PKGNAME PKGREVISION SVR4_PKGNAME WRKSRC NO_WRKSUBDIR CATEGORIES -MASTER_SITES MASTER_SITE_SUBDIR EXTRACT_SUFX DISTFILES +MASTER_SITES DYNAMIC_MASTER_SITES MASTER_SITE_SUBDIR EXTRACT_SUFX DISTFILES EOF push(@tocheck,"ONLY_FOR_ARCHS"); push(@tocheck,"NO_SRC_ON_FTP"); @@ -896,9 +896,14 @@ EOF print "OK: non-URL \"$i\" ok.\n" if ($verbose); } + if ($tmp !~ /\nDYNAMIC_MASTER_SITES[+?]?=/) { + &perror("WARN: MASTER_SITES and DYNAMIC_MASTER_SITES ". + "found. Is this ok?"); + } } - } else { - &perror("WARN: no MASTER_SITES found. Is this ok?"); + } elsif ($tmp !~ /\nDYNAMIC_MASTER_SITES[+?]?=/) { + &perror("WARN: no MASTER_SITES or DYNAMIC_MASTER_SITES found.". + "Is this ok?"); } # check DISTFILES and related items. |