Add back a facility to rebuild the run-time library search paths database

on platforms that need it.

XXX Right now, if the platform needs it, then it runs for every package.
XXX This needs to be fixed to only run for packages that install shared
XXX libraries.

* Move mk/plist/shlib-type to mk/scripts.

* Move definition of SHLIB_TYPE from mk/plist/plist.mk to bsd.pkg.mk.

* Move inclusion of bsd.pkginstall.mk below bsd.tools.mk so that it
  can use SHLIB_TYPE.  This is necessary because SHLIB_TYPE's value
  is the result of evaluating a command, and the command needs "TOOL"
  definitions provided by bsd.tools.mk.

2 files changed, 1 insertions, 59 deletions

diff --git a/mk/plist/plist.mk b/mk/plist/plist.mk
index 5ba1e8fdf1f..88cef677edc 100644
--- a/mk/plist/plist.mk
+++ b/mk/plist/plist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plist.mk,v 1.26 2007/07/18 14:12:30 jlam Exp $
+# $NetBSD: plist.mk,v 1.27 2007/07/18 18:01:03 jlam Exp $
 #
 # This Makefile fragment handles the creation of PLISTs for use by
 # pkg_create(8).
@@ -157,13 +157,6 @@ _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/plist/shlib-type ${_OPSYS_SHLIB_TYPE:Q}
-
 ######################################################################
 
 # GENERATE_PLIST is a sequence of commands, terminating in a semicolon,
diff --git a/mk/plist/shlib-type b/mk/plist/shlib-type
deleted file mode 100755
index 56ebb365a0f..00000000000
--- a/mk/plist/shlib-type
+++ /dev/null
@@ -1,51 +0,0 @@
-# /bin/sh
-#
-# $NetBSD: shlib-type,v 1.3 2006/07/21 13:40:27 jlam Exp $
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Alistair Crooks.
-#
-# This script returns the the library format for the platform.  If
-# the library format is "ELF/a.out", then we inspect "pkg_info" (which
-# should exist on a pkgsrc system) to determine the correct object
-# format (either ELF or a.out).
-#
-
-: ${ECHO=echo}
-: ${FILE_CMD=file}
-: ${TEST=test}
-: ${PKG_INFO_CMD=/usr/sbin/pkg_info}
-
-self="${0##*/}"
-
-usage() {
-	${ECHO} 1>&2 "usage: $self libformat"
-}
-
-${TEST} $# -gt 0 || { usage; exit 1; }
-
-sotype=none
-case "$1" in
-ELF/a.out)
-	case "${PKG_INFO_CMD}" in
-	/*)	;;
-	*)	PKG_INFO_CMD="/usr/sbin/pkg_info"
-	esac
-	if ${TEST} -f ${PKG_INFO_CMD}; then
-		case `${FILE_CMD} ${PKG_INFO_CMD}` in
-		*ELF*dynamically*)	sotype="ELF" ;;
-		*shared*library*)	sotype="a.out" ;;
-		*dynamically*)		sotype="a.out" ;;
-		esac
-	else
-		# "pkg_info" is missing so just guess "ELF.
-		sotype="ELF"
-	fi
-	;;
-*)
-	sotype="$1"
-	;;
-esac
-${ECHO} $sotype
-
-exit 0