Putting bsd.pkginstall.mk under bsd.tools.mk was a bad idea -- the

former set several USE_TOOLS lines that were being missed by bsd.tools.mk.

Rearrange the +SHLIBS code so that bsd.tools.mk can now be included
after bsd.pkginstall.mk again.  The +SHLIBS code has now been moved
over to the plist module, which is so far the repository for all of
the shlib-type handling.

This should fix the problem with fonts handling being broken.

4 files changed, 44 insertions, 46 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 67d43e82753..3e3e7552e02 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1914 2007/07/20 14:25:03 rillig Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1915 2007/07/23 15:23:46 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -432,24 +432,15 @@ USE_TOOLS+=	expr
 USE_TOOLS+=	tee tsort
 .endif
 
+# INSTALL/DEINSTALL script framework
+.include "${.PARSEDIR}/pkginstall/bsd.pkginstall.mk"
+
 # Locking
 .include "${.PARSEDIR}/internal/locking.mk"
 
 # Tools
 .include "${.PARSEDIR}/tools/bsd.tools.mk"
 
-# SHLIB_TYPE
-# 	The type of shared library supported by the platform.
-#
-SHLIB_TYPE=		${_SHLIB_TYPE_cmd:sh}
-_SHLIB_TYPE_cmd=	\
-	${SETENV} ECHO=${TOOLS_ECHO:Q} FILE_CMD=${TOOLS_FILE_CMD:Q}	\
-		TEST=${TOOLS_TEST:Q} PKG_INFO_CMD=${PKG_INFO_CMD:Q}	\
-	${SH} ${PKGSRCDIR}/mk/scripts/shlib-type ${_OPSYS_SHLIB_TYPE:Q}
-
-# INSTALL/DEINSTALL script framework
-.include "${.PARSEDIR}/pkginstall/bsd.pkginstall.mk"
-
 # Barrier
 .include "${.PARSEDIR}/bsd.pkg.barrier.mk"
 
diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk
index 04a590c12e3..21be9014232 100644
--- a/mk/pkginstall/bsd.pkginstall.mk
+++ b/mk/pkginstall/bsd.pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.27 2007/07/18 18:01:02 jlam Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.28 2007/07/23 15:23:47 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -686,36 +686,6 @@ ${_INSTALL_SHELL_FILE}: ../../mk/pkginstall/shell
 		${TOUCH} ${TOUCH_ARGS} ${.TARGET};			\
 	fi
 
-# LDCONFIG_ADD_CMD
-# LDCONFIG_REMOVE_CMD
-#	Command-line to be invoked to update the system run-time library
-#	search paths database when adding and removing a package.
-#
-#	Default value: ${LDCONFIG}
-#
-LDCONFIG_ADD_CMD?=		${_LDCONFIG_ADD_CMD.${OPSYS}}
-LDCONFIG_REMOVE_CMD?=		${_LDCONFIG_REMOVE_CMD.${OPSYS}}
-_LDCONFIG_ADD_CMD.${OPSYS}?=	${LDCONFIG}
-_LDCONFIG_REMOVE_CMD.${OPSYS}?=	${LDCONFIG}
-FILES_SUBST+=			LDCONFIG_ADD_CMD=${LDCONFIG_ADD_CMD:Q}
-FILES_SUBST+=			LDCONFIG_REMOVE_CMD=${LDCONFIG_REMOVE_CMD:Q}
-
-.if ${SHLIB_TYPE} == "a.out"
-RUN_LDCONFIG?=	yes
-.else
-RUN_LDCONFIG?=	no
-.endif
-
-_INSTALL_SHLIBS_FILE=		${_PKGINSTALL_DIR}/shlibs
-.if !empty(RUN_LDCONFIG:M[Yy][Ee][Ss])
-_INSTALL_UNPACK_TMPL+=		${_INSTALL_SHLIBS_FILE}
-.endif
-
-${_INSTALL_SHLIBS_FILE}: ../../mk/pkginstall/shlibs
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/shlibs > ${.TARGET}
-
 # FONTS_DIRS.<type> are lists of directories in which the font databases
 #	are updated.  If this is non-empty, then the appropriate tools is
 #	used to update the fonts database for the font type.  The supported
diff --git a/mk/plist/plist.mk b/mk/plist/plist.mk
index 88cef677edc..25b652ef34f 100644
--- a/mk/plist/plist.mk
+++ b/mk/plist/plist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plist.mk,v 1.27 2007/07/18 18:01:03 jlam Exp $
+# $NetBSD: plist.mk,v 1.28 2007/07/23 15:23:48 jlam Exp $
 #
 # This Makefile fragment handles the creation of PLISTs for use by
 # pkg_create(8).
@@ -157,6 +157,13 @@ _SHLIB_AWKFILE.a.out=	${.CURDIR}/../../mk/plist/shlib-aout.awk
 _SHLIB_AWKFILE.dylib=	${.CURDIR}/../../mk/plist/shlib-dylib.awk
 _SHLIB_AWKFILE.none=	${.CURDIR}/../../mk/plist/shlib-none.awk
 
+# SHLIB_TYPE is the type of shared library supported by the platform.
+SHLIB_TYPE=		${_SHLIB_TYPE_cmd:sh}
+_SHLIB_TYPE_cmd=							\
+	${SETENV} ECHO=${TOOLS_ECHO:Q} FILE_CMD=${TOOLS_FILE_CMD:Q}	\
+		TEST=${TOOLS_TEST:Q} PKG_INFO_CMD=${PKG_INFO_CMD:Q}	\
+	${SH} ${.CURDIR}/../../mk/scripts/shlib-type ${_OPSYS_SHLIB_TYPE:Q}
+
 ######################################################################
 
 # GENERATE_PLIST is a sequence of commands, terminating in a semicolon,
@@ -251,3 +258,33 @@ INFO_FILES_cmd=								\
 	${SETENV} ${_PLIST_AWK_ENV} ${AWK} ${_PLIST_INFO_AWK} |		\
 	${AWK} '($$0 !~ "-[0-9]*(\\.gz)?$$") { print }'
 .endif
+
+# LDCONFIG_ADD_CMD
+# LDCONFIG_REMOVE_CMD
+#	Command-line to be invoked to update the system run-time library
+#	search paths database when adding and removing a package.
+#
+#	Default value: ${LDCONFIG}
+#
+LDCONFIG_ADD_CMD?=		${_LDCONFIG_ADD_CMD.${OPSYS}}
+LDCONFIG_REMOVE_CMD?=		${_LDCONFIG_REMOVE_CMD.${OPSYS}}
+_LDCONFIG_ADD_CMD.${OPSYS}?=	${LDCONFIG}
+_LDCONFIG_REMOVE_CMD.${OPSYS}?=	${LDCONFIG}
+FILES_SUBST+=			LDCONFIG_ADD_CMD=${LDCONFIG_ADD_CMD:Q}
+FILES_SUBST+=			LDCONFIG_REMOVE_CMD=${LDCONFIG_REMOVE_CMD:Q}
+
+.if ${SHLIB_TYPE} == "a.out"
+RUN_LDCONFIG?=	yes
+.else
+RUN_LDCONFIG?=	no
+.endif
+
+_INSTALL_SHLIBS_FILE=		${_PKGINSTALL_DIR}/shlibs
+.if !empty(RUN_LDCONFIG:M[Yy][Ee][Ss])
+_INSTALL_UNPACK_TMPL+=		${_INSTALL_SHLIBS_FILE}
+.endif
+
+${_INSTALL_SHLIBS_FILE}: ../../mk/plist/shlibs
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/shlibs > ${.TARGET}
diff --git a/mk/pkginstall/shlibs b/mk/plist/shlibs
index 3aa14c4da5d..d9a90f95525 100644
--- a/mk/pkginstall/shlibs
+++ b/mk/plist/shlibs
@@ -1,4 +1,4 @@
-# $NetBSD: shlibs,v 1.5 2007/07/18 18:55:56 jlam Exp $
+# $NetBSD: shlibs,v 1.1 2007/07/23 15:23:48 jlam Exp $
 #
 # Generate a +SHLIBS script that updates the system run-time library
 # search paths database for the package.