summaryrefslogtreecommitdiff
path: root/pkgtools/pkglint/files/pkglint.pl
diff options
context:
space:
mode:
Diffstat (limited to 'pkgtools/pkglint/files/pkglint.pl')
-rw-r--r--pkgtools/pkglint/files/pkglint.pl14
1 files changed, 1 insertions, 13 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 96f9ddbc29a..f051195d220 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -1,5 +1,5 @@
#! @PERL@
-# $NetBSD: pkglint.pl,v 1.663 2006/07/27 13:05:09 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.664 2006/07/27 16:13:51 rillig Exp $
#
# pkglint - static analyzer and checker for pkgsrc packages
@@ -5500,7 +5500,6 @@ sub checklines_package_Makefile_varorder($) {
[ "SVR4_PKGNAME", optional ],
[ "CATEGORIES", once ],
[ "MASTER_SITES", once ],
- [ "DYNAMIC_MASTER_SITES", optional ],
[ "DIST_SUBDIR", optional ],
[ "EXTRACT_SUFX", optional ],
[ "DISTFILES", many ],
@@ -6414,17 +6413,6 @@ sub checkfile_package_Makefile($$$) {
log_warning($fname, NO_LINE_NUMBER, "Please use the RCD_SCRIPTS mechanism to install rc.d scripts automatically to \${RCD_SCRIPTS_EXAMPLEDIR}.");
}
- if (exists($pkgctx_vardef->{"MASTER_SITES"})) {
- if (exists($pkgctx_vardef->{"DYNAMIC_MASTER_SITES"})) {
- $pkgctx_vardef->{"MASTER_SITES"}->log_warning("MASTER_SITES and ...");
- $pkgctx_vardef->{"DYNAMIC_MASTER_SITES"}->log_warning("... DYNAMIC_MASTER_SITES conflict.");
- }
- } else {
- if (!exists($pkgctx_vardef->{"DYNAMIC_MASTER_SITES"})) {
- log_warning($fname, NO_LINE_NUMBER, "Neither MASTER_SITES nor DYNAMIC_MASTER_SITES found.");
- }
- }
-
if (exists($pkgctx_vardef->{"REPLACE_PERL"}) && exists($pkgctx_vardef->{"NO_CONFIGURE"})) {
$pkgctx_vardef->{"REPLACE_PERL"}->log_warning("REPLACE_PERL is ignored when ...");
$pkgctx_vardef->{"NO_CONFIGURE"}->log_warning("... NO_CONFIGURE is set.");