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

9 files changed, 18 insertions, 25 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index 0fb80bf99dd..2d04fd55d99 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2006/02/05 23:09:59 joerg Exp $
+# $NetBSD: Makefile,v 1.81 2006/03/05 16:27:27 jlam Exp $
 
 DISTNAME=		R-2.2.1
 PKGREVISION=		2
@@ -16,11 +16,10 @@ NOT_FOR_PLATFORM=	NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 TEST_TARGET=		check
-USE_TOOLS+=		gmake gzip:run perl:run sed xmkmf
+USE_TOOLS+=		gmake gzip:run makeinfo perl:run sed xmkmf
 USE_GNU_READLINE=	# uses callback interface
 USE_LANGUAGES=		c fortran
 USE_LIBTOOL=		yes
-USE_MAKEINFO=		yes
 TEXINFO_REQD=		4.5
 
 GNU_CONFIGURE=		yes
diff --git a/math/calc/Makefile b/math/calc/Makefile
index 485f4a523a0..f8307ff2ba8 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:03 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/05 16:27:27 jlam Exp $
 
 DISTNAME=	calc-2.02f
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -14,7 +14,7 @@ COMMENT=	Advanced Calculator for GNU Emacs
 
 MAKE_ENV+=	EMACS=${EMACS_FLAVOR:Q}
 
-USE_MAKEINFO=	YES
+USE_TOOLS+=	makeinfo
 INFO_FILES=	calc.info
 
 INSTALLATION_DIRS=	info
diff --git a/math/ess/Makefile b/math/ess/Makefile
index 8d988a09500..cdba644c22c 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:01 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/05 16:27:27 jlam Exp $
 
 DISTNAME=	ess-5.1.24
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -12,8 +12,7 @@ COMMENT=	Emacs Speaks Statistics
 
 MAKEFLAGS+=	EMACS=${EMACS_BIN:Q}
 
-USE_MAKEINFO=	YES
-USE_TOOLS+=	perl
+USE_TOOLS+=	makeinfo perl
 
 .if defined(USE_XEMACS)
 LISPDIR=	${EMACS_LISPPREFIX}
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index 93be1e155e0..c1a62417226 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:10:01 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/05 16:27:27 jlam Exp $
 
 DISTNAME=	eukleides.1.0.1
 PKGNAME=	eukleides-1.0.1
@@ -14,8 +14,7 @@ BUILD_DEPENDS+= bison>=1.35:../../devel/bison
 DEPENDS+=	pstoedit>=3.31:../../graphics/pstoedit
 
 BUILD_TARGET=	eukleides
-USE_TOOLS+=	gmake
-USE_MAKEINFO=	YES
+USE_TOOLS+=	gmake makeinfo
 INFO_FILES=	eukleides.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/fftw2/Makefile b/math/fftw2/Makefile
index 20a65a5af73..7219d4d65ca 100644
--- a/math/fftw2/Makefile
+++ b/math/fftw2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:10:01 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/03/05 16:27:27 jlam Exp $
 
 DISTNAME=		fftw-2.1.5
 PKGNAME=		fftw2-2.1.5
@@ -19,8 +19,7 @@ CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-i386-hacks
 .endif
 USE_LANGUAGES=		fortran
-USE_TOOLS+=		gmake
-USE_MAKEINFO=		yes
+USE_TOOLS+=		gmake makeinfo
 INFO_FILES=		fftw.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/mcsim/Makefile b/math/mcsim/Makefile
index 2c0b43dc333..6984292a65b 100644
--- a/math/mcsim/Makefile
+++ b/math/mcsim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:04 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/05 16:27:27 jlam Exp $
 
 DISTNAME=	mcsim-4.2.0
 CATEGORIES=	math
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:=mcsim/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Monte Carlo Simulation software
 
-USE_MAKEINFO=	YES
+USE_TOOLS+=	makeinfo
 INFO_FILES=	mcsim
 WRKSRC=		${WRKDIR}/mcsim
 
diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index a5ac560a6e9..4b943d3af16 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2006/02/05 23:10:03 joerg Exp $
+# $NetBSD: Makefile,v 1.55 2006/03/05 16:27:27 jlam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 PKGNAME=	octave-current-${OCTAVE_VER}
@@ -27,8 +27,7 @@ BROKEN=		Internal compiler error occurs on arm32 (even with gcc-2.95.3)
 
 USE_GNU_READLINE=	yes
 USE_LIBTOOL=		yes
-USE_MAKEINFO=		yes
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake makeinfo perl
 GNU_CONFIGURE=		yes
 
 GCC_REQD+=		3.0
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 077b10055c4..4fdd594f3d9 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2006/02/05 23:10:03 joerg Exp $
+# $NetBSD: Makefile,v 1.62 2006/03/05 16:27:27 jlam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 PKGREVISION=	1
@@ -26,8 +26,7 @@ BROKEN=		Internal compiler error occurs on arm32 (even with gcc-2.95.3)
 
 USE_GNU_READLINE=	yes
 USE_LIBTOOL=		yes
-USE_MAKEINFO=		yes
-USE_TOOLS+=		gmake perl
+USE_TOOLS+=		gmake makeinfo perl
 GNU_CONFIGURE=		yes
 
 GCC_REQD+=		3.0
diff --git a/math/yorick/Makefile b/math/yorick/Makefile
index f2c8cd227e5..560e8b2fe07 100644
--- a/math/yorick/Makefile
+++ b/math/yorick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:09 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/05 16:27:27 jlam Exp $
 
 DISTNAME=	yorick-1.6.02
 PKGREVISION=	1
@@ -14,9 +14,8 @@ WRKSRC=		${WRKDIR}/yorick-1.6
 BUILD_DIRS=	${WRKSRC} ${WRKSRC}/doc
 INSTALL_DIRS=	${WRKSRC}
 
-USE_MAKEINFO=	YES
+USE_TOOLS+=	gmake makeinfo
 INFO_FILES=	yorick.info
-USE_TOOLS+=	gmake
 
 .include "../../mk/x11.buildlink3.mk"