Teach the tools framework how to supply a pkgsrc version of install-info

if a native one isn't available.  We ensure that the "install-info"
tool in the tools directory is a no-op since the real info file
registration is handled by the INSTALL/DEINSTALL script in
pkgsrc/mk/pkginstall/install-info.

11 files changed, 56 insertions, 38 deletions

diff --git a/mk/texinfo.mk b/mk/texinfo.mk
index 518f111e955..4ded93b7bfd 100644
--- a/mk/texinfo.mk
+++ b/mk/texinfo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texinfo.mk,v 1.32 2006/03/05 16:27:29 jlam Exp $
+# $NetBSD: texinfo.mk,v 1.33 2006/03/06 05:25:45 jlam Exp $
 
 #
 # This Makefile fragment is included by bsd.pkg.mk when INFO_FILES is
@@ -17,25 +17,7 @@ TEXINFO_MK=	# defined
 # files and the Info dir file.
 INFO_DIR?=	info
 
-# Does the system have the install-info command?
-# Any version will fit (really?).
-_INSTALL_INFO=
-.  for _i_ in /usr/bin/install-info /sbin/install-info
-.    if exists(${_i_}) && (${LOCALBASE} != ${_i_:C|/[^/]+/install-info$||})
-_INSTALL_INFO=			${_i_}
-.    endif
-.  endfor
-
-# If no install-info was found provide one with the pkg_install-info package.
-# And set INSTALL_INFO to the install-info command it provides.
-.  if empty(_INSTALL_INFO)
-_PKG_INSTALL_INFO_PREFIX_DEFAULT=	${LOCALBASE}
-DEPENDS+=	pkg_install-info-[0-9]*:../../pkgtools/pkg_install-info
-EVAL_PREFIX+=	_PKG_INSTALL_INFO_PREFIX=pkg_install-info
-INSTALL_INFO=	${_PKG_INSTALL_INFO_PREFIX}/bin/pkg_install-info
-.  else
-INSTALL_INFO=	${_INSTALL_INFO}
-.  endif
+USE_TOOLS+=	install-info:run
 
 # Generate INSTALL/DEINSTALL scripts code for handling install-info.
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../mk/install/install-info
diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index ba244bd0703..65b7e4f58ba 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.45 2006/03/05 16:27:29 jlam Exp $
+# $NetBSD: defaults.mk,v 1.46 2006/03/06 05:25:45 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -92,6 +92,7 @@ _TOOLS_VARNAME.hostname=	HOSTNAME_CMD
 _TOOLS_VARNAME.id=		ID
 _TOOLS_VARNAME.imake=		IMAKE
 _TOOLS_VARNAME.install=		INSTALL
+_TOOLS_VARNAME.install-info=	INSTALL_INFO
 _TOOLS_VARNAME.lex=		LEX
 _TOOLS_VARNAME.lha=		LHA
 _TOOLS_VARNAME.ln=		LN
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index b1c8a4d0a46..4dd5acd3270 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.160 2006/03/05 16:27:29 jlam Exp $
+# $NetBSD: replace.mk,v 1.161 2006/03/06 05:25:45 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -426,6 +426,22 @@ TOOLS_ARGS.gzip=		-nf ${GZIP}
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.install-info) && !empty(_USE_TOOLS:Minstall-info)
+.  if !empty(PKGPATH:Mpkgtools/pkg_install-info)
+MAKEFLAGS+=			TOOLS_IGNORE.install-info=
+.  elif !empty(_TOOLS_USE_PKGSRC.install-info:M[yY][eE][sS])
+TOOLS_DEPENDS.install-info?=	pkg_install-info-[0-9]*:../../pkgtools/pkg_install-info
+TOOLS_CREATE+=			install-info
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.install-info=pkg_install-info
+TOOLS_PATH.install-info=	${TOOLS_PREFIX.install-info}/bin/pkg_install-info
+.  endif
+.endif
+#
+# Always create an install-info tool that is a "no operation" command, as
+# registration of info files is handled by the INSTALL script.
+#
+TOOLS_SCRIPT.install-info=	exit 0
+
 .if !defined(TOOLS_IGNORE.ksh) && !empty(_USE_TOOLS:Mksh)
 .  if !empty(PKGPATH:Mshells/pdksh)
 MAKEFLAGS+=			TOOLS_IGNORE.ksh=
diff --git a/mk/tools/texinfo.mk b/mk/tools/texinfo.mk
index 5f608e49a0a..0544b665e03 100644
--- a/mk/tools/texinfo.mk
+++ b/mk/tools/texinfo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texinfo.mk,v 1.9 2006/03/05 16:27:29 jlam Exp $
+# $NetBSD: texinfo.mk,v 1.10 2006/03/06 05:25:45 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -35,14 +35,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-#
-# Create an install-info script that is a "no operation" command, as
-# registration of info files is handled by the INSTALL script.
-#
-TOOLS_NOOP+=		install-info
-CONFIGURE_ENV+=		INSTALL_INFO=${TOOLS_CMD.install-info:Q}
-MAKE_ENV+=		INSTALL_INFO=${TOOLS_CMD.install-info:Q}
-
 TEXINFO_REQD?=		3.12
 
 # If the package doesn't explicitly request makeinfo as a tool, then
@@ -76,5 +68,7 @@ _TOOLS_USE_PKGSRC.makeinfo!=						\
 MAKEVARS+=	_TOOLS_USE_PKGSRC.makeinfo
 .endif
 
+CONFIGURE_ENV+=		INSTALL_INFO=${TOOLS_CMD.install-info:Q}
+MAKE_ENV+=		INSTALL_INFO=${TOOLS_CMD.install-info:Q}
 CONFIGURE_ENV+=		MAKEINFO=${TOOLS_CMD.makeinfo:Q}
 MAKE_ENV+=		MAKEINFO=${TOOLS_CMD.makeinfo:Q}
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index 694a92fd4d4..cc52018a5ca 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.23 2006/03/05 16:27:29 jlam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.24 2006/03/06 05:25:45 jlam Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -40,6 +40,9 @@ TOOLS_PLATFORM.head?=		/usr/bin/head
 TOOLS_PLATFORM.hostname?=	/bin/hostname
 TOOLS_PLATFORM.id?=		/usr/bin/id
 TOOLS_PLATFORM.install?=	/usr/bin/install
+.if exists(/usr/bin/install-info)
+TOOLS_PLATFORM.install-info?=	/usr/bin/install-info
+.endif
 .if exists(/bin/ksh)
 TOOLS_PLATFORM.ksh?=		/bin/ksh
 .endif
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index dbdfa0af15d..149acbdd569 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.23 2006/03/05 16:27:29 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.24 2006/03/06 05:25:45 jlam Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -36,6 +36,9 @@ TOOLS_PLATFORM.head?=		/usr/bin/head
 TOOLS_PLATFORM.hostname?=	/bin/hostname
 TOOLS_PLATFORM.id?=		/usr/bin/id
 TOOLS_PLATFORM.install?=	/usr/bin/install
+.if exists(/usr/bin/install-info)
+TOOLS_PLATFORM.install-info?=	/usr/bin/install-info
+.endif
 TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
 TOOLS_PLATFORM.lex?=		/usr/bin/lex
 TOOLS_PLATFORM.ln?=		/bin/ln
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
index 32ef797a273..e6537c1d61d 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.24 2006/03/05 16:27:29 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.25 2006/03/06 05:25:45 jlam Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -37,6 +37,9 @@ TOOLS_PLATFORM.head?=		/usr/bin/head
 TOOLS_PLATFORM.hostname?=	/bin/hostname
 TOOLS_PLATFORM.id?=		/usr/bin/id
 TOOLS_PLATFORM.install?=	/usr/bin/install
+.if exists(/usr/bin/install-info)
+TOOLS_PLATFORM.install-info?=	/usr/bin/install-info
+.endif
 TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
 TOOLS_PLATFORM.lex?=		/usr/bin/lex
 TOOLS_PLATFORM.ln?=		/bin/ln
diff --git a/mk/tools/tools.Interix.mk b/mk/tools/tools.Interix.mk
index 1453ddba158..7e013498518 100644
--- a/mk/tools/tools.Interix.mk
+++ b/mk/tools/tools.Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Interix.mk,v 1.19 2006/03/05 18:12:52 jlam Exp $
+# $NetBSD: tools.Interix.mk,v 1.20 2006/03/06 05:25:45 jlam Exp $
 #
 # System-supplied tools for the Interix operating system.
 
@@ -31,6 +31,9 @@ TOOLS_PLATFORM.gzip?=		/usr/contrib/bin/gzip -nf ${GZIP}
 TOOLS_PLATFORM.head?=		/bin/head
 TOOLS_PLATFORM.hostname?=	/bin/hostname
 TOOLS_PLATFORM.id?=		/bin/id
+.if exists(/bin/install-info)
+TOOLS_PLATFORM.install-info?=	/bin/install-info
+.endif
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
 TOOLS_PLATFORM.m4?=		/bin/m4
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index dc0062cfda6..cc1c8ce8d9c 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.29 2006/03/05 16:27:29 jlam Exp $
+# $NetBSD: tools.Linux.mk,v 1.30 2006/03/06 05:25:45 jlam Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -100,6 +100,13 @@ TOOLS_PLATFORM.id?=		/bin/id
 TOOLS_PLATFORM.id?=		/usr/bin/id
 .endif
 TOOLS_PLATFORM.install?=	/usr/bin/install
+.if exists(/sbin/install-info)
+TOOLS_PLATFORM.install-info?=	/sbin/install-info
+.elif exists(/usr/sbin/install-info)
+TOOLS_PLATFORM.install-info?=	/usr/sbin/install-info
+.elif exists(/usr/bin/install-info)
+TOOLS_PLATFORM.install-info?=	/usr/bin/install-info
+.endif
 TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index 5d4dc17797d..aab10c426af 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.25 2006/03/05 16:27:29 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.26 2006/03/06 05:25:45 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -42,6 +42,9 @@ TOOLS_PLATFORM.head?=		/usr/bin/head
 TOOLS_PLATFORM.hostname?=	/bin/hostname
 TOOLS_PLATFORM.id?=		/usr/bin/id
 TOOLS_PLATFORM.install?=	/usr/bin/install
+.if exists(/usr/bin/install-info)
+TOOLS_PLATFORM.install-info?=	/usr/bin/install-info
+.endif
 .if exists(/sbin/ldconfig)
 TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
 .endif
diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk
index 40bbc1ffd61..e5a7f1fd6ce 100644
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.23 2006/03/05 16:27:29 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.24 2006/03/06 05:25:45 jlam Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
@@ -42,6 +42,9 @@ TOOLS_PLATFORM.head?=		/usr/bin/head
 TOOLS_PLATFORM.hostname?=	/bin/hostname
 TOOLS_PLATFORM.id?=		/usr/bin/id
 TOOLS_PLATFORM.install?=	/usr/bin/install
+.if exists(/usr/bin/install-info)
+TOOLS_PLATFORM.install-info?=	/usr/bin/install-info
+.endif
 TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
 TOOLS_PLATFORM.ksh?=		/bin/ksh
 TOOLS_PLATFORM.lex?=		/usr/bin/lex