pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc * Teach the tools framework how to supply the pkgsrc v...
details: https://anonhg.NetBSD.org/pkgsrc/rev/777e24f73b2d
branches: trunk
changeset: 509185:777e24f73b2d
user: jlam <jlam%pkgsrc.org@localhost>
date: Sun Mar 05 16:27:22 2006 +0000
description:
* 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.
diffstat:
archivers/gcpio/Makefile | 4 +-
archivers/gsharutils/Makefile | 5 +-
audio/csound4/Makefile | 5 +-
audio/libmikmod/Makefile | 5 +-
audio/openal/Makefile | 5 +-
audio/rplay/Makefile | 4 +-
audio/solfege/Makefile | 5 +-
audio/tracker/Makefile | 4 +-
cad/gschem/Makefile | 5 +-
cad/ng-spice/Makefile | 5 +-
comms/fidogate/Makefile | 5 +-
comms/mgetty+sendfax/Makefile | 4 +-
cross/avr-binutils/Makefile | 5 +-
cross/avrdude/Makefile | 6 +-
cross/h8300-hms-binutils/Makefile | 5 +-
cross/i386-msdosdjgpp/Makefile | 4 +-
cross/i386-netbsdpe/Makefile | 5 +-
cross/mipsEEel-netbsd/Makefile | 5 +-
databases/gnats/Makefile | 5 +-
devel/allegro/Makefile | 5 +-
devel/autoconf213/Makefile | 5 +-
devel/autogen/Makefile | 5 +-
devel/automake14/Makefile | 5 +-
devel/binutils/Makefile | 4 +-
devel/cssc/Makefile | 5 +-
devel/cvs/Makefile | 4 +-
devel/elib/Makefile | 5 +-
devel/flim/Makefile | 4 +-
devel/g-wrap/Makefile | 6 +--
devel/g-wrap1/Makefile | 6 +--
devel/gcvs/Makefile | 5 +-
devel/gdb6/Makefile | 5 +-
devel/gdbada/Makefile | 5 +-
devel/guile-gtk/Makefile | 4 +-
devel/guile-lib/Makefile | 5 +-
devel/libidn/Makefile | 5 +-
devel/libjit/Makefile | 5 +-
devel/libtool-info/Makefile | 4 +-
devel/monotone/Makefile | 5 +-
devel/nasm/Makefile | 5 +-
devel/opencm/Makefile | 5 +-
devel/semi/Makefile | 4 +-
devel/treecc/Makefile | 6 +--
editors/mule/Makefile | 5 +-
editors/zile/Makefile | 4 +-
finance/gnucash-devel/Makefile | 5 +-
games/xconq/Makefile | 5 +-
graphics/gnuplot/Makefile.common | 4 +-
graphics/gri/Makefile | 6 +--
graphics/hp2xx/Makefile | 4 +-
graphics/xzgv/Makefile | 8 +--
lang/gauche/Makefile | 5 +-
lang/gcc34/Makefile | 7 +--
lang/guile/Makefile | 6 +--
lang/ksi/Makefile | 4 +-
lang/librep/Makefile | 5 +-
lang/pnet/Makefile | 5 +-
lang/sather/Makefile | 5 +-
lang/smalltalk/Makefile | 5 +-
mail/gnus/Makefile | 4 +-
mail/mairix/Makefile | 4 +-
mail/vm/Makefile | 4 +-
math/R/Makefile | 5 +-
math/calc/Makefile | 4 +-
math/ess/Makefile | 5 +-
math/eukleides/Makefile | 5 +-
math/fftw2/Makefile | 5 +-
math/mcsim/Makefile | 4 +-
math/octave-current/Makefile | 5 +-
math/octave/Makefile | 5 +-
math/yorick/Makefile | 5 +-
misc/bbdb/Makefile | 4 +-
misc/vera/Makefile | 4 +-
mk/bsd.pkg.use.mk | 7 +--
mk/texinfo.mk | 78 +--------------------------------------
mk/tools/defaults.mk | 3 +-
mk/tools/replace.mk | 13 ++++++-
mk/tools/texinfo.mk | 41 +++++++++++++++-----
mk/tools/tools.Darwin.mk | 5 ++-
mk/tools/tools.DragonFly.mk | 5 ++-
mk/tools/tools.FreeBSD.mk | 5 ++-
mk/tools/tools.Interix.mk | 5 ++-
mk/tools/tools.Linux.mk | 5 ++-
mk/tools/tools.NetBSD.mk | 5 ++-
mk/tools/tools.OpenBSD.mk | 5 ++-
net/freewais-sf/Makefile | 4 +-
net/ipgrab/Makefile | 4 +-
net/lambdamoo-doc/Makefile | 4 +-
net/mydns-pgsql/Makefile.common | 4 +-
net/zebra/Makefile | 6 +-
print/dvipng/Makefile | 4 +-
print/gv/Makefile | 5 +-
print/lilypond/Makefile | 5 +-
security/libtasn1/Makefile | 4 +-
security/sfs/Makefile | 5 +-
shells/bash/Makefile | 4 +-
shells/zsh/Makefile.common | 4 +-
shells/zsh3/Makefile | 5 +-
sysutils/e2fsprogs/Makefile | 4 +-
sysutils/libgtop2/Makefile | 5 +-
sysutils/mtools/Makefile | 5 +-
textproc/grep/Makefile | 4 +-
textproc/ndtpd/Makefile | 4 +-
textproc/rubber/Makefile | 4 +-
textproc/wdiff/Makefile | 4 +-
wm/sawfish/Makefile | 4 +-
106 files changed, 270 insertions(+), 353 deletions(-)
diffs (truncated from 2252 to 300 lines):
diff -r 196b82b11f1f -r 777e24f73b2d archivers/gcpio/Makefile
--- a/archivers/gcpio/Makefile Sun Mar 05 10:27:12 2006 +0000
+++ b/archivers/gcpio/Makefile Sun Mar 05 16:27:22 2006 +0000
@@ -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 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
-USE_MAKEINFO= yes
+USE_TOOLS+= makeinfo
TEST_TARGET= check
diff -r 196b82b11f1f -r 777e24f73b2d archivers/gsharutils/Makefile
--- a/archivers/gsharutils/Makefile Sun Mar 05 10:27:12 2006 +0000
+++ b/archivers/gsharutils/Makefile Sun Mar 05 16:27:22 2006 +0000
@@ -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 @@
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 -r 196b82b11f1f -r 777e24f73b2d audio/csound4/Makefile
--- a/audio/csound4/Makefile Sun Mar 05 10:27:12 2006 +0000
+++ b/audio/csound4/Makefile Sun Mar 05 16:27:22 2006 +0000
@@ -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 @@
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 -r 196b82b11f1f -r 777e24f73b2d audio/libmikmod/Makefile
--- a/audio/libmikmod/Makefile Sun Mar 05 10:27:12 2006 +0000
+++ b/audio/libmikmod/Makefile Sun Mar 05 16:27:22 2006 +0000
@@ -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 @@
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 -r 196b82b11f1f -r 777e24f73b2d audio/openal/Makefile
--- a/audio/openal/Makefile Sun Mar 05 10:27:12 2006 +0000
+++ b/audio/openal/Makefile Sun Mar 05 16:27:22 2006 +0000
@@ -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 @@
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 -r 196b82b11f1f -r 777e24f73b2d audio/rplay/Makefile
--- a/audio/rplay/Makefile Sun Mar 05 10:27:12 2006 +0000
+++ b/audio/rplay/Makefile Sun Mar 05 16:27:22 2006 +0000
@@ -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 @@
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 -r 196b82b11f1f -r 777e24f73b2d audio/solfege/Makefile
--- a/audio/solfege/Makefile Sun Mar 05 10:27:12 2006 +0000
+++ b/audio/solfege/Makefile Sun Mar 05 16:27:22 2006 +0000
@@ -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_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 -r 196b82b11f1f -r 777e24f73b2d audio/tracker/Makefile
--- a/audio/tracker/Makefile Sun Mar 05 10:27:12 2006 +0000
+++ b/audio/tracker/Makefile Sun Mar 05 16:27:22 2006 +0000
@@ -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 @@
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 -r 196b82b11f1f -r 777e24f73b2d cad/gschem/Makefile
--- a/cad/gschem/Makefile Sun Mar 05 10:27:12 2006 +0000
+++ b/cad/gschem/Makefile Sun Mar 05 16:27:22 2006 +0000
@@ -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 @@
.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 -r 196b82b11f1f -r 777e24f73b2d cad/ng-spice/Makefile
--- a/cad/ng-spice/Makefile Sun Mar 05 10:27:12 2006 +0000
+++ b/cad/ng-spice/Makefile Sun Mar 05 16:27:22 2006 +0000
@@ -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 @@
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 -r 196b82b11f1f -r 777e24f73b2d comms/fidogate/Makefile
--- a/comms/fidogate/Makefile Sun Mar 05 10:27:12 2006 +0000
+++ b/comms/fidogate/Makefile Sun Mar 05 16:27:22 2006 +0000
@@ -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 @@
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 -r 196b82b11f1f -r 777e24f73b2d comms/mgetty+sendfax/Makefile
--- a/comms/mgetty+sendfax/Makefile Sun Mar 05 10:27:12 2006 +0000
+++ b/comms/mgetty+sendfax/Makefile Sun Mar 05 16:27:22 2006 +0000
@@ -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 @@
MAKE_ENV+= MGETTY_CONFDIR=${PKG_SYSCONFDIR:Q}
-USE_MAKEINFO= YES
+USE_TOOLS+= makeinfo
INFO_FILES= mgetty.info
PKG_SYSCONFSUBDIR= mgetty+sendfax
diff -r 196b82b11f1f -r 777e24f73b2d cross/avr-binutils/Makefile
--- a/cross/avr-binutils/Makefile Sun Mar 05 10:27:12 2006 +0000
+++ b/cross/avr-binutils/Makefile Sun Mar 05 16:27:22 2006 +0000
@@ -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 @@
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 -r 196b82b11f1f -r 777e24f73b2d cross/avrdude/Makefile
--- a/cross/avrdude/Makefile Sun Mar 05 10:27:12 2006 +0000
+++ b/cross/avrdude/Makefile Sun Mar 05 16:27:22 2006 +0000
@@ -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 @@
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 -r 196b82b11f1f -r 777e24f73b2d cross/h8300-hms-binutils/Makefile
--- a/cross/h8300-hms-binutils/Makefile Sun Mar 05 10:27:12 2006 +0000
+++ b/cross/h8300-hms-binutils/Makefile Sun Mar 05 16:27:22 2006 +0000
@@ -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 @@
H8300_PREFIX= ${PREFIX}/libexec/cross-h8300-hms
WRKSRC= ${WRKDIR}/objdir
Home |
Main Index |
Thread Index |
Old Index