summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-07-27 16:13:51 +0000
committerrillig <rillig@pkgsrc.org>2006-07-27 16:13:51 +0000
commit3440a30b3f2aeff201b5d6ea364d7d0ec821b474 (patch)
tree60612be776f66fdc3a9d807d02ba19a7095513b5 /pkgtools
parent817fd9ec0d8b95bdd0d9d3f1ea3698736e1519f7 (diff)
downloadpkgsrc-3440a30b3f2aeff201b5d6ea364d7d0ec821b474.tar.gz
DYNAMIC_MASTER_SITES is gone.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/files/deprecated.map3
-rw-r--r--pkgtools/pkglint/files/makevars.map4
-rw-r--r--pkgtools/pkglint/files/pkglint.pl14
3 files changed, 6 insertions, 15 deletions
diff --git a/pkgtools/pkglint/files/deprecated.map b/pkgtools/pkglint/files/deprecated.map
index 1dd7f2a0cc2..f36ba087688 100644
--- a/pkgtools/pkglint/files/deprecated.map
+++ b/pkgtools/pkglint/files/deprecated.map
@@ -1,4 +1,4 @@
-# $NetBSD: deprecated.map,v 1.45 2006/07/21 14:28:35 jlam Exp $
+# $NetBSD: deprecated.map,v 1.46 2006/07/27 16:13:51 rillig Exp $
#
# This file contains names of Makefile variables and a short explanation
@@ -118,3 +118,4 @@ USE_DIGEST You can just remove it.
LTCONFIG_OVERRIDE You can just remove it.
USE_GNU_GETTEXT You can just remove it.
BUILD_ENV Use PKGSRC_MAKE_ENV instead.
+DYNAMIC_MASTER_SITES You can just remove it.
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map
index e938c7e7d11..bd62a64be9c 100644
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.134 2006/07/27 15:48:45 rillig Exp $
+# $NetBSD: makevars.map,v 1.135 2006/07/27 16:13:51 rillig Exp $
#
# This file contains the guessed type of some variables, according to
@@ -261,6 +261,8 @@ DOCOWN UserGroupName [$system]
DOCGRP UserGroupName [$system]
DOWNLOADED_DISTFILE Pathname [$system]
DO_NADA ShellCommand [$system]
+DYNAMIC_SITE_CMD ShellCommand [$package]
+DYNAMIC_SITE_SCRIPT Pathname [$package]
ECHO ShellCommand [$system]
ECHO_MSG ShellCommand [$system]
ECHO_N ShellCommand [$system]
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.");