CVS commit: pkgsrc/pkgtools/lintpkgsrc

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri Aug 19 18:23:41 UTC 2022

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

Log Message:
lintpkgsrc: fix location of mk.conf

The effective location of mk.conf is not stored in a variable, and there
are several locations where it could be. Noticed by adam@.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/pkgtools/lintpkgsrc/Makefile
cvs rdiff -u -r1.127 -r1.128 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/Makefile
diff -u pkgsrc/pkgtools/lintpkgsrc/Makefile:1.53 pkgsrc/pkgtools/lintpkgsrc/Makefile:1.54
--- pkgsrc/pkgtools/lintpkgsrc/Makefile:1.53    Sun Aug 14 13:13:52 2022
+++ pkgsrc/pkgtools/lintpkgsrc/Makefile Fri Aug 19 18:23:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2022/08/14 13:13:52 rillig Exp $
+# $NetBSD: Makefile,v 1.54 2022/08/19 18:23:41 rillig Exp $
 
 PKGNAME=       lintpkgsrc-2022.08.13
 CATEGORIES=    pkgtools
@@ -18,11 +18,27 @@ WRKSRC=             ${WRKDIR}
 USE_LANGUAGES= # none
 AUTO_MKDIRS=   yes
 
+.include "../../mk/bsd.prefs.mk"
+
+# See bootstrap/bootstrap.
+# See pkgtools/bootstrap-mk-files/files/bsd.own.mk.in.
+# Another guess would be '${.MAKE.MAKEFILES:M*/mk.conf:[1]}'.
+.for conf in \
+    ${MAKECONF} \
+    ${PKG_SYSCONFBASE:=/mk.conf} \
+    ${SYSCONFBASE:=/mk.conf} \
+    ${LOCALBASE:=/etc/mk.conf}
+.  if exists(${conf})
+LINTPKGSRC_MAKECONF=   ${conf}
+.  endif
+.endfor
+LINTPKGSRC_MAKECONF?=  /etc/mk.conf
+
 SUBST_CLASSES+=                lp
 SUBST_STAGE.lp=                post-configure
 SUBST_FILES.lp+=       lintpkgsrc.1 lintpkgsrc.pl
+SUBST_VARS.lp+=                LINTPKGSRC_MAKECONF
 SUBST_VARS.lp+=                MAKE
-SUBST_VARS.lp+=                MAKECONF
 SUBST_VARS.lp+=                PERL5
 SUBST_VARS.lp+=                PKGSRCDIR
 SUBST_VARS.lp+=                PKG_INFO

Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.127 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.128
--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.127        Fri Aug 19 05:20:27 2022
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl      Fri Aug 19 18:23:41 2022
@@ -1,5 +1,5 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.127 2022/08/19 05:20:27 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.128 2022/08/19 18:23:41 rillig Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -185,7 +185,7 @@ package main;
 
 # Buildtime configuration
 my $conf_make = '@MAKE@';
-my $conf_makeconf = '@MAKECONF@';
+my $conf_makeconf = '@LINTPKGSRC_MAKECONF@';
 my $conf_pkg_info = '@PKG_INFO@';
 my $conf_pkgsrcdir = '@PKGSRCDIR@';
 my $conf_prefix = '@PREFIX@';