[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files - Added PKG_CONFIG to makevars....

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/156f3726f7d6
branches:  trunk
changeset: 516297:156f3726f7d6
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Jul 18 18:14:33 2006 +0000

description:
- Added PKG_CONFIG to makevars.map.
- Make sure that the bsd.pkginstall.mk file exists before mentioning it
  in diagnostic messages. Noticed by Martti Kuparinen.

diffstat:

 pkgtools/pkglint/files/makevars.map |  6 +++++-
 pkgtools/pkglint/files/pkglint.pl   |  9 ++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diffs (51 lines):

diff -r d9a077e4ac05 -r 156f3726f7d6 pkgtools/pkglint/files/makevars.map
--- a/pkgtools/pkglint/files/makevars.map       Tue Jul 18 18:10:29 2006 +0000
+++ b/pkgtools/pkglint/files/makevars.map       Tue Jul 18 18:14:33 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.131 2006/07/16 09:29:39 rillig Exp $
+# $NetBSD: makevars.map,v 1.132 2006/07/18 18:14:33 rillig Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -487,6 +487,10 @@
 PKG_APACHE             { apache13 apache2 } [$system]
 PKG_APACHE_ACCEPTED    List of { apache13 apache2 }
 PKG_APACHE_DEFAULT     { apache13 apache2 } [$user]
+PKG_CONFIG             Yes [$user]
+# ^^ No, this is not the popular command from GNOME, but the setting
+# whether the pkgsrc user wants configuration files automatically
+# installed or not.
 PKG_CREATE             ShellCommand [$system]
 PKG_DEBUG_LEVEL                Integer [$cmdline]
 PKG_DEFAULT_OPTIONS    List of Option [$user]
diff -r d9a077e4ac05 -r 156f3726f7d6 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Tue Jul 18 18:10:29 2006 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Tue Jul 18 18:14:33 2006 +0000
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.654 2006/07/17 13:36:57 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.655 2006/07/18 18:14:33 rillig Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -2425,7 +2425,7 @@
        # Some user-defined variables do not influence the binary
        # package at all and therefore do not have to be added to
        # BUILD_DEFS.
-       foreach my $bdvar (qw(DISTDIR FETCH_OUTPUT_ARGS)) {
+       foreach my $bdvar (qw(DISTDIR FETCH_CMD FETCH_OUTPUT_ARGS)) {
                $system_build_defs->{$bdvar} = true;
        }
        #$system_build_defs->{"PACKAGES"} = true;
@@ -6811,7 +6811,10 @@
                                $line->log_error("RCD_SCRIPTS must not be registered in the PLIST. Please use the RCD_SCRIPTS framework.");
 
                        } elsif ($text =~ qr"^etc/") {
-                               $line->log_error("Configuration files must not be registered in the PLIST. Please use the CONF_FILES framework, which is described in mk/install/bsd.pkginstall.mk.");
+                               my $f = "mk/pkginstall/bsd.pkginstall.mk";
+
+                               assert(-f "${cwd_pkgsrcdir}/${f}");
+                               $line->log_error("Configuration files must not be registered in the PLIST. Please use the CONF_FILES framework, which is described in ${f}.");
 
                        } elsif ($text =~ qr"^include/.*\.(?:h|hpp)$") {
                                # Fine.