* Teach the tools framework how to supply the pkgsrc version of

  makeinfo if no native makeinfo executable exists.  Honor TEXINFO_REQD
  when determining whether the native makeinfo can be used.

* Remove USE_MAKEINFO and replace it with USE_TOOLS+=makeinfo.

* Get rid of all the "split" argument deduction for makeinfo since
  the PLIST module already handles varying numbers of split info files
  correctly.

NOTE: Platforms that have "makeinfo" in the base system should check
      that the makeinfo entries of pkgsrc/mk/tools.${OPSYS}.mk are
      correct.

24 files changed, 48 insertions, 69 deletions

diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index 957d6c7e3e5..5f30808bd2f 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/05 16:27:23 jlam Exp $
 
 DISTNAME=	allegro-4.2.0
 PKGREVISION=	1
@@ -9,12 +9,11 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://alleg.sourceforge.net/
 COMMENT=	Allegro game programming library
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake makeinfo
 GNU_CONFIGURE=		yes
 
 MAKEFILE=		makefile
 BUILD_TARGET=		# there is no 'all' target for some reason
-USE_MAKEINFO=		yes
 INFO_FILES=		allegro.info
 INSTALL_TARGET=		install install-info
 
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index e8912871ad3..e34b5a3f404 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/16 19:10:38 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/05 16:27:23 jlam Exp $
 
 DISTNAME=       autoconf-2.13
 PKGNAME=	autoconf213-2.13
@@ -10,7 +10,7 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/autoconf/autoconf.html
 COMMENT=	Generates automatic source code configuration scripts (old version)
 
-USE_TOOLS+=		gm4:run perl:run
+USE_TOOLS+=		gm4:run makeinfo perl:run
 
 CONFLICTS=		autoconf-devel-[0-9]*
 CONFLICTS=		autoconf<2.50
@@ -20,7 +20,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--program-transform-name='s/$$/-2.13/'
 
-USE_MAKEINFO=		YES
 INFO_FILES=		autoconf213.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index 4d80a1134db..f4d9fc6a8db 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/05 16:27:24 jlam Exp $
 
 DISTNAME=	autogen-5.6.4
 PKGREVISION=	1
@@ -10,10 +10,9 @@ MAINTAINER=	kristerw@NetBSD.org
 HOMEPAGE=	http://autogen.sourceforge.net/
 COMMENT=	The Automated Program Generator
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake makeinfo
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_MAKEINFO=		YES
 INFO_FILES=		autogen.info
 
 .include "../../lang/guile/buildlink3.mk"
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 74b967c9ccd..96ed111b29e 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:02 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/05 16:27:24 jlam Exp $
 #
 
 DISTNAME=	automake-1.4-p6
@@ -19,8 +19,7 @@ CONFLICTS=	automake<1.6
 GNU_CONFIGURE=		YES
 _STRIPFLAG_INSTALL=	# none
 
-USE_TOOLS+=		perl:run
-USE_MAKEINFO=		YES
+USE_TOOLS+=		makeinfo perl:run
 INFO_FILES=		automake14.info
 
 TEST_TARGET=		check
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 8ad535d517e..d918471f7df 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/04 21:29:12 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/03/05 16:27:24 jlam Exp $
 
 DISTNAME=	binutils-2.16.1
 CATEGORIES=	devel
@@ -15,7 +15,7 @@ NOT_FOR_PLATFORM=	Darwin-*-* Interix-*-*
 USE_PKGLOCALEDIR=	yes
 REPLACE_LOCALEDIR_PATTERNS+=	Make-in
 
-USE_MAKEINFO=		yes
+USE_TOOLS+=		makeinfo
 TEXINFO_REQD=		4.0
 MAKEFLAGS+=		TEXINFO_LOCALE=no
 
diff --git a/devel/cssc/Makefile b/devel/cssc/Makefile
index 25afa5d7b8d..fa2d0cbae0b 100644
--- a/devel/cssc/Makefile
+++ b/devel/cssc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:29:13 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/03/05 16:27:24 jlam Exp $
 #
 
 DISTNAME=	CSSC-1.0.1
@@ -15,10 +15,9 @@ USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--enable-binary
 CONFIGURE_ENV+=	CONFIG_DIFF_COMMAND=${TOOLS_DIFF:Q}
-USE_TOOLS+=	diff
+USE_TOOLS+=	diff makeinfo
 TEST_TARGET=	check
 
-USE_MAKEINFO=	YES
 TEXINFO_REQD=	4.0
 INFO_FILES=	cssc.info
 
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index a23cb8a19e4..b2bb0f99332 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2006/01/29 02:40:40 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2006/03/05 16:27:24 jlam Exp $
 #
 
 DISTNAME=	cvs-1.11.21
@@ -19,7 +19,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	perl_path=${PERL5:Q}
 
 INFO_FILES=	cvs.info cvsclient.info
-USE_MAKEINFO=	yes
+USE_TOOLS+=	makeinfo
 TEXINFO_REQD?=	4.0
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/elib/Makefile b/devel/elib/Makefile
index 1c6cab7d4a6..2ad4d1075a6 100644
--- a/devel/elib/Makefile
+++ b/devel/elib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:41 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/05 16:27:24 jlam Exp $
 #
 
 DISTNAME=	elib-1.0
@@ -19,9 +19,8 @@ BUILD_ENV+=	EMACS=${EMACS_FLAVOR}
 MAKEFLAGS+=	EMACS=${EMACS_FLAVOR:Q}
 
 NO_CONFIGURE=	yes
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake makeinfo
 
-USE_MAKEINFO=	YES
 INFO_FILES=	elib.info
 
 SRCS=	stack-f.el stack-m.el queue-f.el queue-m.el elib-node.el	\
diff --git a/devel/flim/Makefile b/devel/flim/Makefile
index 9d331cbf35b..091612d0321 100644
--- a/devel/flim/Makefile
+++ b/devel/flim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/05 16:27:24 jlam Exp $
 
 DISTNAME=	flim-1.14.7
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -26,7 +26,7 @@ INSTALL_TARGET= install-package
 MAKEFLAGS+=	PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
 .endif
 
-USE_MAKEINFO=	YES
+USE_TOOLS+=	makeinfo
 INFO_FILES=	mime-en.info mime-ja.info
 TEXINFO_REQD=	4.5
 
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index 48604bf6054..fe8b17f12a5 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2006/03/05 16:27:24 jlam Exp $
 
 DISTNAME=	g-wrap-1.9.6
 PKGREVISION=	1
@@ -13,11 +13,9 @@ DEPENDS+=	guile-lib>=0.1.2:../../devel/guile-lib
 
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake makeinfo pkg-config
 USE_LIBTOOL=		YES
 TEST_TARGET=		check
-
-USE_MAKEINFO=		YES
 INFO_FILES=		g-wrap.info
 
 pre-install:
diff --git a/devel/g-wrap1/Makefile b/devel/g-wrap1/Makefile
index 68ae677fcc2..b1bce9acf2d 100644
--- a/devel/g-wrap1/Makefile
+++ b/devel/g-wrap1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/03/05 16:27:24 jlam Exp $
 
 DISTNAME=	g-wrap-1.3.4
 PKGREVISION=	7
@@ -13,10 +13,8 @@ DEPENDS+=	guile-slib>=2.4.2nb6:../../devel/guile-slib
 
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake makeinfo
 USE_LIBTOOL=		YES
-
-USE_MAKEINFO=		YES
 INFO_FILES=		g-wrap.info
 
 CONFIGURE_ARGS+=	--with-modules-dir=${PREFIX}/share/guile
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 6b06fc80fe2..4aca1511fe2 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/03/05 16:27:24 jlam Exp $
 
 DISTNAME=		gcvs-1.0
 PKGREVISION=		3
@@ -13,9 +13,8 @@ COMMENT=		GTK interface for CVS
 
 CONFLICTS=		cvs-[0-9]*
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake makeinfo
 GNU_CONFIGURE=		yes
-USE_MAKEINFO=		yes
 INFO_FILES=		cvs.info cvsclient.info
 
 CONFIGURE_ARGS+=	--with-tclinclude="${BUILDLINK_PREFIX.tcl}/include" \
diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile
index 57661bbe69d..e504467f6bc 100644
--- a/devel/gdb6/Makefile
+++ b/devel/gdb6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/05 16:27:24 jlam Exp $
 #
 
 DISTNAME=		gdb-6.2.1
@@ -15,7 +15,7 @@ NOT_FOR_PLATFORM=	Darwin-*-*
 
 BUILD_USES_MSGFMT=	yes
 
-USE_TOOLS+=		autoconf213 gmake
+USE_TOOLS+=		autoconf213 gmake makeinfo
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_PKGLOCALEDIR=	yes
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/gdb6
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/gdb6
 CONFIGURE_ARGS+=	--enable-libada
 
-USE_MAKEINFO=		yes
 INFO_FILES=		annotate.info bfd.info configure.info
 INFO_FILES+=		gdb.info gdbint.info mmalloc.info
 INFO_FILES+=		stabs.info standards.info
diff --git a/devel/gdbada/Makefile b/devel/gdbada/Makefile
index 410ccf8f586..03c660426ed 100644
--- a/devel/gdbada/Makefile
+++ b/devel/gdbada/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/05 16:27:24 jlam Exp $
 
 DISTNAME=	gdbada-6.3
 PKGREVISION=	1
@@ -19,7 +19,7 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GDB_SUBPREFIX=	gdbada
 GDB_PREFIX=	${PREFIX}/${GDB_SUBPREFIX}
 GNU_CONFIGURE=          YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake makeinfo
 TEST_TARGET=    	check
 INFO_DIR=		${GDB_PREFIX}/info
 LIB_DIR=		${GDB_PREFIX}/lib
@@ -32,7 +32,6 @@ CONFIGURE_ARGS+=	--mandir=${GDB_PREFIX}/man
 CONFIGURE_ARGS+=	--datadir=${GDB_PREFIX}/share
 # We don't seem to be able to control where locale data goes, so:
 CONFIGURE_ARGS+=	--disable-nls
-USE_MAKEINFO=		YES
 USE_NEW_TEXINFO=	YES
 
 pre-patch:
diff --git a/devel/guile-gtk/Makefile b/devel/guile-gtk/Makefile
index c69d1644c83..c3cbd2f71db 100644
--- a/devel/guile-gtk/Makefile
+++ b/devel/guile-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/02/22 21:25:01 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2006/03/05 16:27:24 jlam Exp $
 #
 
 DISTNAME=		guile-gtk-0.40.91
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.gnu.org/software/guile-gtk/
 COMMENT=		Library to make GTK 1.2 accessible from guile
 
 USE_LIBTOOL=		yes
-USE_MAKEINFO=		yes
+USE_TOOLS+=		makeinfo
 
 GNU_CONFIGURE=		yes
 MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
diff --git a/devel/guile-lib/Makefile b/devel/guile-lib/Makefile
index 7a7bbc62bd0..90187f0d7e0 100644
--- a/devel/guile-lib/Makefile
+++ b/devel/guile-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/03/05 16:27:24 jlam Exp $
 
 DISTNAME=	guile-lib-0.1.2
 PKGREVISION=	1
@@ -18,8 +18,7 @@ BUILD_DIRS=	${WRKSRC}/build
 CONFIGURE_SCRIPT=	../src/configure
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 
-USE_TOOLS+=	gmake
-USE_MAKEINFO=	yes
+USE_TOOLS+=	gmake makeinfo
 TEXINFO_REQD=	4.2
 INFO_FILES=	guile-library.info
 TEST_TARGET=	test
diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index 10196ddd9d5..dc9f0cfd8d9 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/04 21:29:17 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2006/03/05 16:27:24 jlam Exp $
 
 DISTNAME=	libidn-0.6.2
 CATEGORIES=	devel
@@ -13,13 +13,12 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		pkg-config perl:build
+USE_TOOLS+=		makeinfo pkg-config perl:build
 GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=	libidn.pc.in
 TEST_TARGET=		check
 
-USE_MAKEINFO=		yes
 INFO_FILES=		libidn.info
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/devel/libjit/Makefile b/devel/libjit/Makefile
index c97a273ff1e..b1d88303400 100644
--- a/devel/libjit/Makefile
+++ b/devel/libjit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:29:17 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/03/05 16:27:24 jlam Exp $
 #
 
 DISTNAME=	libjit-0.0.4
@@ -11,9 +11,8 @@ HOMEPAGE=	http://www.southern-storm.com.au/libjit.html
 COMMENT=	Just-In-Time compilation functionality
 
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake makeinfo
 GNU_CONFIGURE=		yes
-USE_MAKEINFO=		yes
 INFO_FILES=		libjit.info
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/libtool-info/Makefile b/devel/libtool-info/Makefile
index 63a39d62a9a..3185749e8a4 100644
--- a/devel/libtool-info/Makefile
+++ b/devel/libtool-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/10/14 19:04:56 tv Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/05 16:27:25 jlam Exp $
 #
 
 .include "../../devel/libtool/Makefile.common"
@@ -10,7 +10,7 @@ COMMENT=	Generic shared library support script - info pages
 
 CONFLICTS+=	libtool<1.3.5nb11
 
-USE_MAKEINFO=	YES
+USE_TOOLS+=	makeinfo
 INFO_FILES=	libtool.info
 
 do-build:
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index e5cf140b937..c658b9b331c 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:48 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/05 16:27:25 jlam Exp $
 #
 
 DISTNAME=	monotone-0.25
@@ -14,9 +14,8 @@ GCC_REQD+=		3.0
 GNU_CONFIGURE=		yes
 INFO_FILES=		monotone.info
 UNLIMIT_RESOURCES+=	datasize
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake makeinfo
 USE_LANGUAGES=		c c++
-USE_MAKEINFO=		yes
 USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	BOOST_SUFFIX=-mt
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index 035f8749bac..802a9aeaa13 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/03/04 21:29:18 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/03/05 16:27:25 jlam Exp $
 
 DISTNAME=	nasm-0.98.39
 PKGREVISION=	2
@@ -12,9 +12,8 @@ COMMENT=	General-purpose x86 assembler
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake makeinfo perl
 GCC_REQD+=		3.0
-USE_MAKEINFO=		yes
 GNU_CONFIGURE=		yes
 
 INFO_FILES=		nasm.info
diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile
index efce4918a79..5f21f16cb73 100644
--- a/devel/opencm/Makefile
+++ b/devel/opencm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/04 21:29:18 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2006/03/05 16:27:25 jlam Exp $
 #
 
 DISTNAME=	${OPENCM_VERSION}-2-src
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.opencm.org/
 COMMENT=	Secure, high-integrity replacement for CVS
 
 WRKSRC=		${WRKDIR}/${OPENCM_VERSION}/base
-USE_TOOLS+=	gmake gzip
+USE_TOOLS+=	gmake gzip makeinfo
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--infodir=${PREFIX}/${INFO_DIR}
 CONFIGURE_ARGS+=	--with-ssl-dir=${BUILDLINK_PREFIX.openssl}
@@ -23,7 +23,6 @@ OPENCM_VERSION=	opencm-0.1.2alpha8
 CONF_FILES=	${PREFIX}/share/examples/opencm/opencm.conf \
 		${PKG_SYSCONFDIR}/opencm.conf
 
-USE_MAKEINFO=		yes
 INFO_FILES=		opencm.info
 
 CPPFLAGS+=	-D__unix__
diff --git a/devel/semi/Makefile b/devel/semi/Makefile
index f95f7f0d866..47929dd541a 100644
--- a/devel/semi/Makefile
+++ b/devel/semi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:53 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/05 16:27:25 jlam Exp $
 #
 # TODO:
 # * Control ${WRKSRC}/SEMI-ELS explicitly, otherwise Emacs/XEmacs founds
@@ -36,7 +36,7 @@ INSTALL_TARGET=	install-package
 MAKEFLAGS+=	PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
 .endif
 
-USE_MAKEINFO=	YES
+USE_TOOLS+=	makeinfo
 INFO_FILES=	mime-ui-en.info mime-ui-ja.info
 
 pre-build:
diff --git a/devel/treecc/Makefile b/devel/treecc/Makefile
index 311e360d865..39930bf37ef 100644
--- a/devel/treecc/Makefile
+++ b/devel/treecc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:54 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/03/05 16:27:25 jlam Exp $
 #
 
 DISTNAME=	treecc-0.3.6
@@ -11,9 +11,7 @@ HOMEPAGE=	http://www.gnu.org/projects/dotgnu/
 COMMENT=	DotGNU Portable.NET aspect-oriented programming tool
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-
-USE_MAKEINFO=	yes
+USE_TOOLS+=	gmake makeinfo
 INFO_FILES=	treecc.info
 
 .include "../../mk/bsd.pkg.mk"