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.

14 files changed, 37 insertions, 31 deletions

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