diff options
| author | seb <seb> | 2002-02-18 15:14:00 +0000 |
|---|---|---|
| committer | seb <seb> | 2002-02-18 15:14:00 +0000 |
| commit | 3d0911b16019865b66bd0db4ae4768f4d13d0909 (patch) | |
| tree | c84409a165bd501342b10b825394cf1eb3684d02 | |
| parent | 41d99a9521443bed0b4de1c8b7469d9717545251 (diff) | |
| download | pkgsrc-3d0911b16019865b66bd0db4ae4768f4d13d0909.tar.gz | |
Introduce new framework for handling info files generation and installation.
Summary of changes:
- removal of USE_GTEXINFO
- addition of mk/texinfo.mk
- inclusion of this file in package Makefiles requiring it
- `install-info' substituted by `${INSTALL_INFO}' in PLISTs
- tuning of mk/bsd.pkg.mk:
removal of USE_GTEXINFO
INSTALL_INFO added to PLIST_SUBST
`${INSTALL_INFO}' replace `install-info' in target rules
print-PLIST target now generate `${INSTALL_INFO}' instead of `install-info'
- a couple of new patch files added for a handful of packages
- setting of the TEXINFO_OVERRIDE "switch" in packages Makefiles requiring it
- devel/cssc marked requiring texinfo 4.0
- a couple of packages Makefiles were tuned with respect of INFO_FILES and
makeinfo command usage
See -newly added by this commit- section 10.24 of Packages.txt for
further information.
320 files changed, 1346 insertions, 852 deletions
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile index bc30fa6e5a8..f7647895e7c 100644 --- a/archivers/gcpio/Makefile +++ b/archivers/gcpio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/07/15 11:34:37 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2002/02/18 15:14:00 seb Exp $ # DISTNAME= cpio-2.4.2 @@ -16,4 +16,5 @@ LIBS+= -lgnumalloc INFO_FILES= cpio.info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/gcpio/PLIST b/archivers/gcpio/PLIST index b6d9936884d..d1caad074b0 100644 --- a/archivers/gcpio/PLIST +++ b/archivers/gcpio/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:24:22 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:00 seb Exp $ bin/gcpio -@unexec install-info --delete --info-dir=%D/info %D/info/cpio.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cpio.info info/cpio.info -@exec install-info --info-dir=%D/info %D/info/cpio.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cpio.info man/man1/gcpio.1.gz diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile index a47352a104b..8ab424e04ed 100644 --- a/archivers/gsharutils/Makefile +++ b/archivers/gsharutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/07/15 11:44:50 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2002/02/18 15:14:01 seb Exp $ DISTNAME= sharutils-4.2.1 PKGNAME= g${DISTNAME} @@ -17,9 +17,11 @@ CONFIGURE_ARGS= --program-prefix=g --disable-uucode CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} INSTALL_TARGET= install install-man INFO_FILES= remsync.info sharutils.info +TEXINFO_OVERRIDE= YES post-patch: @${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/po/sharutils.pot .include "../../devel/gettext-lib/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/gsharutils/PLIST b/archivers/gsharutils/PLIST index fc0772f3360..bd8fa7f8578 100644 --- a/archivers/gsharutils/PLIST +++ b/archivers/gsharutils/PLIST @@ -1,15 +1,15 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:24:23 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:01 seb Exp $ bin/gmail-files bin/gmailshar bin/gremsync bin/gshar bin/gunshar -@unexec install-info --delete %D/info/sharutils.info %D/info/dir -@unexec install-info --delete %D/info/remsync.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/sharutils.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/remsync.info %D/info/dir info/sharutils.info info/remsync.info -@exec install-info %D/info/sharutils.info %D/info/dir -@exec install-info %D/info/remsync.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/sharutils.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/remsync.info %D/info/dir man/man1/gshar.1 man/man1/gunshar.1 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/sharutils.mo diff --git a/archivers/gtar-info/Makefile b/archivers/gtar-info/Makefile index 205ea41b27a..12213b29ee7 100644 --- a/archivers/gtar-info/Makefile +++ b/archivers/gtar-info/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/01/27 18:32:32 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:01 seb Exp $ # DISTNAME= tar-1.12 @@ -12,7 +12,6 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/tar/tar.html COMMENT= Info format documentation for the GNU tape archiver -USE_GTEXINFO= yes INFO_FILES= tar.info NO_PATCH= yes @@ -25,4 +24,5 @@ do-install: ${INSTALL_DATA} $${i} ${PREFIX}/info ; \ done +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/gtar-info/PLIST b/archivers/gtar-info/PLIST index bcefecae80d..62e206bfcf9 100644 --- a/archivers/gtar-info/PLIST +++ b/archivers/gtar-info/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:24:26 zuntum Exp $ -@unexec install-info --delete --info-dir=%D/info %D/info/tar.info +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:01 seb Exp $ +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/tar.info info/tar.info info/tar.info-1 info/tar.info-2 @@ -9,4 +9,4 @@ info/tar.info-5 info/tar.info-6 info/tar.info-7 info/tar.info-8 -@exec install-info --info-dir=%D/info %D/info/tar.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/tar.info diff --git a/archivers/gzip-info/Makefile b/archivers/gzip-info/Makefile index a762e5bc5b7..4f510202125 100644 --- a/archivers/gzip-info/Makefile +++ b/archivers/gzip-info/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/01/27 18:32:33 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2002/02/18 15:14:01 seb Exp $ DISTNAME= gzip-1.2.4a PKGNAME= gzip-info-1.2.4a @@ -11,7 +11,6 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/gzip/gzip.html COMMENT= Info format documentation for the GZIP utility -USE_GTEXINFO= yes INFO_FILES= gzip.info NO_PATCH= yes @@ -25,4 +24,5 @@ IGNORE= "${PKGNAME} is part of your ${OPSYS} distribution" do-install: ${INSTALL_DATA} ${WRKSRC}/gzip.info ${PREFIX}/info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/gzip-info/PLIST b/archivers/gzip-info/PLIST index e4d6cf4d7d4..84c1ed10c08 100644 --- a/archivers/gzip-info/PLIST +++ b/archivers/gzip-info/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:24:28 zuntum Exp $ -@unexec install-info --delete --info-dir=%D/info %D/info/gzip.info +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:01 seb Exp $ +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gzip.info info/gzip.info -@exec install-info --info-dir=%D/info %D/info/gzip.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gzip.info diff --git a/audio/festdoc/Makefile b/audio/festdoc/Makefile index f4bfd8d7849..d24131202d1 100644 --- a/audio/festdoc/Makefile +++ b/audio/festdoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/07/18 15:19:35 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2002/02/18 15:14:01 seb Exp $ DISTNAME= festdoc-1.4.0.1 PKGNAME= festival-doc-1.4.0.1 @@ -33,4 +33,5 @@ do-install: ${RMDIR} festival/info ${RM} ${PREFIX}/info/festival.info.orig +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/festdoc/PLIST b/audio/festdoc/PLIST index a6d38c298cf..b82d2ba671b 100644 --- a/audio/festdoc/PLIST +++ b/audio/festdoc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:47 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:02 seb Exp $ share/doc/festival/speechtools/images_gen/docppimath_929959730_6.gif share/doc/festival/speechtools/images_gen/docppmath_929959728_2.gif share/doc/festival/speechtools/images_gen/docppmath_929959741_1.gif @@ -140,7 +140,7 @@ share/doc/festival/speechtools/index.html share/doc/festival/speechtools/HTML.index share/doc/festival/speechtools/TeX.formulae @dirrm share/doc/festival/speechtools -@unexec install-info --delete %D/info/festival.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/festival.info %D/info/dir info/festival.info info/festival.info-9 info/festival.info-8 @@ -152,7 +152,7 @@ info/festival.info-3 info/festival.info-2 info/festival.info-1 info/festival.info-10 -@exec install-info %D/info/festival.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/festival.info %D/info/dir share/doc/festival/festival/user-manual/festival_35.html share/doc/festival/festival/user-manual/festival_1.html share/doc/festival/festival/user-manual/festival_2.html diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile index fa4a4e4655f..7868ff398d5 100644 --- a/audio/libmikmod/Makefile +++ b/audio/libmikmod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/10/22 03:48:12 mycroft Exp $ +# $NetBSD: Makefile,v 1.15 2002/02/18 15:14:02 seb Exp $ DISTNAME= libmikmod-3.1.9 CATEGORIES= audio @@ -9,7 +9,6 @@ HOMEPAGE= http://www.mikmod.org/ COMMENT= MikMod Sound Library USE_GMAKE= # defined -USE_GTEXINFO= # defined GNU_CONFIGURE= # defined USE_LIBTOOL= # defined USE_BUILDLINK_ONLY= # defined @@ -21,4 +20,5 @@ pre-build: ${RM} -f ${WRKSRC}/docs/mikmod.info* .include "../../audio/esound/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libmikmod/PLIST b/audio/libmikmod/PLIST index dfa1f56c51e..f956e942b24 100644 --- a/audio/libmikmod/PLIST +++ b/audio/libmikmod/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:07 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:02 seb Exp $ bin/libmikmod-config include/mikmod.h -@unexec install-info --delete %D/info/mikmod.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/mikmod.info %D/info/dir info/mikmod.info -@exec install-info %D/info/mikmod.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/mikmod.info %D/info/dir lib/libmikmod.a lib/libmikmod.la lib/libmikmod.so diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile index 4e0003f2f15..737edd49f16 100644 --- a/audio/rplay/Makefile +++ b/audio/rplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2002/01/11 15:10:56 skrll Exp $ +# $NetBSD: Makefile,v 1.35 2002/02/18 15:14:02 seb Exp $ # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp # @@ -36,4 +36,5 @@ post-install: .include "../../devel/readline/buildlink.mk" .include "../../devel/rx/buildlink.mk" .include "../../mk/bsd.pkg.install.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/rplay/PLIST b/audio/rplay/PLIST index 318e3db4a8d..a6767e39bce 100644 --- a/audio/rplay/PLIST +++ b/audio/rplay/PLIST @@ -1,20 +1,20 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:50 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:02 seb Exp $ etc/rc.d/rplayd bin/rplay bin/rptp include/rplay.h -@unexec install-info --delete %D/info/RPLAY.info %D/info/dir -@unexec install-info --delete %D/info/RPTP.info %D/info/dir -@unexec install-info --delete %D/info/librplay.info %D/info/dir -@unexec install-info --delete %D/info/rplay.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/RPLAY.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/RPTP.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/librplay.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/rplay.info %D/info/dir info/RPLAY.info info/RPTP.info info/librplay.info info/rplay.info -@exec install-info %D/info/RPLAY.info %D/info/dir -@exec install-info %D/info/RPTP.info %D/info/dir -@exec install-info %D/info/librplay.info %D/info/dir -@exec install-info %D/info/rplay.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/RPLAY.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/RPTP.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/librplay.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/rplay.info %D/info/dir lib/librplay.a lib/librplay.la lib/librplay.so diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile index 680dba9111e..ad1821d1345 100644 --- a/audio/tracker/Makefile +++ b/audio/tracker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/04/09 11:45:34 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2002/02/18 15:14:02 seb Exp $ # FreeBSD Id: Makefile,v 1.29 1996/12/20 23:46:22 ache Exp # @@ -26,7 +26,7 @@ INFO_FILES= tracker.info pre-install: cd ${WRKSRC}/Docs && \ - makeinfo --no-split tracker.texinfo -o tracker.info && \ + ${MAKEINFO} --no-split tracker.texinfo -o tracker.info && \ ${CP} tracker.info ${PREFIX}/info && \ ${RM} -f tracker.info *.orig @@ -34,4 +34,5 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tracker ${CP} -R ${WRKSRC}/Docs/* ${PREFIX}/share/doc/tracker +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/tracker/PLIST b/audio/tracker/PLIST index 787eba0e50d..369596fa587 100644 --- a/audio/tracker/PLIST +++ b/audio/tracker/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:18:05 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:02 seb Exp $ bin/tracker bin/randomize etc/compression_methods -@unexec install-info --delete %D/info/tracker.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/tracker.info %D/info/dir info/tracker.info -@exec install-info %D/info/tracker.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/tracker.info %D/info/dir share/doc/tracker/Html/Aix.html share/doc/tracker/Html/Introduction.html share/doc/tracker/Html/Availability.html diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile index 7f58b024409..0b1198b19bc 100644 --- a/cad/dinotrace/Makefile +++ b/cad/dinotrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/02/10 22:06:15 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.15 2002/02/18 15:14:02 seb Exp $ # DISTNAME= dinotrace-9.1g @@ -18,4 +18,5 @@ GNU_CONFIGURE= YES .include "../../mk/motif.buildlink.mk" .include "../../mk/x11.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/dinotrace/PLIST b/cad/dinotrace/PLIST index 51c900e3afb..6004315fb45 100644 --- a/cad/dinotrace/PLIST +++ b/cad/dinotrace/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:47:46 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:02 seb Exp $ bin/dinotrace -@unexec install-info --delete %D/info/dinotrace.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/dinotrace.info %D/info/dir info/dinotrace.info -@exec install-info %D/info/dinotrace.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/dinotrace.info %D/info/dir diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile index df3a48db2a3..0eaeed477af 100644 --- a/cad/ng-spice/Makefile +++ b/cad/ng-spice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/01/26 02:38:30 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.11 2002/02/18 15:14:03 seb Exp $ # DISTNAME= ng-spice-rework-14 @@ -22,4 +22,5 @@ USE_BUILDLINK_ONLY= YES .include "../../devel/libgetopt/buildlink.mk" .include "../../devel/ncurses/buildlink.mk" .include "../../mk/x11.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/ng-spice/PLIST b/cad/ng-spice/PLIST index 1fe4adf3766..552d0b19803 100644 --- a/cad/ng-spice/PLIST +++ b/cad/ng-spice/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/26 02:38:30 dmcmahill Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:03 seb Exp $ bin/nghelp bin/ngmakeidx bin/ngmultidec @@ -6,7 +6,7 @@ bin/ngspice bin/ngnutmeg bin/ngproc2mod bin/ngsconvert -@unexec install-info --delete --info-dir=%D/info %D/info/ngspice.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ngspice.info info/ngspice.info info/ngspice.info-1 info/ngspice.info-2 @@ -16,7 +16,7 @@ info/ngspice.info-5 info/ngspice.info-6 info/ngspice.info-7 info/ngspice.info-8 -@exec install-info --info-dir=%D/info %D/info/ngspice.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ngspice.info lib/libdev.a lib/ng-spice-rework/libasrc.a lib/ng-spice-rework/libasrc.la diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile index 82498fc4eae..eccb4e9fe32 100644 --- a/cad/pcb/Makefile +++ b/cad/pcb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/16 13:46:27 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2002/02/18 15:14:03 seb Exp $ # FreeBSD Id: Makefile,v 1.19 1998/10/31 18:05:31 jseger Exp # @@ -28,4 +28,5 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/doc/pcb.ps ${PREFIX}/share/doc/pcb/ ${INSTALL_MAN} ${WRKSRC}/doc/refcard.ps ${PREFIX}/share/doc/pcb/ +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/pcb/PLIST b/cad/pcb/PLIST index bb31723d494..9173693ade0 100644 --- a/cad/pcb/PLIST +++ b/cad/pcb/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:49:02 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:03 seb Exp $ bin/pcb -@unexec install-info --delete %D/info/pcb.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/pcb.info %D/info/dir info/pcb.info -@exec install-info %D/info/pcb.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/pcb.info %D/info/dir lib/X11/app-defaults/Pcb lib/X11/pcb/default_font lib/X11/pcb/pcblib diff --git a/chat/zenirc/Makefile b/chat/zenirc/Makefile index ea5d947c2c2..7c7c2b32ee9 100644 --- a/chat/zenirc/Makefile +++ b/chat/zenirc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/09/27 23:17:49 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:03 seb Exp $ # DISTNAME= zenirc-2.112 @@ -12,7 +12,7 @@ COMMENT= IRC client for Emacs # XXX Someone who cares can make this work with Xemacs. DEPENDS+= emacs-[0-9]*:../../editors/emacs -USE_GTEXINFO= YES GNU_CONFIGURE= YES +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/zenirc/PLIST b/chat/zenirc/PLIST index 7a43c8aa5f2..138bc49a39b 100644 --- a/chat/zenirc/PLIST +++ b/chat/zenirc/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:06:50 zuntum Exp $ -@comment @unexec install-info --delete %D/info/zenirc.info %D/info/dir +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:03 seb Exp $ +@comment @unexec ${INSTALL_INFO} --delete %D/info/zenirc.info %D/info/dir @comment info/zenirc.info -@comment @exec install-info %D/info/zenirc.info %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/zenirc.info %D/info/dir share/emacs/site-lisp/zenirc-18.elc share/emacs/site-lisp/zenirc-8ball.elc share/emacs/site-lisp/zenirc-away.elc diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile index d321dd997f8..6133acbb1df 100644 --- a/comms/fidogate/Makefile +++ b/comms/fidogate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/11/30 17:37:15 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2002/02/18 15:14:03 seb Exp $ # DISTNAME= fidogate-4.4.4 @@ -27,7 +27,7 @@ do-configure: pre-build: ${RM} -f ${WRKSRC}/doc/fidogate.info* - cd ${WRKSRC}/doc && makeinfo --no-split fidogate.texi && \ + cd ${WRKSRC}/doc && ${MAKEINFO} --no-split fidogate.texi && \ ${TOUCH} fidogate.txt html/fidogate_toc.html ${PERL5} ${WRKSRC}/subst.pl -t${WRKSRC} ${WRKSRC}/fidogate.conf \ >${WRKSRC}/fidogate.conf.dist @@ -56,4 +56,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/fidogate.conf.dist ${PREFIX}/etc/fidogate/ .include "../../lang/perl5/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/fidogate/PLIST b/comms/fidogate/PLIST index c691dcbe54b..970413eb064 100644 --- a/comms/fidogate/PLIST +++ b/comms/fidogate/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:04 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:03 seb Exp $ etc/fidogate/fidogate.conf.dist @dirrm etc/fidogate etc/rc.d/fidogate -@unexec install-info --delete %D/info/fidogate.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/fidogate.info %D/info/dir info/fidogate.info -@exec install-info %D/info/fidogate.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/fidogate.info %D/info/dir lib/fidogate/areafix.help lib/fidogate/bin/areasbbssync lib/fidogate/bin/ftnafutil diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile index a6a639b78c5..9ede4d012b1 100644 --- a/comms/mgetty+sendfax/Makefile +++ b/comms/mgetty+sendfax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/10/26 14:10:00 agc Exp $ +# $NetBSD: Makefile,v 1.19 2002/02/18 15:14:04 seb Exp $ # FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp # @@ -44,4 +44,5 @@ post-install: ${PAX} -r -w -pe -k * ${MGETTY_CONFDIR} .include "../../graphics/netpbm/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/mgetty+sendfax/PLIST b/comms/mgetty+sendfax/PLIST index ac47645a0df..bb0ece736aa 100644 --- a/comms/mgetty+sendfax/PLIST +++ b/comms/mgetty+sendfax/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:20 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:04 seb Exp $ bin/autopvf bin/basictopvf bin/faxspool @@ -33,13 +33,13 @@ bin/rmdtopvf bin/vm bin/voctopvf bin/wavtopvf -@unexec install-info --delete %D/info/mgetty.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/mgetty.info %D/info/dir info/mgetty.info info/mgetty.info-1 info/mgetty.info-2 info/mgetty.info-3 info/mgetty.info-4 -@exec install-info %D/info/mgetty.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/mgetty.info %D/info/dir lib/mgetty+sendfax/cour25.pbm lib/mgetty+sendfax/cour25n.pbm man/man1/g3cat.1 diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo index b0cea2047c1..39218f15b84 100644 --- a/comms/mgetty+sendfax/distinfo +++ b/comms/mgetty+sendfax/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.3 2001/06/21 17:02:23 fredb Exp $ +$NetBSD: distinfo,v 1.4 2002/02/18 15:14:04 seb Exp $ SHA1 (mgetty1.1.26-Apr16.tar.gz) = c36926dad8849f14e617f207cb7729f8e4c7f089 Size (mgetty1.1.26-Apr16.tar.gz) = 948245 bytes SHA1 (patch-aa) = 249ec3d2425d359a5d89241978ff9ac6122d0eb6 SHA1 (patch-ab) = ca2ff2961b045b66a3aedf692ce83e8fc6ecdd09 SHA1 (patch-ac) = f37ba8521f18957931f5180c8c90f3ec0b6a707f -SHA1 (patch-ad) = c31a50209e83d9082cd4a026c0d3e1517d96a336 +SHA1 (patch-ad) = a4ae1d528791ff532c8e8f0dcdf9eda9df790b33 SHA1 (patch-ae) = bf1dde04e3c3ae0b0683481cf1bd2e590d1dddd8 SHA1 (patch-af) = 418e87beca4f3a52ae0c6f7e337d119f86766d6c SHA1 (patch-ag) = 943aa837a285663ff6cf5ab07c3f908f499c2074 diff --git a/comms/mgetty+sendfax/patches/patch-ad b/comms/mgetty+sendfax/patches/patch-ad index bb9f1798baa..edb09012b50 100644 --- a/comms/mgetty+sendfax/patches/patch-ad +++ b/comms/mgetty+sendfax/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.2 1998/11/15 20:45:30 tron Exp $ +$NetBSD: patch-ad,v 1.3 2002/02/18 15:14:04 seb Exp $ ---- doc/Makefile.orig Fri Nov 28 04:33:26 1997 -+++ doc/Makefile Mon Dec 29 22:31:59 1997 +--- doc/Makefile.orig Thu Nov 27 21:33:26 1997 ++++ doc/Makefile @@ -26,7 +26,7 @@ all: @@ -11,3 +11,12 @@ $NetBSD: patch-ad,v 1.2 1998/11/15 20:45:30 tron Exp $ manpages: $(MANSRC) +@@ -43,7 +43,7 @@ + -texi2html -verbose mgetty.texi + + mgetty.info: mgetty.texi +- -makeinfo mgetty.texi ++ -${MAKEINFO} mgetty.texi + + mgetty.ps: mgetty.dvi + -dvips -o mgetty.ps mgetty.dvi diff --git a/converters/latex2rtf/Makefile b/converters/latex2rtf/Makefile index c70de3e098a..80c6d23c6ed 100644 --- a/converters/latex2rtf/Makefile +++ b/converters/latex2rtf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/08/20 04:06:48 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/02/18 15:14:04 seb Exp $ # DISTNAME= latex2rtf-1.8aa @@ -32,4 +32,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/l2r.html ${PREFIX}/share/doc/latex2rtf/latex2rtf.html ${INSTALL_DATA} ${WRKSRC}/doc/l2r.pdf ${PREFIX}/share/doc/latex2rtf/latex2rtf.pdf +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/latex2rtf/PLIST b/converters/latex2rtf/PLIST index c1f7f6d7ecb..2d1aa248f85 100644 --- a/converters/latex2rtf/PLIST +++ b/converters/latex2rtf/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:50:53 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:05 seb Exp $ bin/latex2rtf -@unexec install-info --delete %D/info/latex2rtf.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/latex2rtf.info %D/info/dir info/latex2rtf.info -@exec install-info %D/info/latex2rtf.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/latex2rtf.info %D/info/dir share/latex2rtf/direct.cfg share/latex2rtf/english.cfg share/latex2rtf/fonts.cfg diff --git a/converters/recode/Makefile b/converters/recode/Makefile index 36003b9bcbe..21be89a54d7 100644 --- a/converters/recode/Makefile +++ b/converters/recode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/01/11 13:20:22 kleink Exp $ +# $NetBSD: Makefile,v 1.11 2002/02/18 15:14:05 seb Exp $ # DISTNAME= recode-3.6 @@ -17,4 +17,5 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig INFO_FILES= recode.info .include "../../devel/gettext-lib/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/recode/PLIST b/converters/recode/PLIST index b94da0ba24e..7e37f97255d 100644 --- a/converters/recode/PLIST +++ b/converters/recode/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/11 13:20:22 kleink Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:05 seb Exp $ bin/recode include/recode.h include/recodext.h -@unexec install-info --delete %D/info/recode.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/recode.info %D/info/dir info/recode.info info/recode.info-1 info/recode.info-2 @@ -11,7 +11,7 @@ info/recode.info-4 info/recode.info-5 info/recode.info-6 info/recode.info-7 -@exec install-info %D/info/recode.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/recode.info %D/info/dir lib/librecode.a lib/librecode.la lib/librecode.so diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile index 85122896612..0ed8bf857c3 100644 --- a/databases/gdbm/Makefile +++ b/databases/gdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/06/21 02:47:27 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2002/02/18 15:14:05 seb Exp $ # FreeBSD Id: Makefile,v 1.4 1997/01/28 08:11:23 asami Exp # @@ -15,8 +15,10 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig INFO_FILES= gdbm.info +TEXINFO_OVERRIDE= YES post-extract: ${RM} -f ${WRKSRC}/gdbm.info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/gdbm/PLIST b/databases/gdbm/PLIST index 07c91280d83..74ad1b0fb32 100644 --- a/databases/gdbm/PLIST +++ b/databases/gdbm/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:11:40 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:06 seb Exp $ include/gdbm.h -@unexec install-info --delete %D/info/gdbm.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gdbm.info %D/info/dir info/gdbm.info -@exec install-info %D/info/gdbm.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gdbm.info %D/info/dir lib/libgdbm.a lib/libgdbm.la lib/libgdbm.so diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile index 72df5bbd2eb..bc10a41392a 100644 --- a/databases/gnats/Makefile +++ b/databases/gnats/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/10/11 11:42:26 martti Exp $ +# $NetBSD: Makefile,v 1.2 2002/02/18 15:14:06 seb Exp $ DISTNAME= gnats-3.113.1 CATEGORIES= devel @@ -27,6 +27,7 @@ CONFIGURE_ARGS= --with-lispdir=${PREFIX}/share/emacs/site-lisp \ --with-release-based USE_GMAKE= yes USE_BISON= yes +TEXINFO_OVERRIDE= YES DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL @@ -53,8 +54,8 @@ CONFIGURE_ENV= SEND_PR=/dev/null INSTALL_TARGET= install-gnats install-send-pr post-build: - (cd ${WRKSRC}/gnats; ${MAKE} info) - (cd ${WRKSRC}/send-pr; ${MAKE} info) + (cd ${WRKSRC}/gnats; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} info) + (cd ${WRKSRC}/send-pr; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} info) pre-install: ${SED} ${INSTALL_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} @@ -62,9 +63,10 @@ pre-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL post-install: - (cd ${WRKSRC}/gnats; ${MAKE} install-info) - (cd ${WRKSRC}/send-pr; ${MAKE} install-info) - install-info ${PREFIX}/info/gnats.info ${PREFIX}/info/dir - install-info ${PREFIX}/info/send-pr.info ${PREFIX}/info/dir + (cd ${WRKSRC}/gnats; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} install-info) + (cd ${WRKSRC}/send-pr; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} install-info) + ${INSTALL_INFO} ${PREFIX}/info/gnats.info ${PREFIX}/info/dir + ${INSTALL_INFO} ${PREFIX}/info/send-pr.info ${PREFIX}/info/dir +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/gnats/PLIST b/databases/gnats/PLIST index d11591c6f38..c1bd6e96865 100644 --- a/databases/gnats/PLIST +++ b/databases/gnats/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:33 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:06 seb Exp $ bin/edit-pr bin/getclose bin/install-sid @@ -7,16 +7,16 @@ bin/nquery-pr bin/query-pr bin/send-pr bin/sub-type -@unexec install-info --delete %D/info/gnats.info %D/info/dir -@unexec install-info --delete %D/info/send-pr.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gnats.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/send-pr.info %D/info/dir info/gnats.info info/gnats.info-1 info/gnats.info-2 info/gnats.info-3 info/gnats.info-4 info/send-pr.info -@exec install-info %D/info/gnats.info %D/info/dir -@exec install-info %D/info/send-pr.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gnats.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/send-pr.info %D/info/dir libexec/gnats/at-pr libexec/gnats/check-db libexec/gnats/delete-pr diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile index 066584b1226..450380f3bee 100644 --- a/databases/mysql-client/Makefile +++ b/databases/mysql-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/11/02 02:57:28 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2002/02/18 15:14:06 seb Exp $ # .include "Makefile.common" @@ -20,4 +20,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info .include "../../devel/readline/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql-client/PLIST b/databases/mysql-client/PLIST index ccffad13f00..b2f9e9886a0 100644 --- a/databases/mysql-client/PLIST +++ b/databases/mysql-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/08 14:09:38 martti Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:06 seb Exp $ bin/msql2mysql bin/mysql bin/mysqlcheck @@ -39,9 +39,9 @@ include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-usage.h include/mysql/sslopt-vars.h -@unexec install-info --delete %D/info/mysql.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/mysql.info %D/info/dir info/mysql.info -@exec install-info %D/info/mysql.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/mysql.info %D/info/dir lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so diff --git a/devel/autoconf-devel/Makefile b/devel/autoconf-devel/Makefile index 202b3475895..94d0977f3e5 100644 --- a/devel/autoconf-devel/Makefile +++ b/devel/autoconf-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/01/03 14:02:27 agc Exp $ +# $NetBSD: Makefile,v 1.2 2002/02/18 15:14:06 seb Exp $ DISTNAME= autoconf-2.52 PKGNAME= autoconf-devel-2.52 @@ -22,4 +22,5 @@ M4= ${PREFIX}/bin/gm4 INFO_FILES= autoconf.info standards.info .include "../../lang/perl5/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/autoconf-devel/PLIST b/devel/autoconf-devel/PLIST index 7167db5c155..412ce4d9d1c 100644 --- a/devel/autoconf-devel/PLIST +++ b/devel/autoconf-devel/PLIST @@ -1,16 +1,16 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/14 17:50:50 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:06 seb Exp $ bin/autoconf bin/autoheader bin/autoreconf bin/autoscan bin/autoupdate bin/ifnames -@unexec install-info --delete %D/info/autoconf.info %D/info/dir -@unexec install-info --delete %D/info/standards.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/autoconf.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/standards.info %D/info/dir info/autoconf.info info/standards.info -@exec install-info %D/info/autoconf.info %D/info/dir -@exec install-info %D/info/standards.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/autoconf.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/standards.info %D/info/dir man/man1/autoconf.1 man/man1/autoheader.1 man/man1/autoreconf.1 diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile index 5b3aff4feaf..ccbd66a6a8a 100644 --- a/devel/autoconf/Makefile +++ b/devel/autoconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2002/02/01 17:09:35 skrll Exp $ +# $NetBSD: Makefile,v 1.32 2002/02/18 15:14:07 seb Exp $ # FreeBSD Id: Makefile,v 1.12 1997/06/13 20:00:47 max Exp # @@ -21,6 +21,8 @@ CONFIGURE_ENV+= AWK="${AWK}" M4= ${PREFIX}/bin/gm4 INFO_FILES= autoconf.info standards.info +TEXINFO_OVERRIDE= YES .include "../../lang/perl5/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/autoconf/PLIST b/devel/autoconf/PLIST index d93ad83934f..54af921bc0d 100644 --- a/devel/autoconf/PLIST +++ b/devel/autoconf/PLIST @@ -1,16 +1,16 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:22:21 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:07 seb Exp $ bin/autoconf bin/autoheader bin/autoreconf bin/autoscan bin/autoupdate bin/ifnames -@unexec install-info --delete %D/info/autoconf.info %D/info/dir -@unexec install-info --delete %D/info/standards.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/autoconf.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/standards.info %D/info/dir info/autoconf.info info/standards.info -@exec install-info %D/info/autoconf.info %D/info/dir -@exec install-info %D/info/standards.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/autoconf.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/standards.info %D/info/dir share/autoconf/acconfig.h share/autoconf/acfunctions share/autoconf/acgeneral.m4 diff --git a/devel/automake/Makefile b/devel/automake/Makefile index f5f014c78bf..c7b36858cfa 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2002/01/10 16:22:37 skrll Exp $ +# $NetBSD: Makefile,v 1.27 2002/02/18 15:14:07 seb Exp $ # FreeBSD Id: Makefile,v 1.5 1997/09/19 09:29:04 max Exp # @@ -20,6 +20,8 @@ CONFIGURE_ENV= PERL=${PERL5} STRIPFLAG= # none INFO_FILES= automake.info +TEXINFO_OVERRIDE= YES .include "../../lang/perl5/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/automake/PLIST b/devel/automake/PLIST index b89c0b1b19a..caf3c086daf 100644 --- a/devel/automake/PLIST +++ b/devel/automake/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:22:22 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:07 seb Exp $ bin/aclocal bin/automake -@unexec install-info --delete %D/info/automake.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/automake.info %D/info/dir info/automake.info -@exec install-info %D/info/automake.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/automake.info %D/info/dir share/aclocal/ccstdc.m4 share/aclocal/cond.m4 share/aclocal/dmalloc.m4 diff --git a/devel/bison/Makefile b/devel/bison/Makefile index c87b0374366..227c372f515 100644 --- a/devel/bison/Makefile +++ b/devel/bison/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2002/02/10 19:05:56 tron Exp $ +# $NetBSD: Makefile,v 1.27 2002/02/18 15:14:07 seb Exp $ DISTNAME= bison-1.32 CATEGORIES= devel @@ -20,4 +20,5 @@ CPPFLAGS+= -Dunix # for $TMPDIR parsing INFO_FILES= bison.info .include "../../devel/gettext-lib/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/bison/PLIST b/devel/bison/PLIST index 5583f14190b..673862b18cb 100644 --- a/devel/bison/PLIST +++ b/devel/bison/PLIST @@ -1,13 +1,13 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/31 13:43:57 mjl Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:08 seb Exp $ bin/bison -@unexec install-info --delete %D/info/bison.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/bison.info %D/info/dir info/bison.info info/bison.info-1 info/bison.info-2 info/bison.info-3 info/bison.info-4 info/bison.info-5 -@exec install-info %D/info/bison.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/bison.info %D/info/dir man/man1/bison.1 share/bison/bison.simple share/bison/bison.hairy diff --git a/devel/cssc/Makefile b/devel/cssc/Makefile index cca85b40fe9..c0146b33412 100644 --- a/devel/cssc/Makefile +++ b/devel/cssc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/02/18 10:25:04 jmc Exp $ +# $NetBSD: Makefile,v 1.4 2002/02/18 15:14:08 seb Exp $ # DISTNAME= CSSC-0.13alpha.pl1a @@ -10,12 +10,12 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://cssc.sourceforge.net/ COMMENT= GNU workalike for the source code control system SCCS -BUILD_DEPENDS+= gtexinfo=>4.0:../../devel/gtexinfo - WRKSRC= ${WRKDIR}/CSSC-0.13alpha.pl1 GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-binary +INFO_FILES= cssc.info +TEXINFO_REQD= 4.0 +TEXINFO_OVERRIDE= YES -PATH= ${LOCALBASE}/bin:$$PATH - +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cssc/PLIST b/devel/cssc/PLIST index 71be2b25474..29b3a67b85d 100644 --- a/devel/cssc/PLIST +++ b/devel/cssc/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/24 23:44:29 seb Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:08 seb Exp $ bin/sccs -@unexec install-info --delete --info-dir=%D/info %D/info/cssc.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cssc.info info/cssc.info info/cssc.info-1 info/cssc.info-2 info/cssc.info-3 -@exec install-info --info-dir=%D/info %D/info/cssc.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cssc.info libexec/cssc/admin libexec/cssc/cdc libexec/cssc/delta diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile index 5d78bb3ae2a..7ec6cb2f617 100644 --- a/devel/cvs/Makefile +++ b/devel/cvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2002/01/11 12:47:23 skrll Exp $ +# $NetBSD: Makefile,v 1.48 2002/02/18 15:14:08 seb Exp $ # DISTNAME= cvs-1.11 @@ -12,7 +12,6 @@ HOMEPAGE= http://www.cvshome.org/ COMMENT= Concurrent Versions System GNU_CONFIGURE= yes -USE_GTEXINFO= yes .include "../../mk/bsd.prefs.mk" @@ -45,6 +44,8 @@ pre-fetch: CONFIGURE_ENV+= perl_path=${PERL5} INFO_FILES= cvs.info cvsclient.info +TEXINFO_OVERRIDE= YES .include "../../devel/zlib/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cvs/PLIST b/devel/cvs/PLIST index aa8d6d1a4f4..18bd8e78768 100644 --- a/devel/cvs/PLIST +++ b/devel/cvs/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:22:53 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:08 seb Exp $ bin/cvs bin/cvsbug bin/rcs2log -@unexec install-info --delete --info-dir=%D/info %D/info/cvs.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cvs.info info/cvs.info -@exec install-info --info-dir=%D/info %D/info/cvs.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cvs.info info/cvs.info-1 info/cvs.info-2 info/cvs.info-3 @@ -14,9 +14,9 @@ info/cvs.info-6 info/cvs.info-7 info/cvs.info-8 info/cvs.info-9 -@unexec install-info --delete --info-dir=%D/info %D/info/cvsclient.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cvsclient.info info/cvsclient.info -@exec install-info --info-dir=%D/info %D/info/cvsclient.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cvsclient.info info/cvsclient.info-1 info/cvsclient.info-2 info/cvsclient.info-3 diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index fb2c1b22d8c..c11153e94eb 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2001/10/24 22:10:51 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2002/02/18 15:14:08 seb Exp $ # DISTNAME= ddd-3.3 @@ -49,4 +49,5 @@ test: .include "../../graphics/xpm/buildlink.mk" .include "../../mk/motif.buildlink.mk" .include "../../mk/x11.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ddd/PLIST b/devel/ddd/PLIST index 70ebc7b5fb4..66d7c4e1559 100644 --- a/devel/ddd/PLIST +++ b/devel/ddd/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:08 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:08 seb Exp $ bin/ddd -@unexec install-info --delete --info-dir=%D/info %D/info/ddd-themes.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ddd-themes.info info/ddd-themes.info info/ddd-themes.info-1 info/ddd-themes.info-2 info/ddd-themes.info-3 -@exec install-info --info-dir=%D/info %D/info/ddd-themes.info -@unexec install-info --delete --info-dir=%D/info %D/info/ddd.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ddd-themes.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ddd.info info/ddd.info info/ddd.info-1 info/ddd.info-10 @@ -19,7 +19,7 @@ info/ddd.info-6 info/ddd.info-7 info/ddd.info-8 info/ddd.info-9 -@exec install-info --info-dir=%D/info %D/info/ddd.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ddd.info lib/libiberty.a man/man1/ddd.1 share/${PKGNAME}/COPYING diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile index 924351a2db4..1331f3da9f4 100644 --- a/devel/diffutils/Makefile +++ b/devel/diffutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/16 14:38:22 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:09 seb Exp $ # DISTNAME= diffutils-2.7 @@ -15,4 +15,5 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --program-prefix=g INFO_FILES= diff.info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/diffutils/PLIST b/devel/diffutils/PLIST index ee6e0c3cda5..e2eb3e7216d 100644 --- a/devel/diffutils/PLIST +++ b/devel/diffutils/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:11 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:09 seb Exp $ bin/gcmp bin/gdiff bin/gdiff3 bin/gsdiff -@unexec install-info --delete %D/info/diff.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/diff.info %D/info/dir info/diff.info info/diff.info-1 info/diff.info-2 info/diff.info-3 info/diff.info-4 -@exec install-info %D/info/diff.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/diff.info %D/info/dir diff --git a/devel/dmalloc/Makefile b/devel/dmalloc/Makefile index 52fdd5da90b..e36427c8845 100644 --- a/devel/dmalloc/Makefile +++ b/devel/dmalloc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/04/04 21:16:36 thorpej Exp $ +# $NetBSD: Makefile,v 1.2 2002/02/18 15:14:09 seb Exp $ DISTNAME= dmalloc-4.8.2 CATEGORIES= devel @@ -15,4 +15,5 @@ INSTALL_TARGET= install installinfo INFO_FILES= dmalloc.info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/dmalloc/PLIST b/devel/dmalloc/PLIST index 39e52c54ee6..6758d09bc2f 100644 --- a/devel/dmalloc/PLIST +++ b/devel/dmalloc/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:14 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:09 seb Exp $ bin/dmalloc include/dmalloc.h -@unexec install-info --delete %D/info/dmalloc.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/dmalloc.info %D/info/dir info/dmalloc.info -@exec install-info %D/info/dmalloc.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/dmalloc.info %D/info/dir lib/libdmalloc.a lib/libdmalloclp.a lib/libdmallocxx.a diff --git a/devel/elib/Makefile b/devel/elib/Makefile index ce065a621de..a2ee8e1c9ef 100644 --- a/devel/elib/Makefile +++ b/devel/elib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/09/27 23:17:55 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:09 seb Exp $ # DISTNAME= elib-1.0 @@ -38,4 +38,5 @@ do-install: ${PREFIX}/${LISPDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/elib/distinfo b/devel/elib/distinfo index d44ccb1934e..63ade517dc2 100644 --- a/devel/elib/distinfo +++ b/devel/elib/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/06/08 21:29:13 cjones Exp $ +$NetBSD: distinfo,v 1.2 2002/02/18 15:14:09 seb Exp $ SHA1 (elib-1.0.tar.gz) = 1f7450a949a2388efadece015aba53bbbada62cf Size (elib-1.0.tar.gz) = 58335 bytes +SHA1 (patch-aa) = d78586bf11e732fbbcf6512ad415fd4cf7b3f78a diff --git a/devel/elib/patches/patch-aa b/devel/elib/patches/patch-aa new file mode 100644 index 00000000000..ca00e543395 --- /dev/null +++ b/devel/elib/patches/patch-aa @@ -0,0 +1,12 @@ +$NetBSD: patch-aa,v 1.1 2002/02/18 15:14:09 seb Exp $ + +--- Makefile.orig Mon Dec 11 01:50:56 1995 ++++ Makefile +@@ -34,7 +34,6 @@ + infodir = $(prefix)/info + + EMACS = emacs +-MAKEINFO = makeinfo + TEXI2DVI = texi2dvi + SHELL = /bin/sh + INSTALL_DATA = cp diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile index 74f545a5ed1..2d449a86c45 100644 --- a/devel/gcvs/Makefile +++ b/devel/gcvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/10/24 22:10:52 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:10 seb Exp $ DISTNAME= gcvs-1.0a7 CATEGORIES= devel @@ -13,6 +13,7 @@ CONFLICTS= cvs-[0-9]* USE_BUILDLINK_ONLY= yes USE_GMAKE= yes GNU_CONFIGURE= yes +TEXINFO_OVERRIDE= YES CONFIGURE_ARGS+= --with-tclinclude="${BUILDLINK_DIR}/include" \ --with-tcllib="${BUILDLINK_DIR}/lib" @@ -25,4 +26,5 @@ post-patch: .include "../../lang/tcl/buildlink.mk" .include "../../x11/gtk/buildlink.mk" .include "../../mk/x11.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gcvs/PLIST b/devel/gcvs/PLIST index 95335fa2af4..87e2a2232dc 100644 --- a/devel/gcvs/PLIST +++ b/devel/gcvs/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:36 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:10 seb Exp $ bin/cvs bin/cvsbug bin/cvstree bin/gcvs bin/rcs2log -@unexec install-info --delete --info-dir=%D/info %D/info/cvs.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cvs.info info/cvs.info -@exec install-info --info-dir=%D/info %D/info/cvs.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cvs.info info/cvs.info-1 info/cvs.info-2 info/cvs.info-3 @@ -16,9 +16,9 @@ info/cvs.info-6 info/cvs.info-7 info/cvs.info-8 info/cvs.info-9 -@unexec install-info --delete --info-dir=%D/info %D/info/cvsclient.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cvsclient.info info/cvsclient.info -@exec install-info --info-dir=%D/info %D/info/cvsclient.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cvsclient.info info/cvsclient.info-1 info/cvsclient.info-2 info/cvsclient.info-3 diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index 232d3136f48..78c97b42f48 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 14:38:25 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2002/02/18 15:14:10 seb Exp $ # DISTNAME= gdb-4.18 @@ -19,4 +19,5 @@ INSTALL_TARGET= install install-info do-configure: cd ${WRKSRC}; ./configure --prefix=${PREFIX} +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gdb/PLIST b/devel/gdb/PLIST index 8334807ade0..c2cc89348bb 100644 --- a/devel/gdb/PLIST +++ b/devel/gdb/PLIST @@ -1,14 +1,14 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:38 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:10 seb Exp $ bin/gdb include/bfd.h include/ansidecl.h include/bfdlink.h -@unexec install-info --delete %D/info/standards.info %D/info/dir -@unexec install-info --delete %D/info/mmalloc.info %D/info/dir -@unexec install-info --delete %D/info/bfd.info %D/info/dir -@unexec install-info --delete %D/info/gdb.info %D/info/dir -@unexec install-info --delete %D/info/gdbint.info %D/info/dir -@unexec install-info --delete %D/info/stabs.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/standards.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/mmalloc.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/bfd.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gdb.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gdbint.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/stabs.info %D/info/dir info/standards.info info/mmalloc.info info/bfd.info @@ -38,12 +38,12 @@ info/stabs.info-1 info/stabs.info-2 info/stabs.info-3 info/stabs.info-4 -@exec install-info %D/info/standards.info %D/info/dir -@exec install-info %D/info/mmalloc.info %D/info/dir -@exec install-info %D/info/bfd.info %D/info/dir -@exec install-info %D/info/gdb.info %D/info/dir -@exec install-info %D/info/gdbint.info %D/info/dir -@exec install-info %D/info/stabs.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/standards.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/mmalloc.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/bfd.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gdb.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gdbint.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/stabs.info %D/info/dir lib/libbfd.la lib/libiberty.a lib/libbfd.a diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index b5f332b0a34..62553d17c2c 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2001/11/29 01:12:29 hubertf Exp $ +# $NetBSD: Makefile,v 1.34 2002/02/18 15:14:10 seb Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp # @@ -19,6 +19,7 @@ USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig INFO_FILES= gettext.info +TEXINFO_OVERRIDE= YES post-patch: ${RM} -f ${WRKSRC}/intl/libgettext.h @@ -32,4 +33,5 @@ post-install: cd ${WRKSRC}/intl; ${MAKE_PROGRAM} install-data .include "../../devel/gettext-lib/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gettext/PLIST b/devel/gettext/PLIST index 24203558eeb..82472334cf8 100644 --- a/devel/gettext/PLIST +++ b/devel/gettext/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:39 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:10 seb Exp $ bin/gettext bin/gettextize bin/msgcmp @@ -7,14 +7,14 @@ bin/msgfmt bin/msgmerge bin/msgunfmt bin/xgettext -@unexec install-info --delete %D/info/gettext.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gettext.info %D/info/dir info/gettext.info info/gettext.info-1 info/gettext.info-2 info/gettext.info-3 info/gettext.info-4 info/gettext.info-5 -@exec install-info %D/info/gettext.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gettext.info %D/info/dir share/gettext/ABOUT-NLS share/gettext/intl/ChangeLog share/gettext/intl/Makefile.in diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile index c0b2d38471f..a0e1a9fa9a9 100644 --- a/devel/gindent/Makefile +++ b/devel/gindent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/07/17 10:05:05 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2002/02/18 15:14:10 seb Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1997/08/29 09:20:00 obrien Exp # @@ -17,4 +17,5 @@ CONFIGURE_ARGS= --program-prefix=g INFO_FILES= indent.info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gindent/PLIST b/devel/gindent/PLIST index 673d76b1c19..f03c148fff5 100644 --- a/devel/gindent/PLIST +++ b/devel/gindent/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:44 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:10 seb Exp $ bin/gindent man/man1/gindent.1 -@unexec install-info --delete %D/info/indent.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/indent.info %D/info/dir info/indent.info -@exec install-info %D/info/indent.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/indent.info %D/info/dir diff --git a/devel/glib/Makefile b/devel/glib/Makefile index e6058f6dcb9..7c65cd20509 100644 --- a/devel/glib/Makefile +++ b/devel/glib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2001/12/26 08:32:42 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2002/02/18 15:14:11 seb Exp $ # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp # @@ -22,6 +22,7 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib INFO_FILES= glib.info +TEXINFO_OVERRIDE= YES # XXX egcs is still broken on arm32. .if (${MACHINE_ARCH} == arm32) @@ -75,4 +76,5 @@ post-configure: .endif .include "../../mk/pthread.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/glib/PLIST b/devel/glib/PLIST index beb3501bdfd..983d0e9611a 100644 --- a/devel/glib/PLIST +++ b/devel/glib/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:47 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:11 seb Exp $ bin/glib-config include/glib/glib-1.2/glib.h include/glib/glib-1.2/gmodule.h -@unexec install-info --delete %D/info/glib.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/glib.info %D/info/dir info/glib.info -@exec install-info %D/info/glib.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/glib.info %D/info/dir lib/glib/include/glibconfig.h lib/libglib.a lib/libglib.la diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index 18914fbbff1..c6d0a1cfb1c 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2001/07/14 03:22:08 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2002/02/18 15:14:11 seb Exp $ # FreeBSD Id: Makefile,v 1.16 1997/06/13 20:00:47 max Exp # @@ -12,11 +12,11 @@ HOMEPAGE= http://www.gnu.org/software/make/make.html COMMENT= GNU version of 'make' utility USE_BUILDLINK_ONLY= YES -USE_GTEXINFO= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --program-prefix="g" CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" +TEXINFO_OVERRIDE= YES post-extract: ${MV} ${WRKSRC}/make.texinfo ${WRKSRC}/make.texinfo.orig @@ -28,4 +28,5 @@ post-install: ${CHGRP} ${BINGRP} ${PREFIX}/bin/gmake .include "../../devel/gettext-lib/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gmake/PLIST b/devel/gmake/PLIST index 064abfeb0e7..097413b2de5 100644 --- a/devel/gmake/PLIST +++ b/devel/gmake/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:50 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:11 seb Exp $ bin/gmake -@unexec install-info --delete %D/info/make.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/make.info %D/info/dir info/make.info info/make.info-1 info/make.info-2 @@ -12,7 +12,7 @@ info/make.info-7 info/make.info-8 info/make.info-9 info/make.info-10 -@exec install-info %D/info/make.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/make.info %D/info/dir man/man1/gmake.1 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/make.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/make.mo diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile index b9c5414846e..db18b3d6a15 100644 --- a/devel/gmp/Makefile +++ b/devel/gmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/07/02 16:46:02 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/02/18 15:14:11 seb Exp $ # DISTNAME= gmp-3.1.1 @@ -16,5 +16,7 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig M4= ${PREFIX}/bin/gm4 +INFO_FILES= gmp.info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gmp/PLIST b/devel/gmp/PLIST index 19c912675a8..d065391e09e 100644 --- a/devel/gmp/PLIST +++ b/devel/gmp/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:51 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:11 seb Exp $ include/gmp.h -@unexec install-info --delete --info-dir=%D/info %D/info/gmp.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gmp.info info/gmp.info -@exec install-info --info-dir=%D/info %D/info/gmp.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gmp.info info/gmp.info-1 info/gmp.info-2 info/gmp.info-3 diff --git a/devel/gperf/Makefile b/devel/gperf/Makefile index 2189360bd00..c713a8b07ca 100644 --- a/devel/gperf/Makefile +++ b/devel/gperf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/05/17 08:38:43 abs Exp $ +# $NetBSD: Makefile,v 1.8 2002/02/18 15:14:12 seb Exp $ # DISTNAME= gperf-2.7.2 @@ -10,6 +10,6 @@ COMMENT= GNU perfect hash function generator GNU_CONFIGURE= yes INFO_FILES= gperf.info -USE_GTEXINFO= yes +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gperf/PLIST b/devel/gperf/PLIST index acdad38fbcd..cdeeaa6a977 100644 --- a/devel/gperf/PLIST +++ b/devel/gperf/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:57 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:12 seb Exp $ bin/gperf -@unexec install-info --delete %D/info/gperf.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gperf.info %D/info/dir info/gperf.info -@exec install-info %D/info/gperf.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gperf.info %D/info/dir man/man1/gperf.1.gz diff --git a/devel/guile-oops/Makefile b/devel/guile-oops/Makefile index 02e56753e27..9596104a422 100644 --- a/devel/guile-oops/Makefile +++ b/devel/guile-oops/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/27 13:43:19 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2002/02/18 15:14:12 seb Exp $ # DISTNAME= guile-oops-0.9.0 @@ -15,4 +15,5 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/guile-oops/PLIST b/devel/guile-oops/PLIST index a5e66df0d87..bedf2b0e75b 100644 --- a/devel/guile-oops/PLIST +++ b/devel/guile-oops/PLIST @@ -1,14 +1,14 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:04 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:12 seb Exp $ bin/guile-oops include/goops-snarf.h include/goops.h include/goops/versiondat.h -@unexec install-info --delete --info-dir=%D/info %D/info/goops.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/goops.info info/goops.info info/goops.info-1 info/goops.info-2 info/goops.info-3 -@exec install-info --info-dir=%D/info %D/info/goops.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/goops.info lib/libgoopscore.a lib/libgoopscore.la lib/libgoopscore.so diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile index 7351f4ece04..df0cbf27a94 100644 --- a/devel/id-utils/Makefile +++ b/devel/id-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/12/04 06:14:59 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2002/02/18 15:14:12 seb Exp $ # FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp # @@ -49,4 +49,5 @@ PLIST_SUBST+= LISPDIR=${LISPDIR} PLIST_SUBST+= CLISPDIR=${CLISPDIR} .include "../../devel/gettext-lib/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/id-utils/PLIST b/devel/id-utils/PLIST index 30dc15bb965..a473c38f001 100644 --- a/devel/id-utils/PLIST +++ b/devel/id-utils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2001/11/03 09:59:35 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:12 seb Exp $ bin/aid bin/defid bin/eid @@ -8,9 +8,9 @@ bin/gid bin/lid bin/mkid bin/xtokid -@unexec install-info --delete --info-dir=%D/info %D/info/id-utils.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/id-utils.info info/id-utils.info -@exec install-info --info-dir=%D/info %D/info/id-utils.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/id-utils.info share/id-lang.map ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/id-utils.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/id-utils.mo diff --git a/devel/isect/Makefile b/devel/isect/Makefile index fce31aa65c4..bc36f1dff50 100644 --- a/devel/isect/Makefile +++ b/devel/isect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/11 06:34:27 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2002/02/18 15:14:12 seb Exp $ # DISTNAME= isect-1.0 @@ -37,4 +37,5 @@ post-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/isect/PLIST b/devel/isect/PLIST index f4182908bf7..6dbe8bfb9b6 100644 --- a/devel/isect/PLIST +++ b/devel/isect/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:13 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:12 seb Exp $ bin/isdcfgck bin/isdclient bin/isdeat @@ -8,9 +8,9 @@ include/isdio.h include/libisect.h include/queues.h include/tabfuncs.h -@unexec install-info --delete %D/info/isect.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/isect.info %D/info/dir info/isect.info -@exec install-info %D/info/isect.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/isect.info %D/info/dir lib/libisdio.a lib/libisdio.la lib/libisdio.so diff --git a/devel/libavl/Makefile b/devel/libavl/Makefile index 759bc684a25..31c0b2b51d3 100644 --- a/devel/libavl/Makefile +++ b/devel/libavl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 14:38:34 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:13 seb Exp $ # DISTNAME= avl-1.4.0 @@ -12,4 +12,5 @@ COMMENT= library for manipulation of balanced binary trees GNU_CONFIGURE= YES +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libavl/PLIST b/devel/libavl/PLIST index d2418c09cb5..17f6e00f5d1 100644 --- a/devel/libavl/PLIST +++ b/devel/libavl/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:26 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:13 seb Exp $ include/avl.h include/avlt.h include/avltr.h include/rb.h -@unexec install-info --delete %D/info/avl.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/avl.info %D/info/dir info/avl.info -@exec install-info %D/info/avl.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/avl.info %D/info/dir lib/libavl.a diff --git a/devel/libg++/Makefile b/devel/libg++/Makefile index 0374f1dc186..04da6892339 100644 --- a/devel/libg++/Makefile +++ b/devel/libg++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/05/17 08:38:44 abs Exp $ +# $NetBSD: Makefile,v 1.20 2002/02/18 15:14:13 seb Exp $ # DISTNAME= libg++-${GXXVERSION} @@ -33,4 +33,5 @@ post-install: /bin/ls 2>/dev/null -1d lib/libg++*.a lib/libg++.so*) \ >${PLIST_SRC} +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libg++/PLIST.pre b/devel/libg++/PLIST.pre index b7f62525458..42d394e2060 100644 --- a/devel/libg++/PLIST.pre +++ b/devel/libg++/PLIST.pre @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.pre,v 1.1 2001/11/01 01:30:52 zuntum Exp $ +@comment $NetBSD: PLIST.pre,v 1.2 2002/02/18 15:14:13 seb Exp $ bin/genclass include/g++/gen/AVLMap.hP include/g++/gen/AVLSet.hP @@ -172,6 +172,6 @@ include/g++/sysent.h include/g++/typemacros.h @dirrm include/g++/gen @dirrm include/g++ -@unexec install-info --delete %D/info/libg++.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/libg++.info %D/info/dir info/libg++.info -@exec install-info %D/info/libg++.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/libg++.info %D/info/dir diff --git a/devel/libg++/files/Makefile b/devel/libg++/files/Makefile index fc79af3c93c..4132607a156 100644 --- a/devel/libg++/files/Makefile +++ b/devel/libg++/files/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/05/18 14:05:44 tv Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:13 seb Exp $ # Makefile for libg++ add-on for NetBSD. Requires libstdc++ shlib v1.x. LIB=g++ @@ -67,7 +67,7 @@ genclass: libg++/genclass/genclass.sh sed -e "s,<VERSION>,${GXXVERSION},;s,^PROTODIR.*,PROTODIR=${PREFIX}/include/g++/gen," ${.ALLSRC} >${.TARGET} libg++.info: libg++/libg++.texi - makeinfo --no-split -I libg++/texinfo -o libg++.info libg++/libg++.texi + ${MAKEINFO} --no-split -I libg++/texinfo -o libg++.info libg++/libg++.texi .PATH: libg++/src librx diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 9a179ad9c2e..5a60b7eae55 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2002/01/22 21:01:26 jdolecek Exp $ +# $NetBSD: Makefile,v 1.58 2002/02/18 15:14:13 seb Exp $ DISTNAME= libgtop-1.0.12 PKGREVISION= 1 @@ -51,4 +51,5 @@ CONFIGURE_ENV+= AWK="${AWK}" CONFIGURE_ENV+= LN_S="${LN} -s" CONFIGURE_ENV+= PERL="${PERL5}" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libgtop/PLIST b/devel/libgtop/PLIST index 2e5830d88d8..5e935c3b246 100644 --- a/devel/libgtop/PLIST +++ b/devel/libgtop/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:32 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:13 seb Exp $ bin/libgtop-config bin/libgtop_daemon bin/libgtop_server @@ -46,9 +46,9 @@ include/glibtop/xmalloc.h include/glibtop_machine.h include/glibtop_server.h include/glibtop_suid.h -@unexec install-info --delete %D/info/libgtop.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/libgtop.info %D/info/dir info/libgtop.info -@exec install-info %D/info/libgtop.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/libgtop.info %D/info/dir lib/libgtop-features.def lib/libgtop.a lib/libgtop.la diff --git a/devel/libtool-info/Makefile b/devel/libtool-info/Makefile index a2a70ab671a..3ebbc454caf 100644 --- a/devel/libtool-info/Makefile +++ b/devel/libtool-info/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/10/18 15:20:11 veego Exp $ +# $NetBSD: Makefile,v 1.8 2002/02/18 15:14:14 seb Exp $ # .include "../libtool/Makefile.common" @@ -10,7 +10,7 @@ COMMENT= Generic shared library support script - info pages CONFLICTS+= libtool<1.3.5nb11 -USE_GTEXINFO= yes +TEXINFO_OVERRIDE= YES # It seems the info-files distributed with libtool 1.3.5 are broken. # To test, type "info libtool|" and hold down space. See it stop with a @@ -20,9 +20,10 @@ post-extract: ${RM} -f ${WRKSRC}/doc/libtool.info* do-build: - cd ${WRKSRC}/doc ; ${MAKE_PROGRAM} + cd ${WRKSRC}/doc ; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} do-install: - cd ${WRKSRC}/doc ; ${MAKE_PROGRAM} install + cd ${WRKSRC}/doc ; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/m4/Makefile b/devel/m4/Makefile index 34bc6a62756..d3a9ed7b16c 100644 --- a/devel/m4/Makefile +++ b/devel/m4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/10/19 09:13:29 veego Exp $ +# $NetBSD: Makefile,v 1.16 2002/02/18 15:14:14 seb Exp $ # FreeBSD Id: Makefile,v 1.7 1997/06/16 08:22:35 max Exp # @@ -13,6 +13,7 @@ USE_BUILDLINK_ONLY= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g INFO_FILES= m4.info +TEXINFO_OVERRIDE= YES pre-build: ${CHMOD} u+w ${WRKSRC}/checks/stamp-checks @@ -21,4 +22,5 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gm4 ${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${PREFIX}/share/examples/gm4 +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/m4/PLIST b/devel/m4/PLIST index da16d98b1d1..b06b816dcd9 100644 --- a/devel/m4/PLIST +++ b/devel/m4/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:51 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:14 seb Exp $ bin/gm4 -@unexec install-info --delete %D/info/m4.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/m4.info %D/info/dir info/m4.info -@exec install-info %D/info/m4.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/m4.info %D/info/dir share/examples/gm4/capitalize.m4 share/examples/gm4/comments.m4 share/examples/gm4/ddivert.m4 diff --git a/devel/nana/Makefile b/devel/nana/Makefile index f0cd114fcc8..d3bbc827059 100644 --- a/devel/nana/Makefile +++ b/devel/nana/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 14:38:42 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:14 seb Exp $ DISTNAME= nana-2.4 CATEGORIES= devel @@ -10,4 +10,5 @@ COMMENT= improved support for assertions and logging in C and C++ GNU_CONFIGURE= yes +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/nana/PLIST b/devel/nana/PLIST index f8bfb12b78a..b6a372fa4c0 100644 --- a/devel/nana/PLIST +++ b/devel/nana/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:55 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:14 seb Exp $ bin/nana bin/nana-c++lg bin/nana-clg @@ -23,12 +23,12 @@ include/nana-config.h include/nana.h include/nana_error.h include/now.h -@unexec install-info --delete %D/info/nana.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/nana.info %D/info/dir info/nana.info info/nana.info-1 info/nana.info-2 info/nana.info-3 -@exec install-info %D/info/nana.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/nana.info %D/info/dir lib/libnana.a libexec/nana-trace.gdb libexec/nanafilter diff --git a/devel/nasm-devel/Makefile b/devel/nasm-devel/Makefile index 43a1ffc501b..8fe525fdcfe 100644 --- a/devel/nasm-devel/Makefile +++ b/devel/nasm-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/06/20 16:51:55 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:14 seb Exp $ # DISTNAME= nasm-0.98.08 @@ -14,10 +14,13 @@ BUILD_DEPENDS+= perl>=5.0:../../lang/perl5 INSTALL_TARGET= install_everything USE_GMAKE= yes INFO_FILES= nasm.info +TEXINFO_OVERRIDE= YES +TEXINFO_PATTERNS+= Makefile MAKE_ENV+= PREFIX="${PREFIX}" \ PERL5="${PERL5}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_DATA="${INSTALL_DATA}" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/nasm-devel/PLIST b/devel/nasm-devel/PLIST index 88ee1770043..0856c9e4c9b 100644 --- a/devel/nasm-devel/PLIST +++ b/devel/nasm-devel/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:57 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:14 seb Exp $ bin/nasm bin/ndisasm bin/rdfdump @@ -10,7 +10,7 @@ bin/rdf2ihx bin/rdf2com man/man1/nasm.1 man/man1/ndisasm.1 -@unexec install-info --delete %D/info/nasm.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/nasm.info %D/info/dir info/nasm.info info/nasm.info-1 info/nasm.info-2 @@ -23,7 +23,7 @@ info/nasm.info-8 info/nasm.info-9 info/nasm.info-10 info/nasm.info-11 -@exec install-info %D/info/nasm.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/nasm.info %D/info/dir share/doc/html/nasm/nasmdoc0.html share/doc/html/nasm/nasmdoc1.html share/doc/html/nasm/nasmdoc2.html diff --git a/devel/prc-tools-base/Makefile b/devel/prc-tools-base/Makefile index 6a9e47888cc..be03db071d7 100644 --- a/devel/prc-tools-base/Makefile +++ b/devel/prc-tools-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/06/28 05:53:27 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/02/18 15:14:14 seb Exp $ # .include "../../devel/prc-tools/Makefile.common" @@ -10,5 +10,7 @@ DEPENDS+= prc-tools-gcc>=2.0:../../devel/prc-tools-gcc DEPENDS+= palmos-includes>=3.5.1:../../devel/palmos-includes USE_BUILDLINK_ONLY= YES +TEXINFO_OVERRIDE= YES +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/prc-tools-base/PLIST b/devel/prc-tools-base/PLIST index 2627dc3da7f..096f854c8ba 100644 --- a/devel/prc-tools-base/PLIST +++ b/devel/prc-tools-base/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:25:58 zuntum Exp $ -@unexec install-info --delete %D/info/prc-tools.info %D/info/dir +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:15 seb Exp $ +@unexec ${INSTALL_INFO} --delete %D/info/prc-tools.info %D/info/dir info/prc-tools.info -@exec install-info %D/info/prc-tools.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/prc-tools.info %D/info/dir m68k-palmos/include/ctype.h m68k-palmos/include/errno.h m68k-palmos/include/malloc.h diff --git a/devel/prcs/Makefile b/devel/prcs/Makefile index bd082a6288e..c7deb55d07e 100644 --- a/devel/prcs/Makefile +++ b/devel/prcs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/02/14 01:20:19 hubertf Exp $ +# $NetBSD: Makefile,v 1.20 2002/02/18 15:14:15 seb Exp $ # FreeBSD Id: Makefile,v 1.9 1997/10/13 05:11:40 jmacd Exp # @@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \ NetBSD-*-sparc NetBSD-*-vax SunOS-*-* GNU_CONFIGURE= yes -USE_GTEXINFO= yes CONFIGURE_ENV+= lispdir=${PREFIX}/share/examples/prcs +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/prcs/PLIST b/devel/prcs/PLIST index 3dda123c1ff..0279c74cf7c 100644 --- a/devel/prcs/PLIST +++ b/devel/prcs/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:26:02 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:15 seb Exp $ bin/prcs bin/prcs-callback -@unexec install-info --delete --info-dir=%D/info %D/info/prcs.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/prcs.info info/prcs.info -@exec install-info --info-dir=%D/info %D/info/prcs.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/prcs.info info/prcs.info-1 info/prcs.info-2 info/prcs.info-3 diff --git a/devel/readline/Makefile b/devel/readline/Makefile index d4a2e8a09cd..891b723b9ae 100644 --- a/devel/readline/Makefile +++ b/devel/readline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/08/06 14:20:46 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2002/02/18 15:14:15 seb Exp $ # DISTNAME= readline-4.2 @@ -31,4 +31,5 @@ post-patch: ${RM} $${file}.fixme; \ done +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/readline/PLIST b/devel/readline/PLIST index 8841d120962..85b27b0ca37 100644 --- a/devel/readline/PLIST +++ b/devel/readline/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:26:11 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:15 seb Exp $ include/readline/chardefs.h include/readline/history.h include/readline/keymaps.h @@ -7,13 +7,13 @@ include/readline/rlconf.h include/readline/rlstdc.h include/readline/rltypedefs.h include/readline/tilde.h -@unexec install-info --delete %D/info/history.info %D/info/dir -@unexec install-info --delete %D/info/readline.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/history.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/readline.info %D/info/dir info/history.info info/readline.info info/rluserman.info -@exec install-info %D/info/history.info %D/info/dir -@exec install-info %D/info/readline.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/history.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/readline.info %D/info/dir lib/libhistory.a lib/libhistory.la lib/libhistory.so diff --git a/devel/rx/Makefile b/devel/rx/Makefile index 3aa56369580..aa58ed069a7 100644 --- a/devel/rx/Makefile +++ b/devel/rx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/06/29 23:02:11 zuntum Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:15 seb Exp $ DISTNAME= rx-1.5 CATEGORIES= devel @@ -25,4 +25,5 @@ MAKE_ENV+= RX_MAJOR="${RX_MAJOR}" RX_MINOR="${RX_MINOR}" post-install: cd ${WRKSRC}/doc; ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/rx/PLIST b/devel/rx/PLIST index dbbcb864b34..c90e072c04a 100644 --- a/devel/rx/PLIST +++ b/devel/rx/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:26:40 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:15 seb Exp $ include/rxposix.h -@unexec install-info --delete %D/info/rx.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/rx.info %D/info/dir info/rx.info -@exec install-info %D/info/rx.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/rx.info %D/info/dir lib/librx.a lib/librx.la lib/librx.so diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile index fc81894efe6..36ad2a8fe0b 100644 --- a/devel/semantic/Makefile +++ b/devel/semantic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/09/27 23:17:58 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:15 seb Exp $ # DISTNAME= semantic-1.4beta5 @@ -48,4 +48,5 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${INFO_FILES} ${OTHER_INFO} \ ${PREFIX}/info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/semantic/PLIST b/devel/semantic/PLIST index 71145147f52..34e8c67dd16 100644 --- a/devel/semantic/PLIST +++ b/devel/semantic/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:26:43 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:15 seb Exp $ ${LISPDIR}/semantic.el ${LISPDIR}/semantic.elc ${LISPDIR}/semantic-util.el @@ -40,9 +40,9 @@ ${LISPDIR}/make.bnf ${LISPDIR}/java.bnf ${LISPDIR}/scheme.bnf ${LISPDIR}/semantic-load.el -@unexec install-info --delete %D/info/semantic.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/semantic.info %D/info/dir info/semantic.info info/semantic.info-1 info/semantic.info-2 -@exec install-info %D/info/semantic.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/semantic.info %D/info/dir @dirrm ${LISPDIR} diff --git a/devel/semantic/distinfo b/devel/semantic/distinfo index a1195a7e09d..7599c4f3e35 100644 --- a/devel/semantic/distinfo +++ b/devel/semantic/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/07/10 21:54:39 cjones Exp $ +$NetBSD: distinfo,v 1.3 2002/02/18 15:14:16 seb Exp $ SHA1 (semantic-1.4beta5.tar.gz) = 10e6e41a13c79cb1e84aae99b072557d63e3f105 Size (semantic-1.4beta5.tar.gz) = 177179 bytes +SHA1 (patch-aa) = 281922cbbbd09783ad581acfb59244a2ec5abbe8 diff --git a/devel/semantic/patches/patch-aa b/devel/semantic/patches/patch-aa new file mode 100644 index 00000000000..ceb731ac703 --- /dev/null +++ b/devel/semantic/patches/patch-aa @@ -0,0 +1,12 @@ +$NetBSD: patch-aa,v 1.1 2002/02/18 15:14:16 seb Exp $ + +--- Makefile.orig Wed May 16 13:40:27 2001 ++++ Makefile +@@ -21,7 +21,6 @@ + LOADPATH= + misc_AUX=INSTALL NEWS + info_TEXINFOS=semantic.texi +-MAKEINFO=makeinfo + aux_AUX=c.bnf make.bnf java.bnf scheme.bnf + VERSION=1.4beta5 + DISTDIR=semantic-$(VERSION) diff --git a/devel/slib/Makefile b/devel/slib/Makefile index d5d10528067..2438939c37a 100644 --- a/devel/slib/Makefile +++ b/devel/slib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/03 09:08:38 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:16 seb Exp $ DISTNAME= slib2d2 # @@ -30,4 +30,5 @@ do-install: cd ${WRKSRC}; ${INSTALL_DATA} README FAQ ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/slib.info ${PREFIX}/info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/slib/PLIST b/devel/slib/PLIST index 6d280f65d7d..8cf031b7ec0 100644 --- a/devel/slib/PLIST +++ b/devel/slib/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:26:50 zuntum Exp $ -@unexec install-info --delete %D/info/slib.info %D/info/dir +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:16 seb Exp $ +@unexec ${INSTALL_INFO} --delete %D/info/slib.info %D/info/dir info/slib.info -@exec install-info %D/info/slib.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/slib.info %D/info/dir share/doc/slib/FAQ share/doc/slib/README share/slib/Bev2slib.scm diff --git a/devel/sml-mode/Makefile b/devel/sml-mode/Makefile index fe67edf4811..6ef7c8bf4d4 100644 --- a/devel/sml-mode/Makefile +++ b/devel/sml-mode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/04/16 15:32:27 jtb Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:16 seb Exp $ DISTNAME= sml-mode-3.9.5 CATEGORIES= devel editors @@ -19,4 +19,5 @@ do-install: ChangeLog ${PREFIX}/share/emacs/site-lisp/sml-mode ${INSTALL_DATA} ${WRKSRC}/sml-mode.info ${PREFIX}/info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/sml-mode/PLIST b/devel/sml-mode/PLIST index e341a537f7c..3331014d0d5 100644 --- a/devel/sml-mode/PLIST +++ b/devel/sml-mode/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:26:51 zuntum Exp $ -@unexec install-info --delete --info-dir=%D/info %D/info/sml-mode.info +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:16 seb Exp $ +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/sml-mode.info info/sml-mode.info -@exec install-info --info-dir=%D/info %D/info/sml-mode.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/sml-mode.info share/emacs/site-lisp/sml-mode/sml-compat.el share/emacs/site-lisp/sml-mode/sml-defs.el share/emacs/site-lisp/sml-mode/sml-mode-startup.el diff --git a/devel/xdelta/Makefile b/devel/xdelta/Makefile index 84354b7069c..b68cf58f0b5 100644 --- a/devel/xdelta/Makefile +++ b/devel/xdelta/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/08/01 17:28:26 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2002/02/18 15:14:16 seb Exp $ # DISTNAME= xdelta-1.1.1 @@ -16,4 +16,5 @@ GNU_CONFIGURE= yes .include "../../devel/glib/buildlink.mk" .include "../../devel/zlib/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/xdelta/PLIST b/devel/xdelta/PLIST index c294ef0f482..89216393d40 100644 --- a/devel/xdelta/PLIST +++ b/devel/xdelta/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:27:18 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:17 seb Exp $ bin/edsio-comp bin/xdelta bin/xdelta-config @@ -6,9 +6,9 @@ include/edsio.h include/edsio_edsio.h include/xdelta.h include/xd_edsio.h -@unexec install-info --delete %D/info/xdelta.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/xdelta.info %D/info/dir info/xdelta.info -@exec install-info %D/info/xdelta.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/xdelta.info %D/info/dir lib/libedsio.so.0.0 lib/libedsio.so.0 lib/libedsio.so diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index b84bbd64332..d9a1ab9f6e6 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2001/10/06 22:04:22 hubertf Exp $ +# $NetBSD: Makefile,v 1.45 2002/02/18 15:14:17 seb Exp $ # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp DISTNAME= emacs-20.7 @@ -47,4 +47,5 @@ pre-install: post-install: ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/emacs/PLIST b/editors/emacs/PLIST index 20766c6de0a..6891e8f6819 100644 --- a/editors/emacs/PLIST +++ b/editors/emacs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:36 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:17 seb Exp $ bin/emacs bin/emacs-${PKGVERSION} bin/emacs-b2m @@ -6,33 +6,33 @@ bin/emacs-ctags bin/emacs-etags bin/emacs-rcs-checkin bin/emacsclient -@unexec install-info --delete %D/info/ccmode %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/ccmode %D/info/dir info/ccmode -@exec install-info %D/info/ccmode %D/info/dir +@exec ${INSTALL_INFO} %D/info/ccmode %D/info/dir info/ccmode-1 info/ccmode-2 info/ccmode-3 -@unexec install-info --delete %D/info/cl %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/cl %D/info/dir info/cl -@exec install-info %D/info/cl %D/info/dir +@exec ${INSTALL_INFO} %D/info/cl %D/info/dir info/cl-1 info/cl-2 info/cl-3 info/cl-4 info/cl-5 info/cl-6 -@unexec install-info --delete %D/info/dired-x %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/dired-x %D/info/dir info/dired-x -@exec install-info %D/info/dired-x %D/info/dir -@unexec install-info --delete %D/info/ediff %D/info/dir +@exec ${INSTALL_INFO} %D/info/dired-x %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/ediff %D/info/dir info/ediff -@exec install-info %D/info/ediff %D/info/dir +@exec ${INSTALL_INFO} %D/info/ediff %D/info/dir info/ediff-1 info/ediff-2 info/ediff-3 -@unexec install-info --delete %D/info/emacs %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/emacs %D/info/dir info/emacs -@exec install-info %D/info/emacs %D/info/dir +@exec ${INSTALL_INFO} %D/info/emacs %D/info/dir info/emacs-1 info/emacs-10 info/emacs-11 @@ -65,12 +65,12 @@ info/emacs-6 info/emacs-7 info/emacs-8 info/emacs-9 -@unexec install-info --delete %D/info/forms %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/forms %D/info/dir info/forms -@exec install-info %D/info/forms %D/info/dir -@unexec install-info --delete %D/info/gnus %D/info/dir +@exec ${INSTALL_INFO} %D/info/forms %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gnus %D/info/dir info/gnus -@exec install-info %D/info/gnus %D/info/dir +@exec ${INSTALL_INFO} %D/info/gnus %D/info/dir info/gnus-1 info/gnus-10 info/gnus-11 @@ -87,44 +87,44 @@ info/gnus-6 info/gnus-7 info/gnus-8 info/gnus-9 -@unexec install-info --delete %D/info/message %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/message %D/info/dir info/message -@exec install-info %D/info/message %D/info/dir -@unexec install-info --delete %D/info/mh-e %D/info/dir +@exec ${INSTALL_INFO} %D/info/message %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/mh-e %D/info/dir info/mh-e -@exec install-info %D/info/mh-e %D/info/dir +@exec ${INSTALL_INFO} %D/info/mh-e %D/info/dir info/mh-e-1 info/mh-e-2 info/mh-e-3 info/mh-e-4 -@unexec install-info --delete %D/info/reftex %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/reftex %D/info/dir info/reftex -@exec install-info %D/info/reftex %D/info/dir +@exec ${INSTALL_INFO} %D/info/reftex %D/info/dir info/reftex-1 info/reftex-2 info/reftex-3 -@unexec install-info --delete %D/info/sc %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/sc %D/info/dir info/sc -@exec install-info %D/info/sc %D/info/dir +@exec ${INSTALL_INFO} %D/info/sc %D/info/dir info/sc-1 info/sc-2 info/sc-3 -@unexec install-info --delete %D/info/vip %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/vip %D/info/dir info/vip -@exec install-info %D/info/vip %D/info/dir +@exec ${INSTALL_INFO} %D/info/vip %D/info/dir info/vip-1 info/vip-2 -@unexec install-info --delete %D/info/viper %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/viper %D/info/dir info/viper -@exec install-info %D/info/viper %D/info/dir +@exec ${INSTALL_INFO} %D/info/viper %D/info/dir info/viper-1 info/viper-2 info/viper-3 info/viper-4 info/viper-5 -@unexec install-info --delete %D/info/widget %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/widget %D/info/dir info/widget -@exec install-info %D/info/widget %D/info/dir +@exec ${INSTALL_INFO} %D/info/widget %D/info/dir libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/cvtmail libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/digest-doc libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/emacsserver diff --git a/editors/mule/Makefile b/editors/mule/Makefile index fc34c595cb7..21dc0c5cd6f 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/01/08 09:36:51 agc Exp $ +# $NetBSD: Makefile,v 1.8 2002/02/18 15:14:17 seb Exp $ DISTNAME= mule-2.3 CATEGORIES= editors @@ -22,7 +22,6 @@ DEPENDS+= Canna-lib-3.5b2:../../japanese/canna-lib WRKSRC= ${WRKDIR}/mule GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GTEXINFO= yes CONFIGURE_ARGS+= ${MACHINE_ARCH}--netbsd --with-x --with-x-toolkit=lucid CONFIGURE_ARGS+= --terminal-face --mcpath @@ -40,6 +39,8 @@ CONFIGURE_ARGS+= --canna --canna-includes=${LOCALBASE}/include --canna-libraries INFO_FILES= antenews-jp canna-jp cl dired-x egg-jp emacs forms gnus mule \ mule-jp sc vip +TEXINFO_OVERRIDE= YES +TEXINFO_PATTERNS+= Makefile MAN1= coco.1 ctags.1 etags.1 m2ps.1 mule.1 @@ -48,4 +49,5 @@ post-patch: @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/info.patch @${RM} -f ${WRKSRC}/info/*.orig +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/mule/PLIST b/editors/mule/PLIST index b3782182ef9..0b6a95c4911 100644 --- a/editors/mule/PLIST +++ b/editors/mule/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:36 skrll Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/02/18 15:14:17 seb Exp $ bin/any2ps bin/b2m bin/coco @@ -10,28 +10,28 @@ bin/mule-19.28 @exec ln %D/%F %B/mule @unexec ${RM} %B/mule bin/rcs-checkin -@comment @unexec install-info --delete %D/info/CCL %D/info/dir -@comment @unexec install-info --delete %D/info/ISO2022 %D/info/dir -@comment @unexec install-info --delete %D/info/R2L %D/info/dir -@comment @unexec install-info --delete %D/info/XFONT %D/info/dir -@unexec install-info --delete %D/info/antenews-jp %D/info/dir -@unexec install-info --delete %D/info/canna-jp %D/info/dir -@unexec install-info --delete %D/info/cl %D/info/dir -@unexec install-info --delete %D/info/dired-x %D/info/dir -@comment @unexec install-info --delete %D/info/egg %D/info/dir -@unexec install-info --delete %D/info/egg-jp %D/info/dir -@unexec install-info --delete %D/info/emacs %D/info/dir -@unexec install-info --delete %D/info/forms %D/info/dir -@unexec install-info --delete %D/info/gnus %D/info/dir -@comment @unexec install-info --delete %D/info/kbd-trans %D/info/dir -@comment @unexec install-info --delete %D/info/languages %D/info/dir -@comment @unexec install-info --delete %D/info/m2ps %D/info/dir -@unexec install-info --delete %D/info/mule %D/info/dir -@unexec install-info --delete %D/info/mule-jp %D/info/dir -@comment @unexec install-info --delete %D/info/quail %D/info/dir -@unexec install-info --delete %D/info/sc %D/info/dir -@comment @unexec install-info --delete %D/info/terminology %D/info/dir -@unexec install-info --delete %D/info/vip %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/CCL %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/ISO2022 %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/R2L %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/XFONT %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/antenews-jp %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/canna-jp %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/cl %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/dired-x %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/egg %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/egg-jp %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/emacs %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/forms %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gnus %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/kbd-trans %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/languages %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/m2ps %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/mule %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/mule-jp %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/quail %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/sc %D/info/dir +@comment @unexec ${INSTALL_INFO} --delete %D/info/terminology %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/vip %D/info/dir info/CCL info/ISO2022 info/R2L @@ -97,28 +97,28 @@ info/terminology info/vip info/vip-1 info/vip-2 -@comment @exec install-info %D/info/CCL %D/info/dir -@comment @exec install-info %D/info/ISO2022 %D/info/dir -@comment @exec install-info %D/info/R2L %D/info/dir -@comment @exec install-info %D/info/XFONT %D/info/dir -@exec install-info %D/info/antenews-jp %D/info/dir -@exec install-info %D/info/canna-jp %D/info/dir -@exec install-info %D/info/cl %D/info/dir -@exec install-info %D/info/dired-x %D/info/dir -@comment @exec install-info %D/info/egg %D/info/dir -@exec install-info %D/info/egg-jp %D/info/dir -@exec install-info %D/info/emacs %D/info/dir -@exec install-info %D/info/forms %D/info/dir -@exec install-info %D/info/gnus %D/info/dir -@comment @exec install-info %D/info/kbd-trans %D/info/dir -@comment @exec install-info %D/info/languages %D/info/dir -@comment @exec install-info %D/info/m2ps %D/info/dir -@exec install-info %D/info/mule %D/info/dir -@exec install-info %D/info/mule-jp %D/info/dir -@comment @exec install-info %D/info/quail %D/info/dir -@exec install-info %D/info/sc %D/info/dir -@comment @exec install-info %D/info/terminology %D/info/dir -@exec install-info %D/info/vip %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/CCL %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/ISO2022 %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/R2L %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/XFONT %D/info/dir +@exec ${INSTALL_INFO} %D/info/antenews-jp %D/info/dir +@exec ${INSTALL_INFO} %D/info/canna-jp %D/info/dir +@exec ${INSTALL_INFO} %D/info/cl %D/info/dir +@exec ${INSTALL_INFO} %D/info/dired-x %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/egg %D/info/dir +@exec ${INSTALL_INFO} %D/info/egg-jp %D/info/dir +@exec ${INSTALL_INFO} %D/info/emacs %D/info/dir +@exec ${INSTALL_INFO} %D/info/forms %D/info/dir +@exec ${INSTALL_INFO} %D/info/gnus %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/kbd-trans %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/languages %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/m2ps %D/info/dir +@exec ${INSTALL_INFO} %D/info/mule %D/info/dir +@exec ${INSTALL_INFO} %D/info/mule-jp %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/quail %D/info/dir +@exec ${INSTALL_INFO} %D/info/sc %D/info/dir +@comment @exec ${INSTALL_INFO} %D/info/terminology %D/info/dir +@exec ${INSTALL_INFO} %D/info/vip %D/info/dir man/man1/coco.1 man/man1/ctags.1 man/man1/etags.1 diff --git a/editors/nano/Makefile b/editors/nano/Makefile index 47367685979..7c2b6b4d49b 100644 --- a/editors/nano/Makefile +++ b/editors/nano/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/01/26 07:16:59 martti Exp $ +# $NetBSD: Makefile,v 1.8 2002/02/18 15:14:17 seb Exp $ DISTNAME= nano-1.0.8 CATEGORIES= editors @@ -13,4 +13,5 @@ USE_BUILDLINK_ONLY= yes .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/ncurses/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/nano/PLIST b/editors/nano/PLIST index 5ee11a028b7..3925ad15722 100644 --- a/editors/nano/PLIST +++ b/editors/nano/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.3 2002/01/26 07:16:59 martti Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/02/18 15:14:17 seb Exp $ bin/nano -@unexec install-info --delete --info-dir=%D/info %D/info/nano.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/nano.info info/nano.info -@exec install-info --info-dir=%D/info %D/info/nano.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/nano.info man/man1/nano.1 share/locale/ca/LC_MESSAGES/nano.mo share/locale/cs/LC_MESSAGES/nano.mo diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile index 3b195cc6a79..7f83732aa68 100644 --- a/editors/speedbar/Makefile +++ b/editors/speedbar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:01 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/02/18 15:14:17 seb Exp $ # DISTNAME= speedbar-0.13a @@ -42,4 +42,5 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} ${IMAGES} ${PREFIX}/${LISPDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/speedbar/PLIST b/editors/speedbar/PLIST index c68e756ba4e..e64aec70ea3 100644 --- a/editors/speedbar/PLIST +++ b/editors/speedbar/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:36 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:18 seb Exp $ ${LISPDIR}/dframe.el ${LISPDIR}/dframe.elc ${LISPDIR}/sb-dir-minus.xpm @@ -17,7 +17,8 @@ ${LISPDIR}/sb-tag-v.xpm ${LISPDIR}/sb-tag.xpm ${LISPDIR}/speedbar.el ${LISPDIR}/speedbar.elc -@unexec install-info --delete %D/info/speedbar.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/speedbar.info %D/info/dir info/speedbar.info +@exec ${INSTALL_INFO} %D/info/speedbar.info %D/info/dir @exec install-info %D/info/speedbar.info %D/info/dir @unexec ${RMDIR} %D/${LISPDIR} 2>/dev/null || true diff --git a/editors/speedbar/distinfo b/editors/speedbar/distinfo index f8e56b47a75..85279ed0b31 100644 --- a/editors/speedbar/distinfo +++ b/editors/speedbar/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/06/08 20:50:11 cjones Exp $ +$NetBSD: distinfo,v 1.2 2002/02/18 15:14:18 seb Exp $ SHA1 (speedbar-0.13a.tar.gz) = 10adb4af2bef3cd1bd301103f79143fa0b21b231 Size (speedbar-0.13a.tar.gz) = 79535 bytes +SHA1 (patch-aa) = 70473a7400582616e70be72215cf50e1fbb7722b diff --git a/editors/speedbar/patches/patch-aa b/editors/speedbar/patches/patch-aa new file mode 100644 index 00000000000..f4c7a20d2d3 --- /dev/null +++ b/editors/speedbar/patches/patch-aa @@ -0,0 +1,21 @@ +$NetBSD: patch-aa,v 1.1 2002/02/18 15:14:18 seb Exp $ + +--- Makefile.orig Mon Oct 9 06:21:34 2000 ++++ Makefile +@@ -11,7 +11,6 @@ + speedbar_LISP=dframe.el speedbar.el + EMACS=emacs + info_TEXINFOS=speedbar.texi +-MAKEINFO=makeinfo + opt_LISP=rpm.el sb-gud.el sb-info.el sb-rmail.el sb-w3.el sb-texinfo.el bigclock.el + aux_AUX=INSTALL + images_MISC=sb-dir-plus.xpm sb-dir-minus.xpm sb-dir.xpm sb-pg-plus.xpm sb-pg-minus.xpm sb-pg.xpm sb-mail.xpm sb-tag-plus.xpm sb-tag-minus.xpm sb-tag.xpm sb-tag-gt.xpm sb-tag-v.xpm sb-tag-type.xpm sb-image.el +@@ -35,7 +34,7 @@ + $(EMACS) -batch -l $@-compile-script -f batch-byte-compile $^ + + speedbar.info: $(info_TEXINFOS) +- makeinfo -o $@ $< ++ $(MAKEINFO) -o $@ $< + + opt: $(opt_LISP) + @echo "(add-to-list 'load-path nil)" > $@-compile-script diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index b5c46aed211..44d115c8e3e 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/10/24 22:10:54 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2002/02/18 15:14:18 seb Exp $ # DISTNAME= vice-1.7 @@ -25,7 +25,6 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} GNU_CONFIGURE= YES BUILD_USES_MSGFMT= YES -USE_GTEXINFO= YES USE_BUILDLINK_ONLY= YES # These changes are rather common, so sed instead of patch: @@ -70,6 +69,7 @@ post-install: #.include "../../graphics/png/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../mk/x11.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" # This is the emulator's recommended setting. We place it last so that it diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST index 691ea2f1223..35dbae18708 100644 --- a/emulators/vice/PLIST +++ b/emulators/vice/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:04 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:18 seb Exp $ bin/c1541 bin/petcat bin/vsid @@ -16,9 +16,9 @@ include/resid/siddefs.h include/resid/spline.h include/resid/voice.h include/resid/wave.h -@unexec install-info --delete --info-dir=%D/info %D/info/vice.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/vice.info info/vice.info -@exec install-info --info-dir=%D/info %D/info/vice.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/vice.info info/vice.info-1 info/vice.info-2 info/vice.info-3 diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index f38c3b82ffe..64934633eac 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/02/01 02:48:05 mjl Exp $ +# $NetBSD: Makefile,v 1.21 2002/02/18 15:14:18 seb Exp $ DISTNAME= gnucash-1.6.5 CATEGORIES= finance @@ -55,4 +55,5 @@ post-extract: .endif .include "../../lang/python/pyversion.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/finance/gnucash/PLIST b/finance/gnucash/PLIST index 67d2587172b..ee58993fdf6 100644 --- a/finance/gnucash/PLIST +++ b/finance/gnucash/PLIST @@ -1,16 +1,16 @@ -@comment $NetBSD: PLIST,v 1.2 2001/12/17 22:29:04 mjl Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:18 seb Exp $ bin/gnc-prices bin/gnucash bin/gnucash-make-guids bin/update-finance-quote etc/gnucash/config -@unexec install-info --delete --info-dir=%D/info %D/info/gnucash-design.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gnucash-design.info info/gnucash-design.info info/gnucash-design.info-1 info/gnucash-design.info-2 info/gnucash-design.info-3 info/gnucash-design.info-4 -@exec install-info --info-dir=%D/info %D/info/gnucash-design.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gnucash-design.info lib/libgncengine.a lib/libgncengine.la lib/libgncengine.so.2.3 diff --git a/games/gnugo/Makefile b/games/gnugo/Makefile index 557be2e2618..88d45cef08c 100644 --- a/games/gnugo/Makefile +++ b/games/gnugo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/16 15:10:51 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:19 seb Exp $ DISTNAME= gnugo-2.6 CATEGORIES= games @@ -10,6 +10,6 @@ COMMENT= Go playing program GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GTEXINFO= yes +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/gnugo/PLIST b/games/gnugo/PLIST index e33d0837f5d..35726d3a58d 100644 --- a/games/gnugo/PLIST +++ b/games/gnugo/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:53:05 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:19 seb Exp $ bin/gnugo -@unexec install-info --delete %D/info/gnugo.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gnugo.info %D/info/dir info/gnugo.info info/gnugo.info-1 info/gnugo.info-2 info/gnugo.info-3 info/gnugo.info-4 info/gnugo.info-5 -@exec install-info %D/info/gnugo.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gnugo.info %D/info/dir man/man6/gnugo.6 diff --git a/games/xboard/Makefile b/games/xboard/Makefile index d8b045423cc..7fbde314028 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/11/29 13:27:46 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2002/02/18 15:14:19 seb Exp $ DISTNAME= xboard-4.2.3 CATEGORIES= games @@ -25,4 +25,5 @@ CONFIGURE_ARGS+= --with-Xaw3d .include "../../graphics/xpm/buildlink.mk" .include "../../mk/xaw.buildlink.mk" .include "../../mk/x11.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xboard/PLIST b/games/xboard/PLIST index 00f6a8a5ee5..bfabae33fdd 100644 --- a/games/xboard/PLIST +++ b/games/xboard/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:56:17 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:19 seb Exp $ bin/cmail bin/pxboard bin/xboard bin/zic2xpm -@unexec install-info --delete %D/info/xboard.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/xboard.info %D/info/dir info/xboard.info -@exec install-info %D/info/xboard.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/xboard.info %D/info/dir man/man6/cmail.6 man/man6/xboard.6 man/man6/zic2xpm.6 diff --git a/games/xboard/distinfo b/games/xboard/distinfo index 6821d538d45..40aef292e9d 100644 --- a/games/xboard/distinfo +++ b/games/xboard/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 02:08:37 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/02/18 15:14:19 seb Exp $ SHA1 (xboard-4.2.3.tar.gz) = 772c5108af79b54a94b12945426486f0e7700230 Size (xboard-4.2.3.tar.gz) = 1100059 bytes -SHA1 (patch-aa) = fb4fd5f625c071524fb750ca9ef11a8fbe9caf67 +SHA1 (patch-aa) = 02f5315dd2e817340e3caee2832c012d42601fb8 diff --git a/games/xboard/patches/patch-aa b/games/xboard/patches/patch-aa index 2d903abf8f8..b29b0a49f98 100644 --- a/games/xboard/patches/patch-aa +++ b/games/xboard/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2001/02/07 06:11:24 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2002/02/18 15:14:19 seb Exp $ ---- Makefile.in.orig Sat Dec 16 21:24:38 2000 +--- Makefile.in.orig Tue Feb 20 05:02:22 2001 +++ Makefile.in -@@ -63,14 +63,14 @@ +@@ -63,16 +63,15 @@ install: installdirs xboard zic2xpm cmail pxboard xboard.man cmail.man \ zic2xpm.man @@ -14,6 +14,8 @@ $NetBSD: patch-aa,v 1.5 2001/02/07 06:11:24 jlam Exp $ - $(INSTALL_DATA) $(srcdir)/cmail.man $(man6dir)/cmail$(man6ext) - $(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext) - $(INSTALL_DATA) xboard.info $(infodir)/xboard.info +- -PATH=$$PATH:/sbin:/usr/sbin install-info \ +- $(infodir)/xboard.info $(infodir)/dir + $(BSD_INSTALL_PROGRAM) xboard $(bindir)/xboard + $(BSD_INSTALL_PROGRAM) zic2xpm $(bindir)/zic2xpm + $(BSD_INSTALL_SCRIPT) cmail $(bindir)/cmail @@ -22,6 +24,7 @@ $NetBSD: patch-aa,v 1.5 2001/02/07 06:11:24 jlam Exp $ + $(BSD_INSTALL_MAN) $(srcdir)/cmail.man $(man6dir)/cmail$(man6ext) + $(BSD_INSTALL_MAN) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext) + $(BSD_INSTALL_DATA) xboard.info $(infodir)/xboard.info - -PATH=$$PATH:/sbin:/usr/sbin install-info \ - $(infodir)/xboard.info $(infodir)/dir ++ $(INSTALL_INFO) $(infodir)/xboard.info $(infodir)/dir + installdirs: mkinstalldirs + $(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir) diff --git a/games/xconq/Makefile b/games/xconq/Makefile index d59e0d229d4..f58ee0203cd 100644 --- a/games/xconq/Makefile +++ b/games/xconq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/10/24 22:10:58 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2002/02/18 15:14:19 seb Exp $ DISTNAME= xconq-7.4.1 CATEGORIES= games x11 @@ -19,6 +19,7 @@ CONFIGURE_ARGS+= --with-tkconfig="${BUILDLINK_DIR}/lib" MAKE_ENV+= LOCALBASE="${LOCALBASE}" INFO_FILES= hacking.info xcdesign.info xconq.info +TEXINFO_OVERRIDE= YES post-build: cd ${WRKSRC}/doc && ${MAKE_PROGRAM} info @@ -28,4 +29,5 @@ post-install: .include "../../x11/tk/buildlink.mk" .include "../../mk/x11.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xconq/PLIST b/games/xconq/PLIST index b854a0b708e..6af5b1cb96b 100644 --- a/games/xconq/PLIST +++ b/games/xconq/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:56:30 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:19 seb Exp $ bin/imf2x bin/x2imf bin/xconq bin/ximfapp -@unexec install-info --delete %D/info/hacking.info %D/info/dir -@unexec install-info --delete %D/info/xcdesign.info %D/info/dir -@unexec install-info --delete %D/info/xconq.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/hacking.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/xcdesign.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/xconq.info %D/info/dir info/hacking.info info/xcdesign.info info/xcdesign.info-1 @@ -28,9 +28,9 @@ info/xconq.info-3 info/xconq.info-4 info/xconq.info-5 info/xconq.info-6 -@exec install-info %D/info/hacking.info %D/info/dir -@exec install-info %D/info/xcdesign.info %D/info/dir -@exec install-info %D/info/xconq.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/hacking.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/xcdesign.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/xconq.info %D/info/dir man/man6/xconq.6 share/xconq/images/advt24x26.gif share/xconq/images/advt32x32.gif diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile index ea42a4e8c3a..7d16ecc56bd 100644 --- a/graphics/aalib/Makefile +++ b/graphics/aalib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/01/30 11:56:08 agc Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:20 seb Exp $ # DISTNAME= aalib-1.4rc4 @@ -20,4 +20,5 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CONFIGURE_ARGS+= --with-x11-driver=no +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/aalib/PLIST b/graphics/aalib/PLIST index 7fca8f83d46..81be1c8c263 100644 --- a/graphics/aalib/PLIST +++ b/graphics/aalib/PLIST @@ -1,16 +1,16 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:14 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:20 seb Exp $ bin/aafire bin/aainfo bin/aalib-config bin/aasavefont bin/aatest include/aalib.h -@unexec install-info --delete --info-dir=%D/info %D/info/aalib.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/aalib.info info/aalib.info info/aalib.info-1 info/aalib.info-2 info/aalib.info-3 -@exec install-info --info-dir=%D/info %D/info/aalib.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/aalib.info lib/libaa.a lib/libaa.la lib/libaa.so diff --git a/graphics/barcode/Makefile b/graphics/barcode/Makefile index b58225e966b..ee5f60d5492 100644 --- a/graphics/barcode/Makefile +++ b/graphics/barcode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/07/12 21:32:53 dillo Exp $ +# $NetBSD: Makefile,v 1.2 2002/02/18 15:14:20 seb Exp $ # DISTNAME= barcode-0.96 @@ -14,4 +14,5 @@ MAKE_ENV+= AWK="${AWK}" INFO_FILES= barcode.info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/barcode/PLIST b/graphics/barcode/PLIST index 1faa51c60f7..4524240fa9b 100644 --- a/graphics/barcode/PLIST +++ b/graphics/barcode/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:19 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:20 seb Exp $ bin/barcode include/barcode.h -@unexec install-info --delete %D/info/barcode.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/barcode.info %D/info/dir info/barcode.info -@exec install-info %D/info/barcode.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/barcode.info %D/info/dir lib/libbarcode.a man/man1/barcode.1 man/man3/barcode.3 diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile index a9c1cb86c55..6afe1b8fd87 100644 --- a/graphics/geomview/Makefile +++ b/graphics/geomview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/10/24 22:11:00 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2002/02/18 15:14:20 seb Exp $ DISTNAME= geomview-1.8.1 CATEGORIES= graphics math @@ -43,4 +43,5 @@ post-install: .include "../../graphics/Mesa/buildlink.mk" .include "../../mk/motif.buildlink.mk" .include "../../mk/x11.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/geomview/PLIST b/graphics/geomview/PLIST index ffcf9a8c16e..5031f949f46 100644 --- a/graphics/geomview/PLIST +++ b/graphics/geomview/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:52 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:20 seb Exp $ bin/.geomview-animate bin/.geomview-drawbdy bin/animate @@ -18,7 +18,7 @@ bin/polymerge bin/togeomview bin/ucdtooff bin/vrml2oogl -@unexec install-info --delete --info-dir=%D/info %D/info/geomview +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/geomview info/geomview info/geomview-1 info/geomview-2 @@ -27,7 +27,7 @@ info/geomview-4 info/geomview-5 info/geomview-6 info/geomview-7 -@exec install-info --info-dir=%D/info %D/info/geomview +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/geomview man/man1/anytooff.1 man/man1/anytoucd.1 man/man1/bdy.1 diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile index 12bb96c75b1..8fb8f6dde19 100644 --- a/graphics/hp2xx/Makefile +++ b/graphics/hp2xx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/09/27 23:18:12 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2002/02/18 15:14:20 seb Exp $ # DISTNAME= hp2xx-3.4.0 @@ -20,4 +20,5 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/sources post-extract: ${CP} ${WRKSRC}/../makes/generic.mak ${WRKSRC}/Makefile +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/hp2xx/PLIST b/graphics/hp2xx/PLIST index 9a05b74b840..4423e144fea 100644 --- a/graphics/hp2xx/PLIST +++ b/graphics/hp2xx/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:51:29 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:20 seb Exp $ bin/hp2xx man/man1/hp2xx.1 -@unexec install-info --delete %D/info/hp2xx.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/hp2xx.info %D/info/dir info/hp2xx.info -@exec install-info %D/info/hp2xx.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/hp2xx.info %D/info/dir diff --git a/graphics/hp2xx/distinfo b/graphics/hp2xx/distinfo index 6330c60f07d..f16c4f7c6c0 100644 --- a/graphics/hp2xx/distinfo +++ b/graphics/hp2xx/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2001/04/23 19:25:46 dmcmahill Exp $ +$NetBSD: distinfo,v 1.4 2002/02/18 15:14:20 seb Exp $ SHA1 (hp2xx-3.4.0.tar.gz) = b8b80ae2f558017046d1b0f43e3c4d7de565065c Size (hp2xx-3.4.0.tar.gz) = 301139 bytes SHA1 (patch-aa) = 80c8e2505556d493ffc6a741ac13bfd0abfe165b -SHA1 (patch-ab) = 574ab1554935f51f2f9dd217552c65a523e76980 +SHA1 (patch-ab) = 6bf8fa3b72cf24803060dabb41e26b103a62545a SHA1 (patch-ac) = 41901116cab61281160e892edb998d73fb2c9bcc SHA1 (patch-ad) = 2ef9c938ef802f139998cafd9cfa4d9f3be29c8d SHA1 (patch-ae) = ae68f08e8ad907f043a344f3172ba4f104223f6d diff --git a/graphics/hp2xx/patches/patch-ab b/graphics/hp2xx/patches/patch-ab index 93d065e2bbf..4db7686c0cb 100644 --- a/graphics/hp2xx/patches/patch-ab +++ b/graphics/hp2xx/patches/patch-ab @@ -1,15 +1,25 @@ -$NetBSD: patch-ab,v 1.5 2000/08/31 12:37:02 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.6 2002/02/18 15:14:21 seb Exp $ ---- Makefile.orig Thu Aug 31 08:09:46 2000 -+++ Makefile Thu Aug 31 08:10:24 2000 -@@ -35,5 +35,5 @@ +--- Makefile.orig Fri Feb 15 14:23:08 2002 ++++ Makefile +@@ -28,13 +28,13 @@ + + CHMOD = chmod + CP = cp +-MKINFO = makeinfo ++MKINFO = $(MAKEINFO) + RMCMD = rm -f + STRIP = strip + # Installation sites (GNU conventions): # -prefix = /usr/local +prefix = ${PREFIX} bindir = $(prefix)/bin includedir = $(prefix)/include -@@ -45,10 +45,10 @@ + mandir = $(prefix)/man +@@ -44,12 +44,12 @@ + # CC and CFLAGS set for gcc, but any ANSI-C compiler should work. # For non-gcc compilers, simply set CFLAGS = -O (to start with) # -CC = gcc @@ -25,14 +35,18 @@ $NetBSD: patch-ab,v 1.5 2000/08/31 12:37:02 dmcmahill Exp $ +BINDCMD = echo # only needed for EMX and DJGPP DOS extenders -@@ -63,5 +63,5 @@ + +@@ -62,7 +62,7 @@ + # DEFINES = -DUNIX -DHAS_UNIX_X11 PREVIEWER = to_x11 -ALL_LIBS = -lX11 -lm # Maybe -lX instead of -lX11 is needed? +ALL_LIBS = -lX11 -lm -lz -lpng -ltiff -ljpeg # # Generic UNIX, no previewer -@@ -183,12 +183,12 @@ + # +@@ -182,14 +182,14 @@ + EX_DEFS = # # PNG support (requires -lpng and -lz on the ALL_LIBS line) -#EX_SRC = png.c to_png.c @@ -51,7 +65,9 @@ $NetBSD: patch-ab,v 1.5 2000/08/31 12:37:02 dmcmahill Exp $ +EX_DEFS+= -DTIF # # Include extras: -@@ -304,14 +304,10 @@ + # EX_SRC = to_pic.c to_pac.c +@@ -305,15 +305,11 @@ + install: install-bin install-info install-man install-bin: $(PROGRAM) - -$(STRIP) $(PROGRAM) diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile index 9e631132998..946451e7f82 100644 --- a/graphics/plotutils/Makefile +++ b/graphics/plotutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/06/11 06:34:38 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2002/02/18 15:14:21 seb Exp $ # DISTNAME= plotutils-2.4.1 @@ -20,6 +20,5 @@ USE_LIBTOOL= yes USE_X11BASE= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig ${WRKSRC}/libxmi/ltconfig -INFO_FILES= plotutils.info - +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/plotutils/PLIST b/graphics/plotutils/PLIST index 9f5d85c3cbf..a220c47de8c 100644 --- a/graphics/plotutils/PLIST +++ b/graphics/plotutils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:09 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:21 seb Exp $ bin/double bin/graph bin/ode @@ -67,9 +67,9 @@ share/tek2plot/scale.tek share/tek2plot/skymap.tek share/tek2plot/skymap2.tek share/tek2plot/usmap.tek -@unexec install-info --delete %D/info/plotutils.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/plotutils.info %D/info/dir info/plotutils.info -@exec install-info %D/info/plotutils.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/plotutils.info %D/info/dir @dirrm share/libplot @dirrm share/ode @dirrm share/pic2plot diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile index 6f811e259c1..bf5290d96e4 100644 --- a/graphics/plplot/Makefile +++ b/graphics/plplot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/10/21 01:45:08 fredb Exp $ +# $NetBSD: Makefile,v 1.22 2002/02/18 15:14:21 seb Exp $ DISTNAME= plplot-5.0.4 CATEGORIES= graphics @@ -73,4 +73,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/plplotdoc-html-0.4.1/*.html \ ${PREFIX}/share/doc/html/plplot +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/plplot/PLIST b/graphics/plplot/PLIST index 1932df1726e..36632cf917c 100644 --- a/graphics/plplot/PLIST +++ b/graphics/plplot/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:12 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:21 seb Exp $ bin/plplot-config bin/plrender bin/plserver @@ -19,7 +19,7 @@ include/plplot/pltcl.h include/plplot/pltk.h include/plplot/plxwd.h include/plplot/tclMatrix.h -@unexec install-info --delete --info-dir=%D/info %D/info/plplotdoc.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/plplotdoc.info info/plplotdoc.info info/plplotdoc.info-1 info/plplotdoc.info-2 @@ -29,7 +29,7 @@ info/plplotdoc.info-5 info/plplotdoc.info-6 info/plplotdoc.info-7 info/plplotdoc.info-8 -@exec install-info --info-dir=%D/info %D/info/plplotdoc.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/plplotdoc.info lib/libplcxxd.a lib/libplplotd.a lib/libtclmatrixd.a diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile index 200a89e30db..e6863ef4b5d 100644 --- a/graphics/xzgv/Makefile +++ b/graphics/xzgv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/10/24 22:11:03 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/02/18 15:14:21 seb Exp $ DISTNAME= xzgv-0.7 CATEGORIES= graphics @@ -18,10 +18,11 @@ USE_GMAKE= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/xzgv ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/xzgv.1 ${PREFIX}/man/man1 - @(cd ${WRKSRC}/doc && makeinfo xzgv.texi) + @(cd ${WRKSRC}/doc && ${MAKEINFO} xzgv.texi) @for f in xzgv xzgv-1 xzgv-2 xzgv-3 ; do \ ${INSTALL_DATA} ${WRKSRC}/doc/$$f ${PREFIX}/info ; done .include "../../graphics/imlib/buildlink.mk" .include "../../mk/x11.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xzgv/PLIST b/graphics/xzgv/PLIST index 2db129df9a9..8142bed587e 100644 --- a/graphics/xzgv/PLIST +++ b/graphics/xzgv/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:51 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:21 seb Exp $ bin/xzgv -@unexec install-info --delete --info-dir=%D/info %D/info/xzgv +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/xzgv info/xzgv info/xzgv-1 info/xzgv-2 info/xzgv-3 -@exec install-info --info-dir=%D/info %D/info/xzgv +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/xzgv man/man1/xzgv.1 diff --git a/ham/tnt/Makefile b/ham/tnt/Makefile index fb1a41e17ae..daba4c53433 100644 --- a/ham/tnt/Makefile +++ b/ham/tnt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/05/16 22:07:02 jtb Exp $ +# $NetBSD: Makefile,v 1.9 2002/02/18 15:14:21 seb Exp $ # DISTNAME= tnt-1.9.1 @@ -17,4 +17,5 @@ GNU_CONFIGURE= yes INFO_FILES= tntdoc.info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/ham/tnt/PLIST b/ham/tnt/PLIST index 80a6191a9ad..8d2e2d15cd6 100644 --- a/ham/tnt/PLIST +++ b/ham/tnt/PLIST @@ -1,14 +1,14 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:39:51 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:22 seb Exp $ bin/tnt bin/tntc include/tntrun.h -@unexec install-info --delete --info-dir=%D/info %D/info/tntdoc.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/tntdoc.info info/tntdoc.info info/tntdoc.info-1 info/tntdoc.info-2 info/tntdoc.info-3 info/tntdoc.info-4 -@exec install-info --info-dir=%D/info %D/info/tntdoc.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/tntdoc.info libexec/tnt/help libexec/tnt/info libexec/tnt/logcall diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile index 89a710cd7b4..3cccd7699ed 100644 --- a/japanese/gawk/Makefile +++ b/japanese/gawk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/16 15:25:16 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:22 seb Exp $ # FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $ DISTNAME= gawk-3.0.4 @@ -23,4 +23,5 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/OREADME.MB ${PREFIX}/share/doc/ja-gawk @${INSTALL_DATA} ${WRKSRC}/README.MB ${PREFIX}/share/doc/ja-gawk +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/japanese/gawk/PLIST b/japanese/gawk/PLIST index 810d2614272..f3539edfd07 100644 --- a/japanese/gawk/PLIST +++ b/japanese/gawk/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:08 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:22 seb Exp $ bin/jgawk bin/jigawk -@unexec install-info --delete %D/info/gawk.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gawk.info %D/info/dir info/gawk.info -@exec install-info %D/info/gawk.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gawk.info %D/info/dir libexec/awk/grcat libexec/awk/pwcat man/man1/jgawk.1 diff --git a/japanese/ipadic/Makefile b/japanese/ipadic/Makefile index 67443dc54d6..97a1c5ecd70 100644 --- a/japanese/ipadic/Makefile +++ b/japanese/ipadic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/02/09 07:36:58 taca Exp $ +# $NetBSD: Makefile,v 1.13 2002/02/18 15:14:22 seb Exp $ # DISTNAME= ipadic-2.4.4 @@ -21,4 +21,5 @@ post-install: .include "../chasen/Makefile.common" .include "../../mk/bsd.pkg.install.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/japanese/ipadic/PLIST b/japanese/ipadic/PLIST index d4d08886b14..79e165fa362 100644 --- a/japanese/ipadic/PLIST +++ b/japanese/ipadic/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/09 07:36:58 taca Exp $ -@unexec install-info --delete --info-dir=%D/info %D/info/ipadic-ja.info +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:23 seb Exp $ +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ipadic-ja.info info/ipadic-ja.info info/ipadic-ja.info-1 info/ipadic-ja.info-2 info/ipadic-ja.info-3 -@exec install-info --info-dir=%D/info %D/info/ipadic-ja.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ipadic-ja.info share/chasen/dic/ipadic/cforms.cha share/chasen/dic/ipadic/chadic.ary share/chasen/dic/ipadic/chadic.int diff --git a/japanese/sed/Makefile b/japanese/sed/Makefile index 1ec866c9aff..41939330fc6 100644 --- a/japanese/sed/Makefile +++ b/japanese/sed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 15:25:28 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:23 seb Exp $ # FreeBSD Id: Makefile,v 1.7 1999/01/27 07:41:18 fenner Exp $ DISTNAME= sed-3.02 @@ -15,6 +15,7 @@ HOMEPAGE= http://www.gnu.org/software/sed/sed.html COMMENT= GNU sed + multi-byte extension INFO_FILES= sed.info +TEXINFO_OVERRIDE= YES USE_GMAKE= yes GNU_CONFIGURE= yes @@ -25,4 +26,5 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/OREADME.MB ${PREFIX}/share/doc/ja-sed @${INSTALL_DATA} ${WRKSRC}/README.MB ${PREFIX}/share/doc/ja-sed +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/japanese/sed/PLIST b/japanese/sed/PLIST index 1801311428f..fe6073a7d36 100644 --- a/japanese/sed/PLIST +++ b/japanese/sed/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:34 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:23 seb Exp $ bin/jsed -@unexec install-info --delete %D/info/sed.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/sed.info %D/info/dir info/sed.info -@exec install-info %D/info/sed.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/sed.info %D/info/dir man/man1/jsed.1 share/doc/ja-sed/OREADME.MB share/doc/ja-sed/README.MB diff --git a/lang/a60/Makefile b/lang/a60/Makefile index f3d0c566351..602884a3087 100644 --- a/lang/a60/Makefile +++ b/lang/a60/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:39 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:23 seb Exp $ DISTNAME= a60-0.20a CATEGORIES= lang @@ -27,4 +27,5 @@ do-install: cd ${WRKSRC} && ${INSTALL_DATA} a60.ps RRA60.ps \ ${PREFIX}/share/doc/a60/ +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/a60/PLIST b/lang/a60/PLIST index 66a3633b32f..a246c8bafb5 100644 --- a/lang/a60/PLIST +++ b/lang/a60/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:22:45 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:23 seb Exp $ bin/a60 -@unexec install-info --delete %D/info/RRA60.info %D/info/dir -@unexec install-info --delete %D/info/a60.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/RRA60.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/a60.info %D/info/dir info/RRA60.info info/a60.info -@exec install-info %D/info/RRA60.info %D/info/dir -@exec install-info %D/info/a60.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/RRA60.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/a60.info %D/info/dir man/man1/a60.1 share/a60/a60-mkc.inc share/doc/a60/a60.ps diff --git a/lang/cim/Makefile b/lang/cim/Makefile index 3fdf93e7808..11e360f9953 100644 --- a/lang/cim/Makefile +++ b/lang/cim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/11/30 05:45:17 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2002/02/18 15:14:23 seb Exp $ DISTNAME= cim-3.30 CATEGORIES= lang @@ -24,4 +24,5 @@ SLDFLAGS= ${LDFLAGS:S/${BUILDLINK_DIR}/${LOCALBASE}/g} MAKE_ENV+= AM_MAKEFLAGS='SCFLAGS="${SCFLAGS}" SLDFLAGS="${SLDFLAGS}"' .include "../../lang/perl5/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/cim/PLIST b/lang/cim/PLIST index 8179dacd78d..b9b3674e5ed 100644 --- a/lang/cim/PLIST +++ b/lang/cim/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:22:53 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:23 seb Exp $ bin/cim bin/cim2latex bin/cim2ps bin/cimindent include/cim.h -@unexec install-info --delete --info-dir=%D/info %D/info/cim.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cim.info info/cim.info -@exec install-info --info-dir=%D/info %D/info/cim.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cim.info lib/libcim-atr.a lib/libcim.a lib/libcim.la diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile index 9aa13fb7609..f8c1467fb92 100644 --- a/lang/egcs/Makefile +++ b/lang/egcs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:04 agc Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:23 seb Exp $ # DISTNAME= egcs-1.1.2 @@ -21,4 +21,5 @@ ALL_TARGET= bootstrap INFO_FILES= cpp.info g77.info gcc.info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/egcs/PLIST b/lang/egcs/PLIST index 8c2fe120077..f983e01d975 100644 --- a/lang/egcs/PLIST +++ b/lang/egcs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:02 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:23 seb Exp $ bin/c++ bin/g++ bin/gcc @@ -145,9 +145,9 @@ include/g++/tempbuf.h include/g++/tree.h include/g++/type_traits.h include/g++/vector.h -@unexec install-info --delete %D/info/g77.info %D/info/dir -@unexec install-info --delete %D/info/gcc.info %D/info/dir -@unexec install-info --delete %D/info/cpp.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/g77.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gcc.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/cpp.info %D/info/dir info/g77.info info/g77.info-1 info/g77.info-10 @@ -203,9 +203,9 @@ info/gcc.info-6 info/gcc.info-7 info/gcc.info-8 info/gcc.info-9 -@exec install-info %D/info/g77.info %D/info/dir -@exec install-info %D/info/gcc.info %D/info/dir -@exec install-info %D/info/cpp.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/g77.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gcc.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/cpp.info %D/info/dir lib/gcc-lib/${MACHINE_GNU_PLATFORM}/egcs-2.91.66/include/math.h lib/gcc-lib/${MACHINE_GNU_PLATFORM}/egcs-2.91.66/include/curses.h lib/gcc-lib/${MACHINE_GNU_PLATFORM}/egcs-2.91.66/include/assert.h diff --git a/lang/eieio/Makefile b/lang/eieio/Makefile index d117894e148..29d94d54d42 100644 --- a/lang/eieio/Makefile +++ b/lang/eieio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:16 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:24 seb Exp $ # DISTNAME= eieio-0.16 @@ -38,4 +38,5 @@ do-install: ${PREFIX}/${LISPDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/eieio/PLIST b/lang/eieio/PLIST index 41fece602f9..3fa5d01b2a0 100644 --- a/lang/eieio/PLIST +++ b/lang/eieio/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:46 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:24 seb Exp $ ${LISPDIR}/eieio.el ${LISPDIR}/eieio.elc ${LISPDIR}/eieio-comp.el @@ -13,7 +13,7 @@ ${LISPDIR}/eieio-base.el ${LISPDIR}/eieio-base.elc ${LISPDIR}/compare-strings.el ${LISPDIR}/compare-strings.elc -@unexec install-info --delete %D/info/eieio.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/eieio.info %D/info/dir info/eieio.info -@exec install-info %D/info/eieio.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/eieio.info %D/info/dir @unexec ${RMDIR} %D/${LISPDIR} 2>/dev/null || true diff --git a/lang/eieio/distinfo b/lang/eieio/distinfo index 2d13da41576..3ce63fc4fc9 100644 --- a/lang/eieio/distinfo +++ b/lang/eieio/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/06/08 20:22:00 cjones Exp $ +$NetBSD: distinfo,v 1.2 2002/02/18 15:14:24 seb Exp $ SHA1 (eieio-0.16.tar.gz) = efad4e46a8c699241eb9e1e09796f7ac86430e9e Size (eieio-0.16.tar.gz) = 77843 bytes +SHA1 (patch-aa) = fa4f0bd7cb20224997d08d15d4051514c862299d diff --git a/lang/eieio/patches/patch-aa b/lang/eieio/patches/patch-aa new file mode 100644 index 00000000000..c488acc545f --- /dev/null +++ b/lang/eieio/patches/patch-aa @@ -0,0 +1,21 @@ +$NetBSD: patch-aa,v 1.1 2002/02/18 15:14:24 seb Exp $ + +--- Makefile.orig Mon Feb 19 18:43:10 2001 ++++ Makefile +@@ -12,7 +12,6 @@ + EMACS=emacs + examples_LISP=tree.el call-tree.el chart.el eieio-speedbar.el + eieio_info_TEXINFOS=eieio.texi +-MAKEINFO=makeinfo + test_LISP=eieio-tests.el + Misc_MISC=INSTALL + VERSION=0.16 +@@ -43,7 +42,7 @@ + $(EMACS) -batch -l $@-compile-script -f batch-byte-compile $^ + + eieio.info: $(eieio_info_TEXINFOS) +- makeinfo -o $@ $< ++ $(MAKEINFO) -o $@ $< + + test: $(test_LISP) + @echo "(add-to-list 'load-path nil)" > $@-compile-script diff --git a/lang/elisp-manual/Makefile b/lang/elisp-manual/Makefile index a8aa01cc454..8d0e4fbcb61 100644 --- a/lang/elisp-manual/Makefile +++ b/lang/elisp-manual/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:04 agc Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:24 seb Exp $ DISTNAME= elisp-manual-20-2.5 CATEGORIES= lang @@ -9,9 +9,10 @@ HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html COMMENT= The Emacs Lisp Reference Manual for GNU Emacs Version 20.3 GNU_CONFIGURE= yes +TEXINFO_OVERRIDE= YES ALL_TARGET= elisp -USE_GTEXINFO= yes +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/elisp-manual/PLIST b/lang/elisp-manual/PLIST index dbdf3e8ad6f..18bac6054bd 100644 --- a/lang/elisp-manual/PLIST +++ b/lang/elisp-manual/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:06 zuntum Exp $ -@unexec install-info --delete %D/info/elisp %D/info/dir +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:24 seb Exp $ +@unexec ${INSTALL_INFO} --delete %D/info/elisp %D/info/dir info/elisp info/elisp-1 info/elisp-2 @@ -44,4 +44,4 @@ info/elisp-40 info/elisp-41 info/elisp-42 info/elisp-43 -@exec install-info %D/info/elisp %D/info/dir +@exec ${INSTALL_INFO} %D/info/elisp %D/info/dir diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile index 844593518cf..3c740f4ff4e 100644 --- a/lang/gawk/Makefile +++ b/lang/gawk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:06 agc Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:24 seb Exp $ # FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $ DISTNAME= gawk-3.0.4 @@ -15,4 +15,5 @@ INFO_FILES= gawk.info GNU_CONFIGURE= yes +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST index ee6bc7dfe45..528b32cc779 100644 --- a/lang/gawk/PLIST +++ b/lang/gawk/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:14 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:24 seb Exp $ bin/gawk bin/igawk -@unexec install-info --delete %D/info/gawk.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gawk.info %D/info/dir info/gawk.info -@exec install-info %D/info/gawk.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gawk.info %D/info/dir libexec/awk/grcat libexec/awk/pwcat man/man1/gawk.1 diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 4c803d220fc..2a50b6b3f6d 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2002/02/16 14:46:20 kent Exp $ +# $NetBSD: Makefile,v 1.35 2002/02/18 15:14:25 seb Exp $ # Make sure that the version number in "Makefile.gcc" matches this. DISTNAME= gcc-2.95.3 @@ -97,6 +97,7 @@ post-install: -${RMDIR} ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/v7 .endif +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" # Make bootstrap with compiler != gcc possible. diff --git a/lang/gcc/PLIST b/lang/gcc/PLIST index 40bea101474..5c4c14890c1 100644 --- a/lang/gcc/PLIST +++ b/lang/gcc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/01/03 21:32:38 tron Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/02/18 15:14:25 seb Exp $ etc/gcc-2.95.3.mk ${PKGNAME}/bin/c++ ${PKGNAME}/bin/c++filt @@ -207,17 +207,17 @@ ${PKGNAME}/man/man1/cccp.1 ${PKGNAME}/man/man1/g++.1 ${PKGNAME}/man/man1/g77.1 ${PKGNAME}/man/man1/gcc.1 -@unexec install-info --delete %D/info/chill.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/chill.info %D/info/dir info/chill.info -@unexec install-info --delete %D/info/cpp.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/cpp.info %D/info/dir info/cpp.info -@exec install-info %D/info/cpp.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/cpp.info %D/info/dir info/cpp.info-1 info/cpp.info-2 info/cpp.info-3 -@unexec install-info --delete %D/info/g77.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/g77.info %D/info/dir info/g77.info -@exec install-info %D/info/g77.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/g77.info %D/info/dir info/g77.info-1 info/g77.info-10 info/g77.info-11 @@ -239,9 +239,9 @@ info/g77.info-6 info/g77.info-7 info/g77.info-8 info/g77.info-9 -@unexec install-info --delete %D/info/gcc.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gcc.info %D/info/dir info/gcc.info -@exec install-info %D/info/gcc.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gcc.info %D/info/dir info/gcc.info-1 info/gcc.info-10 info/gcc.info-11 diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile index 62e61e2dfd5..e3367e9fc6b 100644 --- a/lang/gforth/Makefile +++ b/lang/gforth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/25 04:17:55 hubertf Exp $ +# $NetBSD: Makefile,v 1.10 2002/02/18 15:14:25 seb Exp $ DISTNAME= gforth-0.5.0 CATEGORIES= lang @@ -28,4 +28,5 @@ post-build: pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/gforth/PLIST b/lang/gforth/PLIST index 9f600245e0b..2880d294093 100644 --- a/lang/gforth/PLIST +++ b/lang/gforth/PLIST @@ -1,13 +1,13 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:24 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:25 seb Exp $ bin/${PKGNAME} bin/gforth bin/gforth-fast bin/gforth-fast-0.5.0 bin/gforthmi bin/gforthmi-0.5.0 -@unexec install-info --delete --info-dir=%D/info %D/info/gforth.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gforth.info info/gforth.info -@exec install-info --info-dir=%D/info %D/info/gforth.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gforth.info info/gforth.info-1 info/gforth.info-10 info/gforth.info-11 diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 6a111b5b07e..f11651d23c8 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2001/06/21 02:36:01 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2002/02/18 15:14:25 seb Exp $ # FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp # @@ -21,4 +21,5 @@ USE_GNU_READLINE= # defined INFO_FILES= data-rep.info .include "../../devel/readline/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/guile/PLIST b/lang/guile/PLIST index ab56df6d8e2..8d0e9c69780 100644 --- a/lang/guile/PLIST +++ b/lang/guile/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:46 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:25 seb Exp $ bin/guile bin/guile-config bin/guile-doc-snarf @@ -92,9 +92,9 @@ include/libguile/vectors.h include/libguile/version.h include/libguile/vports.h include/libguile/weaks.h -@unexec install-info --delete %D/info/data-rep.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/data-rep.info %D/info/dir info/data-rep.info -@exec install-info %D/info/data-rep.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/data-rep.info %D/info/dir lib/libguile.a lib/libguile.la lib/libguile.so diff --git a/lang/inform/Makefile b/lang/inform/Makefile index 70c5f7cbb83..7a61d96408d 100644 --- a/lang/inform/Makefile +++ b/lang/inform/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/06/22 03:41:49 nathanw Exp $ +# $NetBSD: Makefile,v 1.2 2002/02/18 15:14:25 seb Exp $ DISTNAME= inform-6.21.2 CATEGORIES= lang @@ -12,4 +12,7 @@ LICENSE= no-profit GNU_CONFIGURE= yes +INFO_FILES= inform + +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/inform/PLIST b/lang/inform/PLIST index 984316174bd..a3a3291d27f 100644 --- a/lang/inform/PLIST +++ b/lang/inform/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:39 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:25 seb Exp $ bin/inform bin/inform-6.21 -@unexec install-info --delete %D/info/inform %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/inform %D/info/dir info/inform info/inform-1 info/inform-2 @@ -17,7 +17,7 @@ info/inform-11 info/inform-12 info/inform-13 info/inform-14 -@exec install-info %D/info/inform %D/info/dir +@exec ${INSTALL_INFO} %D/info/inform %D/info/dir share/inform/6.21/module/parserm.m5 share/inform/6.21/module/verblibm.m5 share/inform/6.21/module/english.h diff --git a/lang/japhar/Makefile b/lang/japhar/Makefile index bc69078e8a0..f19bba40d38 100644 --- a/lang/japhar/Makefile +++ b/lang/japhar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/17 09:07:14 agc Exp $ +# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:26 seb Exp $ # DISTNAME= japhar-0.08 @@ -21,4 +21,5 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig ${WRKSRC}/lib/libffi/ltconfig # The japhar tar archive uses ././@LongLink GNU tar hacks .undef EXTRACT_USING_PAX +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/japhar/PLIST b/lang/japhar/PLIST index 507234dc304..55d14f4cb8e 100644 --- a/lang/japhar/PLIST +++ b/lang/japhar/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:42 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:26 seb Exp $ lib/libarch.a lib/libarch.la lib/libarch.so @@ -144,8 +144,8 @@ include/japhar/jvmdiint.h include/fficonfig.h include/ffi.h include/ffi_mips.h -@unexec install-info --delete %D/info/japhar.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/japhar.info %D/info/dir info/japhar.info -@exec install-info %D/info/japhar.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/japhar.info %D/info/dir @dirrm include/japhar/private @dirrm include/japhar diff --git a/lang/librep/Makefile b/lang/librep/Makefile index 01ba9b049f6..8b4c3c1fa5c 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/10/23 03:37:44 mycroft Exp $ +# $NetBSD: Makefile,v 1.19 2002/02/18 15:14:26 seb Exp $ # DISTNAME= librep-${REP_VERS} @@ -22,6 +22,8 @@ GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-readline CONFIGURE_ARGS+= --with-gmp CONFIGURE_ARGS+= --enable-static +TEXINFO_OVERRIDE= YES +TEXINFO_PATTERNS+= Makedefs.in PLIST_SUBST+= REP_VERS=${REP_VERS} @@ -29,4 +31,5 @@ PLIST_SUBST+= REP_VERS=${REP_VERS} .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/gmp/buildlink.mk" .include "../../devel/readline/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/librep/PLIST b/lang/librep/PLIST index 2d9d95bda28..7c5a7b129b8 100644 --- a/lang/librep/PLIST +++ b/lang/librep/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:24:01 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:26 seb Exp $ bin/rep bin/rep-config bin/rep-remote @@ -8,7 +8,7 @@ include/rep.h include/rep_lisp.h include/rep_regexp.h include/rep_subrs.h -@unexec install-info --delete --info-dir=%D/info %D/info/librep.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/librep.info info/librep.info info/librep.info-1 info/librep.info-2 @@ -19,7 +19,7 @@ info/librep.info-6 info/librep.info-7 info/librep.info-8 info/librep.info-9 -@exec install-info --info-dir=%D/info %D/info/librep.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/librep.info lib/librep.a lib/librep.la lib/librep.so diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile index 14bf7a03a1d..5922b4e7833 100644 --- a/lang/mercury/Makefile +++ b/lang/mercury/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/11/14 14:47:55 agc Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:26 seb Exp $ DISTNAME= mercury-compiler-0.10.1 PKGNAME= mercury-0.10.1 @@ -35,4 +35,5 @@ post-install: ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/samples cd ${WRKSRC}/samples && ${PAX} -rw . ${PREFIX}/share/examples/mercury +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/mercury/PLIST b/lang/mercury/PLIST index 8aa16406156..f0ce13be152 100644 --- a/lang/mercury/PLIST +++ b/lang/mercury/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:24:11 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:26 seb Exp $ bin/c2init bin/canonical_grade bin/info_to_mdb @@ -17,7 +17,7 @@ bin/mprof_merge_runs bin/mtags bin/sicstus_conv bin/vpath_find -@unexec install-info --delete --info-dir=%D/info %D/info/mercury.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/mercury.info info/mercury.info info/mercury_faq.info info/mercury_library.info @@ -46,7 +46,7 @@ info/mercury_user_guide.info-1 info/mercury_user_guide.info-2 info/mercury_user_guide.info-3 info/mercury_user_guide.info-4 -@exec install-info --info-dir=%D/info %D/info/mercury.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/mercury.info lib/mercury/bin/${MACHINE_ARCH}--${LOWER_OPSYS}/mercury_compile lib/mercury/bin/${MACHINE_ARCH}--${LOWER_OPSYS}/mercury_profile lib/mercury/inc/gc.h diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile index 4e089a3557b..677a267daec 100644 --- a/lang/pgcc/Makefile +++ b/lang/pgcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/01/10 14:07:07 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2002/02/18 15:14:27 seb Exp $ DISTNAME= gcc-2.95.2 PKGNAME= pgcc-2.95.2.1 @@ -101,6 +101,7 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/etc/${PKGNAME}.mk .endif +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" # Make bootstrap with compiler != gcc possible. diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index 709008dc2bd..bdacc16a02a 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/01/31 14:08:58 mjl Exp $ +# $NetBSD: Makefile,v 1.9 2002/02/18 15:14:27 seb Exp $ # DISTNAME= smalltalk-1.95.10 @@ -26,4 +26,5 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig .include "../../devel/readline/buildlink.mk" .include "../../lang/tcl/buildlink.mk" .include "../../x11/tk/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/smalltalk/PLIST b/lang/smalltalk/PLIST index 6e319516fd0..2a704b902c9 100644 --- a/lang/smalltalk/PLIST +++ b/lang/smalltalk/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.3 2002/01/31 14:08:58 mjl Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/02/18 15:14:27 seb Exp $ bin/gst bin/gst-config bin/gst-package include/gst.h include/gstpub.h -@unexec install-info --delete --info-dir=%D/info %D/info/gst.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gst.info info/gst.info info/gst.info-1 info/gst.info-10 @@ -26,7 +26,7 @@ info/gst.info-6 info/gst.info-7 info/gst.info-8 info/gst.info-9 -@exec install-info --info-dir=%D/info %D/info/gst.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gst.info lib/libgst.la lib/libgst.a lib/smalltalk/blox-tk-1.95.10.so diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile index 5b62237560d..91d01daab02 100644 --- a/mail/mailcrypt/Makefile +++ b/mail/mailcrypt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/07/23 19:52:29 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:27 seb Exp $ # FreeBSD Id: ports/mail/mailcrypt/Makefile,v 1.7 2000/05/14 05:21:52 billf Exp DISTNAME= mailcrypt-3.5.6 @@ -13,4 +13,5 @@ BUILD_DEPENDS= emacs>=19.34:../../editors/emacs GNU_CONFIGURE= yes +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/mailcrypt/PLIST b/mail/mailcrypt/PLIST index c4feaf6b91e..0eef222c836 100644 --- a/mail/mailcrypt/PLIST +++ b/mail/mailcrypt/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:21 zuntum Exp $ -@unexec install-info --delete %D/info/mailcrypt.info %D/info/dir +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:27 seb Exp $ +@unexec ${INSTALL_INFO} --delete %D/info/mailcrypt.info %D/info/dir info/mailcrypt.info info/mailcrypt.info-1 info/mailcrypt.info-2 -@exec install-info %D/info/mailcrypt.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/mailcrypt.info %D/info/dir share/emacs/site-lisp/expect.el share/emacs/site-lisp/expect.elc share/emacs/site-lisp/mailcrypt.el diff --git a/mail/mew/Makefile b/mail/mew/Makefile index 780ba4bd52c..09897e2bf62 100644 --- a/mail/mew/Makefile +++ b/mail/mew/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2001/12/10 09:45:35 jun Exp $ +# $NetBSD: Makefile,v 1.45 2002/02/18 15:14:28 seb Exp $ DISTNAME= mew-2.1.51 CATEGORIES= mail @@ -33,4 +33,5 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/contrib/$f ${PREFIX}/bin .endfor +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/mew/PLIST b/mail/mew/PLIST index 84070bf1b29..5493cd9ba5e 100644 --- a/mail/mew/PLIST +++ b/mail/mew/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:33 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:28 seb Exp $ bin/incdir bin/incmbox bin/mewcat @@ -6,12 +6,12 @@ bin/mewdecode bin/mewencode bin/mewinc bin/mewls -@unexec install-info --delete --info-dir=%D/info %D/info/mew.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/mew.info info/mew.info info/mew.info-1 info/mew.info-2 info/mew.info-3 -@exec install-info --info-dir=%D/info %D/info/mew.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/mew.info lib/emacs/etc/Mew/Mew.img lib/emacs/etc/Mew/Mew.png lib/emacs/etc/Mew/Mew.xbm diff --git a/mail/vm/Makefile b/mail/vm/Makefile index 75af5e35548..e95eae10827 100644 --- a/mail/vm/Makefile +++ b/mail/vm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/02/07 14:50:19 seb Exp $ +# $NetBSD: Makefile,v 1.12 2002/02/18 15:14:28 seb Exp $ DISTNAME= vm-7.00 CATEGORIES= mail @@ -47,4 +47,5 @@ do-install: cd ${WRKSRC} && ${INSTALL_PROGRAM} qp-decode qp-encode \ base64-decode base64-encode ${BINDIR} +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/vm/PLIST.emacs b/mail/vm/PLIST.emacs index 073c52a1036..aefd396d770 100644 --- a/mail/vm/PLIST.emacs +++ b/mail/vm/PLIST.emacs @@ -1,15 +1,15 @@ -@comment $NetBSD: PLIST.emacs,v 1.3 2002/02/15 10:12:49 skrll Exp $ +@comment $NetBSD: PLIST.emacs,v 1.4 2002/02/18 15:14:28 seb Exp $ bin/base64-decode bin/base64-encode bin/qp-decode bin/qp-encode -@unexec install-info --delete --info-dir=%D/info %D/info/vm.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/vm.info info/vm.info info/vm.info-1 info/vm.info-2 info/vm.info-3 info/vm.info-4 -@exec install-info --info-dir=%D/info %D/info/vm.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/vm.info share/emacs/site-lisp/vm/pixmaps/audio_stamp-colorful.xpm share/emacs/site-lisp/vm/pixmaps/audio_stamp-simple.xpm share/emacs/site-lisp/vm/pixmaps/autofile-dn.xbm diff --git a/mail/vm/distinfo b/mail/vm/distinfo index c29590c33fe..df45c15a502 100644 --- a/mail/vm/distinfo +++ b/mail/vm/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2001/12/11 15:49:26 wiz Exp $ +$NetBSD: distinfo,v 1.6 2002/02/18 15:14:28 seb Exp $ SHA1 (vm-7.00.tar.gz) = 855e7020d9033ecc5a13c9a209b5d58cfa49ebbb Size (vm-7.00.tar.gz) = 361595 bytes -SHA1 (patch-aa) = 91e0d6f87091138d0f0922653706dddfa44c5ba6 +SHA1 (patch-aa) = dfec118e2c67fc90ca9373d9db56cbf91206dbdd diff --git a/mail/vm/patches/patch-aa b/mail/vm/patches/patch-aa index c61f721654a..95eb703661c 100644 --- a/mail/vm/patches/patch-aa +++ b/mail/vm/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2001/01/28 03:16:55 jtb Exp $ +$NetBSD: patch-aa,v 1.4 2002/02/18 15:14:28 seb Exp $ ---- Makefile.orig Fri Dec 15 20:05:39 2000 +--- Makefile.orig Sun Oct 28 02:35:41 2001 +++ Makefile @@ -2,24 +2,24 @@ # prior to 19.14 for XEmacs are unsupported. @@ -33,12 +33,12 @@ $NetBSD: patch-aa,v 1.3 2001/01/28 03:16:55 jtb Exp $ ############## no user servicable parts beyond this point ################### -@@ -131,7 +131,7 @@ +@@ -134,7 +134,7 @@ vm.info: vm.texinfo @echo "making vm.info..." - @$(EMACS) $(BATCHFLAGS) -insert vm.texinfo -l texinfmt -f texinfo-format-buffer -f save-buffer -+ makeinfo vm.texinfo ++ $(MAKEINFO) vm.texinfo vm-autoload.elc: $(SOURCES) @echo scanning sources to build autoload definitions... diff --git a/mail/wl/Makefile b/mail/wl/Makefile index bd38ec44040..ab6382e4d57 100644 --- a/mail/wl/Makefile +++ b/mail/wl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/01/08 11:47:16 jun Exp $ +# $NetBSD: Makefile,v 1.8 2002/02/18 15:14:29 seb Exp $ DISTNAME= wl-2.8.1 CATEGORIES= mail @@ -35,4 +35,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/samples/ja/$f ${EXAMPLESDIR}/ja .endfor +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/calc/Makefile b/math/calc/Makefile index 288e279ee69..91ed583a987 100644 --- a/math/calc/Makefile +++ b/math/calc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/04/14 21:43:50 jtb Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:29 seb Exp $ DISTNAME= calc-2.02f CATEGORIES= math @@ -29,4 +29,5 @@ do-install: ${WRKSRC}/calccard.tex ${PREFIX}/${SITE_LISP}/calc ${INSTALL_DATA} ${WRKSRC}/calc.info* ${PREFIX}/info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/calc/PLIST b/math/calc/PLIST index 10e0dbcc9f3..420a89f6602 100644 --- a/math/calc/PLIST +++ b/math/calc/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:10 zuntum Exp $ -@unexec install-info --delete --info-dir=%D/info %D/info/calc.info +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:29 seb Exp $ +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/calc.info info/calc.info info/calc.info-1 info/calc.info-10 @@ -35,7 +35,7 @@ info/calc.info-6 info/calc.info-7 info/calc.info-8 info/calc.info-9 -@exec install-info --info-dir=%D/info %D/info/calc.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/calc.info ${SITE_LISP}/calc/calc-aent.el ${SITE_LISP}/calc/calc-aent.elc ${SITE_LISP}/calc/calc-alg-2.el diff --git a/math/calc/distinfo b/math/calc/distinfo index 6454274d138..abc9f5d13ad 100644 --- a/math/calc/distinfo +++ b/math/calc/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 08:45:38 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/02/18 15:14:29 seb Exp $ SHA1 (calc-2.02f.tar.gz) = 1a1d54fb90725aacaf1c9308a94be4b813ac4880 Size (calc-2.02f.tar.gz) = 831865 bytes -SHA1 (patch-aa) = 14d11b1b7f8db0a8929a5ac632aa3571bee05652 +SHA1 (patch-aa) = 38688806fb5b62e7ac3ca1783376abfb79fd2bfe SHA1 (patch-ab) = f8634afae8f7236bcf2e4c232e5cd60d5500e0cb diff --git a/math/calc/patches/patch-aa b/math/calc/patches/patch-aa index 4bd04c828a0..b632b4b4d9a 100644 --- a/math/calc/patches/patch-aa +++ b/math/calc/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2000/12/13 23:51:35 jtb Exp $ +$NetBSD: patch-aa,v 1.3 2002/02/18 15:14:29 seb Exp $ ---- Makefile.orig Mon Dec 16 04:50:45 1996 +--- Makefile.orig Mon Dec 16 05:50:45 1996 +++ Makefile -@@ -29,10 +29,10 @@ +@@ -29,10 +29,9 @@ # Programs. @@ -11,11 +11,10 @@ $NetBSD: patch-aa,v 1.2 2000/12/13 23:51:35 jtb Exp $ TEX = tex TEXINDEX = texindex -MAKEINFO = makeinfo -+MAKEINFO = makeinfo --no-validate MAKE = make ECHO = @echo REMOVE = -rm -f -@@ -54,13 +54,10 @@ +@@ -54,13 +53,10 @@ # to make the steps more explicit while the `make' is in progress. all: $(MAKE) compile @@ -29,14 +28,14 @@ $NetBSD: patch-aa,v 1.2 2000/12/13 23:51:35 jtb Exp $ $(MAKE) info $(ECHO) "Calc is now installed." -@@ -83,9 +80,9 @@ +@@ -83,9 +79,9 @@ # Format the Calc manual for the Info system using makeinfo. info: calc.info calc.info: calc.texinfo - -$(MAKEINFO) calc.texinfo - $(ECHO) "Please ignore warnings for Copying, Getting Started, and Interactive Tutorial." - $(MAKE) texinfo -+ $(MAKEINFO) calc.texinfo ++ $(MAKEINFO) --no-validate calc.texinfo +# $(ECHO) "Please ignore warnings for Copying, Getting Started, and Interactive Tutorial." +# $(MAKE) texinfo diff --git a/math/fftw/Makefile b/math/fftw/Makefile index 45dbef6599d..e38b5a62816 100644 --- a/math/fftw/Makefile +++ b/math/fftw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/04/27 22:22:22 jtb Exp $ +# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:29 seb Exp $ DISTNAME= fftw-2.1.3 CATEGORIES= math @@ -16,5 +16,7 @@ CONFIGURE_ARGS+= --enable-i386-hacks USE_FORTRAN= yes USE_GMAKE= yes INFO_FILES= fftw.info +TEXINFO_OVERRIDE= YES +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/fftw/PLIST b/math/fftw/PLIST index cfe17bbf90c..27d89febea3 100644 --- a/math/fftw/PLIST +++ b/math/fftw/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:23 zuntum Exp $ -@unexec install-info --delete %D/info/fftw.info %D/info/dir +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:29 seb Exp $ +@unexec ${INSTALL_INFO} --delete %D/info/fftw.info %D/info/dir info/fftw.info info/fftw.info-1 info/fftw.info-2 info/fftw.info-3 info/fftw.info-4 info/fftw.info-5 -@exec install-info %D/info/fftw.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/fftw.info %D/info/dir include/fftw.h include/rfftw.h lib/libfftw.a diff --git a/math/gsl/Makefile b/math/gsl/Makefile index cf843b3bbdb..0a13a3e1b82 100644 --- a/math/gsl/Makefile +++ b/math/gsl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/11/22 12:58:40 agc Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:30 seb Exp $ # DISTNAME= gsl-1.0 @@ -22,8 +22,8 @@ HOMEPAGE= http://sources.redhat.com/gsl/ COMMENT= The GNU Scientific Library GNU_CONFIGURE= yes -USE_GTEXINFO= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/gsl/PLIST b/math/gsl/PLIST index a06353df86a..864bc956018 100644 --- a/math/gsl/PLIST +++ b/math/gsl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2001/11/22 12:58:40 agc Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:31 seb Exp $ bin/gsl-config bin/gsl-histogram bin/gsl-randist @@ -207,7 +207,7 @@ include/gsl/gsl_vector_uint.h include/gsl/gsl_vector_ulong.h include/gsl/gsl_vector_ushort.h include/gsl/gsl_version.h -@unexec install-info --delete --info-dir=%D/info %D/info/gsl-ref.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gsl-ref.info info/gsl-ref.info info/gsl-ref.info-1 info/gsl-ref.info-10 @@ -231,7 +231,7 @@ info/gsl-ref.info-6 info/gsl-ref.info-7 info/gsl-ref.info-8 info/gsl-ref.info-9 -@exec install-info --info-dir=%D/info %D/info/gsl-ref.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gsl-ref.info lib/libgsl.a lib/libgsl.la lib/libgsl.so diff --git a/math/mcsim/Makefile b/math/mcsim/Makefile index 8b96f2045d1..db62ee7e992 100644 --- a/math/mcsim/Makefile +++ b/math/mcsim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/04/29 01:15:06 jtb Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:31 seb Exp $ DISTNAME= mcsim-4.2.0 CATEGORIES= math @@ -11,7 +11,7 @@ WRKSRC= ${WRKDIR}/mcsim INFO_FILES= mcsim post-build: - cd ${WRKSRC}/doc && makeinfo mcsim.texinfo + cd ${WRKSRC}/doc && ${MAKEINFO} mcsim.texinfo do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mod/mod ${PREFIX}/bin @@ -25,4 +25,5 @@ do-install: cd ${WRKSRC}/doc && ${INSTALL_DATA} mcsim mcsim-1 mcsim-2 \ mcsim-3 ${PREFIX}/info/ +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/mcsim/PLIST b/math/mcsim/PLIST index acac60c767a..e2b31f7650e 100644 --- a/math/mcsim/PLIST +++ b/math/mcsim/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:12 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:31 seb Exp $ bin/mcsim bin/mod -@unexec install-info --delete --info-dir=%D/info %D/info/mcsim +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/mcsim info/mcsim info/mcsim-1 info/mcsim-2 info/mcsim-3 -@exec install-info --info-dir=%D/info %D/info/mcsim +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/mcsim share/doc/html/mcsim/mcsim.html share/doc/mcsim/About-Datasets.txt share/doc/mcsim/About-Doc.txt diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile index fe1cdd3b211..b4fc80b2f9e 100644 --- a/math/octave-current/Makefile +++ b/math/octave-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/01/03 17:09:45 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2002/02/18 15:14:32 seb Exp $ DISTNAME= octave-2.1.33 PKGNAME= octave-2.1.34 @@ -26,7 +26,6 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_FORTRAN= yes USE_GMAKE= yes -USE_GTEXINFO= yes CONFIGURE_ARGS+=--with-g77 CONFIGURE_ARGS+=--enable-shared --enable-rpath CONFIGURE_ARGS+=-prefix=${PREFIX} @@ -60,4 +59,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/$f ${PREFIX}/share/doc/html/octave .endfor +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST index 8675fac865d..41efa1ae971 100644 --- a/math/octave-current/PLIST +++ b/math/octave-current/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/03 17:09:45 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:32 seb Exp $ bin/mkoctfile bin/mkoctfile-2.1.34 bin/octave @@ -272,8 +272,8 @@ include/${PKGNAME}/octave/vx-s-ccv.h include/${PKGNAME}/octave/vx-s-crv.h include/${PKGNAME}/octave/xdiv.h include/${PKGNAME}/octave/xpow.h -@unexec install-info --delete %D/info/liboctave.info %D/info/dir -@unexec install-info --delete %D/info/octave.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/liboctave.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/octave.info %D/info/dir info/liboctave.info info/liboctave.info-1 info/liboctave.info-2 @@ -294,8 +294,8 @@ info/octave.info-6 info/octave.info-7 info/octave.info-8 info/octave.info-9 -@exec install-info %D/info/liboctave.info %D/info/dir -@exec install-info %D/info/octave.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/liboctave.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/octave.info %D/info/dir lib/libcruft.a lib/libcruft.la lib/libcruft.so diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo index e18763fb0dc..4cffa349b8b 100644 --- a/math/octave-current/distinfo +++ b/math/octave-current/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2002/01/03 17:09:46 wiz Exp $ +$NetBSD: distinfo,v 1.10 2002/02/18 15:14:32 seb Exp $ SHA1 (octave-2.1.33.tar.bz2) = 15a07d08647a2c2aeedb31917ac41ed3b7bb4245 Size (octave-2.1.33.tar.bz2) = 3740256 bytes @@ -14,5 +14,9 @@ SHA1 (patch-ag) = c848d3dff78de1975b376b133c514068d956db31 SHA1 (patch-ah) = 5e1b20562559124a33bbdcdff2194805929d06f9 SHA1 (patch-ai) = 248dbc97c2233c47dc532f86b0fb2fd3ebd18068 SHA1 (patch-aj) = 8e2bbe9afde5567540b32fc183f58b87fbf9a547 -SHA1 (patch-ak) = b998dfe27accebec38cffa38555a3e32932c0c07 +SHA1 (patch-ak) = 3de50cdd07f3ceca1aa0cd34442f873f0348122f SHA1 (patch-al) = 7134c3cb12ce4fdd5cbe2a39c586aeac6dab2045 +SHA1 (patch-am) = a5e0b06a9bc1209a4463e7fd8655d1e674476a85 +SHA1 (patch-an) = 47bffab64a8094c7846d22eaa7860e529cb587bc +SHA1 (patch-ao) = 053de6f1f6f1bed959e63752c31ea54ac03985fc +SHA1 (patch-ap) = a7c1ccd8ba7bd51d6cba0a3428ab7c4cc8e0e1f5 diff --git a/math/octave-current/patches/patch-ak b/math/octave-current/patches/patch-ak index a34f35d33fa..096daee62da 100644 --- a/math/octave-current/patches/patch-ak +++ b/math/octave-current/patches/patch-ak @@ -1,7 +1,7 @@ -$NetBSD: patch-ak,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ +$NetBSD: patch-ak,v 1.2 2002/02/18 15:14:32 seb Exp $ ---- kpathsea/Makefile.in.orig Thu Apr 27 10:05:26 2000 -+++ kpathsea/Makefile.in Thu Apr 27 10:08:11 2000 +--- kpathsea/Makefile.in.orig Mon May 4 18:36:19 1998 ++++ kpathsea/Makefile.in @@ -148,6 +148,7 @@ INSTALL_SCRIPT = $(INSTALL_PROGRAM) INSTALL_DATA = @INSTALL_DATA@ @@ -10,7 +10,15 @@ $NetBSD: patch-ak,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $ INSTALL_LIBTOOL_PROG = INSTALL_PROGRAM='$(INSTALL_PROGRAM)' $(LIBTOOL) install-prog # Creating (symbolic) links. -@@ -253,7 +254,7 @@ +@@ -189,7 +190,6 @@ + # End of programs.make. + + # texi.make -- making .dvi and .info from .texi. +-MAKEINFO = makeinfo + MAKEINFO_FLAGS = --paragraph-indent=2 -I$(srcdir) + + TEXI2DVI = texi2dvi +@@ -253,7 +253,7 @@ $(kpathsea): $(objects) klibtool.version $(LIBTOOL) archive $(AR) $(ARFLAGS) $@ $(objects) diff --git a/math/octave-current/patches/patch-am b/math/octave-current/patches/patch-am new file mode 100644 index 00000000000..c99ed5bb867 --- /dev/null +++ b/math/octave-current/patches/patch-am @@ -0,0 +1,12 @@ +$NetBSD: patch-am,v 1.4 2002/02/18 15:14:32 seb Exp $ + +--- readline/doc/Makefile.in.orig Sun Feb 17 16:26:41 2002 ++++ readline/doc/Makefile.in +@@ -41,7 +41,6 @@ + BUILD_DIR = @BUILD_DIR@ + TEXINPUTDIR = $(srcdir) + +-MAKEINFO = LANGUAGE= makeinfo + TEXI2DVI = $(srcdir)/texi2dvi + TEXI2HTML = $(srcdir)/texi2html + QUIETPS = #set this to -q to shut up dvips diff --git a/math/octave-current/patches/patch-an b/math/octave-current/patches/patch-an new file mode 100644 index 00000000000..4966144e7eb --- /dev/null +++ b/math/octave-current/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.1 2002/02/18 15:14:32 seb Exp $ + +--- doc/faq/Makefile.in.orig Sun Feb 17 16:26:40 2002 ++++ doc/faq/Makefile.in +@@ -39,7 +39,7 @@ + .PHONY: all + + Octave-FAQ.info: Octave-FAQ.texi +- -makeinfo -I$(srcdir) $(srcdir)/Octave-FAQ.texi ++ -$(MAKEINFO) -I$(srcdir) $(srcdir)/Octave-FAQ.texi + + Octave-FAQ.dvi: Octave-FAQ.texi + -TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \ diff --git a/math/octave-current/patches/patch-ao b/math/octave-current/patches/patch-ao new file mode 100644 index 00000000000..41695a0ea33 --- /dev/null +++ b/math/octave-current/patches/patch-ao @@ -0,0 +1,30 @@ +$NetBSD: patch-ao,v 1.1 2002/02/18 15:14:32 seb Exp $ + +--- doc/interpreter/Makefile.in.orig Sun Feb 17 16:26:40 2002 ++++ doc/interpreter/Makefile.in +@@ -81,7 +81,7 @@ + @mv $@.t $@ + + octave.info: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi +- -makeinfo -I$(srcdir) -I$(srcdir)/.. $< ++ -$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $< + + octave.dvi: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi + -TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \ +@@ -93,14 +93,14 @@ + + ../../INSTALL.OCTAVE: install.texi + rm -f INSTALL +- -makeinfo -D INSTALLONLY \ ++ -$(MAKEINFO) -D INSTALLONLY \ + --no-validate --no-headers --no-split --output INSTALL \ + -I$(srcdir) -I$(srcdir)/.. $< + mv INSTALL ../../INSTALL.OCTAVE + + ../../BUGS: bugs.texi + rm -f BUGS +- -makeinfo -D BUGSONLY \ ++ -$(MAKEINFO) -D BUGSONLY \ + --no-validate --no-headers --no-split --output BUGS \ + -I$(srcdir) -I$(srcdir)/.. $< + mv BUGS ../../BUGS diff --git a/math/octave-current/patches/patch-ap b/math/octave-current/patches/patch-ap new file mode 100644 index 00000000000..a834440009e --- /dev/null +++ b/math/octave-current/patches/patch-ap @@ -0,0 +1,13 @@ +$NetBSD: patch-ap,v 1.1 2002/02/18 15:14:32 seb Exp $ + +--- doc/liboctave/Makefile.in.orig Sun Feb 17 16:26:40 2002 ++++ doc/liboctave/Makefile.in +@@ -43,7 +43,7 @@ + .PHONY: all + + liboctave.info: $(TEXINFO) ../conf.texi +- -makeinfo -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi ++ -$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi + + liboctave.dvi: $(TEXINFO) ../conf.texi + -TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \ diff --git a/math/octave/Makefile b/math/octave/Makefile index de354406d64..45e0419dccd 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2002/02/17 20:30:39 seb Exp $ +# $NetBSD: Makefile,v 1.29 2002/02/18 15:14:33 seb Exp $ # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp DISTNAME= octave-2.0.16 @@ -60,4 +60,5 @@ post-patch: fi .endif +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/octave/PLIST b/math/octave/PLIST index 88284b1e665..a02cb1d9b01 100644 --- a/math/octave/PLIST +++ b/math/octave/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:51 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:33 seb Exp $ bin/octave bin/octave-bug bin/mkoctfile @@ -209,8 +209,8 @@ include/${PKGNAME}/oct-conf.h include/${PKGNAME}/oct-gperf.h @exec ln -s ${PKGNAME} %D/include/octave @unexec ${RM} -f %D/include/octave -@unexec install-info --delete %D/info/octave.info %D/info/dir -@unexec install-info --delete %D/info/liboctave.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/octave.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/liboctave.info %D/info/dir info/octave.info info/octave.info-1 info/octave.info-10 @@ -228,8 +228,8 @@ info/liboctave.info info/liboctave.info-1 info/liboctave.info-2 info/liboctave.info-3 -@exec install-info %D/info/liboctave.info %D/info/dir -@exec install-info %D/info/octave.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/liboctave.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/octave.info %D/info/dir lib/${PKGNAME}/libcruft.a lib/${PKGNAME}/liboctave.a lib/${PKGNAME}/liboctinterp.a diff --git a/math/octave/distinfo b/math/octave/distinfo index 9ae503dc154..bd075e4a3c7 100644 --- a/math/octave/distinfo +++ b/math/octave/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 03:03:24 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3 2002/02/18 15:14:33 seb Exp $ SHA1 (octave-2.0.16.tar.gz) = 50db40d260e5294520af67d03c2933567cec31e0 Size (octave-2.0.16.tar.gz) = 3840681 bytes @@ -8,3 +8,6 @@ SHA1 (patch-ae) = 385d3b34764c245530378a04c42735b597c881e4 SHA1 (patch-af) = 8e1f3e3b4f18eeaa77c60ab887d9898b8e5936cc SHA1 (patch-ag) = c31a22e4feb22b2ee10301556bf2d497e5c1c895 SHA1 (patch-ah) = faf342ddb0eeb91927dc119670e2124a214e5346 +SHA1 (patch-ai) = 033c68b15de66e5b7c26d579d39ab20bad57a1e1 +SHA1 (patch-aj) = ce0e8b477c45ef93959bb264dfc85357b34ed454 +SHA1 (patch-ak) = acf783819036e5b8d2cf0e082855e8c24a1aad6d diff --git a/math/octave/patches/patch-ai b/math/octave/patches/patch-ai new file mode 100644 index 00000000000..e9bb39a5f23 --- /dev/null +++ b/math/octave/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2002/02/18 15:14:33 seb Exp $ + +--- doc/liboctave/Makefile.in.orig Sun Feb 17 22:48:00 2002 ++++ doc/liboctave/Makefile.in +@@ -43,7 +43,7 @@ + .PHONY: all + + liboctave.info: $(TEXINFO) ../conf.texi +- -makeinfo -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi ++ -$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi + + liboctave.dvi: $(TEXINFO) ../conf.texi + -TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" ; \ diff --git a/math/octave/patches/patch-aj b/math/octave/patches/patch-aj new file mode 100644 index 00000000000..992dd3c4b1d --- /dev/null +++ b/math/octave/patches/patch-aj @@ -0,0 +1,29 @@ +$NetBSD: patch-aj,v 1.1 2002/02/18 15:14:33 seb Exp $ + +--- doc/interpreter/Makefile.in.orig Sun Feb 17 22:48:00 2002 ++++ doc/interpreter/Makefile.in +@@ -56,7 +56,7 @@ + .PHONY: all + + octave.info: $(TEXINFO) ../conf.texi +- -makeinfo -I$(srcdir) -I$(srcdir)/.. $(srcdir)/octave.texi ++ -$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $(srcdir)/octave.texi + + octave.dvi: $(TEXINFO) ../conf.texi + -TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" ; \ +@@ -67,13 +67,13 @@ + -dvips -o octave.ps octave.dvi + + ../../INSTALL.OCTAVE: install.texi +- -makeinfo -D INSTALLONLY \ ++ -$(MAKEINFO) -D INSTALLONLY \ + --no-validate --no-headers --no-split --output INSTALL \ + -I$(srcdir) -I$(srcdir)/.. $(srcdir)/install.texi + mv INSTALL ../../INSTALL.OCTAVE + + ../../BUGS: bugs.texi +- -makeinfo -D BUGSONLY \ ++ -$(MAKEINFO) -D BUGSONLY \ + --no-validate --no-headers --no-split --output BUGS \ + -I$(srcdir) -I$(srcdir)/.. $(srcdir)/bugs.texi + mv BUGS ../../BUGS diff --git a/math/octave/patches/patch-ak b/math/octave/patches/patch-ak new file mode 100644 index 00000000000..747e8c07f9a --- /dev/null +++ b/math/octave/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1 2002/02/18 15:14:33 seb Exp $ + +--- doc/faq/Makefile.in.orig Sun Feb 17 22:48:00 2002 ++++ doc/faq/Makefile.in +@@ -39,7 +39,7 @@ + .PHONY: all + + Octave-FAQ.info: Octave-FAQ.texi +- -makeinfo -I$(srcdir) $(srcdir)/Octave-FAQ.texi ++ -$(MAKEINFO) -I$(srcdir) $(srcdir)/Octave-FAQ.texi + + Octave-FAQ.dvi: Octave-FAQ.texi + -TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" ; \ diff --git a/math/pspp/Makefile b/math/pspp/Makefile index 150c273cf68..913ecd84c80 100644 --- a/math/pspp/Makefile +++ b/math/pspp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/08/27 14:35:11 tron Exp $ +# $NetBSD: Makefile,v 1.19 2002/02/18 15:14:33 seb Exp $ # DISTNAME= pspp-0.3.0 @@ -20,7 +20,6 @@ BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes -USE_GTEXINFO= yes USE_LIBINTL= yes CPPFLAGS+= -Dunix=1 MAKE_ENV+= pkgsysconfdir="${PREFIX}/etc/pspp" @@ -28,4 +27,5 @@ MAKE_ENV+= pkgsysconfdir="${PREFIX}/etc/pspp" pre-configure: cd ${WRKSRC}; ${LOCALBASE}/bin/autoconf +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/pspp/PLIST b/math/pspp/PLIST index aa85871d316..2a663a00c6e 100644 --- a/math/pspp/PLIST +++ b/math/pspp/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:33:59 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:33 seb Exp $ bin/pspp etc/pspp/devices etc/pspp/html-prologue etc/pspp/papersize etc/pspp/ps-prologue -@unexec install-info --delete %D/info/pspp.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/pspp.info %D/info/dir info/pspp.info info/pspp.info-1 info/pspp.info-2 @@ -14,7 +14,7 @@ info/pspp.info-5 info/pspp.info-6 info/pspp.info-7 info/pspp.info-8 -@exec install-info %D/info/pspp.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/pspp.info %D/info/dir share/doc/pspp/NEWS share/doc/pspp/README share/doc/pspp/TODO diff --git a/misc/git/Makefile b/misc/git/Makefile index 6d015aa5104..18e43a4d573 100644 --- a/misc/git/Makefile +++ b/misc/git/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/02/25 04:18:02 hubertf Exp $ +# $NetBSD: Makefile,v 1.18 2002/02/18 15:14:33 seb Exp $ # FreeBSD Id: Makefile,v 1.8 1996/11/21 11:54:39 asami Exp # @@ -23,4 +23,5 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc ${MV} ${PREFIX}/lib/git/html ${PREFIX}/share/doc/git +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/git/PLIST b/misc/git/PLIST index 29ac820b7b6..7907fc8435f 100644 --- a/misc/git/PLIST +++ b/misc/git/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:28:05 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:33 seb Exp $ bin/git bin/gitps bin/gitview @@ -13,12 +13,12 @@ bin/gitregrep bin/gitrfgrep bin/gitunpack bin/gitmkdirs -@unexec install-info --delete %D/info/git.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/git.info %D/info/dir info/git.info info/git.info-1 info/git.info-2 info/git.info-3 -@exec install-info %D/info/git.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/git.info %D/info/dir lib/git/term/.gitrc.aixterm lib/git/term/.gitrc.ansi lib/git/term/.gitrc.common diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile index 56ef39f5438..d80cd01ca10 100644 --- a/misc/pinfo/Makefile +++ b/misc/pinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/07/02 23:06:55 fredb Exp $ +# $NetBSD: Makefile,v 1.9 2002/02/18 15:14:34 seb Exp $ # DISTNAME= pinfo-0.6.1 @@ -28,4 +28,5 @@ DEPENDS+= ncurses>=5.0:../../devel/ncurses CONFIGURE_ARGS+= --with-ncurses=${LOCALBASE} .endif +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/pinfo/PLIST b/misc/pinfo/PLIST index d158cd108ca..da9258b3f6e 100644 --- a/misc/pinfo/PLIST +++ b/misc/pinfo/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:29:14 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:34 seb Exp $ bin/pinfo -@unexec install-info --delete %D/info/pinfo.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/pinfo.info %D/info/dir info/pinfo.info -@exec install-info %D/info/pinfo.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/pinfo.info %D/info/dir man/man1/pinfo.1 share/locale/cs/LC_MESSAGES/pinfo.mo share/locale/de/LC_MESSAGES/pinfo.mo diff --git a/misc/screen/Makefile b/misc/screen/Makefile index 5ac623dbaec..caec8b98526 100644 --- a/misc/screen/Makefile +++ b/misc/screen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2002/02/16 11:18:34 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2002/02/18 15:14:34 seb Exp $ # DISTNAME= screen-3.9.11 @@ -14,6 +14,7 @@ GNU_CONFIGURE= yes INFO_FILES= screen.info PLIST_SUBST= DISTNAME=${DISTNAME} USE_BUILDLINK_ONLY= yes +TEXINFO_OVERRIDE= YES .include "../../mk/bsd.prefs.mk" .if (${OPSYS} == SunOS) @@ -29,4 +30,5 @@ post-install: /usr/5bin/tic screeninfo.src .endif +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/screen/PLIST b/misc/screen/PLIST index f3a98adb7ab..0c931f14191 100644 --- a/misc/screen/PLIST +++ b/misc/screen/PLIST @@ -1,15 +1,15 @@ -@comment $NetBSD: PLIST,v 1.3 2002/02/16 11:18:35 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/02/18 15:14:34 seb Exp $ bin/screen bin/${DISTNAME} man/man1/screen.1 -@unexec install-info --delete %D/info/screen.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/screen.info %D/info/dir info/screen.info info/screen.info-1 info/screen.info-2 info/screen.info-3 info/screen.info-4 info/screen.info-5 -@exec install-info %D/info/screen.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/screen.info %D/info/dir @unexec if [ -f %D/bin/screen.old ]; then ${RM} -f %D/bin/screen.old ; fi share/examples/screen/screenrc share/screen/utf8encodings/01 diff --git a/misc/screen/PLIST.SunOS b/misc/screen/PLIST.SunOS index acd2e8d0a0c..64dee5d196d 100644 --- a/misc/screen/PLIST.SunOS +++ b/misc/screen/PLIST.SunOS @@ -1,15 +1,15 @@ -@comment $NetBSD: PLIST.SunOS,v 1.4 2002/02/18 11:09:47 seb Exp $ +@comment $NetBSD: PLIST.SunOS,v 1.5 2002/02/18 15:14:34 seb Exp $ bin/screen bin/${DISTNAME} man/man1/screen.1 -@unexec install-info --delete %D/info/screen.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/screen.info %D/info/dir info/screen.info info/screen.info-1 info/screen.info-2 info/screen.info-3 info/screen.info-4 info/screen.info-5 -@exec install-info %D/info/screen.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/screen.info %D/info/dir @unexec if [ -f %D/bin/screen.old ]; then ${RM} -f %D/bin/screen.old ; fi share/examples/screen/screenrc share/lib/terminfo/s/screen diff --git a/misc/vera/Makefile b/misc/vera/Makefile index 6b0c7f316f0..cb4d43da364 100644 --- a/misc/vera/Makefile +++ b/misc/vera/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/05/26 09:56:10 zuntum Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:34 seb Exp $ # FreeBSD Id: ports/misc/vera/Makefile,v 1.7 2000/11/13 12:44:18 demon Exp DISTNAME= vera-1.6 @@ -10,12 +10,10 @@ HOMEPAGE= http://userpage.fu-berlin.de/~oheiabbd/vera-e.html COMMENT= Virtual Entity of Relevant Acronyms do-build: - cd ${WRKSRC} && makeinfo vera.texi + cd ${WRKSRC} && ${MAKEINFO} vera.texi do-install: ${INSTALL_DATA} ${WRKSRC}/vera.info* ${PREFIX}/info -post-install: - install-info ${PREFIX}/info/vera.info ${PREFIX}/info/dir - +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/vera/PLIST b/misc/vera/PLIST index 52e8f01c089..b59694b806c 100644 --- a/misc/vera/PLIST +++ b/misc/vera/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:29:48 zuntum Exp $ -@unexec install-info --delete %D/info/vera.info %D/info/dir +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:34 seb Exp $ +@unexec ${INSTALL_INFO} --delete %D/info/vera.info %D/info/dir info/vera.info info/vera.info-1 info/vera.info-2 @@ -12,4 +12,4 @@ info/vera.info-8 info/vera.info-9 info/vera.info-10 info/vera.info-11 -@exec install-info %D/info/vera.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/vera.info %D/info/dir diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 23f8fef56b9..3af82b73f14 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.927 2002/02/15 10:12:52 skrll Exp $ +# $NetBSD: bsd.pkg.mk,v 1.928 2002/02/18 15:14:34 seb Exp $ # # This file is in the public domain. # @@ -213,18 +213,10 @@ MAKE_ENV+= F77="${F77}" MAKE_ENV+= FC="${FC}" .endif -.if defined(INFO_FILES) -USE_GTEXINFO= yes -.endif - .if ((defined(NEED_NCURSES)) && (${NEED_NCURSES} == YES)) DEPENDS+= ncurses>=5.0:../../devel/ncurses .endif -.if defined(USE_GTEXINFO) && !exists(/usr/bin/install-info) -DEPENDS+= gtexinfo>=3.12:../../devel/gtexinfo -.endif - # Automatically increase process limit where necessary for building. _ULIMIT_CMD= .if defined(UNLIMIT_RESOURCES) @@ -514,6 +506,7 @@ PLIST_SUBST+= OPSYS=${OPSYS} \ CHGRP=${CHGRP:Q} \ CHMOD=${CHMOD:Q} \ CHOWN=${CHOWN:Q} \ + INSTALL_INFO=${INSTALL_INFO:Q} \ MKDIR=${MKDIR:Q} \ RMDIR=${RMDIR:Q} \ RM=${RM:Q} \ @@ -1950,9 +1943,9 @@ real-su-install: ${MESSAGE} ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} post-install ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} post-install-script .for f in ${INFO_FILES} - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} "install-info --info-dir=${PREFIX}/info ${PREFIX}/info/${f}"; \ - install-info --remove --info-dir=${PREFIX}/info ${PREFIX}/info/${f}; \ - install-info --info-dir=${PREFIX}/info ${PREFIX}/info/${f} + ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} "${INSTALL_INFO} --info-dir=${PREFIX}/info ${PREFIX}/info/${f}"; \ + ${INSTALL_INFO} --remove --info-dir=${PREFIX}/info ${PREFIX}/info/${f}; \ + ${INSTALL_INFO} --info-dir=${PREFIX}/info ${PREFIX}/info/${f} .endfor @# PLIST must be generated at this late point (instead of @# depending on it somewhere earlier), as the @@ -3427,9 +3420,9 @@ print-PLIST: } \ { \ if (/\.info$$/) { \ - print "\@unexec install-info --delete --info-dir=%D/info %D/" $$0; \ + print "\@unexec $${INSTALL_INFO} --delete --info-dir=%D/info %D/" $$0; \ print $$0; \ - print "\@exec install-info --info-dir=%D/info %D/" $$0; \ + print "\@exec $${INSTALL_INFO} --info-dir=%D/info %D/" $$0; \ } else if (!/^info\/dir$$/) { \ print $$0; \ } \ diff --git a/mk/texinfo.mk b/mk/texinfo.mk new file mode 100644 index 00000000000..d5a2b23ee62 --- /dev/null +++ b/mk/texinfo.mk @@ -0,0 +1,83 @@ +# $NetBSD: texinfo.mk,v 1.1 2002/02/18 15:14:35 seb Exp $ +# +# This Makefile fragment is included by packages that provide info files. +# + +.if !defined(TEXINFO_MK) +TEXINFO_MK= # defined + +# Does the system have the GNU texinfo tools and if yes, what version are they? +_INSTALL_INFO= /usr/bin/install-info +.if exists(${_INSTALL_INFO}) +. if !defined(INSTALL_INFO_VERSION) +_INSTALL_INFO_VERSION_OUTPUT!= ${_INSTALL_INFO} --version 2>/dev/null +# if install-info departs from the [0-9].[0-9] numbering scheme, the following +# would have to be changed as well as the comparison below +INSTALL_INFO_VERSION= ${_INSTALL_INFO_VERSION_OUTPUT:M[0-9]*.[0-9]*} +MAKEFLAGS+= INSTALL_INFO_VERSION=${INSTALL_INFO_VERSION} +. endif +.endif + +# Minimum required version for the GNU texinfo tools. +TEXINFO_REQD?= 3.12 + +# Sort out if we need the version provided by devel/gtexinfo. +.if defined(INSTALL_INFO_VERSION) +. if ${INSTALL_INFO_VERSION} < ${TEXINFO_REQD} +_NEED_TEXINFO= # defined +. endif +.else +_NEED_TEXINFO= # defined +.endif + +.if defined(_NEED_TEXINFO) +DEPENDS+= gtexinfo>=${TEXINFO_REQD}:../../devel/gtexinfo +EVAL_PREFIX= _GTEXINFO_PREFIX=gtexinfo +.else +_GTEXINFO_PREFIX= ${_INSTALL_INFO:C|/bin/install-info$||} +.endif + +# +# Advertise in environment which install-info and makeinfo should be used. +# +INSTALL_INFO= ${_GTEXINFO_PREFIX}/bin/install-info +MAKEINFO= ${_GTEXINFO_PREFIX}/bin/makeinfo +CONFIGURE_ENV+= MAKEINFO="${MAKEINFO}" INSTALL_INFO="${INSTALL_INFO}" +MAKE_ENV+= MAKEINFO="${MAKEINFO}" INSTALL_INFO="${INSTALL_INFO}" + +# +# Another way would be to use ${SED} to substitute @MAKEINFO@, @INSTALL_INFO@ +# and bare makeinfo and install-info words in target rules commands and in +# Makefiles variable assignments for the files matching ${TEXINFO_PATTERNS}. +# +# Note: there are embeded tabs in some variables below. +# +TEXINFO_OVERRIDE?= NO + +.if defined(TEXINFO_OVERRIDE) && (${TEXINFO_OVERRIDE} == "YES") +TEXINFO_PATTERNS+= Makefile.in +# replace @MAKEINFO@ and @INSTALL_INFO@ respectively with ${MAKEINFO} and +# ${INSTALL_INFO} +TEXINFO_VAR_SUBST+= MAKEINFO=${MAKEINFO:Q} +TEXINFO_VAR_SUBST+= INSTALL_INFO=${INSTALL_INFO:Q} +TEXINFO_SUBST_SED= ${TEXINFO_VAR_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} +# replace bare makeinfo and install-info in MAKEINFO and INSTALL_INFO variables +# assignments +TEXINFO_SUBST_SED+= -e 's!^MAKEINFO[ ]*=[ ]*makeinfo[ ]*\(.*\)$$!MAKEINFO = ${MAKEINFO} \1!' +TEXINFO_SUBST_SED+= -e 's!^INSTALL_INFO[ ]*=[ ]*install-info[ ]*\(.*\)$$!INSTALL_INFO = ${INSTALL_INFO} \1!' +# replace bare makeinfo and install-info commands in Makefile target rules +TEXINFO_SUBST_SED+= -e "s!^\( .*\)\([ ]\)makeinfo\([ ]\)!\1\2${MAKEINFO}\3!g" +TEXINFO_SUBST_SED+= -e "s!^\( .*\)\([ ']\)install-info\([ ]\)!\1\2${INSTALL_INFO}\3!g" + +_CONFIGURE_PREREQ+= texinfo-override +texinfo-override: + ${_PKG_SILENT}${_PKG_DEBUG} \ + (for _PATTERN in ${TEXINFO_PATTERNS}; do \ + ${FIND} ${WRKSRC} -type f -name "$$_PATTERN" -print; \ + done; ) | ( while read _F ; do \ + ${SED} ${TEXINFO_SUBST_SED} "$$_F" > "$$_F.new" && \ + ${MV} "$$_F.new" "$$_F"; \ + done ) +.endif # TEXINFO_OVERRIDE + +.endif # TEXINFO_MK diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index 33779283d54..73319dbe292 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2002/01/15 23:52:11 rh Exp $ +# $NetBSD: Makefile,v 1.73 2002/02/18 15:14:35 seb Exp $ # DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR} @@ -36,4 +36,5 @@ AUTOMAKE_OVERRIDE= NO # Otherwise breaks 1.5 arm32 .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/glib/buildlink.mk" .include "../../security/tcp_wrappers/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ORBit/PLIST b/net/ORBit/PLIST index 69fead44e79..dd722c86e0d 100644 --- a/net/ORBit/PLIST +++ b/net/ORBit/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:53 skrll Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/02/18 15:14:35 seb Exp $ bin/libIDL-config bin/name-client bin/old-name-server @@ -64,9 +64,9 @@ include/orbit-1.0/orb/poa.h include/orbit-1.0/orb/sequences.h include/orbit-1.0/orb/typecode.h include/orbit-1.0/orbit-idl2.h -@unexec install-info --delete %D/info/libIDL.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/libIDL.info %D/info/dir info/libIDL.info -@exec install-info %D/info/libIDL.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/libIDL.info %D/info/dir lib/libIDL.a lib/libIDL.la lib/libIDL.so diff --git a/net/arla/Makefile b/net/arla/Makefile index 68eafa0a2a3..064737b8abb 100644 --- a/net/arla/Makefile +++ b/net/arla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/12/05 15:00:47 agc Exp $ +# $NetBSD: Makefile,v 1.20 2002/02/18 15:14:35 seb Exp $ # DISTNAME= arla-0.35.5 @@ -79,4 +79,5 @@ post-install: > ${PREFIX}/etc/rc.d/arlad @${ECHO} " " +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/arla/PLIST b/net/arla/PLIST index f50a23db97a..3ef491df2ce 100644 --- a/net/arla/PLIST +++ b/net/arla/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:53 skrll Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/02/18 15:14:35 seb Exp $ include/arlalib.h include/atypes.h include/fs_errors.h @@ -110,9 +110,9 @@ man/man8/arlad.8 man/man8/arla-cli.8 man/man8/vos.8 man/man8/bos.8 -@unexec install-info --delete %D/info/arla.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/arla.info %D/info/dir info/arla.info -@exec install-info %D/info/arla.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/arla.info %D/info/dir @exec if [ ! -e ${ARLA_CACHE} ] ; then ${MKDIR} -p ${ARLA_CACHE}; ${CHMOD} 700 ${ARLA_CACHE}; ${CHOWN} root ${ARLA_CACHE}; fi @exec if [ ! -e /sbin/mount_xfs ]; then /bin/ln -s %D/sbin/mount_xfs /sbin/mount_xfs; fi @unexec /bin/rm -f /sbin/mount_xfs diff --git a/net/cftp/Makefile b/net/cftp/Makefile index 8193c7862ed..d0ab40a8b20 100644 --- a/net/cftp/Makefile +++ b/net/cftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/12/10 16:05:26 dillo Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:36 seb Exp $ # DISTNAME= cftp-0.11 @@ -21,4 +21,5 @@ post-install: cd ${WRKSRC} && ${INSTALL_MAN} README bindings.desc \ ${PREFIX}/share/doc/cftp +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/cftp/PLIST b/net/cftp/PLIST index 579fc2a2997..a7dd8adbe0b 100644 --- a/net/cftp/PLIST +++ b/net/cftp/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:59 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:36 seb Exp $ bin/cftp -@unexec install-info --delete %D/info/cftp.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/cftp.info %D/info/dir info/cftp.info -@exec install-info %D/info/cftp.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/cftp.info %D/info/dir share/doc/cftp/README share/doc/cftp/bindings.desc @dirrm share/doc/cftp diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile index db7c7d74ab8..554680e7eaf 100644 --- a/net/freewais-sf/Makefile +++ b/net/freewais-sf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/04/30 04:16:10 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/02/18 15:14:36 seb Exp $ # DISTNAME= freeWAIS-sf-2.2.12 @@ -24,9 +24,10 @@ INSTALL_TARGET= install install.man INFO_FILES= fwsf.info post-build: - cd ${WRKSRC}/doc/SF; makeinfo fwsf.texi + cd ${WRKSRC}/doc/SF; ${MAKEINFO} fwsf.texi post-install: ${INSTALL_DATA} ${WRKSRC}/doc/SF/fwsf.info* ${PREFIX}/info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/freewais-sf/PLIST b/net/freewais-sf/PLIST index 246e7cf7fc6..2320dd54b45 100644 --- a/net/freewais-sf/PLIST +++ b/net/freewais-sf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:23 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:36 seb Exp $ bin/catalog bin/check-sources bin/dictionary @@ -34,8 +34,8 @@ man/man1/waissearch.1 man/man1/waisserver.1 man/man1/xwais.1 man/man1/xwaisq.1 -@unexec install-info --delete %D/info/fwsf.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/fwsf.info %D/info/dir info/fwsf.info info/fwsf.info-1 info/fwsf.info-2 -@exec install-info %D/info/fwsf.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/fwsf.info %D/info/dir diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile index c36bbb47dec..85752032cfd 100644 --- a/net/jwhois/Makefile +++ b/net/jwhois/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/12/02 06:56:42 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2002/02/18 15:14:36 seb Exp $ # DISTNAME= jwhois-3.0.1 @@ -27,4 +27,5 @@ post-install: .include "../../devel/gettext-lib/buildlink.mk" .include "../../mk/bsd.pkg.install.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/jwhois/PLIST b/net/jwhois/PLIST index a64f77477b5..b206897666b 100644 --- a/net/jwhois/PLIST +++ b/net/jwhois/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:54 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:36 seb Exp $ bin/jwhois -@unexec install-info --delete %D/info/jwhois.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/jwhois.info %D/info/dir info/jwhois.info -@exec install-info %D/info/jwhois.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/jwhois.info %D/info/dir man/man1/jwhois.1 share/examples/jwhois.conf ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/jwhois.mo diff --git a/net/wget/Makefile b/net/wget/Makefile index fcf480d2f26..1118ac685a2 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2001/12/04 06:15:00 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2002/02/18 15:14:36 seb Exp $ DISTNAME= wget-1.7 CATEGORIES= net @@ -36,4 +36,5 @@ CONFIGURE_ARGS+= --disable-ipv6 .endif .include "../../devel/gettext-lib/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/wget/PLIST b/net/wget/PLIST index e4dc40e9783..30953747268 100644 --- a/net/wget/PLIST +++ b/net/wget/PLIST @@ -1,14 +1,14 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:48 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:36 seb Exp $ bin/wget etc/wgetrc man/man1/wget.1 -@unexec install-info --delete %D/info/wget.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/wget.info %D/info/dir info/wget.info info/wget.info-1 info/wget.info-2 info/wget.info-3 info/wget.info-4 -@exec install-info %D/info/wget.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/wget.info %D/info/dir ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/wget.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/wget.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/wget.mo diff --git a/net/zebra/Makefile b/net/zebra/Makefile index 223574663e8..b49f0486fad 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2001/11/29 19:46:13 jlam Exp $ +# $NetBSD: Makefile,v 1.49 2002/02/18 15:14:36 seb Exp $ # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp # @@ -32,7 +32,6 @@ PLIST_SRC+= ${PKGDIR}/PLIST.vtysh CONFIGURE_ARGS+= --disable-vtysh .endif -USE_GTEXINFO= # defined USE_GMAKE= # defined BUILD_DEFS+= USE_INET6 @@ -55,9 +54,10 @@ pre-configure: #post-build: # cd ${WRKSRC}/doc ; \ # ${TOUCH} zebra.texi ; \ -# makeinfo --no-split zebra.texi +# ${MAKEINFO} --no-split zebra.texi post-install: @${CHMOD} a+r ${PREFIX}/share/examples/zebra/* +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/zebra/PLIST b/net/zebra/PLIST index 8274c028e59..820de18b3b8 100644 --- a/net/zebra/PLIST +++ b/net/zebra/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:00:01 zuntum Exp $ -@unexec install-info --delete %D/info/zebra.info %D/info/dir +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:37 seb Exp $ +@unexec ${INSTALL_INFO} --delete %D/info/zebra.info %D/info/dir info/zebra.info -@exec install-info %D/info/zebra.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/zebra.info %D/info/dir man/man1/vtysh.1 man/man8/bgpd.8 man/man8/ospfd.8 diff --git a/news/gnus/Makefile b/news/gnus/Makefile index 218fb0e2453..61521903abc 100644 --- a/news/gnus/Makefile +++ b/news/gnus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:33 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:37 seb Exp $ # DISTNAME= gnus-5.8.8 @@ -12,7 +12,8 @@ COMMENT= News/Mail reader for Emacs # XXX Someone who cares can make this work with Xemacs. DEPENDS+= emacs-[0-9]*:../../editors/emacs -USE_GTEXINFO= YES GNU_CONFIGURE= YES +TEXINFO_OVERRIDE= YES +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/news/newscache/Makefile b/news/newscache/Makefile index 809a5d7e896..f5c69e30415 100644 --- a/news/newscache/Makefile +++ b/news/newscache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/08/28 03:30:41 mjl Exp $ +# $NetBSD: Makefile,v 1.4 2002/02/18 15:14:37 seb Exp $ # DISTNAME= NewsCache-0.99.17 @@ -11,4 +11,5 @@ COMMENT= Free cache server for USENET News GNU_CONFIGURE= YES +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/news/newscache/PLIST b/news/newscache/PLIST index 5538628ba1e..770494d865e 100644 --- a/news/newscache/PLIST +++ b/news/newscache/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:03:44 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:37 seb Exp $ bin/updatenews etc/newscache.conf-dist -@unexec install-info --delete %D/info/NewsCache.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/NewsCache.info %D/info/dir info/NewsCache.info -@exec install-info %D/info/NewsCache.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/NewsCache.info %D/info/dir man/man5/newscache.conf.5 man/man8/NewsCache.8 man/man8/NewsCacheClean.8 diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile index b4125eae448..5e4e961fde9 100644 --- a/print/a2ps/Makefile +++ b/print/a2ps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2002/01/06 02:10:56 tron Exp $ +# $NetBSD: Makefile,v 1.34 2002/02/18 15:14:37 seb Exp $ # DISTNAME= a2ps-4.13b @@ -17,7 +17,6 @@ DEPENDS+= psutils-1.17:../../print/psutils STRIP= # empty USE_PERL5= YES USE_GMAKE= YES -USE_GTEXINFO= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/auxdir/ltconfig @@ -32,4 +31,5 @@ pre-build: ${TOUCH} ${WRKSRC}/doc/*.info ${TOUCH} ${WRKSRC}/doc/*.dvi +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/a2ps/PLIST b/print/a2ps/PLIST index dfb98c340eb..180de08527a 100644 --- a/print/a2ps/PLIST +++ b/print/a2ps/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:27:28 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:37 seb Exp $ bin/a2ps bin/card bin/composeglyphs @@ -12,9 +12,9 @@ bin/texi2dvi4a2ps etc/a2ps-site.cfg etc/a2ps.cfg include/liba2ps.h -@unexec install-info --delete %D/info/a2ps.info %D/info/dir -@unexec install-info --delete %D/info/ogonkify.info %D/info/dir -@unexec install-info --delete %D/info/regex.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/a2ps.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/ogonkify.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/regex.info %D/info/dir info/a2ps.info info/a2ps.info-1 info/a2ps.info-2 @@ -27,9 +27,9 @@ info/regex.info info/regex.info-1 info/regex.info-2 info/regex.info-3 -@exec install-info %D/info/a2ps.info %D/info/dir -@exec install-info %D/info/ogonkify.info %D/info/dir -@exec install-info %D/info/regex.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/a2ps.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/ogonkify.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/regex.info %D/info/dir lib/liba2ps.a lib/liba2ps.la lib/liba2ps.so diff --git a/print/auctex/Makefile b/print/auctex/Makefile index 6e0aa35b1fe..9179b56b6bd 100644 --- a/print/auctex/Makefile +++ b/print/auctex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/05/03 22:16:52 jtb Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:37 seb Exp $ DISTNAME= auctex-10.0g CATEGORIES= print @@ -40,7 +40,7 @@ post-patch: post-build: ${RM} -f ${WRKSRC}/doc/auctex* - cd ${WRKSRC}/doc && ${MAKE} auctex + cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE} auctex do-install: ${INSTALL_DATA_DIR} ${PREFIX}/${LISPDIR}/auctex @@ -58,4 +58,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/style/*.el* ${PREFIX}/${LISPDIR}/auctex/style ${INSTALL_DATA} ${WRKSRC}/doc/auctex* ${PREFIX}/${INFODIR} +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/auctex/PLIST b/print/auctex/PLIST index d8b7efa03d5..28f40b464a6 100644 --- a/print/auctex/PLIST +++ b/print/auctex/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:27:33 zuntum Exp $ -@unexec install-info --delete --info-dir=%D/${INFODIR} %D/${INFODIR}/auctex +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:38 seb Exp $ +@unexec ${INSTALL_INFO} --delete --info-dir=%D/${INFODIR} %D/${INFODIR}/auctex ${INFODIR}/auctex ${INFODIR}/auctex-1 ${INFODIR}/auctex-2 ${INFODIR}/auctex-3 -@exec install-info --info-dir=%D/${INFODIR} %D/${INFODIR}/auctex +@exec ${INSTALL_INFO} --info-dir=%D/${INFODIR} %D/${INFODIR}/auctex ${LISPDIR}/auctex/auc-old.el ${LISPDIR}/auctex/auc-old.elc ${LISPDIR}/auctex/bib-cite.el diff --git a/print/auctex/distinfo b/print/auctex/distinfo index f60436a7fdc..d39885b5484 100644 --- a/print/auctex/distinfo +++ b/print/auctex/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 22:23:45 jtb Exp $ +$NetBSD: distinfo,v 1.3 2002/02/18 15:14:38 seb Exp $ SHA1 (auctex-10.0g.tar.gz) = b73539603ce1967560d1a9494b003ac292440d9d Size (auctex-10.0g.tar.gz) = 283767 bytes SHA1 (patch-aa) = b0c04b4d27fc90ec01673c002c9e529ccde9afde +SHA1 (patch-ab) = 08e32149fd6aa7d26c21f1881acdab54ce51b950 SHA1 (patch-ac) = 27f38d4176f542f4a69044ba7697197fd2556c8e diff --git a/print/auctex/patches/patch-ab b/print/auctex/patches/patch-ab new file mode 100644 index 00000000000..61e33ab09da --- /dev/null +++ b/print/auctex/patches/patch-ab @@ -0,0 +1,33 @@ +$NetBSD: patch-ab,v 1.3 2002/02/18 15:14:38 seb Exp $ + +--- doc/Makefile.orig Wed Apr 11 13:54:04 2001 ++++ doc/Makefile +@@ -39,23 +39,23 @@ + dvips auc-tex.dvi -o auc-tex.ps + + auctex: auc-tex.texi install.texi intro.texi changes.texi +- -makeinfo auc-tex.texi ++ -$(MAKEINFO) auc-tex.texi + @echo "**********************************************************" + @echo "** If this gave trouble, maybe you need to install" + @echo "** a newer version of texinfo?" + @echo "**********************************************************" + + INSTALLATION: install.texi +- -makeinfo --no-headers install.texi --output INSTALLATION ++ -$(MAKEINFO) --no-headers install.texi --output INSTALLATION + + README: intro.texi +- -makeinfo --no-headers intro.texi --output README ++ -$(MAKEINFO) --no-headers intro.texi --output README + + CHANGES: changes.texi +- -makeinfo --no-headers changes.texi --output CHANGES ++ -$(MAKEINFO) --no-headers changes.texi --output CHANGES + + HISTORY: history.texi +- -makeinfo --no-headers history.texi --output HISTORY ++ -$(MAKEINFO) --no-headers history.texi --output HISTORY + + install: auctex + cp auctex auctex-* $(infodir) diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 8708513b9cd..25aa1b86638 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/01/18 14:03:01 drochner Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:38 seb Exp $ # DISTNAME= lilypond-1.3.119 @@ -23,4 +23,5 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN} PYTHON_VERSIONS_ACCEPTED= 20 21 # 22 has some regular expression problem .include "../../lang/python/application.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/lilypond/PLIST b/print/lilypond/PLIST index c9c18a3d2e5..8626ecb3aff 100644 --- a/print/lilypond/PLIST +++ b/print/lilypond/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:27:47 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:38 seb Exp $ bin/abc2ly bin/as2text bin/convert-ly @@ -9,8 +9,8 @@ bin/ly2dvi bin/midi2ly bin/musedata2ly bin/pmx2ly -@unexec install-info --delete --info-dir=%D/info %D/info/lilypond-internals.info -@unexec install-info --delete --info-dir=%D/info %D/info/lilypond.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/lilypond-internals.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/lilypond.info info/lilypond-internals.info info/lilypond-internals.info-1 info/lilypond-internals.info-2 @@ -22,8 +22,8 @@ info/lilypond.info info/lilypond.info-1 info/lilypond.info-2 info/lilypond.info-3 -@exec install-info --info-dir=%D/info %D/info/lilypond.info -@exec install-info --info-dir=%D/info %D/info/lilypond-internals.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/lilypond.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/lilypond-internals.info man/man1/abc2ly.1 man/man1/as2text.1 man/man1/convert-ly.1 diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile index aecbafe8cf7..910c0c99ab2 100644 --- a/print/teTeX-bin/Makefile +++ b/print/teTeX-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2002/01/28 15:25:13 drochner Exp $ +# $NetBSD: Makefile,v 1.34 2002/02/18 15:14:39 seb Exp $ # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp # @@ -69,4 +69,5 @@ post-install: texconfig font vardir /var/spool/texfonts texconfig font options appendonlydir varfonts +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/teTeX-bin/PLIST b/print/teTeX-bin/PLIST index a549a2c83c1..f8ce9d4cd20 100644 --- a/print/teTeX-bin/PLIST +++ b/print/teTeX-bin/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:57 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:39 seb Exp $ @comment There are three files in this package that teTeX-share installs @comment and that teTeX-bin modifies. Take care of this: lib/libkpathsea.a -@unexec install-info --delete %D/info/latex.info %D/info/dir -@unexec install-info --delete %D/info/dvips.info %D/info/dir -@unexec install-info --delete %D/info/web2c.info %D/info/dir -@unexec install-info --delete %D/info/kpathsea.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/latex.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/dvips.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/web2c.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/kpathsea.info %D/info/dir info/latex.info-3 info/latex.info-2 info/latex.info-1 @@ -21,10 +21,10 @@ info/web2c.info-2 info/web2c.info-1 info/web2c.info info/kpathsea.info -@exec install-info %D/info/latex.info %D/info/dir -@exec install-info %D/info/dvips.info %D/info/dir -@exec install-info %D/info/web2c.info %D/info/dir -@exec install-info %D/info/kpathsea.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/latex.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/dvips.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/web2c.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/kpathsea.info %D/info/dir include/kpathsea/xstat.h include/kpathsea/xopendir.h include/kpathsea/win32lib.h diff --git a/security/fsh/Makefile b/security/fsh/Makefile index dfc6abea33f..e5000a72691 100644 --- a/security/fsh/Makefile +++ b/security/fsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/01/18 13:29:29 drochner Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:39 seb Exp $ # DISTNAME= fsh-1.1 @@ -11,9 +11,9 @@ HOMEPAGE= http://www.lysator.liu.se/fsh/ COMMENT= fast remote command execution GNU_CONFIGURE= YES -USE_GTEXINFO= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN} .include "../../lang/python/application.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/fsh/PLIST b/security/fsh/PLIST index 7120dc99c6e..874660b6978 100644 --- a/security/fsh/PLIST +++ b/security/fsh/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:16:41 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:39 seb Exp $ bin/fcp bin/fsh bin/fshd @@ -10,7 +10,7 @@ share/fsh/fshd.py share/fsh/fshlib.py share/fsh/fshversion.py share/fsh/infshd.py -@unexec install-info --delete %D/info/fsh.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/fsh.info %D/info/dir info/fsh.info -@exec install-info %D/info/fsh.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/fsh.info %D/info/dir @dirrm share/fsh diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index de7525a0758..9f0376ea1c0 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2001/10/27 07:00:53 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2002/02/18 15:14:39 seb Exp $ # DISTNAME= gnupg-1.0.6 @@ -49,4 +49,5 @@ PLIST_SUBST+= IDEA="@comment " .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/zlib/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST index 48dc0803e9e..06e28f3b1d7 100644 --- a/security/gnupg/PLIST +++ b/security/gnupg/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:16:42 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:39 seb Exp $ bin/gpg bin/gpgv -@unexec install-info --delete --info-dir=%D/info %D/info/gpg.info -@unexec install-info --delete --info-dir=%D/info %D/info/gpgv.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gpg.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gpgv.info info/gpg.info info/gpgv.info -@exec install-info --info-dir=%D/info %D/info/gpg.info -@exec install-info --info-dir=%D/info %D/info/gpgv.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gpg.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gpgv.info ${IDEA}lib/gnupg/idea lib/gnupg/rndegd lib/gnupg/rndunix diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile index 5d815b31555..3f136c84490 100644 --- a/security/kth-krb4/Makefile +++ b/security/kth-krb4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/09/27 23:18:38 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2002/02/18 15:14:39 seb Exp $ # DISTNAME= krb4-1.0.9 @@ -32,4 +32,5 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/services-1.4.2.diff ${PREFIX}/share/examples/kth-krb4 ${INSTALL_DATA} ${FILESDIR}/services-1.5.diff ${PREFIX}/share/examples/kth-krb4 +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/kth-krb4/PLIST b/security/kth-krb4/PLIST index 1090679b8a2..1c47d6ed20e 100644 --- a/security/kth-krb4/PLIST +++ b/security/kth-krb4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:16:47 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:39 seb Exp $ share/examples/kth-krb4/inetd.conf.changes share/examples/kth-krb4/krb.conf share/examples/kth-krb4/krb.realms @@ -213,6 +213,6 @@ man/cat8/rlogind.0 man/cat8/rshd.0 man/cat8/telnetd.0 man/cat8/push.0 -@unexec install-info --delete %D/info/kth-krb.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/kth-krb.info %D/info/dir info/kth-krb.info -@exec install-info %D/info/kth-krb.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/kth-krb.info %D/info/dir diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 471a27ce130..1a86d5777a5 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2001/11/29 01:12:47 hubertf Exp $ +# $NetBSD: Makefile,v 1.32 2002/02/18 15:14:40 seb Exp $ # V= 2.05 @@ -16,7 +16,6 @@ COMMENT= The GNU Bourne Again Shell USE_BUILDLINK_ONLY= yes GNU_CONFIGURE= yes -USE_GTEXINFO= yes MAKE_ENV+= INSTALL_SCRIPT='${INSTALL_SCRIPT}' .include "../../mk/bsd.prefs.mk" @@ -57,4 +56,5 @@ post-install: ${GZIP_CMD} ${PREFIX}/share/doc/bash/*.ps .include "../../devel/gettext-lib/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/shells/bash2/PLIST b/shells/bash2/PLIST index ce25927b1d4..96d4a861729 100644 --- a/shells/bash2/PLIST +++ b/shells/bash2/PLIST @@ -1,13 +1,13 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:26:56 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:40 seb Exp $ bin/bash @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true; echo %D/%F) >/etc/shells @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true) >/etc/shells bin/bashbug man/man1/bash.1.gz man/man1/bashbug.1.gz -@unexec install-info --delete %D/info/bash.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/bash.info %D/info/dir info/bash.info -@exec install-info %D/info/bash.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/bash.info %D/info/dir share/doc/bash/article.ps.gz share/doc/bash/article.txt share/doc/bash/bashref.ps.gz diff --git a/shells/esh/Makefile b/shells/esh/Makefile index d026c026203..60aec5abb24 100644 --- a/shells/esh/Makefile +++ b/shells/esh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/05/03 21:39:25 jtb Exp $ +# $NetBSD: Makefile,v 1.10 2002/02/18 15:14:40 seb Exp $ DISTNAME= esh-0.8 CATEGORIES= shells @@ -23,4 +23,5 @@ do-install: cd ${WRKSRC}/doc && ${INSTALL_DATA} esh.html esh_toc.html \ ${PREFIX}/share/doc/esh/ +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/shells/esh/PLIST b/shells/esh/PLIST index a9c17d58b73..503be9ed22f 100644 --- a/shells/esh/PLIST +++ b/shells/esh/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:58 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:40 seb Exp $ bin/esh -@unexec install-info --delete --info-dir=%D/info %D/info/esh.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/esh.info info/esh.info -@exec install-info --info-dir=%D/info %D/info/esh.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/esh.info share/doc/esh/esh.html share/doc/esh/esh_toc.html share/emacs/site-lisp/esh-mode.el diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index c79be0ade71..6a133fb6066 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2001/12/02 16:42:00 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2002/02/18 15:14:40 seb Exp $ DISTNAME= zsh-4.0.4 CATEGORIES= shells @@ -15,6 +15,7 @@ COMMENT= The Z shell GNU_CONFIGURE= yes INFO_FILES= zsh.info +TEXINFO_OVERRIDE= YES .include "../../mk/bsd.prefs.mk" @@ -42,4 +43,5 @@ post-install: (${GREP} -v ${PREFIX}/bin/zsh /etc/shells.bak || ${TRUE}; ${ECHO} ${PREFIX}/bin/zsh) >/etc/shells ${RM} /etc/shells.bak +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST index df63a0d3b83..17c6cce67a3 100644 --- a/shells/zsh/PLIST +++ b/shells/zsh/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2001/11/29 09:16:28 martti Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:40 seb Exp $ bin/zsh @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true; echo %D/%F) >/etc/shells @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true) >/etc/shells bin/${PKGNAME} -@unexec install-info --delete %D/info/zsh.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/zsh.info %D/info/dir info/zsh.info -@exec install-info %D/info/zsh.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/zsh.info %D/info/dir man/man1/zsh.1 man/man1/zshall.1 man/man1/zshbuiltins.1 diff --git a/shells/zsh3/Makefile b/shells/zsh3/Makefile index 5f568958991..a64d4e57dbe 100644 --- a/shells/zsh3/Makefile +++ b/shells/zsh3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/09/23 21:01:30 tron Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:40 seb Exp $ DISTNAME= zsh-3.0.8 CATEGORIES= shells @@ -14,6 +14,7 @@ COMMENT= The Z shell GNU_CONFIGURE= yes INFO_FILES= zsh.info +TEXINFO_OVERRIDE= YES .include "../../mk/bsd.prefs.mk" @@ -27,4 +28,5 @@ post-install: (${GREP} -v ${PREFIX}/bin/zsh /etc/shells.bak || ${TRUE}; ${ECHO} ${PREFIX}/bin/zsh) >/etc/shells ${RM} /etc/shells.bak +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/shells/zsh3/PLIST b/shells/zsh3/PLIST index ab0b2c6bb70..89b72ba52af 100644 --- a/shells/zsh3/PLIST +++ b/shells/zsh3/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:27:03 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:40 seb Exp $ bin/zsh @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true; echo %D/%F) >/etc/shells @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak || true) >/etc/shells bin/${PKGNAME} -@unexec install-info --delete %D/info/zsh.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/zsh.info %D/info/dir info/zsh.info -@exec install-info %D/info/zsh.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/zsh.info %D/info/dir man/man1/zshcompctl.1.gz man/man1/zshexpn.1.gz man/man1/zshmisc.1.gz diff --git a/sysutils/fileutils/Makefile b/sysutils/fileutils/Makefile index dfc1fd8884d..a641dc81959 100644 --- a/sysutils/fileutils/Makefile +++ b/sysutils/fileutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/12/22 08:49:58 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2002/02/18 15:14:40 seb Exp $ DISTNAME= fileutils-4.0 CATEGORIES= sysutils @@ -8,9 +8,9 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/fileutils/fileutils.html COMMENT= GNU file management utilities -USE_GTEXINFO= yes NO_PATCH= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --program-prefix=g +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/fileutils/PLIST b/sysutils/fileutils/PLIST index 6dc615d1f43..1a59c876687 100644 --- a/sysutils/fileutils/PLIST +++ b/sysutils/fileutils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:06 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:41 seb Exp $ bin/gchgrp bin/gchown bin/gchmod @@ -20,9 +20,9 @@ bin/grmdir bin/gsync bin/gtouch bin/gdf -@unexec install-info --delete %D/info/fileutils.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/fileutils.info %D/info/dir info/fileutils.info -@exec install-info %D/info/fileutils.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/fileutils.info %D/info/dir man/man1/grmdir.1 man/man1/gdircolors.1 man/man1/gln.1 diff --git a/sysutils/findutils/Makefile b/sysutils/findutils/Makefile index a68ae6101c8..a32a63a4b50 100644 --- a/sysutils/findutils/Makefile +++ b/sysutils/findutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 17:42:13 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2002/02/18 15:14:41 seb Exp $ # FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $ DISTNAME= findutils-4.1 @@ -9,10 +9,10 @@ MAINTAINER= bouyer@netbsd.org HOMEPAGE= http://www.gnu.org/software/findutils/findutils.html COMMENT= The GNU find, xargs and locate utilities -USE_GTEXINFO= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --program-prefix=g INFO_FILES= find.info +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/findutils/PLIST b/sysutils/findutils/PLIST index 120f74ae943..f739ebabd8f 100644 --- a/sysutils/findutils/PLIST +++ b/sysutils/findutils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:07 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:41 seb Exp $ bin/gfind bin/gxargs bin/glocate @@ -6,11 +6,11 @@ bin/gupdatedb libexec/gfrcode libexec/gcode libexec/gbigram -@unexec install-info --delete %D/info/find.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/find.info %D/info/dir info/find.info info/find.info-1 info/find.info-2 -@exec install-info %D/info/find.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/find.info %D/info/dir man/cat1/gfind.1 man/cat1/gxargs.1 man/cat1/glocate.1 diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile index 4f3bbc18d88..61eb69a6b35 100644 --- a/sysutils/mtools/Makefile +++ b/sysutils/mtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2001/11/29 01:12:48 hubertf Exp $ +# $NetBSD: Makefile,v 1.26 2002/02/18 15:14:41 seb Exp $ # DISTNAME= mtools-3.9.7 @@ -15,6 +15,7 @@ NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64 # LP64 problem GNU_CONFIGURE= yes USE_GMAKE= yes INFO_FILES= mtools.info +TEXINFO_OVERRIDE= YES .include "../../mk/bsd.prefs.mk" @@ -41,4 +42,5 @@ post-install: ${GREP} -v /floppyd ${PKGDIR}/PLIST >${PLIST_SRC} .endif +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/mtools/PLIST b/sysutils/mtools/PLIST index 9b24bb3005f..9cf16658443 100644 --- a/sysutils/mtools/PLIST +++ b/sysutils/mtools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:34 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:41 seb Exp $ bin/floppyd bin/floppyd_installtest bin/lz @@ -32,9 +32,9 @@ bin/mxtar bin/mzip bin/tgz bin/uz -@unexec install-info --delete --info-dir=%D/info %D/info/mtools.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/mtools.info info/mtools.info -@exec install-info --info-dir=%D/info %D/info/mtools.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/mtools.info man/man1/floppyd.1 man/man1/mattrib.1 man/man1/mbadblocks.1 diff --git a/sysutils/sh-utils/Makefile b/sysutils/sh-utils/Makefile index 0a0099a2355..ed68d4e0d40 100644 --- a/sysutils/sh-utils/Makefile +++ b/sysutils/sh-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/02/07 10:52:11 seb Exp $ +# $NetBSD: Makefile,v 1.8 2002/02/18 15:14:41 seb Exp $ DISTNAME= sh-utils-2.0 PKGREVISION= 1 @@ -12,10 +12,10 @@ COMMENT= GNU shell utilities BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5 USE_GMAKE= YES -USE_GTEXINFO= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --program-prefix=g CONFIGURE_ARGS+= --program-transform-name='s,^gid,gnuid,' CONFIGURE_ENV+= ac_cv_func_uname=no +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/sh-utils/PLIST b/sysutils/sh-utils/PLIST index 23bb55089ae..b66cb0348e3 100644 --- a/sysutils/sh-utils/PLIST +++ b/sysutils/sh-utils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/07 10:52:11 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:41 seb Exp $ bin/gbasename bin/gchroot bin/gdate @@ -31,9 +31,9 @@ bin/gusers bin/gwho bin/gwhoami bin/gyes -@unexec install-info --delete %D/info/sh-utils.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/sh-utils.info %D/info/dir info/sh-utils.info -@exec install-info %D/info/sh-utils.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/sh-utils.info %D/info/dir man/man1/gbasename.1 man/man1/gchroot.1 man/man1/gdate.1 diff --git a/sysutils/stow/Makefile b/sysutils/stow/Makefile index ecca98fb346..19a64cc600c 100644 --- a/sysutils/stow/Makefile +++ b/sysutils/stow/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/11/30 17:33:31 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:41 seb Exp $ # DISTNAME= stow-1.3.2 @@ -15,4 +15,5 @@ GNU_CONFIGURE= YES INFO_FILES= stow.info .include "../../lang/perl5/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/stow/PLIST b/sysutils/stow/PLIST index cf316732029..d29485786bb 100644 --- a/sysutils/stow/PLIST +++ b/sysutils/stow/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:50 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:42 seb Exp $ bin/stow -@unexec install-info --delete %D/info/stow.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/stow.info %D/info/dir info/stow.info -@exec install-info %D/info/stow.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/stow.info %D/info/dir diff --git a/sysutils/vcdimager/Makefile b/sysutils/vcdimager/Makefile index b4aaf651b40..0c7f6f35143 100644 --- a/sysutils/vcdimager/Makefile +++ b/sysutils/vcdimager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/09/25 19:51:55 magick Exp $ +# $NetBSD: Makefile,v 1.2 2002/02/18 15:14:42 seb Exp $ # DISTNAME= vcdimager-0.6.2 @@ -10,9 +10,9 @@ HOMEPAGE= http://www.gnu.org/software/vcdimager/ COMMENT= mastering suite for Video CDs USE_BUILDLINK_ONLY= YES -#USE_GTEXINFO= YES USE_GMAKE= YES GNU_CONFIGURE= YES .include "../../devel/gettext-lib/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/vcdimager/PLIST b/sysutils/vcdimager/PLIST index a230aba16d0..1a223111895 100644 --- a/sysutils/vcdimager/PLIST +++ b/sysutils/vcdimager/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:10 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:42 seb Exp $ bin/vcdimager bin/vcdrip -@unexec install-info --delete --info-dir=%D/info %D/info/vcdimager.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/vcdimager.info info/vcdimager.info -@exec install-info --info-dir=%D/info %D/info/vcdimager.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/vcdimager.info man/man1/vcdimager.1 man/man1/vcdrip.1 diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile index 961a746b6ca..6d77ef56169 100644 --- a/textproc/eb/Makefile +++ b/textproc/eb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/10/27 07:00:53 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:42 seb Exp $ # FreeBSD Id: ports/japanese/eb/Makefile,v 1.21 2000/08/21 03:39:42 kevlo Exp DISTNAME= eb-3.0 @@ -65,4 +65,5 @@ post-install: .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/zlib/buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/eb/PLIST b/textproc/eb/PLIST index 34fafad4ae8..9e37e56f9e9 100644 --- a/textproc/eb/PLIST +++ b/textproc/eb/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:34 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:43 seb Exp $ bin/ebappendix bin/ebfont bin/ebinfo @@ -14,14 +14,14 @@ include/eb/error.h include/eb/font.h include/eb/text.h include/eb/zio.h -@unexec install-info --delete --info-dir=%D/info %D/info/ebfont-ja.info -@unexec install-info --delete --info-dir=%D/info %D/info/ebfont.info -@unexec install-info --delete --info-dir=%D/info %D/info/ebinfo-ja.info -@unexec install-info --delete --info-dir=%D/info %D/info/ebinfo.info -@unexec install-info --delete --info-dir=%D/info %D/info/ebrefile-ja.info -@unexec install-info --delete --info-dir=%D/info %D/info/ebrefile.info -@unexec install-info --delete --info-dir=%D/info %D/info/ebzip-ja.info -@unexec install-info --delete --info-dir=%D/info %D/info/ebzip.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebfont-ja.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebfont.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebinfo-ja.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebinfo.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebrefile-ja.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebrefile.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebzip-ja.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebzip.info info/ebfont-ja.info info/ebfont.info info/ebinfo-ja.info @@ -30,14 +30,14 @@ info/ebrefile-ja.info info/ebrefile.info info/ebzip-ja.info info/ebzip.info -@exec install-info --info-dir=%D/info %D/info/ebzip-ja.info -@exec install-info --info-dir=%D/info %D/info/ebrefile.info -@exec install-info --info-dir=%D/info %D/info/ebrefile-ja.info -@exec install-info --info-dir=%D/info %D/info/ebinfo.info -@exec install-info --info-dir=%D/info %D/info/ebinfo-ja.info -@exec install-info --info-dir=%D/info %D/info/ebfont.info -@exec install-info --info-dir=%D/info %D/info/ebfont-ja.info -@exec install-info --info-dir=%D/info %D/info/ebzip.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebzip-ja.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebrefile.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebrefile-ja.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebinfo.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebinfo-ja.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebfont.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebfont-ja.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebzip.info lib/libeb.a lib/libeb.la lib/libeb.so diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile index c80479b8b9f..826f86cfb1e 100644 --- a/textproc/gsed/Makefile +++ b/textproc/gsed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/12/04 06:15:01 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:43 seb Exp $ # DISTNAME= sed-3.02 @@ -15,4 +15,5 @@ CONFIGURE_ARGS= --program-prefix=g INFO_FILES= sed.info AUTOMAKE_PATTERNS+= sed.info version.texi stamp-vti +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/gsed/PLIST b/textproc/gsed/PLIST index e3b8ef55586..311527a3fb5 100644 --- a/textproc/gsed/PLIST +++ b/textproc/gsed/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:45 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:43 seb Exp $ bin/gsed man/man1/gsed.1 -@unexec install-info --delete %D/info/sed.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/sed.info %D/info/dir info/sed.info -@exec install-info %D/info/sed.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/sed.info %D/info/dir diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile index 895e7f5f966..9b7f0493e25 100644 --- a/textproc/ispell-base/Makefile +++ b/textproc/ispell-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:49 hubertf Exp $ +# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:43 seb Exp $ # DISTNAME= ispell-3.1.20 @@ -17,7 +17,6 @@ MAKE_FLAGS+= TMPDIR="${WRKDIR}" WRKSRC= ${WRKDIR}/ispell-3.1 -USE_GTEXINFO= yes INFO_FILES= ispell.info .if exists(/usr/include/inttypes.h) @@ -38,4 +37,5 @@ do-configure: ${ECHO} "#define ELISPDIR \"${PREFIX}/share/emacs/site-lisp\"" >> local.h; \ ${ECHO} "#define CFLAGS \"${CFLAGS}\"" >> local.h +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/ispell-base/PLIST b/textproc/ispell-base/PLIST index 6dd9e17c386..ab3ae24e9c0 100644 --- a/textproc/ispell-base/PLIST +++ b/textproc/ispell-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:57:01 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:43 seb Exp $ bin/buildhash bin/findaffix bin/icombine @@ -8,9 +8,9 @@ bin/munchlist bin/sq bin/tryaffix bin/unsq -@unexec install-info --delete %D/info/ispell.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/ispell.info %D/info/dir info/ispell.info -@exec install-info %D/info/ispell.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/ispell.info %D/info/dir lib/american.hash lib/americanmed+.hash lib/english.aff diff --git a/textproc/ispell-base/distinfo b/textproc/ispell-base/distinfo index e6dcd65d36c..6c2a25ff498 100644 --- a/textproc/ispell-base/distinfo +++ b/textproc/ispell-base/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 15:04:58 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/02/18 15:14:43 seb Exp $ SHA1 (ispell-3.1.20.tar.gz) = f8f849a3868ef3d88c1ba6fe5b49505f75de786e Size (ispell-3.1.20.tar.gz) = 677987 bytes SHA1 (patch-aa) = cf8e0863e62103526d75ba5f0f25c760d4ee8e32 -SHA1 (patch-ab) = 6cad60fd5b86f6691702eb69d59cd650a9eb27a2 +SHA1 (patch-ab) = f67725f76e3fe9136381e55e3aab37ef8b729cf7 SHA1 (patch-ac) = 05b7f88754819faf2e282221ce1c2fcc446f0b36 SHA1 (patch-ad) = 72769350706c17ecf30afe99d7487edd4ad9551c SHA1 (patch-ae) = e7e2b99d9055e5beeaaf68b9a4379f630241d0bd diff --git a/textproc/ispell-base/patches/patch-ab b/textproc/ispell-base/patches/patch-ab index fa90b951858..5c88ad602f1 100644 --- a/textproc/ispell-base/patches/patch-ab +++ b/textproc/ispell-base/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $ +$NetBSD: patch-ab,v 1.2 2002/02/18 15:14:43 seb Exp $ ---- Makefile.orig Sat Jan 1 20:32:31 2000 -+++ Makefile Sat Jan 1 20:38:02 2000 +--- Makefile.orig Thu Oct 12 20:04:06 1995 ++++ Makefile @@ -240,31 +240,15 @@ set $(SHELLDEBUG); \ if [ -d $$TEXINFODIR -a -r ispell.info ]; then \ @@ -37,12 +37,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/03/14 12:10:22 agc Exp $ install-dictbuild: @. ./config.sh; \ -@@ -324,7 +308,7 @@ +@@ -323,8 +307,8 @@ + . ./config.sh; \ set $(SHELLDEBUG); \ if [ -d $$TEXINFODIR ]; then \ - if sh iwhich makeinfo >/dev/null \ +- if sh iwhich makeinfo >/dev/null \ - && makeinfo ispell.texinfo 2>/dev/null; then \ -+ && makeinfo --no-split --force ispell.texinfo 2>/dev/null; true; then \ ++ if true >/dev/null \ ++ && $(MAKEINFO) --no-split --force ispell.texinfo 2>/dev/null; true; then \ :; \ elif sh iwhich $$EMACS >/dev/null; then \ set -e; \ diff --git a/textproc/textutils/Makefile b/textproc/textutils/Makefile index 5ed37c4eee1..4f7040d1b52 100644 --- a/textproc/textutils/Makefile +++ b/textproc/textutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/12/30 11:52:13 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2002/02/18 15:14:43 seb Exp $ # FreeBSD Id: ports/textproc/textutils/Makefile,v 1.7 1999/09/18 17:46:30 steve Exp DISTNAME= textutils-2.0 @@ -16,6 +16,7 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS= --program-prefix=g post-install: - install-info ${PREFIX}/info/textutils.info ${PREFIX}/info/dir + ${INSTALL_INFO} ${PREFIX}/info/textutils.info ${PREFIX}/info/dir +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/textutils/PLIST b/textproc/textutils/PLIST index a8771cad6d6..1be8ef7733e 100644 --- a/textproc/textutils/PLIST +++ b/textproc/textutils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:04 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:43 seb Exp $ bin/gcat bin/gcksum bin/gcomm @@ -25,10 +25,10 @@ bin/gtsort bin/gunexpand bin/guniq bin/gwc -@unexec install-info --delete %D/info/textutils.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/textutils.info %D/info/dir info/textutils.info @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir -@exec install-info %D/info/textutils.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/textutils.info %D/info/dir man/man1/gcat.1 man/man1/gcksum.1 man/man1/gcomm.1 diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile index 8526d815a30..c8a000b629c 100644 --- a/textproc/wdiff/Makefile +++ b/textproc/wdiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:37:55 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:44 seb Exp $ # DISTNAME= wdiff-0.5 @@ -12,5 +12,7 @@ COMMENT= Word-by-word diff GNU_CONFIGURE= yes INFO_FILES+= wdiff.info +TEXINFO_OVERRIDE= YES +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/wdiff/PLIST b/textproc/wdiff/PLIST index 73805fcd584..7b9134abccf 100644 --- a/textproc/wdiff/PLIST +++ b/textproc/wdiff/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:11 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:44 seb Exp $ bin/wdiff -@unexec install-info --delete %D/info/wdiff.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/wdiff.info %D/info/dir info/wdiff.info -@exec install-info %D/info/wdiff.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/wdiff.info %D/info/dir diff --git a/wm/ratpoison/Makefile b/wm/ratpoison/Makefile index 7d6affdac73..8f805477a31 100644 --- a/wm/ratpoison/Makefile +++ b/wm/ratpoison/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/21 10:10:05 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:44 seb Exp $ # DISTNAME= ratpoison-1.0.0 @@ -13,4 +13,5 @@ USE_BUILDLINK_ONLY= YES GNU_CONFIGURE= YES .include "../../mk/x11.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/ratpoison/PLIST b/wm/ratpoison/PLIST index ef2d4c564af..fb71c20b77f 100644 --- a/wm/ratpoison/PLIST +++ b/wm/ratpoison/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:24 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:44 seb Exp $ bin/ratpoison -@unexec install-info --delete --info-dir=%D/info %D/info/ratpoison.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ratpoison.info info/ratpoison.info -@exec install-info --info-dir=%D/info %D/info/ratpoison.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ratpoison.info man/man1/ratpoison.1 share/doc/ratpoison/AUTHORS share/doc/ratpoison/COPYING diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile index 5758013d422..b9661a9fb77 100644 --- a/wm/sawfish/Makefile +++ b/wm/sawfish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/26 20:19:49 tron Exp $ +# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:44 seb Exp $ # PKGNAME= sawfish-${SF_VERS} @@ -11,6 +11,7 @@ USE_X11BASE= # defined CONFIGURE_ENV+= LOCALEDIR=${LOCALEDIR} MAKE_ENV+= LOCALEDIR=${LOCALEDIR} +TEXINFO_OVERRIDE= YES PLIST_SUBST+= SF_VERS=${SF_VERS} diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common index 0951ab8b033..1be4359718d 100644 --- a/wm/sawfish/Makefile.common +++ b/wm/sawfish/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2001/10/22 02:34:38 mycroft Exp $ +# $NetBSD: Makefile.common,v 1.6 2002/02/18 15:14:44 seb Exp $ DISTNAME= sawfish-${SF_VERS} SF_VERS= 1.0.1 @@ -21,4 +21,5 @@ GNU_CONFIGURE= # defined FILESDIR= ${.CURDIR}/../../wm/sawfish/files PATCHDIR= ${.CURDIR}/../../wm/sawfish/patches +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/sawfish/PLIST b/wm/sawfish/PLIST index c6446cd709d..bafd146e4f6 100644 --- a/wm/sawfish/PLIST +++ b/wm/sawfish/PLIST @@ -1,17 +1,17 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:25 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:44 seb Exp $ bin/sawfish bin/sawfish-capplet bin/sawfish-client bin/sawfish-themer bin/sawfish-ui -@unexec install-info --delete --info-dir=%D/info %D/info/sawfish.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/sawfish.info info/sawfish.info info/sawfish.info-1 info/sawfish.info-2 info/sawfish.info-3 info/sawfish.info-4 info/sawfish.info-5 -@exec install-info --info-dir=%D/info %D/info/sawfish.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/sawfish.info libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/DOC libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gradient.la libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gradient.a diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile index cd3fcdda951..2339d352325 100644 --- a/www/cgicc/Makefile +++ b/www/cgicc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/11/28 17:47:05 martti Exp $ +# $NetBSD: Makefile,v 1.2 2002/02/18 15:14:44 seb Exp $ DISTNAME= cgicc-3.1.5 CATEGORIES= www @@ -16,4 +16,5 @@ INFO_FILES= cgicc.info LTCONFIG_OVERRIDE= ${WRKSRC}/support/ltconfig ${WRKSRC}/example/ltconfig +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/cgicc/PLIST b/www/cgicc/PLIST index fab681e1c81..538f87b54be 100644 --- a/www/cgicc/PLIST +++ b/www/cgicc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2001/11/28 17:47:05 martti Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:45 seb Exp $ bin/cgicc-config include/cgicc/CgiDefs.h include/cgicc/CgiEnvironment.h @@ -12,12 +12,12 @@ include/cgicc/HTMLElements.h include/cgicc/HTMLGeneric.h include/cgicc/HTTPHeaders.h include/cgicc/MStreamable.h -@unexec install-info --delete --info-dir=%D/info %D/info/cgicc.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cgicc.info info/cgicc.info info/cgicc.info-1 info/cgicc.info-2 info/cgicc.info-3 -@exec install-info --info-dir=%D/info %D/info/cgicc.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cgicc.info lib/libcgicc.a lib/libcgicc.la lib/libcgicc.so diff --git a/www/cronolog/Makefile b/www/cronolog/Makefile index 8bc490695ff..ae391dd7bf6 100644 --- a/www/cronolog/Makefile +++ b/www/cronolog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/11/14 06:18:08 zuntum Exp $ +# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:45 seb Exp $ # DISTNAME= cronolog-1.6.1 @@ -20,4 +20,5 @@ post-install: ${MV} ${PREFIX}/man/man1/cronolog.1m ${PREFIX}/man/man8/cronolog.8 ${MV} ${PREFIX}/man/man1/cronosplit.1m ${PREFIX}/man/man8/cronosplit.8 +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/cronolog/PLIST b/www/cronolog/PLIST index 9a20bcb8d1e..cb9724296e8 100644 --- a/www/cronolog/PLIST +++ b/www/cronolog/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:35 zuntum Exp $ -@unexec install-info --delete --info-dir=%D/info %D/info/cronolog.info +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:45 seb Exp $ +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cronolog.info info/cronolog.info -@exec install-info --info-dir=%D/info %D/info/cronolog.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cronolog.info man/man8/cronolog.8 man/man8/cronosplit.8 sbin/cronolog diff --git a/www/w3/Makefile b/www/w3/Makefile index 906cb300f67..f0117f93492 100644 --- a/www/w3/Makefile +++ b/www/w3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/05/19 17:40:01 jtb Exp $ +# $NetBSD: Makefile,v 1.9 2002/02/18 15:14:45 seb Exp $ DISTNAME= w3-4.0pre.46 PKGNAME= w3-4.0b46 @@ -31,4 +31,5 @@ INFO_FILES= w3.info w3-faq.info PLIST_SRC= ${PKGDIR}/PLIST.emacs .endif +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/w3/PLIST.emacs b/www/w3/PLIST.emacs index c0cf47675ff..406e13afe5d 100644 --- a/www/w3/PLIST.emacs +++ b/www/w3/PLIST.emacs @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST.emacs,v 1.1 2001/11/01 02:27:01 zuntum Exp $ -@unexec install-info --delete --info-dir=%D/info %D/info/w3-faq.info -@unexec install-info --delete --info-dir=%D/info %D/info/w3.info +@comment $NetBSD: PLIST.emacs,v 1.2 2002/02/18 15:14:45 seb Exp $ +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/w3-faq.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/w3.info info/w3-faq.info info/w3.info info/w3.info-1 @@ -8,8 +8,8 @@ info/w3.info-2 info/w3.info-3 info/w3.info-4 info/w3.info-5 -@exec install-info --info-dir=%D/info %D/info/w3-faq.info -@exec install-info --info-dir=%D/info %D/info/w3.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/w3-faq.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/w3.info share/default.css share/emacs/site-lisp/w3/auto-autoloads.el share/emacs/site-lisp/w3/auto-autoloads.elc diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index e6f0316b899..23d8ed1373a 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2001/10/24 22:11:13 jlam Exp $ +# $NetBSD: Makefile,v 1.69 2002/02/18 15:14:45 seb Exp $ DISTNAME= gtk+-1.2.10 CATEGORIES= x11 @@ -65,4 +65,5 @@ post-install: .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/glib/buildlink.mk" .include "../../mk/x11.buildlink.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk/PLIST b/x11/gtk/PLIST index 7c55b75f5f0..67feb539b88 100644 --- a/x11/gtk/PLIST +++ b/x11/gtk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:07 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:45 seb Exp $ bin/gtk-config etc/gtk/gtkrc.az etc/gtk/gtkrc.be @@ -184,8 +184,8 @@ lib/libgtk.la lib/pkgconfig/gdk.pc lib/pkgconfig/gtk+.pc man/man1/gtk-config.1 -@unexec install-info --delete %D/info/gdk.info %D/info/dir -@unexec install-info --delete %D/info/gtk.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gdk.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gtk.info %D/info/dir info/gdk.info info/gtk.info info/gtk.info-1 @@ -194,8 +194,8 @@ info/gtk.info-3 info/gtk.info-4 info/gtk.info-5 info/gtk.info-6 -@exec install-info %D/info/gdk.info %D/info/dir -@exec install-info %D/info/gtk.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gdk.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gtk.info %D/info/dir share/aclocal/gtk.m4 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtk+.mo ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gtk+.mo diff --git a/x11/gtk10/Makefile b/x11/gtk10/Makefile index 56e8bd94580..8dc29e2608f 100644 --- a/x11/gtk10/Makefile +++ b/x11/gtk10/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/04/27 11:43:40 tron Exp $ +# $NetBSD: Makefile,v 1.14 2002/02/18 15:14:45 seb Exp $ DISTNAME= gtk+-1.0.6 PKGNAME= gtk10-1.0.6 @@ -19,8 +19,10 @@ CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk10 CFLAGS= -pipe -O2 INFO_FILES= gdk10.info glib10.info gtk10.info +TEXINFO_OVERRIDE= YES post-extract: cd ${WRKSRC}/docs && ${RM} -f ${INFO_FILES} +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk10/PLIST b/x11/gtk10/PLIST index aef949b945b..e88ecae35d3 100644 --- a/x11/gtk10/PLIST +++ b/x11/gtk10/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:56 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:46 seb Exp $ bin/gtk10-config include/gtk10/gdk/gdk.h include/gtk10/gdk/gdkcursors.h @@ -103,9 +103,9 @@ include/gtk10/gtk/gtkvscrollbar.h include/gtk10/gtk/gtkvseparator.h include/gtk10/gtk/gtkwidget.h include/gtk10/gtk/gtkwindow.h -@unexec install-info --delete %D/info/gdk10.info %D/info/dir -@unexec install-info --delete %D/info/glib10.info %D/info/dir -@unexec install-info --delete %D/info/gtk10.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gdk10.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/glib10.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/gtk10.info %D/info/dir info/gdk10.info info/glib10.info info/gtk10.info @@ -114,9 +114,9 @@ info/gtk10.info-2 info/gtk10.info-3 info/gtk10.info-4 info/gtk10.info-5 -@exec install-info %D/info/gdk10.info %D/info/dir -@exec install-info %D/info/glib10.info %D/info/dir -@exec install-info %D/info/gtk10.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gdk10.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/glib10.info %D/info/dir +@exec ${INSTALL_INFO} %D/info/gtk10.info %D/info/dir lib/libgdk10.a lib/libgdk10.la lib/libgdk10.so diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile index d3019516136..965229f9307 100644 --- a/x11/xview-lib/Makefile +++ b/x11/xview-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/11/29 01:12:53 hubertf Exp $ +# $NetBSD: Makefile,v 1.18 2002/02/18 15:14:46 seb Exp $ # $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp # @@ -23,4 +23,5 @@ post-install: cd ${PREFIX}/lib && ${LN} -fs libolgx.so.3.2 libolgx.so.3 && \ ${LN} -fs libxview.so.3.2 libxview.so.3 +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xview-lib/PLIST b/x11/xview-lib/PLIST index ce175a2e5d2..2b5d4d83179 100644 --- a/x11/xview-lib/PLIST +++ b/x11/xview-lib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:44 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:46 seb Exp $ include/bitmaps/1x1 include/bitmaps/2x2 include/bitmaps/black @@ -512,21 +512,21 @@ include/xview_private/xv_path_util.h lib/.text_extras_menu lib/.textswrc lib/.ttyswrc -@unexec install-info --delete --info-dir=%D/info %D/lib/help/props.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/lib/help/props.info lib/help/props.info -@exec install-info --info-dir=%D/info %D/lib/help/props.info -@unexec install-info --delete --info-dir=%D/info %D/lib/help/textedit.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/lib/help/props.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/lib/help/textedit.info lib/help/textedit.info -@exec install-info --info-dir=%D/info %D/lib/help/textedit.info -@unexec install-info --delete --info-dir=%D/info %D/lib/help/textsw.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/lib/help/textedit.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/lib/help/textsw.info lib/help/textsw.info -@exec install-info --info-dir=%D/info %D/lib/help/textsw.info -@unexec install-info --delete --info-dir=%D/info %D/lib/help/ttysw.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/lib/help/textsw.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/lib/help/ttysw.info lib/help/ttysw.info -@exec install-info --info-dir=%D/info %D/lib/help/ttysw.info -@unexec install-info --delete --info-dir=%D/info %D/lib/help/xview.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/lib/help/ttysw.info +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/lib/help/xview.info lib/help/xview.info -@exec install-info --info-dir=%D/info %D/lib/help/xview.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/lib/help/xview.info lib/libolgx.a lib/libolgx.so lib/libolgx.so.3 |