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.

10 files changed, 68 insertions, 31 deletions

diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index b4125eae448..5e4e961fde9 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2002/01/06 02:10:56 tron Exp $
+# $NetBSD: Makefile,v 1.34 2002/02/18 15:14:37 seb Exp $
 #
 
 DISTNAME=		a2ps-4.13b
@@ -17,7 +17,6 @@ DEPENDS+=		psutils-1.17:../../print/psutils
 STRIP=			# empty
 USE_PERL5=		YES
 USE_GMAKE=		YES
-USE_GTEXINFO=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/auxdir/ltconfig
 
@@ -32,4 +31,5 @@ pre-build:
 	${TOUCH} ${WRKSRC}/doc/*.info
 	${TOUCH} ${WRKSRC}/doc/*.dvi
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/a2ps/PLIST b/print/a2ps/PLIST
index dfb98c340eb..180de08527a 100644
--- a/print/a2ps/PLIST
+++ b/print/a2ps/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:27:28 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:37 seb Exp $
 bin/a2ps
 bin/card
 bin/composeglyphs
@@ -12,9 +12,9 @@ bin/texi2dvi4a2ps
 etc/a2ps-site.cfg
 etc/a2ps.cfg
 include/liba2ps.h
-@unexec install-info --delete %D/info/a2ps.info %D/info/dir
-@unexec install-info --delete %D/info/ogonkify.info %D/info/dir
-@unexec install-info --delete %D/info/regex.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/a2ps.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/ogonkify.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/regex.info %D/info/dir
 info/a2ps.info
 info/a2ps.info-1
 info/a2ps.info-2
@@ -27,9 +27,9 @@ info/regex.info
 info/regex.info-1
 info/regex.info-2
 info/regex.info-3
-@exec install-info %D/info/a2ps.info %D/info/dir
-@exec install-info %D/info/ogonkify.info %D/info/dir
-@exec install-info %D/info/regex.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/a2ps.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/ogonkify.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/regex.info %D/info/dir
 lib/liba2ps.a
 lib/liba2ps.la
 lib/liba2ps.so
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 6e0aa35b1fe..9179b56b6bd 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/03 22:16:52 jtb Exp $
+# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:37 seb Exp $
 
 DISTNAME=		auctex-10.0g
 CATEGORIES=		print
@@ -40,7 +40,7 @@ post-patch:
 
 post-build:
 	${RM} -f ${WRKSRC}/doc/auctex*
-	cd ${WRKSRC}/doc && ${MAKE} auctex
+	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE} auctex
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${LISPDIR}/auctex
@@ -58,4 +58,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/style/*.el* ${PREFIX}/${LISPDIR}/auctex/style
 	${INSTALL_DATA} ${WRKSRC}/doc/auctex* ${PREFIX}/${INFODIR}
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/auctex/PLIST b/print/auctex/PLIST
index d8b7efa03d5..28f40b464a6 100644
--- a/print/auctex/PLIST
+++ b/print/auctex/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:27:33 zuntum Exp $
-@unexec install-info --delete --info-dir=%D/${INFODIR} %D/${INFODIR}/auctex
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:38 seb Exp $
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/${INFODIR} %D/${INFODIR}/auctex
 ${INFODIR}/auctex
 ${INFODIR}/auctex-1
 ${INFODIR}/auctex-2
 ${INFODIR}/auctex-3
-@exec install-info --info-dir=%D/${INFODIR} %D/${INFODIR}/auctex
+@exec ${INSTALL_INFO} --info-dir=%D/${INFODIR} %D/${INFODIR}/auctex
 ${LISPDIR}/auctex/auc-old.el
 ${LISPDIR}/auctex/auc-old.elc
 ${LISPDIR}/auctex/bib-cite.el
diff --git a/print/auctex/distinfo b/print/auctex/distinfo
index f60436a7fdc..d39885b5484 100644
--- a/print/auctex/distinfo
+++ b/print/auctex/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 22:23:45 jtb Exp $
+$NetBSD: distinfo,v 1.3 2002/02/18 15:14:38 seb Exp $
 
 SHA1 (auctex-10.0g.tar.gz) = b73539603ce1967560d1a9494b003ac292440d9d
 Size (auctex-10.0g.tar.gz) = 283767 bytes
 SHA1 (patch-aa) = b0c04b4d27fc90ec01673c002c9e529ccde9afde
+SHA1 (patch-ab) = 08e32149fd6aa7d26c21f1881acdab54ce51b950
 SHA1 (patch-ac) = 27f38d4176f542f4a69044ba7697197fd2556c8e
diff --git a/print/auctex/patches/patch-ab b/print/auctex/patches/patch-ab
new file mode 100644
index 00000000000..61e33ab09da
--- /dev/null
+++ b/print/auctex/patches/patch-ab
@@ -0,0 +1,33 @@
+$NetBSD: patch-ab,v 1.3 2002/02/18 15:14:38 seb Exp $
+
+--- doc/Makefile.orig	Wed Apr 11 13:54:04 2001
++++ doc/Makefile
+@@ -39,23 +39,23 @@
+ 	dvips auc-tex.dvi -o auc-tex.ps
+ 
+ auctex: auc-tex.texi install.texi intro.texi changes.texi
+-	-makeinfo auc-tex.texi
++	-$(MAKEINFO) auc-tex.texi
+ 	@echo "**********************************************************"
+ 	@echo "** If this gave trouble, maybe you need to install"
+ 	@echo "** a newer version of texinfo?"
+ 	@echo "**********************************************************"
+ 
+ INSTALLATION: install.texi
+-	-makeinfo --no-headers install.texi --output INSTALLATION
++	-$(MAKEINFO) --no-headers install.texi --output INSTALLATION
+ 
+ README: intro.texi
+-	-makeinfo --no-headers intro.texi --output README
++	-$(MAKEINFO) --no-headers intro.texi --output README
+ 
+ CHANGES: changes.texi
+-	-makeinfo --no-headers changes.texi --output CHANGES
++	-$(MAKEINFO) --no-headers changes.texi --output CHANGES
+ 
+ HISTORY: history.texi
+-	-makeinfo --no-headers history.texi --output HISTORY
++	-$(MAKEINFO) --no-headers history.texi --output HISTORY
+ 
+ install: auctex
+ 	cp auctex auctex-* $(infodir)
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 8708513b9cd..25aa1b86638 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/01/18 14:03:01 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:38 seb Exp $
 #
 
 DISTNAME=	lilypond-1.3.119
@@ -23,4 +23,5 @@ CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 PYTHON_VERSIONS_ACCEPTED= 20 21 # 22 has some regular expression problem
 
 .include "../../lang/python/application.buildlink.mk"
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/lilypond/PLIST b/print/lilypond/PLIST
index c9c18a3d2e5..8626ecb3aff 100644
--- a/print/lilypond/PLIST
+++ b/print/lilypond/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:27:47 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:38 seb Exp $
 bin/abc2ly
 bin/as2text
 bin/convert-ly
@@ -9,8 +9,8 @@ bin/ly2dvi
 bin/midi2ly
 bin/musedata2ly
 bin/pmx2ly
-@unexec install-info --delete --info-dir=%D/info %D/info/lilypond-internals.info
-@unexec install-info --delete --info-dir=%D/info %D/info/lilypond.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/lilypond-internals.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/lilypond.info
 info/lilypond-internals.info
 info/lilypond-internals.info-1
 info/lilypond-internals.info-2
@@ -22,8 +22,8 @@ info/lilypond.info
 info/lilypond.info-1
 info/lilypond.info-2
 info/lilypond.info-3
-@exec install-info --info-dir=%D/info %D/info/lilypond.info
-@exec install-info --info-dir=%D/info %D/info/lilypond-internals.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/lilypond.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/lilypond-internals.info
 man/man1/abc2ly.1
 man/man1/as2text.1
 man/man1/convert-ly.1
diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile
index aecbafe8cf7..910c0c99ab2 100644
--- a/print/teTeX-bin/Makefile
+++ b/print/teTeX-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2002/01/28 15:25:13 drochner Exp $
+# $NetBSD: Makefile,v 1.34 2002/02/18 15:14:39 seb Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
 #
 
@@ -69,4 +69,5 @@ post-install:
 	texconfig font vardir /var/spool/texfonts
 	texconfig font options appendonlydir varfonts
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX-bin/PLIST b/print/teTeX-bin/PLIST
index a549a2c83c1..f8ce9d4cd20 100644
--- a/print/teTeX-bin/PLIST
+++ b/print/teTeX-bin/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:57 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:39 seb Exp $
 @comment There are three files in this package that teTeX-share installs
 @comment and that teTeX-bin modifies. Take care of this:
 lib/libkpathsea.a
-@unexec install-info --delete %D/info/latex.info %D/info/dir
-@unexec install-info --delete %D/info/dvips.info %D/info/dir
-@unexec install-info --delete %D/info/web2c.info %D/info/dir
-@unexec install-info --delete %D/info/kpathsea.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/latex.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/dvips.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/web2c.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/kpathsea.info %D/info/dir
 info/latex.info-3
 info/latex.info-2
 info/latex.info-1
@@ -21,10 +21,10 @@ info/web2c.info-2
 info/web2c.info-1
 info/web2c.info
 info/kpathsea.info
-@exec install-info %D/info/latex.info %D/info/dir
-@exec install-info %D/info/dvips.info %D/info/dir
-@exec install-info %D/info/web2c.info %D/info/dir
-@exec install-info %D/info/kpathsea.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/latex.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/dvips.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/web2c.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/kpathsea.info %D/info/dir
 include/kpathsea/xstat.h
 include/kpathsea/xopendir.h
 include/kpathsea/win32lib.h