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.

1 files changed, 0 insertions, 51 deletions

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
-