Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1496867059126620"
MIME-Version: 1.0
Date: Wed, 7 Jun 2017 20:24:19 +0000
From: "Johnny C. Lam" <jlam@netbsd.org>
Subject: CVS commit: pkgsrc/mk
To: pkgsrc-changes@NetBSD.org
Reply-To: jlam@netbsd.org
Message-Id: <20170607202419.61DB3FAE7@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1496867059126620
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jlam
Date:		Wed Jun  7 20:24:19 UTC 2017

Modified Files:
	pkgsrc/mk/pkgformat/pkg/templates: header
	pkgsrc/mk/pkgtasks: shlibs.mk

Log Message:
Substitute for LDCONFIG_ADD_CMD and LDCONFIG_REMOVE_CMD in scripts.

LDCONFIG_ADD_CMD and LDCONFIG_REMOVE_CMD are set by emulator/*.mk
in order to update the library search paths in the emulated system
directories.  Substitute for those values, but default them to the
empty string so that the default action taken by the "shlibs" task
can be used.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mk/pkgformat/pkg/templates/header
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mk/pkgtasks/shlibs.mk

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


--_----------=_1496867059126620
Content-Disposition: inline
Content-Length: 2035
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mk/pkgformat/pkg/templates/header
diff -u pkgsrc/mk/pkgformat/pkg/templates/header:1.2 pkgsrc/mk/pkgformat/pkg/templates/header:1.3
--- pkgsrc/mk/pkgformat/pkg/templates/header:1.2	Wed Jun  7 20:24:01 2017
+++ pkgsrc/mk/pkgformat/pkg/templates/header	Wed Jun  7 20:24:19 2017
@@ -29,7 +29,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-# $NetBSD: header,v 1.2 2017/06/07 20:24:01 jlam Exp $
+# $NetBSD: header,v 1.3 2017/06/07 20:24:19 jlam Exp $
 
 # Package task loader.
 : ${TASK_MODULE_DIR:=@LOCALBASE@/share/pkgtasks-1}
@@ -130,6 +130,10 @@ PKG_SYSCONFDIR="@PKG_SYSCONFDIR@"
 # Variables for the local state directory.
 VARBASE="@VARBASE@"
 
+# Variables for updating the library search paths cache.
+LDCONFIG_ADD_CMD="@LDCONFIG_ADD_CMD@"
+LDCONFIG_REMOVE_CMD="@LDCONFIG_REMOVE_CMD@"
+
 # The current working directory from which the script was invoked.
 CURDIR=$( ${PWD_CMD} )
 

Index: pkgsrc/mk/pkgtasks/shlibs.mk
diff -u pkgsrc/mk/pkgtasks/shlibs.mk:1.1 pkgsrc/mk/pkgtasks/shlibs.mk:1.2
--- pkgsrc/mk/pkgtasks/shlibs.mk:1.1	Thu Jun  1 02:06:04 2017
+++ pkgsrc/mk/pkgtasks/shlibs.mk	Wed Jun  7 20:24:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shlibs.mk,v 1.1 2017/06/01 02:06:04 jlam Exp $
+# $NetBSD: shlibs.mk,v 1.2 2017/06/07 20:24:19 jlam Exp $
 #
 # Copyright (c) 2017 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -38,6 +38,19 @@
 _USER_VARS.pkgtasks+=	RUN_LDCONFIG
 RUN_LDCONFIG?=		${"${SHLIB_TYPE}" == "a.out":?yes:no}
 
+# LDCONFIG_ADD_CMD
+# LDCONFIG_REMOVE_CMD
+#	Command-lines to be invoked to update the library search paths
+#	cache when adding or removing a package.
+#
+#	Possible: any valid shell command-line
+#	Default: empty
+#
+LDCONFIG_ADD_CMD?=	# empty
+LDCONFIG_REMOVE_CMD?=	# empty
+FILES_SUBST+=		LDCONFIG_ADD_CMD=${LDCONFIG_ADD_CMD:Q}
+FILES_SUBST+=		LDCONFIG_REMOVE_CMD=${LDCONFIG_REMOVE_CMD:Q}
+
 # Trigger pkgtasks dependency if needed.
 .if "${RUN_LDCONFIG:tl}" == "yes"
 USE_PKGTASKS=		yes


--_----------=_1496867059126620--