CVS commit: pkgsrc/pkgtools/lintpkgsrc/files

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri Aug 19 05:06:26 UTC 2022

Modified Files:
        pkgsrc/pkgtools/lintpkgsrc/files: lintpkgsrc.pl

Log Message:
lintpkgsrc: fix parse-guessing of Apache modules

When lintpkgsrc parses the package makefile of an Apache module, it
includes mk/apache.mk, and that file defines APACHE_PKG_PREFIX, thereby
hiding the fallback value from $default_vars.


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.125 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.126
--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.125        Fri Aug 19 04:34:03 2022
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl      Fri Aug 19 05:06:26 2022
@@ -1,5 +1,5 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.125 2022/08/19 04:34:03 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.126 2022/08/19 05:06:26 rillig Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -763,7 +763,8 @@ sub get_default_makefile_vars() {
 
        $default_vars->{PACKAGES} ||= $default_vars->{PKGSRCDIR} . '/packages';
 
-       $default_vars->{APACHE_PKG_PREFIX} = 'ap12345';
+       $default_vars->{PKG_APACHE} = 'apache12345';
+       $default_vars->{'_APACHE_PKG_PREFIX.apache12345'} = 'ap12345';
        $default_vars->{LUA_PKGPREFIX} = 'lua12345';
        $default_vars->{PHP_PKG_PREFIX} = 'php12345';
        $default_vars->{PYPKGPREFIX} = 'py12345';