From 66111c6d15be91debc28f649061f5ed03d48e340 Mon Sep 17 00:00:00 2001 From: seb Date: Mon, 18 Feb 2002 15:14:00 +0000 Subject: 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. --- devel/autoconf-devel/Makefile | 3 ++- devel/autoconf-devel/PLIST | 10 +++++----- devel/autoconf/Makefile | 4 +++- devel/autoconf/PLIST | 10 +++++----- devel/automake/Makefile | 4 +++- devel/automake/PLIST | 6 +++--- devel/bison/Makefile | 3 ++- devel/bison/PLIST | 6 +++--- devel/cssc/Makefile | 10 +++++----- devel/cssc/PLIST | 6 +++--- devel/cvs/Makefile | 5 +++-- devel/cvs/PLIST | 10 +++++----- devel/ddd/Makefile | 3 ++- devel/ddd/PLIST | 10 +++++----- devel/diffutils/Makefile | 3 ++- devel/diffutils/PLIST | 6 +++--- devel/dmalloc/Makefile | 3 ++- devel/dmalloc/PLIST | 6 +++--- devel/elib/Makefile | 3 ++- devel/elib/distinfo | 3 ++- devel/elib/patches/patch-aa | 12 ++++++++++++ devel/gcvs/Makefile | 4 +++- devel/gcvs/PLIST | 10 +++++----- devel/gdb/Makefile | 3 ++- devel/gdb/PLIST | 26 +++++++++++++------------- devel/gettext/Makefile | 4 +++- devel/gettext/PLIST | 6 +++--- devel/gindent/Makefile | 3 ++- devel/gindent/PLIST | 6 +++--- devel/glib/Makefile | 4 +++- devel/glib/PLIST | 6 +++--- devel/gmake/Makefile | 5 +++-- devel/gmake/PLIST | 6 +++--- devel/gmp/Makefile | 4 +++- devel/gmp/PLIST | 6 +++--- devel/gperf/Makefile | 4 ++-- devel/gperf/PLIST | 6 +++--- devel/guile-oops/Makefile | 3 ++- devel/guile-oops/PLIST | 6 +++--- devel/id-utils/Makefile | 3 ++- devel/id-utils/PLIST | 6 +++--- devel/isect/Makefile | 3 ++- devel/isect/PLIST | 6 +++--- devel/libavl/Makefile | 3 ++- devel/libavl/PLIST | 6 +++--- devel/libg++/Makefile | 3 ++- devel/libg++/PLIST.pre | 6 +++--- devel/libg++/files/Makefile | 4 ++-- devel/libgtop/Makefile | 3 ++- devel/libgtop/PLIST | 6 +++--- devel/libtool-info/Makefile | 9 +++++---- devel/m4/Makefile | 4 +++- devel/m4/PLIST | 6 +++--- devel/nana/Makefile | 3 ++- devel/nana/PLIST | 6 +++--- devel/nasm-devel/Makefile | 5 ++++- devel/nasm-devel/PLIST | 6 +++--- devel/prc-tools-base/Makefile | 4 +++- devel/prc-tools-base/PLIST | 6 +++--- devel/prcs/Makefile | 4 ++-- devel/prcs/PLIST | 6 +++--- devel/readline/Makefile | 3 ++- devel/readline/PLIST | 10 +++++----- devel/rx/Makefile | 3 ++- devel/rx/PLIST | 6 +++--- devel/semantic/Makefile | 3 ++- devel/semantic/PLIST | 6 +++--- devel/semantic/distinfo | 3 ++- devel/semantic/patches/patch-aa | 12 ++++++++++++ devel/slib/Makefile | 3 ++- devel/slib/PLIST | 6 +++--- devel/sml-mode/Makefile | 3 ++- devel/sml-mode/PLIST | 6 +++--- devel/xdelta/Makefile | 3 ++- devel/xdelta/PLIST | 6 +++--- 75 files changed, 244 insertions(+), 175 deletions(-) create mode 100644 devel/elib/patches/patch-aa create mode 100644 devel/semantic/patches/patch-aa (limited to 'devel') 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,,${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 -- cgit v1.2.3