Introduce new framework for handling info files generation and instal…

…lation. 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.
jsonn · Feb 18, 2002 · 1964a9f · 1964a9f
1 parent 9e56564
commit 1964a9f
Show file tree

Hide file tree

Showing 320 changed files with 1,346 additions and 852 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,12 +26,13 @@ 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
 
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,12 +1,12 @@
-@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
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"