* 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.

6 files changed, 13 insertions, 17 deletions

diff --git a/cross/avr-binutils/Makefile b/cross/avr-binutils/Makefile
index 4852b9646a9..e37d9cc21aa 100644
--- a/cross/avr-binutils/Makefile
+++ b/cross/avr-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:29 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/05 16:27:23 jlam Exp $
 
 DISTNAME=		binutils-2.13.2.1
 PKGNAME=		avr-binutils-2.13.2.1
@@ -10,10 +10,9 @@ MAINTAINER=		karlj@mdstud.chalmers.se
 COMMENT=		GNU binutils for Atmel AVR 8-bit RISC microcontrollers
 
 USE_BZIP2=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake makeinfo
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_MAKEINFO=		YES
 
 CONFIGURE_ARGS+=	--target=avr
 
diff --git a/cross/avrdude/Makefile b/cross/avrdude/Makefile
index fa4ceed78ab..4099a10e52c 100644
--- a/cross/avrdude/Makefile
+++ b/cross/avrdude/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:30 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/05 16:27:23 jlam Exp $
 
 DISTNAME=	avrdude-4.1.0
 PKGREVISION=	3
@@ -10,14 +10,14 @@ HOMEPAGE=	http://www.bsdhome.com/avrdude/
 COMMENT=	Downloader/uploader for Atmel AVR 8-bit RISC microcontrollers
 
 USE_GNU_READLINE=	YES
-TEX_DEPMETHOD=	build
+TEX_DEPMETHOD=		build
 TEX_ACCEPTED=		teTeX1 teTeX2 teTeX3
 
 BUILD_DEPENDS+=	texi2html>=1.76:../../textproc/texi2html
 
 GNU_CONFIGURE=	yes
+USE_TOOLS+=	makeinfo
 INFO_FILES=	avrdude.info
-USE_MAKEINFO=	yes
 
 CONFIGURE_ARGS+=	--disable-versioned-doc
 
diff --git a/cross/h8300-hms-binutils/Makefile b/cross/h8300-hms-binutils/Makefile
index 2a8c1685f5e..9f28f868e25 100644
--- a/cross/h8300-hms-binutils/Makefile
+++ b/cross/h8300-hms-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:30 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/03/05 16:27:23 jlam Exp $
 
 DISTNAME=		binutils-2.12.1
 PKGNAME=		cross-h8300-hms-binutils-2.12.1
@@ -14,8 +14,7 @@ COMMENT=		h8300-hms cross utility
 H8300_PREFIX=		${PREFIX}/libexec/cross-h8300-hms
 
 WRKSRC=			${WRKDIR}/objdir
-USE_TOOLS+=		gmake
-USE_MAKEINFO=		yes
+USE_TOOLS+=		gmake makeinfo
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${H8300_PREFIX:Q}
 CONFIGURE_ARGS+=	--infodir=${H8300_PREFIX}/binutils
diff --git a/cross/i386-msdosdjgpp/Makefile b/cross/i386-msdosdjgpp/Makefile
index 6eb25fe420b..1eb69a702eb 100644
--- a/cross/i386-msdosdjgpp/Makefile
+++ b/cross/i386-msdosdjgpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:29:07 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/03/05 16:27:23 jlam Exp $
 #
 
 DISTVERSION=		2.02.0
@@ -28,7 +28,7 @@ USE_CROSS_BINUTILS=	yes
 BINUTILS_GNUTARGET=	coff-go32
 BINUTILS_LDEMULATION=	i386go32
 USE_CROSS_EGCS=		yes
-USE_MAKEINFO=		yes
+USE_TOOLS+=		makeinfo
 
 # Scripts in the build need to have a $CPP defined that works with the built
 # compiler
diff --git a/cross/i386-netbsdpe/Makefile b/cross/i386-netbsdpe/Makefile
index 144e10d7a37..430e7642697 100644
--- a/cross/i386-netbsdpe/Makefile
+++ b/cross/i386-netbsdpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/02/16 18:12:58 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2006/03/05 16:27:23 jlam Exp $
 
 DISTNAME=		cross-${TARGET_ARCH}-${DISTVERSION}
 DISTVERSION=		3.3.3
@@ -37,8 +37,7 @@ GCC_DISTNAME=		gcc-3.3.3
 GCC_INTVERSION=		3.3.3
 MASTER_SITES+=		${MASTER_SITE_GNU:=gcc/releases/gcc-3.3.3/}
 DISTFILES+=		${GCC_DISTNAME}.tar.gz
-USE_TOOLS+=		gmake
-USE_MAKEINFO=		YES
+USE_TOOLS+=		gmake makeinfo
 GCC_LANGUAGES=		c,c++
 CONFIGURE_ENV=		${SETENV} CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} \
 		CXXFLAGS=${CXXFLAGS:M*:Q} LDFLAGS=${LDFLAGS:M*:Q}
diff --git a/cross/mipsEEel-netbsd/Makefile b/cross/mipsEEel-netbsd/Makefile
index 6d8021dbd9d..60ec01f58a6 100644
--- a/cross/mipsEEel-netbsd/Makefile
+++ b/cross/mipsEEel-netbsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:29:07 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/05 16:27:23 jlam Exp $
 
 DISTNAME=	cross-${TARGET_ARCH}-${DISTVERSION}
 TARGET_ARCH=	mipsEEel-netbsd
@@ -8,8 +8,7 @@ CATEGORIES+=	cross lang
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Cross-compiler for NetBSD/PlayStation2 kernel
 
-USE_TOOLS+=	gmake
-USE_MAKEINFO=	yes
+USE_TOOLS+=	gmake makeinfo
 
 .if exists(/usr/bin/bzcat)
 BZCAT=		/usr/bin/bzcat