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.

12 files changed, 51 insertions, 44 deletions

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