diff options
| author | wiz <wiz> | 2000-12-13 23:53:42 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2000-12-13 23:53:42 +0000 |
| commit | 9faa0c35302b7013b56aa734851ada7d2bb0bdb3 (patch) | |
| tree | 47008284e877911504bb7c690cbc1f82ff28edbe /pkgtools | |
| parent | 2cdc8a355a637297b9cccc0afa48c4d8cbdc0ca5 (diff) | |
| download | pkgsrc-9faa0c35302b7013b56aa734851ada7d2bb0bdb3.tar.gz | |
MIRROR_DISTFILE is deprecated; add tests for that and NO_{BIN,SRC}_ON_FTP
instead. Bump to 2.33.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 17 |
2 files changed, 14 insertions, 7 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 1feb4e046c9..489ffe42de4 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.70 2000/12/02 02:02:59 wiz Exp $ +# $NetBSD: Makefile,v 1.71 2000/12/13 23:53:42 wiz Exp $ # -DISTNAME= pkglint-2.32 +DISTNAME= pkglint-2.33 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index fd26cc15322..71d4c807b82 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.36 2000/12/02 02:02:59 wiz Exp $ +# $NetBSD: pkglint.pl,v 1.37 2000/12/13 23:53:42 wiz Exp $ # # This version contains some changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org> and @@ -766,6 +766,11 @@ sub checkmakefile { &perror("FATAL: USE_PKGLIBTOOL is deprecated, ". "use USE_LIBTOOL instead."); } + print "OK: checking MIRROR_DISTFILE.\n" if ($verbose); + if ($whole =~ /\nMIRROR_DISTFILE/) { + &perror("WARN: use of MIRROR_DISTFILE deprecated, ". + "use NO_BIN_ON_FTP and/or NO_SRC_ON_FTP instead."); + } print "OK: checking NO_CDROM.\n" if ($verbose); if ($whole =~ /\nNO_CDROM/) { &perror("WARN: use of NO_CDROM discouraged, ". @@ -916,7 +921,8 @@ EXTRACT_SUFX DISTFILES EOF if ($osname eq "NetBSD") { push(@tocheck,"ONLY_FOR_ARCHS"); - push(@tocheck,"MIRROR_DISTFILE"); + push(@tocheck,"NO_SRC_ON_FTP"); + push(@tocheck,"NO_BIN_ON_FTP"); } &checkorder('DISTNAME', $tmp, @tocheck); @@ -1296,9 +1302,10 @@ EOF } # next check commented out since NetBSD doesn't have pkgsrc/LEGAL - # check RESTRICTED/NO_CDROM/NO_PACKAGE - # print "OK: checking RESTRICTED/NO_CDROM/NO_PACKAGE.\n" if ($verbose); - # if ($committer && $tmp =~ /\n(RESTRICTED|NO_CDROM|NO_PACKAGE)[+?]?=/) { + # check RESTRICTED/NO_SRC_ON_CDROM/NO_BIN_ON_CDROM/NO_PACKAGE + # print "OK: checking RESTRICTED/NO_{SRC,BIN}_ON_CDROM/NO_PACKAGE.\n" + # if ($verbose); + # if ($committer && $tmp =~ /\n(RESTRICTED|NO_{SRC,BIN}_ON_CDROM|NO_PACKAGE)[+?]?=/) { # &perror("WARN: \"$1\" found. do not forget to update ". # "ports/LEGAL."); # } |