summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorrillig <rillig>2006-01-22 23:35:04 +0000
committerrillig <rillig>2006-01-22 23:35:04 +0000
commit145f92bfaf706106b1598c11dbfbc37ae0019f9f (patch)
tree484bf3b45369815a21946f523362b09c027eeb37 /pkgtools
parent2218f6bd2505abcd3858388774101f3f8e8cf2b5 (diff)
downloadpkgsrc-145f92bfaf706106b1598c11dbfbc37ae0019f9f.tar.gz
- Instead of only allowing the :Q modifier for quoting, allow any modifier
that ends in :Q. - When NO_CONFIGURE ist defined, REPLACE_PERL does not work.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/files/pkglint.pl9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 05d281c07ff..f4c80a2d91a 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -1,5 +1,5 @@
#! @PERL@
-# $NetBSD: pkglint.pl,v 1.478 2006/01/20 13:33:37 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.479 2006/01/22 23:35:04 rillig Exp $
#
# pkglint - static analyzer and checker for pkgsrc packages
@@ -2107,7 +2107,7 @@ sub checkline_mk_shellword($$$) {
if (!$opt_warn_quoting) {
# Skip the following checks.
- } elsif ($state == SWST_PLAIN && defined($mod) && $mod eq ":Q") {
+ } elsif ($state == SWST_PLAIN && defined($mod) && $mod =~ qr":Q$") {
# Fine.
} else {
@@ -3542,6 +3542,11 @@ sub checkfile_package_Makefile($$$) {
}
}
+ if (exists($makevar->{"REPLACE_PERL"}) && exists($makevar->{"NO_CONFIGURE"})) {
+ $makevar->{"REPLACE_PERL"}->log_warning("REPLACE_PERL is ignored when ...");
+ $makevar->{"NO_CONFIGURE"}->log_warning("... NO_CONFIGURE is set.");
+ }
+
# check DISTFILES and related items.
$distname = expand_variable($whole, "DISTNAME");
$pkgname = expand_variable($whole, "PKGNAME");