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.

8 files changed, 22 insertions, 17 deletions

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