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.

6 files changed, 30 insertions, 26 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index e6f0316b899..23d8ed1373a 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2001/10/24 22:11:13 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2002/02/18 15:14:45 seb Exp $
 
 DISTNAME=		gtk+-1.2.10
 CATEGORIES=		x11
@@ -65,4 +65,5 @@ post-install:
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../devel/glib/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk/PLIST b/x11/gtk/PLIST
index 7c55b75f5f0..67feb539b88 100644
--- a/x11/gtk/PLIST
+++ b/x11/gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:07 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:45 seb Exp $
 bin/gtk-config
 etc/gtk/gtkrc.az
 etc/gtk/gtkrc.be
@@ -184,8 +184,8 @@ lib/libgtk.la
 lib/pkgconfig/gdk.pc
 lib/pkgconfig/gtk+.pc
 man/man1/gtk-config.1
-@unexec install-info --delete %D/info/gdk.info %D/info/dir
-@unexec install-info --delete %D/info/gtk.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/gdk.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/gtk.info %D/info/dir
 info/gdk.info
 info/gtk.info
 info/gtk.info-1
@@ -194,8 +194,8 @@ info/gtk.info-3
 info/gtk.info-4
 info/gtk.info-5
 info/gtk.info-6
-@exec install-info %D/info/gdk.info %D/info/dir
-@exec install-info %D/info/gtk.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/gdk.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/gtk.info %D/info/dir
 share/aclocal/gtk.m4
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtk+.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gtk+.mo
diff --git a/x11/gtk10/Makefile b/x11/gtk10/Makefile
index 56e8bd94580..8dc29e2608f 100644
--- a/x11/gtk10/Makefile
+++ b/x11/gtk10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/04/27 11:43:40 tron Exp $
+# $NetBSD: Makefile,v 1.14 2002/02/18 15:14:45 seb Exp $
 
 DISTNAME=	gtk+-1.0.6
 PKGNAME=	gtk10-1.0.6
@@ -19,8 +19,10 @@ CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk10
 
 CFLAGS=		-pipe -O2
 INFO_FILES=	gdk10.info glib10.info gtk10.info
+TEXINFO_OVERRIDE=	YES
 
 post-extract:
 	cd ${WRKSRC}/docs && ${RM} -f ${INFO_FILES}
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk10/PLIST b/x11/gtk10/PLIST
index aef949b945b..e88ecae35d3 100644
--- a/x11/gtk10/PLIST
+++ b/x11/gtk10/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:56 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:46 seb Exp $
 bin/gtk10-config
 include/gtk10/gdk/gdk.h
 include/gtk10/gdk/gdkcursors.h
@@ -103,9 +103,9 @@ include/gtk10/gtk/gtkvscrollbar.h
 include/gtk10/gtk/gtkvseparator.h
 include/gtk10/gtk/gtkwidget.h
 include/gtk10/gtk/gtkwindow.h
-@unexec install-info --delete %D/info/gdk10.info %D/info/dir
-@unexec install-info --delete %D/info/glib10.info %D/info/dir
-@unexec install-info --delete %D/info/gtk10.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/gdk10.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/glib10.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/gtk10.info %D/info/dir
 info/gdk10.info
 info/glib10.info
 info/gtk10.info
@@ -114,9 +114,9 @@ info/gtk10.info-2
 info/gtk10.info-3
 info/gtk10.info-4
 info/gtk10.info-5
-@exec install-info %D/info/gdk10.info %D/info/dir
-@exec install-info %D/info/glib10.info %D/info/dir
-@exec install-info %D/info/gtk10.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/gdk10.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/glib10.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/gtk10.info %D/info/dir
 lib/libgdk10.a
 lib/libgdk10.la
 lib/libgdk10.so
diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index d3019516136..965229f9307 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/11/29 01:12:53 hubertf Exp $
+# $NetBSD: Makefile,v 1.18 2002/02/18 15:14:46 seb Exp $
 # $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp
 #
 
@@ -23,4 +23,5 @@ post-install:
 	cd ${PREFIX}/lib && ${LN} -fs libolgx.so.3.2 libolgx.so.3 && \
 		${LN} -fs libxview.so.3.2 libxview.so.3
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xview-lib/PLIST b/x11/xview-lib/PLIST
index ce175a2e5d2..2b5d4d83179 100644
--- a/x11/xview-lib/PLIST
+++ b/x11/xview-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:44 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:46 seb Exp $
 include/bitmaps/1x1
 include/bitmaps/2x2
 include/bitmaps/black
@@ -512,21 +512,21 @@ include/xview_private/xv_path_util.h
 lib/.text_extras_menu
 lib/.textswrc
 lib/.ttyswrc
-@unexec install-info --delete --info-dir=%D/info %D/lib/help/props.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/lib/help/props.info
 lib/help/props.info
-@exec install-info --info-dir=%D/info %D/lib/help/props.info
-@unexec install-info --delete --info-dir=%D/info %D/lib/help/textedit.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/lib/help/props.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/lib/help/textedit.info
 lib/help/textedit.info
-@exec install-info --info-dir=%D/info %D/lib/help/textedit.info
-@unexec install-info --delete --info-dir=%D/info %D/lib/help/textsw.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/lib/help/textedit.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/lib/help/textsw.info
 lib/help/textsw.info
-@exec install-info --info-dir=%D/info %D/lib/help/textsw.info
-@unexec install-info --delete --info-dir=%D/info %D/lib/help/ttysw.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/lib/help/textsw.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/lib/help/ttysw.info
 lib/help/ttysw.info
-@exec install-info --info-dir=%D/info %D/lib/help/ttysw.info
-@unexec install-info --delete --info-dir=%D/info %D/lib/help/xview.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/lib/help/ttysw.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/lib/help/xview.info
 lib/help/xview.info
-@exec install-info --info-dir=%D/info %D/lib/help/xview.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/lib/help/xview.info
 lib/libolgx.a
 lib/libolgx.so
 lib/libolgx.so.3