CVS commit: pkgsrc/mk

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Nov  3 08:26:10 UTC 2022

Modified Files:
        pkgsrc/mk: bsd.pkg.mk

Log Message:
mk: Support PKGSRC_CONFIG_SITE.

Allows users to specify a suitably sanitised and tested CONFIG_SITE file, while
retaining the default behaviour of ignoring CONFIG_SITE to avoid surprises.


To generate a diff of this commit:
cvs rdiff -u -r1.2041 -r1.2042 pkgsrc/mk/bsd.pkg.mk

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

Modified files:

Index: pkgsrc/mk/bsd.pkg.mk
diff -u pkgsrc/mk/bsd.pkg.mk:1.2041 pkgsrc/mk/bsd.pkg.mk:1.2042
--- pkgsrc/mk/bsd.pkg.mk:1.2041 Sun Jul 31 19:16:33 2022
+++ pkgsrc/mk/bsd.pkg.mk        Thu Nov  3 08:26:10 2022
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.2041 2022/07/31 19:16:33 wiz Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.2042 2022/11/03 08:26:10 jperkin Exp $
 #
 # This file is in the public domain.
 #
@@ -182,7 +182,7 @@ ALL_ENV+=   LINKER_RPATH_FLAG=${LINKER_RPA
 ALL_ENV+=      PATH=${PATH:Q}:${LOCALBASE}/bin:${X11BASE}/bin
 ALL_ENV+=      PREFIX=${PREFIX}
 ALL_ENV+=      MAKELEVEL=0
-ALL_ENV+=      CONFIG_SITE=
+ALL_ENV+=      CONFIG_SITE=${PKGSRC_CONFIG_SITE:U}
 
 # This variable can be added to MAKE_ENV to ease installation of packages
 # that use BSD-style Makefiles.