diff options
| author | jlam <jlam> | 2006-03-05 16:27:22 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-03-05 16:27:22 +0000 |
| commit | ce4bbe5f06174694c3b499219adedc4dab48cc15 (patch) | |
| tree | e3c6cf61f7cffff30eee10d4bef3729227d7edcb | |
| parent | 8c289c620336c1910cc533433541050cac4530a4 (diff) | |
| download | pkgsrc-ce4bbe5f06174694c3b499219adedc4dab48cc15.tar.gz | |
* 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.
106 files changed, 271 insertions, 354 deletions
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile index e00d7d2b998..f022c0fb47b 100644 --- a/archivers/gcpio/Makefile +++ b/archivers/gcpio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/03/04 21:28:52 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2006/03/05 16:27:22 jlam Exp $ # DISTNAME= cpio-2.6 @@ -14,7 +14,7 @@ COMMENT= GNU copy-in/out (cpio) with remote magnetic tape (rmt) support PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes -USE_MAKEINFO= yes +USE_TOOLS+= makeinfo TEST_TARGET= check diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile index 1b1a7f4e981..c2d601c109a 100644 --- a/archivers/gsharutils/Makefile +++ b/archivers/gsharutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2006/03/04 21:28:52 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2006/03/05 16:27:22 jlam Exp $ DISTNAME= sharutils-4.2.1 PKGNAME= g${DISTNAME} @@ -19,9 +19,8 @@ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes INSTALL_TARGET= install install-man -USE_MAKEINFO= YES INFO_FILES= remsync.info sharutils.info -USE_TOOLS+= sh:run mktemp:run +USE_TOOLS+= makeinfo sh:run mktemp:run CONFIGURE_ARGS+= --disable-uucode CONFIGURE_ENV+= SH=${TOOLS_SH:Q} diff --git a/audio/csound4/Makefile b/audio/csound4/Makefile index 3bbae4871cb..f5cbac60cf2 100644 --- a/audio/csound4/Makefile +++ b/audio/csound4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:06 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2006/03/05 16:27:22 jlam Exp $ # DISTNAME= csound-4.23f13gbs.0 @@ -14,9 +14,8 @@ COMMENT= Software synthesizer and sequencer DIST_SUBDIR= csound CONFLICTS+= csound-bath-4* CONFLICTS+= csound-dev-4* -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo GNU_CONFIGURE= yes -USE_MAKEINFO= yes TEXINFO_REQD= 4.2 CONFIGURE_ARGS+= --enable-debug CFLAGS+= -g diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile index ea3481217ea..4f2300fe6f5 100644 --- a/audio/libmikmod/Makefile +++ b/audio/libmikmod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2006/02/05 23:08:10 joerg Exp $ +# $NetBSD: Makefile,v 1.39 2006/03/05 16:27:22 jlam Exp $ DISTNAME= libmikmod-3.1.11 PKGNAME= libmikmod-3.1.11.1 @@ -16,10 +16,9 @@ COMMENT= MikMod Sound Library PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_MAKEINFO= yes INFO_FILES= mikmod.info CONFIGURE_ARGS+= --disable-threads diff --git a/audio/openal/Makefile b/audio/openal/Makefile index 90340bbbdd7..e7258d22744 100644 --- a/audio/openal/Makefile +++ b/audio/openal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/04 21:28:57 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/03/05 16:27:22 jlam Exp $ DISTNAME= openal-20040816 PKGREVISION= 1 @@ -12,11 +12,10 @@ HOMEPAGE= http://www.openal.org/ COMMENT= 3D positional spatialized sound library WRKSRC= ${WRKDIR}/${DISTNAME}/linux -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo USE_LIBTOOL= yes GNU_CONFIGURE= yes -USE_MAKEINFO= yes INFO_FILES= openal.info post-install: diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile index 4bdf73b84e5..e4af01b5f95 100644 --- a/audio/rplay/Makefile +++ b/audio/rplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2006/03/04 21:28:58 jlam Exp $ +# $NetBSD: Makefile,v 1.54 2006/03/05 16:27:22 jlam Exp $ # DISTNAME= rplay-3.3.2 @@ -11,12 +11,12 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://rplay.doit.org/ COMMENT= Network audio player +USE_TOOLS+= makeinfo USE_LIBTOOL= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --build=BUILD -USE_MAKEINFO= YES INFO_FILES= RPLAY.info RPTP.info librplay.info rplay.info RCD_SCRIPTS= rplayd EGDIR= ${PREFIX}/share/examples/rplay diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile index 9298a8b57c8..ceb388aec31 100644 --- a/audio/solfege/Makefile +++ b/audio/solfege/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/03/02 00:48:31 schmonz Exp $ +# $NetBSD: Makefile,v 1.9 2006/03/05 16:27:23 jlam Exp $ # DISTNAME= solfege-3.0.7 @@ -16,8 +16,7 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --disable-oss-sound -USE_TOOLS+= gmake gm4 pkg-config -USE_MAKEINFO= yes +USE_TOOLS+= gmake gm4 makeinfo pkg-config PYTHON_VERSIONS_ACCEPTED= 24 23 PYTHON_PATCH_SCRIPTS= *.py *.py.in */*.py */*.py.in diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile index aa0e1e65d60..10d3910f1a6 100644 --- a/audio/tracker/Makefile +++ b/audio/tracker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/03/04 21:28:59 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2006/03/05 16:27:23 jlam Exp $ DISTNAME= tracker-5.3 PKGREVISION= 1 @@ -26,7 +26,7 @@ MAKE_FLAGS+= MACHINE=${LOWER_OPSYS:Q} INSTALL=${INSTALL:Q} \ EGDIR= ${PREFIX}/share/examples/tracker CONF_FILES= ${EGDIR}/compression_methods ${PKG_SYSCONFDIR}/compression_methods -USE_MAKEINFO= YES +USE_TOOLS+= makeinfo INFO_FILES= tracker.info INSTALLATION_DIRS= bin info diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile index 702a7647a10..80f5001a6bd 100644 --- a/cad/gschem/Makefile +++ b/cad/gschem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/02/05 23:08:21 joerg Exp $ +# $NetBSD: Makefile,v 1.38 2006/03/05 16:27:23 jlam Exp $ # DISTNAME= geda-gschem-${PKGVERSION} @@ -17,9 +17,8 @@ CONFLICTS+= gEDA<19991011 .include "../../cad/geda/Makefile.common" GNU_CONFIGURE= YES -USE_TOOLS+= pkg-config +USE_TOOLS+= makeinfo pkg-config USE_PKGLOCALEDIR= YES -USE_MAKEINFO= YES INFO_FILES= gschemdoc.info .include "../../cad/libgeda/buildlink3.mk" diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile index 7ee67242e8c..46b896a900e 100644 --- a/cad/ng-spice/Makefile +++ b/cad/ng-spice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/02/05 23:08:22 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2006/03/05 16:27:23 jlam Exp $ # DISTNAME= ng-spice-rework-17 @@ -13,8 +13,7 @@ COMMENT= Next generation circuit simulation program WRKSRC= ${WRKDIR}/ng-spice-rework-17 USE_LIBTOOL= YES -USE_MAKEINFO= YES -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo USE_GNU_READLINE= uses rl_* interface GNU_CONFIGURE= YES diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile index 5013c79ac60..2a79c1a708d 100644 --- a/comms/fidogate/Makefile +++ b/comms/fidogate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2006/02/05 23:08:27 joerg Exp $ +# $NetBSD: Makefile,v 1.51 2006/03/05 16:27:23 jlam Exp $ # DISTNAME= fidogate-4.4.10 @@ -10,11 +10,10 @@ MAINTAINER= tv@duh.org HOMEPAGE= http://www.fidogate.org/ COMMENT= FidoNet (FTN) <-> Internet mail and news gateway -USE_TOOLS+= gmake perl:run +USE_TOOLS+= gmake makeinfo perl:run MAKE_ENV+= DEBUG="${CFLAGS} -Werror" BUILDLINK_SETENV.CC= CC="cc ${_STRIPFLAG_CC}" -USE_MAKEINFO= YES INFO_FILES= fidogate.info EGDIR= ${PREFIX}/share/examples/fidogate diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile index 1c86831c110..fcc0e831c39 100644 --- a/comms/mgetty+sendfax/Makefile +++ b/comms/mgetty+sendfax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2006/02/05 23:08:27 joerg Exp $ +# $NetBSD: Makefile,v 1.51 2006/03/05 16:27:23 jlam Exp $ DISTNAME= mgetty1.1.31-Jul24 PKGNAME= mgetty-1.1.31 @@ -22,7 +22,7 @@ INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL MAKE_ENV+= MGETTY_CONFDIR=${PKG_SYSCONFDIR:Q} -USE_MAKEINFO= YES +USE_TOOLS+= makeinfo INFO_FILES= mgetty.info PKG_SYSCONFSUBDIR= mgetty+sendfax 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 diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile index 4fe44b4662a..45c6b306c53 100644 --- a/databases/gnats/Makefile +++ b/databases/gnats/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/02/05 23:08:30 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2006/03/05 16:27:23 jlam Exp $ DISTNAME= gnats-4.1.0 PKGREVISION= 2 @@ -10,9 +10,8 @@ HOMEPAGE= http://www.gnu.org/software/gnats/ COMMENT= GNATS bug tracking system USE_PKGLOCALEDIR= yes -USE_TOOLS+= gm4 gmake +USE_TOOLS+= gm4 gmake makeinfo USE_BISON= yes -USE_MAKEINFO= yes TEXINFO_REQD= 4.6 USE_LIBTOOL= yes GNU_CONFIGURE= yes 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" diff --git a/editors/mule/Makefile b/editors/mule/Makefile index 80ab92906ad..c294cdcaa87 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2006/02/05 23:08:57 joerg Exp $ +# $NetBSD: Makefile,v 1.37 2006/03/05 16:27:25 jlam Exp $ DISTNAME= mule-2.3 PKGREVISION= 3 @@ -18,7 +18,7 @@ CHECK_WRKREF_SKIP+= ${PREFIX}/bin/mule-19.28 WRKSRC= ${WRKDIR}/mule GNU_CONFIGURE= yes GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR}/man1 -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo .include "../../mk/bsd.prefs.mk" @@ -33,7 +33,6 @@ CONFIGURE_ARGS+= --bdf-path=${X11PREFIX}/lib/X11/fonts/intlfonts/bdf .include "options.mk" -USE_MAKEINFO= YES INFO_FILES= CCL ISO2022 R2L XFONT antenews-jp canna-jp cl dired-x INFO_FILES+= egg egg-jp emacs forms gnus kbd-trans languages m2ps mule INFO_FILES+= mule-jp quail sc terminology vip diff --git a/editors/zile/Makefile b/editors/zile/Makefile index 9b669861341..52775f6afd9 100644 --- a/editors/zile/Makefile +++ b/editors/zile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/03/04 21:29:34 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2006/03/05 16:27:25 jlam Exp $ DISTNAME= zile-2.2.4 CATEGORIES= editors @@ -8,7 +8,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://zile.sourceforge.net/ COMMENT= Emacs-like text editor -USE_MAKEINFO= yes +USE_TOOLS+= makeinfo USE_NCURSES= yes # uses stdscr->_delay directly GNU_CONFIGURE= yes diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile index 048eb3e394f..03e522e2f10 100644 --- a/finance/gnucash-devel/Makefile +++ b/finance/gnucash-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/02/20 23:25:46 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2006/03/05 16:27:25 jlam Exp $ # DISTNAME= gnucash-1.9.1 @@ -14,10 +14,9 @@ DEPENDS+= guile-www-[0-9]*:../../devel/guile-www USE_DIRS+= xdg-1.1 USE_LIBTOOL= yes -USE_MAKEINFO= yes USE_MSGFMT_PLURALS= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake pkg-config +USE_TOOLS+= gmake makeinfo pkg-config GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= lib/goffice-0.0.4/libgoffice-1.pc.in diff --git a/games/xconq/Makefile b/games/xconq/Makefile index d03f330a69f..c66bdb089ac 100644 --- a/games/xconq/Makefile +++ b/games/xconq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/02/05 23:09:24 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2006/03/05 16:27:25 jlam Exp $ DISTNAME= xconq-7.4.1 PKGREVISION= 5 @@ -10,7 +10,7 @@ HOMEPAGE= http://sources.redhat.com/xconq/ COMMENT= Xconq is a general strategy game system USE_X11BASE= YES -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-alternate-scoresdir=${VARBASE}/games/xconq/scores CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib" @@ -18,7 +18,6 @@ CONFIGURE_ARGS+= --with-tkconfig="${BUILDLINK_PREFIX.tk}/lib" MAKE_ENV+= LOCALBASE=${LOCALBASE:Q} -USE_MAKEINFO= YES INFO_FILES= hacking.info xcdesign.info xconq.info post-build: diff --git a/graphics/gnuplot/Makefile.common b/graphics/gnuplot/Makefile.common index ea435092a7b..4d0892327b2 100644 --- a/graphics/gnuplot/Makefile.common +++ b/graphics/gnuplot/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2005/12/29 23:01:51 garbled Exp $ +# $NetBSD: Makefile.common,v 1.7 2006/03/05 16:27:25 jlam Exp $ # DISTNAME= gnuplot-4.0.0 @@ -17,7 +17,7 @@ GNU_CONFIGURE= YES # because of missing rl_complete_with_tilde_expansion and rl_terminal_name USE_GNU_READLINE= YES -USE_MAKEINFO= YES +USE_TOOLS+= makeinfo INFO_FILES= gnuplot.info CONFIGURE_ARGS+= --with-pdf diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile index 8a5c3e64fbe..a4bd3f672f7 100644 --- a/graphics/gri/Makefile +++ b/graphics/gri/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/03/04 21:29:49 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2006/03/05 16:27:25 jlam Exp $ DISTNAME= gri-2.12.5 PKGREVISION= 3 @@ -13,10 +13,8 @@ COMMENT= Language for scientific graphics applications BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick GNU_CONFIGURE= yes -USE_TOOLS+= gmake gs:run perl +USE_TOOLS+= gmake gs:run makeinfo perl REPLACE_PERL+= gri_merge gri_unpage - -USE_MAKEINFO= yes INFO_FILES= gri.info .include "../../devel/netcdf/buildlink3.mk" diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile index 807b6d3aeea..2934c597145 100644 --- a/graphics/hp2xx/Makefile +++ b/graphics/hp2xx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/02/05 23:09:33 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2006/03/05 16:27:26 jlam Exp $ # DISTNAME= hp2xx-3.4.4 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnu.org/software/hp2xx/hp2xx.html COMMENT= HPGL converter and previewer BUILD_DIRS= sources -USE_MAKEINFO= YES +USE_TOOLS+= makeinfo INFO_FILES= hp2xx.info post-extract: diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile index 602a3ab55bb..3cdf02793f9 100644 --- a/graphics/xzgv/Makefile +++ b/graphics/xzgv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/03/04 21:29:53 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2006/03/05 16:27:26 jlam Exp $ DISTNAME= xzgv-0.8 PKGNAME= xzgv-0.8.0.1 @@ -14,11 +14,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://rus.members.beeb.net/xzgv.html COMMENT= Image viewer -USE_MAKEINFO= YES -INFO_FILES= xzgv - USE_X11BASE= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo +INFO_FILES= xzgv INSTALLATION_DIRS= bin info man/man1 do-install: diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile index 26072b65b84..5d52a40a045 100644 --- a/lang/gauche/Makefile +++ b/lang/gauche/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2006/02/22 22:28:35 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2006/03/05 16:27:26 jlam Exp $ # DISTNAME= Gauche-0.8.6 @@ -32,8 +32,7 @@ CONFIGURE_ENV+= AS="${CC} -x assembler-with-cpp -c" _WITH_ICONV_LIB= ${BUILDLINK_LIBICONV_LDADD:M-l*:C/-l//} LDFLAGS+= ${BUILDLINK_LIBICONV_LDADD} -USE_MAKEINFO= YES -USE_TOOLS+= gzip +USE_TOOLS+= gzip makeinfo INFO_FILES= gauche-refe.info gauche-refj.info post-install: diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile index d8eb781ce6d..d994ba269bf 100644 --- a/lang/gcc34/Makefile +++ b/lang/gcc34/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/02/05 23:09:45 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2006/03/05 16:27:26 jlam Exp $ # DISTNAME= gcc-${GCC_VERSION} @@ -107,12 +107,11 @@ PTHREAD_OPTS+= native CONFIGURE_ARGS+= --disable-threads .endif -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo HAS_CONFIGURE= YES # no GNU_CONFIGURE! CONFIG_SHELL?= ${SH} CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL:Q} -USE_MAKEINFO= YES -PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC +PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC .if !empty(BUILD_ADA:M[Yy][Ee][Ss]) diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 166c24e2e8f..2da536ce187 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2006/02/05 23:09:45 joerg Exp $ +# $NetBSD: Makefile,v 1.70 2006/03/05 16:27:26 jlam Exp $ DISTNAME= guile-1.6.7 PKGREVISION= 3 @@ -12,12 +12,10 @@ COMMENT= GNU's Ubiquitous Intelligent Language for Extension CONFLICTS= guile14<1.4.1nb1 guile-oops-[0-9]* GNU_CONFIGURE= YES -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo USE_LIBTOOL= YES USE_GNU_READLINE= YES PTHREAD_AUTO_VARS= YES - -USE_MAKEINFO= YES INFO_FILES= guile.info guile-tut.info goops.info r5rs.info TEST_DIRS= ${WRKSRC} diff --git a/lang/ksi/Makefile b/lang/ksi/Makefile index 051395d9010..2cbb6972c89 100644 --- a/lang/ksi/Makefile +++ b/lang/ksi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/03/04 21:29:54 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2006/03/05 16:27:26 jlam Exp $ DISTNAME= ksi-3.4.1 PKGREVISION= 4 @@ -11,11 +11,11 @@ COMMENT= Portable, embeddable Scheme implementation written in C CPPFLAGS+= -Dunix GNU_CONFIGURE= yes +USE_TOOLS+= makeinfo INFO_FILES= ksi-lang.info ksi-lib.info ksi.info MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q} USE_GNU_READLINE= # uses rl_event_hook() interface USE_LIBTOOL= yes -USE_MAKEINFO= YES USE_NEW_TEXINFO= YES USE_PKGLOCALEDIR= yes diff --git a/lang/librep/Makefile b/lang/librep/Makefile index 4b0004790c7..47f088623d9 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2006/03/04 21:29:54 jlam Exp $ +# $NetBSD: Makefile,v 1.44 2006/03/05 16:27:26 jlam Exp $ # DISTNAME= librep-0.17 @@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://librep.sourceforge.net/ COMMENT= Emacs Lisp-like runtime library, interpreter, compiler and VM -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo USE_GNU_READLINE= # uses rl_basic_quote_characters USE_LIBTOOL= yes @@ -23,7 +23,6 @@ CONFIGURE_ARGS+= --enable-static CONFIG_STATUS_OVERRIDE= # empty -USE_MAKEINFO= YES INFO_FILES= librep.info post-install: diff --git a/lang/pnet/Makefile b/lang/pnet/Makefile index a8e6f5d002e..00f8c216f18 100644 --- a/lang/pnet/Makefile +++ b/lang/pnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/02/05 23:09:47 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/03/05 16:27:26 jlam Exp $ DISTNAME= pnet-0.6.6 PKGREVISION= 2 @@ -13,9 +13,8 @@ BUILD_DEPENDS+= treecc>=0.2.6:../../devel/treecc CONFLICTS= mono-[0-9]* -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo USE_LIBTOOL= yes -USE_MAKEINFO= yes GNU_CONFIGURE= yes INFO_FILES= pnettools.info diff --git a/lang/sather/Makefile b/lang/sather/Makefile index e6fc08f0a26..bc6507da1b2 100644 --- a/lang/sather/Makefile +++ b/lang/sather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2006/03/04 21:29:56 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2006/03/05 16:27:26 jlam Exp $ DISTNAME= sather-1.2.1 PKGREVISION= 6 @@ -9,11 +9,10 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnu.org/software/sather/ COMMENT= Compiler for the Sather object oriented programming language -USE_TOOLS+= gmake +USE_TOOLS+= gmake makeinfo BUILD_TARGET= full optional -USE_MAKEINFO= YES INFO_FILES= sather.info sather-tutorial.info sather-mode.info REPLACE_PERL= Browser/Web/ps2gif diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index 72def11a1ee..0ad3a708433 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/03/04 21:29:56 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2006/03/05 16:27:26 jlam Exp $ DISTNAME= smalltalk-2.1.9 PKGREVISION= 2 @@ -12,10 +12,9 @@ COMMENT= GNU Smalltalk: A smalltalk-80 implementation ONLY_FOR_PLATFORM= *-*-i386 *-*-sparc *-*-powerpc LIBTOOLIZE_PLIST= NO # Manually created libc.la breaks PLIST. -USE_TOOLS+= gawk gmake pkg-config +USE_TOOLS+= gawk gmake makeinfo pkg-config USE_GNU_READLINE= YES USE_LIBTOOL= YES -USE_MAKEINFO= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-gdbm=${BUILDLINK_PREFIX.gdbm}/lib CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}/lib diff --git a/mail/gnus/Makefile b/mail/gnus/Makefile index e1f06fef28b..9b77ea29a48 100644 --- a/mail/gnus/Makefile +++ b/mail/gnus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:55 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/03/05 16:27:26 jlam Exp $ DISTNAME= gnus-5.10.6 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --with-etcdir=${PREFIX}/share/gnus # Avoid conflicting with Emacsen provided gnus info files CONFIGURE_ARGS+= --infodir=${PREFIX}/share/doc/gnus/info -USE_MAKEINFO= YES +USE_TOOLS+= makeinfo INFO_DIR= share/doc/gnus/info INFO_FILES= emacs-mime gnus message pgg sieve diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile index abe17c23081..b478e80aaa4 100644 --- a/mail/mairix/Makefile +++ b/mail/mairix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:11 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2006/03/05 16:27:26 jlam Exp $ # DISTNAME= mairix-0.16.1 @@ -14,7 +14,7 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX:Q} -USE_MAKEINFO= YES +USE_TOOLS+= makeinfo INFO_FILES= mairix.info BINDIR= ${PREFIX}/bin diff --git a/mail/vm/Makefile b/mail/vm/Makefile index 67e48938eab..2b4a170a8c1 100644 --- a/mail/vm/Makefile +++ b/mail/vm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/03/04 21:30:02 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2006/03/05 16:27:26 jlam Exp $ DISTNAME= vm-7.19 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -23,7 +23,7 @@ COMMENT= VM (View Mail) is an advanced mail user agent for Emacs .include "../../mk/emacs.mk" -USE_MAKEINFO= YES +USE_TOOLS+= makeinfo .if ${EMACS_FLAVOR} == "xemacs" INFODIR= ${PREFIX}/lib/xemacs/site-packages/info 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" diff --git a/misc/bbdb/Makefile b/misc/bbdb/Makefile index 319defbef79..0c3d4a6f864 100644 --- a/misc/bbdb/Makefile +++ b/misc/bbdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/02/05 23:10:07 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/03/05 16:27:27 jlam Exp $ # DISTNAME= bbdb-2.34 @@ -18,7 +18,7 @@ CONFLICTS+= xemacs-packages USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes BUILD_TARGET= all mhe -USE_MAKEINFO= yes +USE_TOOLS+= makeinfo INFO_FILES= bbdb.info INFO_DIR= ${INFODIR} PLIST_SUBST+= INFODIR=${INFODIR:Q} diff --git a/misc/vera/Makefile b/misc/vera/Makefile index cf2dc843391..ca45701c723 100644 --- a/misc/vera/Makefile +++ b/misc/vera/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/04 21:30:13 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/03/05 16:27:27 jlam Exp $ DISTNAME= vera-1.16 CATEGORIES= misc @@ -9,7 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://cgi.snafu.de/ohei/user-cgi-bin/veramain-e.cgi COMMENT= Virtual Entity of Relevant Acronyms -USE_MAKEINFO= YES +USE_TOOLS+= makeinfo INFO_FILES= vera.info INSTALLATION_DIRS= info diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index ff1fd2f2335..5786956003e 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.27 2006/01/12 19:05:06 joerg Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.28 2006/03/05 16:27:29 jlam Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -103,12 +103,11 @@ MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" LIBTOOL_OVERRIDE?= libtool */libtool */*/libtool .endif -### USE_MAKEINFO, INFO_FILES +### INFO_FILES INFO_FILES?= # empty -USE_MAKEINFO?= no -.if !empty(INFO_FILES) || empty(USE_MAKEINFO:M[nN][oO]) +.if !empty(INFO_FILES) . include "../../mk/texinfo.mk" .endif diff --git a/mk/texinfo.mk b/mk/texinfo.mk index 289b9522547..518f111e955 100644 --- a/mk/texinfo.mk +++ b/mk/texinfo.mk @@ -1,8 +1,8 @@ -# $NetBSD: texinfo.mk,v 1.31 2006/01/10 00:01:16 seb Exp $ +# $NetBSD: texinfo.mk,v 1.32 2006/03/05 16:27:29 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk when INFO_FILES is -# not empty or USE_MAKEINFO is not "no". +# not empty. # .if !defined(TEXINFO_MK) @@ -45,78 +45,4 @@ FILES_SUBST+= INSTALL_INFO=${INSTALL_INFO:Q} FILES_SUBST+= INFO_DIR=${INFO_DIR:Q} .endif # INFO_FILES -.if empty(USE_MAKEINFO:M[nN][oO]) -# -# Handle makeinfo. -# - -# Minimum required version for the GNU makeinfo command. -TEXINFO_REQD?= 3.12 -_TEXINFO_REQD_MAJOR= ${TEXINFO_REQD:C|\..*$||} -_TEXINFO_REQD_MINOR= ${TEXINFO_REQD:C|^[0-9]+\.||:C|\..*$||} - -# Argument to specify maximum info files size for newer versions -# of makeinfo. This argument is supported since makeinfo 4.1. -_MAKEINFO_SPLIT_SIZE_ARG+= --split-size=50000 - -# The minimum version of makeinfo for which the default info files size -# was bumped from 50000. -_MAKEINFO_SPLIT_SIZE_VERSION= 4.6 - -# Add OPSYS specific flags if any. -MAKEINFO_ARGS+= ${_OPSYS_MAKEINFO_ARGS} - -# Does the system has a makeinfo command? -_MAKEINFO= -. for _i_ in /usr/bin/makeinfo -. if exists(${_i_}) -_MAKEINFO= ${_i_} -. endif -. endfor - -# Record makeinfo's version. -# If makeinfo's version contains useful information outside the first -# two dot separated numbers the following would have to be changed as well -# as _{MAKEINFO,TEXINFO_REQD}_{MAJOR,MINOR} and their comparison below. -. if !empty(_MAKEINFO) && !defined(MAKEINFO_VERSION) -MAKEINFO_VERSION_OUTPUT!= ${_MAKEINFO} --version 2>/dev/null || ${ECHO} -MAKEINFO_VERSION= -. for _i_ in ${MAKEINFO_VERSION_OUTPUT:M[0-9]*.[0-9]*:C/[^0-9.]//} -. if empty(MAKEINFO_VERSION) -MAKEINFO_VERSION= ${_i_} -. endif -. endfor -MAKEFLAGS+= MAKEINFO_VERSION=${MAKEINFO_VERSION:Q} -. endif - -# Sort out if the version provided by devel/gtexinfo is needed. -# If it is add it as build time dependency and set MAKEINFO -# to the makeinfo it provides. -# Here it is assumed devel/gtexinfo's makeinfo version will be -# superior or equal to TEXINFO_REQD. -_NEED_TEXINFO= YES -. if defined(MAKEINFO_VERSION) -_MAKEINFO_VERSION_MAJOR= ${MAKEINFO_VERSION:C|\..*$||} -_MAKEINFO_VERSION_MINOR= ${MAKEINFO_VERSION:C|^[0-9]+\.||:C|\..*$||} -. if ${_MAKEINFO_VERSION_MAJOR} > ${_TEXINFO_REQD_MAJOR} -_NEED_TEXINFO= NO -. elif ${_MAKEINFO_VERSION_MAJOR} == ${_TEXINFO_REQD_MAJOR} && ${_MAKEINFO_VERSION_MINOR} >= ${_TEXINFO_REQD_MINOR} -_NEED_TEXINFO= NO -. endif -. endif -. if !empty(_NEED_TEXINFO:M[yY][eE][sS]) -BUILD_DEPENDS+= gtexinfo>=${TEXINFO_REQD}:../../devel/gtexinfo -_GTEXINFO_PREFIX_DEFAULT= ${LOCALBASE} -EVAL_PREFIX+= _GTEXINFO_PREFIX=gtexinfo -# assume devel/gtexinfo version is >= ${_MAKEINFO_SPLIT_SIZE_VERSION} -MAKEINFO_ARGS+= ${_MAKEINFO_SPLIT_SIZE_ARG} -MAKEINFO= ${_GTEXINFO_PREFIX}/bin/makeinfo ${MAKEINFO_ARGS} -. else -. if defined(MAKEINFO_VERSION) && ${MAKEINFO_VERSION} >= ${_MAKEINFO_SPLIT_SIZE_VERSION} -MAKEINFO_ARGS+= ${_MAKEINFO_SPLIT_SIZE_ARG} -. endif -MAKEINFO= ${_MAKEINFO} ${MAKEINFO_ARGS} -. endif -.endif # USE_MAKEINFO - .endif # TEXINFO_MK diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk index 98cd42c6e5a..ba244bd0703 100644 --- a/mk/tools/defaults.mk +++ b/mk/tools/defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: defaults.mk,v 1.44 2006/01/21 14:40:31 jlam Exp $ +# $NetBSD: defaults.mk,v 1.45 2006/03/05 16:27:29 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -98,6 +98,7 @@ _TOOLS_VARNAME.ln= LN _TOOLS_VARNAME.ls= LS _TOOLS_VARNAME.m4= M4 _TOOLS_VARNAME.mail= MAIL_CMD +_TOOLS_VARNAME.makeinfo= MAKEINFO _TOOLS_VARNAME.mkdir= MKDIR _TOOLS_VARNAME.mktemp= MKTEMP _TOOLS_VARNAME.mtree= MTREE diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 93329d9826f..b1c8a4d0a46 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.159 2006/02/21 17:39:32 rillig Exp $ +# $NetBSD: replace.mk,v 1.160 2006/03/05 16:27:29 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -486,6 +486,17 @@ TOOLS_PATH.mail= ${TOOLS_PREFIX.mail}/bin/nail . endif .endif +.if !defined(TOOLS_IGNORE.makeinfo) && !empty(_USE_TOOLS:Mmakeinfo) +. if !empty(PKGPATH:Mdevel/gtexinfo) +MAKEFLAGS+= TOOLS_IGNORE.makeinfo= +. elif !empty(_TOOLS_USE_PKGSRC.makeinfo:M[yY][eE][sS]) +TOOLS_DEPENDS.makeinfo?= gtexinfo>=${TEXINFO_REQD}:../../devel/gtexinfo +TOOLS_CREATE+= makeinfo +TOOLS_FIND_PREFIX+= TOOLS_PREFIX.makeinfo=gtexinfo +TOOLS_PATH.makeinfo= ${TOOLS_PREFIX.makeinfo}/bin/makeinfo +. endif +.endif + .if !defined(TOOLS_IGNORE.mktemp) && !empty(_USE_TOOLS:Mmktemp) . if !empty(PKGPATH:Msysutils/mktemp) MAKEFLAGS+= TOOLS_IGNORE.mktemp= diff --git a/mk/tools/texinfo.mk b/mk/tools/texinfo.mk index 06852b74d68..5f608e49a0a 100644 --- a/mk/tools/texinfo.mk +++ b/mk/tools/texinfo.mk @@ -1,4 +1,4 @@ -# $NetBSD: texinfo.mk,v 1.8 2005/07/17 21:36:24 jlam Exp $ +# $NetBSD: texinfo.mk,v 1.9 2006/03/05 16:27:29 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -43,17 +43,38 @@ TOOLS_NOOP+= install-info CONFIGURE_ENV+= INSTALL_INFO=${TOOLS_CMD.install-info:Q} MAKE_ENV+= INSTALL_INFO=${TOOLS_CMD.install-info:Q} -# Create a makeinfo script that will invoke the right makeinfo command -# if USE_MAKEINFO is "yes" or will exit on error if not. MAKEINFO is -# defined by mk/texinfo.mk if USE_MAKEINFO is "yes". -# -USE_MAKEINFO?= no -.if empty(USE_MAKEINFO:M[nN][oO]) -TOOLS_CREATE+= makeinfo -TOOLS_PATH.makeinfo= ${MAKEINFO:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//} -TOOLS_ARGS.makeinfo= ${MAKEINFO:C/^/_asdf_/1:N_asdf_*} -.else +TEXINFO_REQD?= 3.12 + +# If the package doesn't explicitly request makeinfo as a tool, then +# create a "broken" makeinfo tool to prevent its use. +# +# If the package does explicitly request makeinfo as a tool, then +# determine if the platform-provided makeinfo's version is at least +# ${TEXINFO_REQD}. If it isn't, then tell the tools framework to use +# the pkgsrc makeinfo. +# +.if empty(USE_TOOLS:C/:.*//:Mmakeinfo) TOOLS_BROKEN+= makeinfo +.elif defined(TOOLS_PLATFORM.makeinfo) && !empty(TOOLS_PLATFORM.makeinfo) +. if !defined(_TOOLS_USE_PKGSRC.makeinfo) +_TOOLS_VERSION.makeinfo!= \ + ${TOOLS_PLATFORM.makeinfo} --version | \ + ${AWK} '{ print $$4; exit; }' +_TOOLS_PKG.makeinfo= gtexinfo-${_TOOLS_VERSION.makeinfo} +_TOOLS_USE_PKGSRC.makeinfo= no +. for _dep_ in gtexinfo>=${TEXINFO_REQD} +. if !empty(_TOOLS_USE_PKGSRC.makeinfo:M[nN][oO]) +_TOOLS_USE_PKGSRC.makeinfo!= \ + if ${PKG_ADMIN} pmatch ${_dep_:Q} ${_TOOLS_PKG.makeinfo:Q}; then \ + ${ECHO} no; \ + else \ + ${ECHO} yes; \ + fi +. endif +. endfor +. endif +MAKEVARS+= _TOOLS_USE_PKGSRC.makeinfo .endif + 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 04b89db9ca3..694a92fd4d4 100644 --- a/mk/tools/tools.Darwin.mk +++ b/mk/tools/tools.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.Darwin.mk,v 1.22 2006/01/16 21:50:46 tron Exp $ +# $NetBSD: tools.Darwin.mk,v 1.23 2006/03/05 16:27:29 jlam Exp $ # # System-supplied tools for the Darwin (Mac OS X) operating system. @@ -49,6 +49,9 @@ TOOLS_PLATFORM.ln?= /bin/ln TOOLS_PLATFORM.ls?= /bin/ls TOOLS_PLATFORM.m4?= /usr/bin/m4 TOOLS_PLATFORM.mail?= /usr/bin/mail +.if exists(/usr/bin/makeinfo) +TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo +.endif TOOLS_PLATFORM.mkdir?= /bin/mkdir -p TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp TOOLS_PLATFORM.mtree?= /usr/sbin/mtree diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk index 289eeee559a..dbdfa0af15d 100644 --- a/mk/tools/tools.DragonFly.mk +++ b/mk/tools/tools.DragonFly.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.DragonFly.mk,v 1.22 2006/02/15 20:02:30 reed Exp $ +# $NetBSD: tools.DragonFly.mk,v 1.23 2006/03/05 16:27:29 jlam Exp $ # # System-supplied tools for the DragonFly operating system. @@ -42,6 +42,9 @@ TOOLS_PLATFORM.ln?= /bin/ln TOOLS_PLATFORM.ls?= /bin/ls TOOLS_PLATFORM.m4?= /usr/bin/m4 TOOLS_PLATFORM.mail?= /usr/bin/mail +.if exists(/usr/bin/makeinfo) +TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo +.endif TOOLS_PLATFORM.mkdir?= /bin/mkdir -p TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp TOOLS_PLATFORM.mtree?= /usr/sbin/mtree diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk index 213a602f180..32ef797a273 100644 --- a/mk/tools/tools.FreeBSD.mk +++ b/mk/tools/tools.FreeBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.FreeBSD.mk,v 1.23 2005/11/08 03:36:13 tv Exp $ +# $NetBSD: tools.FreeBSD.mk,v 1.24 2006/03/05 16:27:29 jlam Exp $ # # System-supplied tools for the FreeBSD operating system. @@ -43,6 +43,9 @@ TOOLS_PLATFORM.ln?= /bin/ln TOOLS_PLATFORM.ls?= /bin/ls TOOLS_PLATFORM.m4?= /usr/bin/m4 TOOLS_PLATFORM.mail?= /usr/bin/mail +.if exists(/usr/bin/makeinfo) +TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo +.endif TOOLS_PLATFORM.mkdir?= /bin/mkdir -p TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp TOOLS_PLATFORM.mtree?= /usr/sbin/mtree diff --git a/mk/tools/tools.Interix.mk b/mk/tools/tools.Interix.mk index 809c119246b..2f4990f6001 100644 --- a/mk/tools/tools.Interix.mk +++ b/mk/tools/tools.Interix.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.Interix.mk,v 1.17 2005/11/04 20:02:01 jlam Exp $ +# $NetBSD: tools.Interix.mk,v 1.18 2006/03/05 16:27:29 jlam Exp $ # # System-supplied tools for the Interix operating system. @@ -35,6 +35,9 @@ TOOLS_PLATFORM.ln?= /bin/ln TOOLS_PLATFORM.ls?= /bin/ls TOOLS_PLATFORM.m4?= /bin/m4 TOOLS_PLATFORM.mail?= /bin/mail +.if exists(/usr/bin/makeinfo) +TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo +.endif TOOLS_PLATFORM.mkdir?= /bin/mkdir -p TOOLS_PLATFORM.mv?= /bin/mv TOOLS_PLATFORM.nice?= /bin/nice diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk index ac9a54e55a5..dc0062cfda6 100644 --- a/mk/tools/tools.Linux.mk +++ b/mk/tools/tools.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.Linux.mk,v 1.28 2006/01/08 23:00:00 jlam Exp $ +# $NetBSD: tools.Linux.mk,v 1.29 2006/03/05 16:27:29 jlam Exp $ # # System-supplied tools for the Linux operating system. @@ -109,6 +109,9 @@ TOOLS_PLATFORM.mail?= /bin/mail # RH, Mandrake .elif exists(/usr/bin/mail) TOOLS_PLATFORM.mail?= /usr/bin/mail # Debian, Slackware, SuSE .endif +.if exists(/usr/bin/makeinfo) +TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo +.endif TOOLS_PLATFORM.mkdir?= /bin/mkdir -p .if exists(/usr/bin/mktemp) TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk index 00ab6da6efc..5d4dc17797d 100644 --- a/mk/tools/tools.NetBSD.mk +++ b/mk/tools/tools.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.NetBSD.mk,v 1.24 2006/01/09 18:32:52 jlam Exp $ +# $NetBSD: tools.NetBSD.mk,v 1.25 2006/03/05 16:27:29 jlam Exp $ # # System-supplied tools for the NetBSD operating system. @@ -51,6 +51,9 @@ TOOLS_PLATFORM.ln?= /bin/ln TOOLS_PLATFORM.ls?= /bin/ls TOOLS_PLATFORM.m4?= /usr/bin/m4 TOOLS_PLATFORM.mail?= /usr/bin/mail +.if exists(/usr/bin/makeinfo) +TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo +.endif TOOLS_PLATFORM.mkdir?= /bin/mkdir -p TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp TOOLS_PLATFORM.mtree?= /usr/sbin/mtree diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk index 3e2743cd464..40bbc1ffd61 100644 --- a/mk/tools/tools.OpenBSD.mk +++ b/mk/tools/tools.OpenBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.OpenBSD.mk,v 1.22 2006/01/09 18:32:52 jlam Exp $ +# $NetBSD: tools.OpenBSD.mk,v 1.23 2006/03/05 16:27:29 jlam Exp $ # # System-supplied tools for the OpenBSD operating system. @@ -49,6 +49,9 @@ TOOLS_PLATFORM.ln?= /bin/ln TOOLS_PLATFORM.ls?= /bin/ls TOOLS_PLATFORM.m4?= /usr/bin/m4 TOOLS_PLATFORM.mail?= /usr/bin/mail +.if exists(/usr/bin/makeinfo) +TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo +.endif TOOLS_PLATFORM.mkdir?= /bin/mkdir -p TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp TOOLS_PLATFORM.mtree?= /usr/sbin/mtree diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile index d870c431b66..92cdd0a05b3 100644 --- a/net/freewais-sf/Makefile +++ b/net/freewais-sf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:13 rillig Exp $ +# $NetBSD: Makefile,v 1.24 2006/03/05 16:27:27 jlam Exp $ # DISTNAME= freeWAIS-sf-2.2.12 @@ -14,7 +14,7 @@ COMMENT= Enhanced Wide Area Information Server NOT_FOR_PLATFORM= Darwin-*-* USE_LIBTOOL= yes -USE_TOOLS+= perl:run +USE_TOOLS+= makeinfo perl:run HAS_CONFIGURE= yes CONFIGURE_ENV+= PREFIX=${PREFIX:Q} diff --git a/net/ipgrab/Makefile b/net/ipgrab/Makefile index 784d6e722be..966245081e5 100644 --- a/net/ipgrab/Makefile +++ b/net/ipgrab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:48 tv Exp $ +# $NetBSD: Makefile,v 1.4 2006/03/05 16:27:27 jlam Exp $ DISTNAME= ipgrab-0.9.9 CATEGORIES= net security @@ -11,7 +11,7 @@ COMMENT= Verbose packet sniffer for UNIX hosts PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes -USE_MAKEINFO= yes +USE_TOOLS+= makeinfo INFO_FILES= ipgrab.info .include "../../net/libpcap/buildlink3.mk" diff --git a/net/lambdamoo-doc/Makefile b/net/lambdamoo-doc/Makefile index f313e5d744e..ce5c0d1707d 100644 --- a/net/lambdamoo-doc/Makefile +++ b/net/lambdamoo-doc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:20 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2006/03/05 16:27:27 jlam Exp $ DISTNAME= lambdamoo-doc-1.8.0p6 CATEGORIES= net @@ -14,7 +14,7 @@ COMMENT= Documentation for lambdamoo EXTRACT_ONLY= ProgrammersManual.texinfo WRKSRC= ${WRKDIR} -USE_MAKEINFO= yes +USE_TOOLS+= makeinfo do-build: makeinfo --no-split --no-headers \ diff --git a/net/mydns-pgsql/Makefile.common b/net/mydns-pgsql/Makefile.common index a49e7bfcf5c..261ab9dc0db 100644 --- a/net/mydns-pgsql/Makefile.common +++ b/net/mydns-pgsql/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2006/03/01 08:39:50 kim Exp $ +# $NetBSD: Makefile.common,v 1.11 2006/03/05 16:27:27 jlam Exp $ DISTNAME= mydns-1.1.0 CATEGORIES= net @@ -9,7 +9,7 @@ MAINTAINER= ghen@NetBSD.org HOMEPAGE= http://mydns.bboy.net/ GNU_CONFIGURE= YES -USE_MAKEINFO= YES +USE_TOOLS+= makeinfo USE_PKGLOCALEDIR= YES CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q} diff --git a/net/zebra/Makefile b/net/zebra/Makefile index 63a8ec1489f..6531c3e7d41 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2006/02/05 23:10:33 joerg Exp $ +# $NetBSD: Makefile,v 1.74 2006/03/05 16:27:28 jlam Exp $ # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp DISTNAME= zebra-0.95 @@ -46,8 +46,8 @@ CONF_FILES+= ${EGDIR}/vtysh.conf.sample ${PKG_SYSCONFDIR}/vtysh.conf CONFIGURE_ARGS+= --disable-vtysh .endif -USE_TOOLS+= automake gmake -USE_MAKEINFO= yes +USE_TOOLS+= automake gmake makeinfo + .include "../../devel/readline/buildlink3.mk" BUILD_DEFS+= USE_INET6 diff --git a/print/dvipng/Makefile b/print/dvipng/Makefile index 1c9d9999189..4c7b2b6e7a4 100644 --- a/print/dvipng/Makefile +++ b/print/dvipng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/03/04 21:30:28 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2006/03/05 16:27:28 jlam Exp $ DISTNAME= dvipng-1.7 CATEGORIES= textproc converters @@ -8,7 +8,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://dvipng.sourceforge.net/dvipng.html COMMENT= Convert DVI files to PNG files -USE_MAKEINFO= yes +USE_TOOLS+= makeinfo USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes diff --git a/print/gv/Makefile b/print/gv/Makefile index 5c6b1441f8a..2266eb7d64f 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2006/02/05 23:10:37 joerg Exp $ +# $NetBSD: Makefile,v 1.59 2006/03/05 16:27:28 jlam Exp $ DISTNAME= gv-3.6.1 PKGREVISION= 1 @@ -10,9 +10,8 @@ HOMEPAGE= http://www.gnu.org/software/gv/ COMMENT= PostScript and PDF previewer GNU_CONFIGURE= yes -USE_TOOLS+= gmake gs:run +USE_TOOLS+= gmake gs:run makeinfo -USE_MAKEINFO= yes TEXINFO_REQD= 4.2 INFO_FILES= gv.info diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 1fb47c0edaf..630f5a925c2 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2006/03/04 21:30:30 jlam Exp $ +# $NetBSD: Makefile,v 1.41 2006/03/05 16:27:28 jlam Exp $ # DISTNAME= lilypond-2.4.3 @@ -18,10 +18,9 @@ BUILDLINK_DEPENDS.mftrace+= mftrace>=1.1.0 GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES USE_LANGUAGES= c c++ -USE_TOOLS+= gmake gs:run +USE_TOOLS+= gmake gs:run makeinfo MAKEFILE= GNUmakefile -USE_MAKEINFO= YES TEXINFO_REQD= 4.7 GCC_REQD+= 3.0.5 INFO_DIR= info/lilypond diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile index 83eabef5096..61da8fe4366 100644 --- a/security/libtasn1/Makefile +++ b/security/libtasn1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/03/04 21:30:34 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2006/03/05 16:27:28 jlam Exp $ DISTNAME= libtasn1-0.3.0 CATEGORIES= security devel @@ -13,8 +13,8 @@ COMMENT= ASN.1 structure parser library PKG_INSTALLATION_TYPES= overwrite pkgviews +USE_TOOLS+= makeinfo USE_LIBTOOL= yes -USE_MAKEINFO= yes GNU_CONFIGURE= yes TEST_TARGET= check diff --git a/security/sfs/Makefile b/security/sfs/Makefile index c7aae068bc0..5e3e27d13d6 100644 --- a/security/sfs/Makefile +++ b/security/sfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/12/29 06:22:11 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2006/03/05 16:27:28 jlam Exp $ # DISTNAME= sfs-0.7.2 @@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --with-sfsdir=${SFS_ROOT:Q} CONFIGURE_ARGS+= --disable-uvfs USE_LANGUAGES= c c++ -USE_TOOLS+= perl:run +USE_TOOLS+= makeinfo perl:run GCC_REQD+= 2.95.3 @@ -40,7 +40,6 @@ SFSEXAMPLEDIR= ${PREFIX}/share/examples/sfs MESSAGE_SUBST+= SFSDIR=${SFS_ROOT} SFSEXAMPLEDIR=${SFSEXAMPLEDIR} -USE_MAKEINFO= YES INFO_FILES= sfs.info post-install: diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 8cd78736784..a8c1a3503de 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/03/04 21:30:39 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2006/03/05 16:27:28 jlam Exp $ DISTNAME= bash-3.1 PKGNAME= bash-3.1pl1 @@ -18,7 +18,7 @@ CONFLICTS= static-bash-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_MAKEINFO= yes +USE_TOOLS+= makeinfo USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common index debd8c42f54..180b9b2b325 100644 --- a/shells/zsh/Makefile.common +++ b/shells/zsh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.32 2005/12/29 06:22:13 jlam Exp $ +# $NetBSD: Makefile.common,v 1.33 2006/03/05 16:27:28 jlam Exp $ DISTNAME= zsh-${ZSH_VERSION} CATEGORIES= shells @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-etcdir=${PKG_SYSCONFDIR:Q} -USE_MAKEINFO= yes +USE_TOOLS+= makeinfo INFO_FILES= zsh.info TEXINFO_REQD= 4.0 diff --git a/shells/zsh3/Makefile b/shells/zsh3/Makefile index 7b2eb95123d..341704cbf34 100644 --- a/shells/zsh3/Makefile +++ b/shells/zsh3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:39 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2006/03/05 16:27:28 jlam Exp $ # DISTNAME= zsh-3.0.8 @@ -15,8 +15,7 @@ HOMEPAGE= http://sunsite.dk/zsh/ COMMENT= The Z shell GNU_CONFIGURE= yes -USE_MAKEINFO= YES - +USE_TOOLS+= makeinfo INFO_FILES= zsh.info .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 209ea9ef67f..9d587b40ed5 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:40 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/03/05 16:27:28 jlam Exp $ # DISTNAME= e2fsprogs-1.32 @@ -13,7 +13,7 @@ HOMEPAGE= http://e2fsprogs.sourceforge.net/ COMMENT= Second extended file system (ext2fs) management programs GNU_CONFIGURE= yes -USE_MAKEINFO= YES +USE_TOOLS+= makeinfo INFO_FILES= libext2fs.info .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile index 1be67797a64..2fbc26572d5 100644 --- a/sysutils/libgtop2/Makefile +++ b/sysutils/libgtop2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/03/04 21:30:41 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2006/03/05 16:27:28 jlam Exp $ DISTNAME= libgtop-2.12.2 PKGNAME= ${DISTNAME:S/-/2-/} @@ -16,11 +16,10 @@ OSVERSION_SPECIFIC= YES USE_MSGFMT_PLURALS= YES USE_PKGLOCALEDIR= YES -USE_TOOLS+= gmake perl pkg-config +USE_TOOLS+= gmake makeinfo perl pkg-config USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= libgtop-2.0.pc.in PKGCONFIG_OVERRIDE+= support/gnome-support-2.0.pc.in -USE_MAKEINFO= YES INFO_FILES= libgtop2.info TEXINFO_REQD= 4.6 diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile index a3ca2e569e4..75d41c65aef 100644 --- a/sysutils/mtools/Makefile +++ b/sysutils/mtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/02/05 23:10:55 joerg Exp $ +# $NetBSD: Makefile,v 1.38 2006/03/05 16:27:28 jlam Exp $ DISTNAME= mtools-3.9.10 PKGREVISION= 1 @@ -13,8 +13,7 @@ COMMENT= FAT (MS-DOS, Atari) disk access tools NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64 # LP64 problem GNU_CONFIGURE= YES -USE_TOOLS+= gmake -USE_MAKEINFO= YES +USE_TOOLS+= gmake makeinfo INFO_FILES= mtools.info .include "../../mk/bsd.prefs.mk" diff --git a/textproc/grep/Makefile b/textproc/grep/Makefile index a9793ddc41f..b05e0461b7f 100644 --- a/textproc/grep/Makefile +++ b/textproc/grep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/02/05 23:11:02 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2006/03/05 16:27:28 jlam Exp $ # DISTNAME= grep-2.5.1 @@ -17,7 +17,7 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-perl-regexp -USE_MAKEINFO= YES +USE_TOOLS+= makeinfo TEXINFO_REQD= 4.0 INFO_FILES= grep.info diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile index 4e46fd7a6e8..99ba44090d8 100644 --- a/textproc/ndtpd/Makefile +++ b/textproc/ndtpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/02/05 23:11:04 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2006/03/05 16:27:28 jlam Exp $ # DISTNAME= ndtpd-3.1.5 @@ -12,11 +12,11 @@ COMMENT= Server for accessing CD-ROM books with NDTP PKG_INSTALLATION_TYPES= pkgviews overwrite +USE_TOOLS+= makeinfo USE_LIBTOOL= YES GNU_CONFIGURE= YES INFO_FILES= ndtpd-ja.info ndtpd.info -USE_MAKEINFO= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --localstatedir=${NDTPD_RUNDIR:Q} diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile index 1658be5d87b..0a1859dd578 100644 --- a/textproc/rubber/Makefile +++ b/textproc/rubber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:07 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2006/03/05 16:27:28 jlam Exp $ # DISTNAME= rubber-1.0 @@ -10,9 +10,9 @@ MAINTAINER= tonio@NetBSD.org HOMEPAGE= http://www.pps.jussieu.fr/~beffara/soft/rubber/ COMMENT= Automated system for building LaTeX documents +USE_TOOLS+= makeinfo USE_PKGLOCALEDIR= yes HAS_CONFIGURE= yes -USE_MAKEINFO= yes INFO_FILES= rubber.info TEXINFO_REQD= 4.6 PYTHON_VERSIONS_ACCEPTED= 24 23 diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile index cf94f71198d..d4ac6edae7d 100644 --- a/textproc/wdiff/Makefile +++ b/textproc/wdiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:51 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/03/05 16:27:29 jlam Exp $ # DISTNAME= wdiff-0.5 @@ -14,7 +14,7 @@ GNU_CONFIGURE= yes CONFIGURE_HAS_INFODIR= no CONFIGURE_HAS_MANDIR= no -USE_MAKEINFO= yes +USE_TOOLS+= makeinfo INFO_FILES= wdiff.info INSTALLATION_DIRS= bin ${INFO_DIR} ${PKGMANDIR}/man1 share/doc/wdiff diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile index 928932e77c2..a5424cf838d 100644 --- a/wm/sawfish/Makefile +++ b/wm/sawfish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2006/02/05 23:11:14 joerg Exp $ +# $NetBSD: Makefile,v 1.34 2006/03/05 16:27:29 jlam Exp $ # PKGNAME= sawfish-${SF_VERS} @@ -15,7 +15,7 @@ CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} BUILD_USES_MSGFMT= YES -USE_MAKEINFO= YES +USE_TOOLS+= makeinfo INFO_FILES= sawfish.info PLIST_SUBST+= SF_VERS=${SF_VERS:Q} |