diff options
| author | wiz <wiz@pkgsrc.org> | 2004-07-06 23:07:35 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2004-07-06 23:07:35 +0000 |
| commit | 546b8ebebfd43ff7bea33b76152a129b04fe7ec8 (patch) | |
| tree | 7b299136fdb2586afb6c4b2e99ff7b2b4b2a4987 /pkgtools | |
| parent | c893aa1af7e2ecfcd5d0cca9572d77cf31b82331 (diff) | |
| download | pkgsrc-546b8ebebfd43ff7bea33b76152a129b04fe7ec8.tar.gz | |
Look for buildlink3 instead of 2, and complain about USE_BUILDLINK2 being
set. Welcome to 3.85!
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 20 |
2 files changed, 14 insertions, 10 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index dc76c5ef84d..a2cb7843a9b 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.197 2004/07/01 20:14:58 abs Exp $ +# $NetBSD: Makefile,v 1.198 2004/07/06 23:07:35 wiz Exp $ # -DISTNAME= pkglint-3.84 +DISTNAME= pkglint-3.85 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index c02fe599bd6..04d4e89e4e1 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -11,7 +11,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.110 2004/06/30 18:49:37 hubertf Exp $ +# $NetBSD: pkglint.pl,v 1.111 2004/07/06 23:07:35 wiz Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -65,7 +65,7 @@ my $seen_PLIST_SRC = 0; my $seen_NO_PKG_REGISTER = 0; my $seen_NO_CHECKSUM = 0; my $seen_USE_PKGLOCALEDIR = 0; -my $seen_USE_BUILDLINK2 = 0; +my $seen_USE_BUILDLINK3 = 0; my %predefined; my $pkgname = "(none)"; @@ -551,7 +551,7 @@ sub checkfile_PLIST($) { "deprecated. Use \${PKGLOCALEDIR}/locale and set USE_PKGLOCALEDIR instead."); } - if ($line->[2] =~ /\${PKGLOCALEDIR}/ && $seen_USE_BUILDLINK2 && !$seen_USE_PKGLOCALEDIR) { + if ($line->[2] =~ /\${PKGLOCALEDIR}/ && $seen_USE_BUILDLINK3 && !$seen_USE_PKGLOCALEDIR) { log_warning($line->[0], $line->[1], "PLIST contains \${PKGLOCALEDIR}, ". "but USE_PKGLOCALEDIR was not found."); } @@ -882,7 +882,11 @@ sub checkfile_Makefile($) { "FOR_CDROM."); } } - log_info(NO_FILE, NO_LINE_NUMBER, "checking IS_INTERACTIVE."); + log_info(NO_FILE, NO_LINE_NUMBER, "checking USE_BUILDLINK2."); + if ($whole =~ /\nUSE_BUILDLINK2/) { + log_error(NO_FILE, NO_LINE_NUMBER, "USE_BUILDLINK2 is deprecated, ". + "use USE_BUILDLINK3 instead."); + } if ($whole =~ /\nIS_INTERACTIVE/) { log_error(NO_FILE, NO_LINE_NUMBER, "IS_INTERACTIVE is deprecated, ". "use INTERACTIVE_STAGE instead."); @@ -908,9 +912,9 @@ sub checkfile_Makefile($) { log_error(NO_FILE, NO_LINE_NUMBER, "USE_PKGLIBTOOL is deprecated, ". "use USE_LIBTOOL instead."); } - log_info(NO_FILE, NO_LINE_NUMBER, "checking for USE_BUILDLINK2."); - if ($whole =~ /\nUSE_BUILDLINK2/) { - $seen_USE_BUILDLINK2=1; + log_info(NO_FILE, NO_LINE_NUMBER, "checking for USE_BUILDLINK3."); + if ($whole =~ /\nUSE_BUILDLINK3/) { + $seen_USE_BUILDLINK3=1; } log_info(NO_FILE, NO_LINE_NUMBER, "checking for USE_PKGLOCALEDIR."); if ($whole =~ /\nUSE_PKGLOCALEDIR/) { @@ -919,7 +923,7 @@ sub checkfile_Makefile($) { log_info(NO_FILE, NO_LINE_NUMBER, "checking USE_SSL."); if ($whole =~ /\nUSE_SSL/) { log_error(NO_FILE, NO_LINE_NUMBER, "USE_SSL is deprecated, ". - "use the openssl buildlink2.mk instead."); + "use the openssl buildlink3.mk instead."); } log_info(NO_FILE, NO_LINE_NUMBER, "checking NO_WRKSUBDIR."); if ($whole =~ /\nNO_WRKSUBDIR/) { |