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.

16 files changed, 62 insertions, 41 deletions

diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index ea42a4e8c3a..7d16ecc56bd 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/01/30 11:56:08 agc Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:20 seb Exp $
 #
 
 DISTNAME=	aalib-1.4rc4
@@ -20,4 +20,5 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 CONFIGURE_ARGS+=	--with-x11-driver=no
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aalib/PLIST b/graphics/aalib/PLIST
index 7fca8f83d46..81be1c8c263 100644
--- a/graphics/aalib/PLIST
+++ b/graphics/aalib/PLIST
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:14 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:20 seb Exp $
 bin/aafire
 bin/aainfo
 bin/aalib-config
 bin/aasavefont
 bin/aatest
 include/aalib.h
-@unexec install-info --delete --info-dir=%D/info %D/info/aalib.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/aalib.info
 info/aalib.info
 info/aalib.info-1
 info/aalib.info-2
 info/aalib.info-3
-@exec install-info --info-dir=%D/info %D/info/aalib.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/aalib.info
 lib/libaa.a
 lib/libaa.la
 lib/libaa.so
diff --git a/graphics/barcode/Makefile b/graphics/barcode/Makefile
index b58225e966b..ee5f60d5492 100644
--- a/graphics/barcode/Makefile
+++ b/graphics/barcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/12 21:32:53 dillo Exp $
+# $NetBSD: Makefile,v 1.2 2002/02/18 15:14:20 seb Exp $
 #
 
 DISTNAME=	barcode-0.96
@@ -14,4 +14,5 @@ MAKE_ENV+=	AWK="${AWK}"
 
 INFO_FILES=	barcode.info
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/barcode/PLIST b/graphics/barcode/PLIST
index 1faa51c60f7..4524240fa9b 100644
--- a/graphics/barcode/PLIST
+++ b/graphics/barcode/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:19 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:20 seb Exp $
 bin/barcode
 include/barcode.h
-@unexec install-info --delete %D/info/barcode.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/barcode.info %D/info/dir
 info/barcode.info
-@exec install-info %D/info/barcode.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/barcode.info %D/info/dir
 lib/libbarcode.a
 man/man1/barcode.1
 man/man3/barcode.3
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index a9c1cb86c55..6afe1b8fd87 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/10/24 22:11:00 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2002/02/18 15:14:20 seb Exp $
 
 DISTNAME=		geomview-1.8.1
 CATEGORIES=		graphics math
@@ -43,4 +43,5 @@ post-install:
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../mk/motif.buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/geomview/PLIST b/graphics/geomview/PLIST
index ffcf9a8c16e..5031f949f46 100644
--- a/graphics/geomview/PLIST
+++ b/graphics/geomview/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:52 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:20 seb Exp $
 bin/.geomview-animate
 bin/.geomview-drawbdy
 bin/animate
@@ -18,7 +18,7 @@ bin/polymerge
 bin/togeomview
 bin/ucdtooff
 bin/vrml2oogl
-@unexec install-info --delete --info-dir=%D/info %D/info/geomview
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/geomview
 info/geomview
 info/geomview-1
 info/geomview-2
@@ -27,7 +27,7 @@ info/geomview-4
 info/geomview-5
 info/geomview-6
 info/geomview-7
-@exec install-info --info-dir=%D/info %D/info/geomview
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/geomview
 man/man1/anytooff.1
 man/man1/anytoucd.1
 man/man1/bdy.1
diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile
index 12bb96c75b1..8fb8f6dde19 100644
--- a/graphics/hp2xx/Makefile
+++ b/graphics/hp2xx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/09/27 23:18:12 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2002/02/18 15:14:20 seb Exp $
 #
 
 DISTNAME=	hp2xx-3.4.0
@@ -20,4 +20,5 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/sources
 post-extract:
 	${CP} ${WRKSRC}/../makes/generic.mak ${WRKSRC}/Makefile
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/hp2xx/PLIST b/graphics/hp2xx/PLIST
index 9a05b74b840..4423e144fea 100644
--- a/graphics/hp2xx/PLIST
+++ b/graphics/hp2xx/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:51:29 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:20 seb Exp $
 bin/hp2xx
 man/man1/hp2xx.1
-@unexec install-info --delete %D/info/hp2xx.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/hp2xx.info %D/info/dir
 info/hp2xx.info
-@exec install-info %D/info/hp2xx.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/hp2xx.info %D/info/dir
diff --git a/graphics/hp2xx/distinfo b/graphics/hp2xx/distinfo
index 6330c60f07d..f16c4f7c6c0 100644
--- a/graphics/hp2xx/distinfo
+++ b/graphics/hp2xx/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/04/23 19:25:46 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2002/02/18 15:14:20 seb Exp $
 
 SHA1 (hp2xx-3.4.0.tar.gz) = b8b80ae2f558017046d1b0f43e3c4d7de565065c
 Size (hp2xx-3.4.0.tar.gz) = 301139 bytes
 SHA1 (patch-aa) = 80c8e2505556d493ffc6a741ac13bfd0abfe165b
-SHA1 (patch-ab) = 574ab1554935f51f2f9dd217552c65a523e76980
+SHA1 (patch-ab) = 6bf8fa3b72cf24803060dabb41e26b103a62545a
 SHA1 (patch-ac) = 41901116cab61281160e892edb998d73fb2c9bcc
 SHA1 (patch-ad) = 2ef9c938ef802f139998cafd9cfa4d9f3be29c8d
 SHA1 (patch-ae) = ae68f08e8ad907f043a344f3172ba4f104223f6d
diff --git a/graphics/hp2xx/patches/patch-ab b/graphics/hp2xx/patches/patch-ab
index 93d065e2bbf..4db7686c0cb 100644
--- a/graphics/hp2xx/patches/patch-ab
+++ b/graphics/hp2xx/patches/patch-ab
@@ -1,15 +1,25 @@
-$NetBSD: patch-ab,v 1.5 2000/08/31 12:37:02 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.6 2002/02/18 15:14:21 seb Exp $
 
---- Makefile.orig	Thu Aug 31 08:09:46 2000
-+++ Makefile	Thu Aug 31 08:10:24 2000
-@@ -35,5 +35,5 @@
+--- Makefile.orig	Fri Feb 15 14:23:08 2002
++++ Makefile
+@@ -28,13 +28,13 @@
+ 
+ CHMOD    = chmod
+ CP       = cp
+-MKINFO   = makeinfo
++MKINFO   = $(MAKEINFO)
+ RMCMD    = rm -f
+ STRIP    = strip
+ 
  # Installation sites (GNU conventions):
  #
 -prefix   = /usr/local
 +prefix   = ${PREFIX}
  bindir   = $(prefix)/bin
  includedir = $(prefix)/include
-@@ -45,10 +45,10 @@
+ mandir   = $(prefix)/man
+@@ -44,12 +44,12 @@
+ # CC and CFLAGS set for gcc, but any ANSI-C compiler should work.
  # For non-gcc compilers, simply set CFLAGS = -O (to start with)
  #
 -CC       = gcc
@@ -25,14 +35,18 @@ $NetBSD: patch-ab,v 1.5 2000/08/31 12:37:02 dmcmahill Exp $
 +BINDCMD  = echo               # only needed for EMX and DJGPP DOS extenders
  
  
-@@ -63,5 +63,5 @@
+ 
+@@ -62,7 +62,7 @@
+ #
  DEFINES   = -DUNIX -DHAS_UNIX_X11
  PREVIEWER = to_x11
 -ALL_LIBS  = -lX11 -lm     #  Maybe -lX instead of -lX11 is needed?
 +ALL_LIBS  = -lX11 -lm -lz -lpng -ltiff -ljpeg
  #
  # Generic UNIX, no previewer
-@@ -183,12 +183,12 @@
+ #
+@@ -182,14 +182,14 @@
+ EX_DEFS	=
  #
  # PNG support (requires -lpng and -lz on the ALL_LIBS line)
 -#EX_SRC	= png.c to_png.c
@@ -51,7 +65,9 @@ $NetBSD: patch-ab,v 1.5 2000/08/31 12:37:02 dmcmahill Exp $
 +EX_DEFS+= -DTIF
  #
  # Include extras:
-@@ -304,14 +304,10 @@
+ # EX_SRC	= to_pic.c to_pac.c
+@@ -305,15 +305,11 @@
+ install:	install-bin install-info install-man
  
  install-bin:	$(PROGRAM)
 -		-$(STRIP) $(PROGRAM)
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 9e631132998..946451e7f82 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/06/11 06:34:38 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2002/02/18 15:14:21 seb Exp $
 #
 
 DISTNAME=		plotutils-2.4.1
@@ -20,6 +20,5 @@ USE_LIBTOOL=		yes
 USE_X11BASE=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig ${WRKSRC}/libxmi/ltconfig
 
-INFO_FILES=		plotutils.info
-
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plotutils/PLIST b/graphics/plotutils/PLIST
index 9f5d85c3cbf..a220c47de8c 100644
--- a/graphics/plotutils/PLIST
+++ b/graphics/plotutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:09 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:21 seb Exp $
 bin/double
 bin/graph
 bin/ode
@@ -67,9 +67,9 @@ share/tek2plot/scale.tek
 share/tek2plot/skymap.tek
 share/tek2plot/skymap2.tek
 share/tek2plot/usmap.tek
-@unexec install-info --delete %D/info/plotutils.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/plotutils.info %D/info/dir
 info/plotutils.info
-@exec install-info %D/info/plotutils.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/plotutils.info %D/info/dir
 @dirrm share/libplot
 @dirrm share/ode
 @dirrm share/pic2plot
diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile
index 6f811e259c1..bf5290d96e4 100644
--- a/graphics/plplot/Makefile
+++ b/graphics/plplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/10/21 01:45:08 fredb Exp $
+# $NetBSD: Makefile,v 1.22 2002/02/18 15:14:21 seb Exp $
 
 DISTNAME=		plplot-5.0.4
 CATEGORIES=		graphics
@@ -73,4 +73,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/plplotdoc-html-0.4.1/*.html	\
 		${PREFIX}/share/doc/html/plplot
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plplot/PLIST b/graphics/plplot/PLIST
index 1932df1726e..36632cf917c 100644
--- a/graphics/plplot/PLIST
+++ b/graphics/plplot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:12 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:21 seb Exp $
 bin/plplot-config
 bin/plrender
 bin/plserver
@@ -19,7 +19,7 @@ include/plplot/pltcl.h
 include/plplot/pltk.h
 include/plplot/plxwd.h
 include/plplot/tclMatrix.h
-@unexec install-info --delete --info-dir=%D/info %D/info/plplotdoc.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/plplotdoc.info
 info/plplotdoc.info
 info/plplotdoc.info-1
 info/plplotdoc.info-2
@@ -29,7 +29,7 @@ info/plplotdoc.info-5
 info/plplotdoc.info-6
 info/plplotdoc.info-7
 info/plplotdoc.info-8
-@exec install-info --info-dir=%D/info %D/info/plplotdoc.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/plplotdoc.info
 lib/libplcxxd.a
 lib/libplplotd.a
 lib/libtclmatrixd.a
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index 200a89e30db..e6863ef4b5d 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/10/24 22:11:03 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/02/18 15:14:21 seb Exp $
 
 DISTNAME=	xzgv-0.7
 CATEGORIES=	graphics
@@ -18,10 +18,11 @@ USE_GMAKE=		yes
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xzgv ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/xzgv.1 ${PREFIX}/man/man1
-	@(cd ${WRKSRC}/doc && makeinfo xzgv.texi)
+	@(cd ${WRKSRC}/doc && ${MAKEINFO} xzgv.texi)
 	@for f in xzgv xzgv-1 xzgv-2 xzgv-3 ; do \
 	${INSTALL_DATA} ${WRKSRC}/doc/$$f ${PREFIX}/info ; done
 
 .include "../../graphics/imlib/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xzgv/PLIST b/graphics/xzgv/PLIST
index 2db129df9a9..8142bed587e 100644
--- a/graphics/xzgv/PLIST
+++ b/graphics/xzgv/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:51 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:21 seb Exp $
 bin/xzgv
-@unexec install-info --delete --info-dir=%D/info %D/info/xzgv
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/xzgv
 info/xzgv
 info/xzgv-1
 info/xzgv-2
 info/xzgv-3
-@exec install-info --info-dir=%D/info %D/info/xzgv
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/xzgv
 man/man1/xzgv.1