Split out ldconfig handling from the USE_TOOLS processing in replace.mk.

This makes more sense since there is never going to be a pkgsrc
replacement for ldconfig.  We now always create an ldconfig tool in
${TOOLS_DIR} that either calls the system-supplied one if it exists,
or is a no-op.

9 files changed, 29 insertions, 18 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index d5f9c54227e..8c0b08b3852 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1634 2005/05/10 19:52:30 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1635 2005/05/10 20:14:27 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -965,9 +965,9 @@ USE_LANGUAGES?=		# empty
 PKGSRC_USE_TOOLS+=							\
 	[ awk basename cat chgrp chmod chown cmp cp cut date dirname	\
 	echo egrep env expr false fgrep file find grep gtar gunzip	\
-	gzcat gzip head hostname id install ldconfig ln ls m4 mkdir	\
-	mtree mv nice pax pwd rm rmdir sed sh shlock sort tail tee test	\
-	touch tr true tsort wc xargs
+	gzcat gzip head hostname id install ln ls m4 mkdir mtree mv	\
+	nice pax pwd rm rmdir sed sh shlock sort tail tee test touch tr	\
+	true tsort wc xargs
 
 # We need a mail command to send mail to ${PKGSRC_MESSAGE_RECIPIENTS}.
 .if !empty(PKGSRC_MESSAGE_RECIPIENTS)
diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk
index 7677c3f1984..7f666f8fbf5 100644
--- a/mk/tools/bsd.tools.mk
+++ b/mk/tools/bsd.tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.18 2005/05/10 19:52:30 jlam Exp $
+# $NetBSD: bsd.tools.mk,v 1.19 2005/05/10 20:14:27 jlam Exp $
 #
 # This Makefile fragment creates tools under ${TOOLS_DIR} that are
 # found before similarly-named tools in the system path.
@@ -75,6 +75,7 @@ USE_TOOLS?=		# empty
 .include "../../mk/tools/automake.mk"
 .include "../../mk/tools/autoconf.mk"
 .include "../../mk/tools/texinfo.mk"
+.include "../../mk/tools/ldconfig.mk"
 .include "../../mk/tools/rpcgen.mk"
 .include "../../mk/tools/strip.mk"
 .include "../../mk/tools/replace.mk"
diff --git a/mk/tools/ldconfig.mk b/mk/tools/ldconfig.mk
new file mode 100644
index 00000000000..061c785d3f0
--- /dev/null
+++ b/mk/tools/ldconfig.mk
@@ -0,0 +1,17 @@
+# $NetBSD: ldconfig.mk,v 1.1 2005/05/10 20:14:27 jlam Exp $
+#
+# Depending on whether the platform has ldconfig, we cause
+# ${TOOLS_DIR}/bin/ldconfig to be either the correct ldconfig tool or
+# a no-op.
+#
+.if !defined(TOOLS_PLATFORM.ldconfig)
+TOOLS_NOOP+=			ldconfig
+.else
+TOOLS_CREATE+=			ldconfig
+TOOLS_REAL_CMD.ldconfig=	${TOOLS_PLATFORM.ldconfig}
+.endif
+
+# Make ${LDCONFIG} call "ldconfig" through the PATH, which should find
+# the one under ${TOOLS_DIR}.
+#
+LDCONFIG?=	ldconfig
diff --git a/mk/tools/tools.IRIX.mk b/mk/tools/tools.IRIX.mk
index 783e1603773..4fafa5debdc 100644
--- a/mk/tools/tools.IRIX.mk
+++ b/mk/tools/tools.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.IRIX.mk,v 1.9 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.IRIX.mk,v 1.10 2005/05/10 20:14:27 jlam Exp $
 #
 # System-supplied tools for the IRIX operating system.
 
@@ -33,7 +33,6 @@ TOOLS_PLATFORM.gzip?=		/usr/sbin/gzip -nf ${GZIP}
 TOOLS_PLATFORM.head?=		/usr/bsd/head
 TOOLS_PLATFORM.hostname?=	/usr/bsd/hostname
 TOOLS_PLATFORM.id?=		/usr/bin/id
-TOOLS_PLATFORM.ldconfig?=	${TOOLS_PLATFORM.true}
 TOOLS_PLATFORM.ln?=		/sbin/ln
 TOOLS_PLATFORM.ls?=		/sbin/ls
 TOOLS_PLATFORM.m4?=		/sbin/m4
diff --git a/mk/tools/tools.Interix.mk b/mk/tools/tools.Interix.mk
index 3349dfcf20e..ce9d4328df6 100644
--- a/mk/tools/tools.Interix.mk
+++ b/mk/tools/tools.Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Interix.mk,v 1.9 2005/05/05 18:59:25 jlam Exp $
+# $NetBSD: tools.Interix.mk,v 1.10 2005/05/10 20:14:27 jlam Exp $
 #
 # System-supplied tools for the Interix operating system.
 
@@ -29,7 +29,6 @@ TOOLS_PLATFORM.gzip?=		/usr/contrib/bin/gzip -nf ${GZIP}
 TOOLS_PLATFORM.head?=		/bin/head
 TOOLS_PLATFORM.hostname?=	/bin/hostname
 TOOLS_PLATFORM.id?=		/bin/id
-TOOLS_PLATFORM.ldconfig?=	/bin/true
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
 TOOLS_PLATFORM.m4?=		/bin/m4
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index 1f1a46c71cf..cd13a43aba5 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.10 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.11 2005/05/10 20:14:27 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -44,8 +44,6 @@ TOOLS_PLATFORM.id?=		/usr/bin/id
 TOOLS_PLATFORM.install?=	/usr/bin/install
 .if exists(/sbin/ldconfig)
 TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
-.else
-TOOLS_PLATFORM.ldconfig?=	${TOOLS_PLATFORM.true}
 .endif
 TOOLS_PLATFORM.lex?=		/usr/bin/lex
 TOOLS_PLATFORM.ln?=		/bin/ln
diff --git a/mk/tools/tools.OSF1.mk b/mk/tools/tools.OSF1.mk
index 428f599dab6..e693c972689 100644
--- a/mk/tools/tools.OSF1.mk
+++ b/mk/tools/tools.OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OSF1.mk,v 1.7 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.OSF1.mk,v 1.8 2005/05/10 20:14:27 jlam Exp $
 #
 # System-supplied tools for the OSF/1 operating system.
 
@@ -29,7 +29,6 @@ TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
 TOOLS_PLATFORM.head?=		/usr/bin/head
 TOOLS_PLATFORM.hostname?=	/bin/hostname
 TOOLS_PLATFORM.id?=		/usr/bin/id
-TOOLS_PLATFORM.ldconfig?=	${TOOLS_PLATFORM.true}
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
 TOOLS_PLATFORM.m4?=		/usr/bin/m4
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
index 44b40a35494..2587f38ac42 100644
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.10 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.SunOS.mk,v 1.11 2005/05/10 20:14:27 jlam Exp $
 #
 # System-supplied tools for the Solaris operating system.
 
@@ -39,7 +39,6 @@ TOOLS_PLATFORM.head?=		/usr/bin/head
 TOOLS_PLATFORM.hostname?=	/bin/hostname
 TOOLS_PLATFORM.id?=		/usr/xpg4/bin/id
 TOOLS_PLATFORM.install?=	/usr/ucb/install
-TOOLS_PLATFORM.ldconfig?=	${TOOLS_PLATFORM.true}
 TOOLS_PLATFORM.ln?=		/usr/bin/ln
 TOOLS_PLATFORM.ls?=		/usr/bin/ls
 TOOLS_PLATFORM.m4?=		/usr/ccs/bin/m4
diff --git a/mk/tools/tools.UnixWare.mk b/mk/tools/tools.UnixWare.mk
index da1bf09fa16..7c54a8d0dff 100644
--- a/mk/tools/tools.UnixWare.mk
+++ b/mk/tools/tools.UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.UnixWare.mk,v 1.8 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.UnixWare.mk,v 1.9 2005/05/10 20:14:27 jlam Exp $
 #
 # System-supplied tools for the UnixWare 7 operating system.
 
@@ -27,7 +27,6 @@ TOOLS_PLATFORM.head?=		/usr/bin/head
 TOOLS_PLATFORM.hostname?=	/usr/bin/hostname
 TOOLS_PLATFORM.id?=		/usr/bin/id
 TOOLS_PLATFORM.install?=	/usr/ucb/install
-TOOLS_PLATFORM.ldconfig?=	${TOOLS_PLATFORM.true}
 TOOLS_PLATFORM.ln?=		/usr/bin/ln
 TOOLS_PLATFORM.ls?=		/usr/bin/ls
 TOOLS_PLATFORM.m4?=		/usr/ccs/bin/m4