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.

2 files changed, 1 insertions, 82 deletions

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/pkginstall/shlibs b/mk/pkginstall/shlibs
deleted file mode 100644
index 3aa14c4da5d..00000000000
--- a/mk/pkginstall/shlibs
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: shlibs,v 1.5 2007/07/18 18:55:56 jlam Exp $
-#
-# Generate a +SHLIBS script that updates the system run-time library
-# search paths database for the package.
-#
-case "${STAGE},$1" in
-UNPACK,|UNPACK,+SHLIBS)
-	${CAT} > ./+SHLIBS << 'EOF'
-#!@SH@
-#
-# +SHLIBS - system run-time library search paths database management script
-#
-# Usage: ./+SHLIBS ADD|REMOVE [metadatadir]
-#
-# This scripts rebuilds the system database of run-time library search
-# paths so that the system can find the shared libraries of the package
-# associated with <metadatadir>.
-#
-
-ECHO="@ECHO@"
-PWD_CMD="@PWD_CMD@"
-TRUE="@TRUE@"
-
-SELF=$0
-ACTION=$1
-
-CURDIR=`${PWD_CMD}`
-PKG_METADATA_DIR="${2-${CURDIR}}"
-: ${PKGNAME=${PKG_METADATA_DIR##*/}}
-: ${PKG_PREFIX=@PREFIX@}
-
-exitcode=0
-case $ACTION in
-ADD)
-	${ECHO} "${PKGNAME}: rebuilding run-time library search paths database"
-	( @LDCONFIG_ADD_CMD@ ) >/dev/null 2>&1 || ${TRUE}
-	;;
-
-REMOVE)
-	${ECHO} "${PKGNAME}: rebuilding run-time library search paths database"
-	( @LDCONFIG_REMOVE_CMD@ ) >/dev/null 2>&1 || ${TRUE}
-	;;
-esac
-exit $exitcode
-
-EOF
-	${SED} -n "/^\# SHLIBS: /p" ${SELF} >> ./+SHLIBS
-	${CHMOD} +x ./+SHLIBS
-	;;
-esac
-