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.

31 files changed, 111 insertions, 70 deletions

diff --git a/lang/a60/Makefile b/lang/a60/Makefile
index f3d0c566351..602884a3087 100644
--- a/lang/a60/Makefile
+++ b/lang/a60/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/06/11 06:34:39 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:23 seb Exp $
 
 DISTNAME=	a60-0.20a
 CATEGORIES=	lang
@@ -27,4 +27,5 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} a60.ps RRA60.ps			\
 		${PREFIX}/share/doc/a60/
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/a60/PLIST b/lang/a60/PLIST
index 66a3633b32f..a246c8bafb5 100644
--- a/lang/a60/PLIST
+++ b/lang/a60/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:22:45 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:23 seb Exp $
 bin/a60
-@unexec install-info --delete %D/info/RRA60.info %D/info/dir
-@unexec install-info --delete %D/info/a60.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/RRA60.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/a60.info %D/info/dir
 info/RRA60.info
 info/a60.info
-@exec install-info %D/info/RRA60.info %D/info/dir
-@exec install-info %D/info/a60.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/RRA60.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/a60.info %D/info/dir
 man/man1/a60.1
 share/a60/a60-mkc.inc
 share/doc/a60/a60.ps
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 3fdf93e7808..11e360f9953 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/11/30 05:45:17 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/02/18 15:14:23 seb Exp $
 
 DISTNAME=		cim-3.30
 CATEGORIES=		lang
@@ -24,4 +24,5 @@ SLDFLAGS=	${LDFLAGS:S/${BUILDLINK_DIR}/${LOCALBASE}/g}
 MAKE_ENV+=	AM_MAKEFLAGS='SCFLAGS="${SCFLAGS}" SLDFLAGS="${SLDFLAGS}"'
 
 .include "../../lang/perl5/buildlink.mk"
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/cim/PLIST b/lang/cim/PLIST
index 8179dacd78d..b9b3674e5ed 100644
--- a/lang/cim/PLIST
+++ b/lang/cim/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:22:53 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:23 seb Exp $
 bin/cim
 bin/cim2latex
 bin/cim2ps
 bin/cimindent
 include/cim.h
-@unexec install-info --delete --info-dir=%D/info %D/info/cim.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cim.info
 info/cim.info
-@exec install-info --info-dir=%D/info %D/info/cim.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cim.info
 lib/libcim-atr.a
 lib/libcim.a
 lib/libcim.la
diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index 9aa13fb7609..f8c1467fb92 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:04 agc Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:23 seb Exp $
 #
 
 DISTNAME=		egcs-1.1.2
@@ -21,4 +21,5 @@ ALL_TARGET=		bootstrap
 
 INFO_FILES=		cpp.info g77.info gcc.info
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/egcs/PLIST b/lang/egcs/PLIST
index 8c2fe120077..f983e01d975 100644
--- a/lang/egcs/PLIST
+++ b/lang/egcs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:02 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:23 seb Exp $
 bin/c++
 bin/g++
 bin/gcc
@@ -145,9 +145,9 @@ include/g++/tempbuf.h
 include/g++/tree.h
 include/g++/type_traits.h
 include/g++/vector.h
-@unexec install-info --delete %D/info/g77.info %D/info/dir
-@unexec install-info --delete %D/info/gcc.info %D/info/dir
-@unexec install-info --delete %D/info/cpp.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/g77.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/gcc.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/cpp.info %D/info/dir
 info/g77.info
 info/g77.info-1
 info/g77.info-10
@@ -203,9 +203,9 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/g77.info %D/info/dir
-@exec install-info %D/info/gcc.info %D/info/dir
-@exec install-info %D/info/cpp.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/g77.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/gcc.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/cpp.info %D/info/dir
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/egcs-2.91.66/include/math.h
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/egcs-2.91.66/include/curses.h
 lib/gcc-lib/${MACHINE_GNU_PLATFORM}/egcs-2.91.66/include/assert.h
diff --git a/lang/eieio/Makefile b/lang/eieio/Makefile
index d117894e148..29d94d54d42 100644
--- a/lang/eieio/Makefile
+++ b/lang/eieio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:16 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:24 seb Exp $
 #
 
 DISTNAME=	eieio-0.16
@@ -38,4 +38,5 @@ do-install:
 			${PREFIX}/${LISPDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/info
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/eieio/PLIST b/lang/eieio/PLIST
index 41fece602f9..3fa5d01b2a0 100644
--- a/lang/eieio/PLIST
+++ b/lang/eieio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:46 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:24 seb Exp $
 ${LISPDIR}/eieio.el
 ${LISPDIR}/eieio.elc
 ${LISPDIR}/eieio-comp.el
@@ -13,7 +13,7 @@ ${LISPDIR}/eieio-base.el
 ${LISPDIR}/eieio-base.elc
 ${LISPDIR}/compare-strings.el
 ${LISPDIR}/compare-strings.elc
-@unexec install-info --delete %D/info/eieio.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/eieio.info %D/info/dir
 info/eieio.info
-@exec install-info %D/info/eieio.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/eieio.info %D/info/dir
 @unexec ${RMDIR} %D/${LISPDIR} 2>/dev/null || true
diff --git a/lang/eieio/distinfo b/lang/eieio/distinfo
index 2d13da41576..3ce63fc4fc9 100644
--- a/lang/eieio/distinfo
+++ b/lang/eieio/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/06/08 20:22:00 cjones Exp $
+$NetBSD: distinfo,v 1.2 2002/02/18 15:14:24 seb Exp $
 
 SHA1 (eieio-0.16.tar.gz) = efad4e46a8c699241eb9e1e09796f7ac86430e9e
 Size (eieio-0.16.tar.gz) = 77843 bytes
+SHA1 (patch-aa) = fa4f0bd7cb20224997d08d15d4051514c862299d
diff --git a/lang/eieio/patches/patch-aa b/lang/eieio/patches/patch-aa
new file mode 100644
index 00000000000..c488acc545f
--- /dev/null
+++ b/lang/eieio/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2002/02/18 15:14:24 seb Exp $
+
+--- Makefile.orig	Mon Feb 19 18:43:10 2001
++++ Makefile
+@@ -12,7 +12,6 @@
+ EMACS=emacs
+ examples_LISP=tree.el call-tree.el chart.el eieio-speedbar.el
+ eieio_info_TEXINFOS=eieio.texi
+-MAKEINFO=makeinfo
+ test_LISP=eieio-tests.el
+ Misc_MISC=INSTALL
+ VERSION=0.16
+@@ -43,7 +42,7 @@
+ 	$(EMACS) -batch -l $@-compile-script -f batch-byte-compile $^
+ 
+ eieio.info: $(eieio_info_TEXINFOS)
+-	makeinfo -o $@ $<
++	$(MAKEINFO) -o $@ $<
+ 
+ test: $(test_LISP)
+ 	@echo "(add-to-list 'load-path nil)" > $@-compile-script
diff --git a/lang/elisp-manual/Makefile b/lang/elisp-manual/Makefile
index a8aa01cc454..8d0e4fbcb61 100644
--- a/lang/elisp-manual/Makefile
+++ b/lang/elisp-manual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:04 agc Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:24 seb Exp $
 
 DISTNAME=	elisp-manual-20-2.5
 CATEGORIES=	lang
@@ -9,9 +9,10 @@ HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
 COMMENT=	The Emacs Lisp Reference Manual for GNU Emacs Version 20.3
 
 GNU_CONFIGURE=	yes
+TEXINFO_OVERRIDE=	YES
 
 ALL_TARGET=	elisp
 
-USE_GTEXINFO=	yes
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/elisp-manual/PLIST b/lang/elisp-manual/PLIST
index dbdf3e8ad6f..18bac6054bd 100644
--- a/lang/elisp-manual/PLIST
+++ b/lang/elisp-manual/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:06 zuntum Exp $
-@unexec install-info --delete %D/info/elisp %D/info/dir
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:24 seb Exp $
+@unexec ${INSTALL_INFO} --delete %D/info/elisp %D/info/dir
 info/elisp
 info/elisp-1
 info/elisp-2
@@ -44,4 +44,4 @@ info/elisp-40
 info/elisp-41
 info/elisp-42
 info/elisp-43
-@exec install-info %D/info/elisp %D/info/dir
+@exec ${INSTALL_INFO} %D/info/elisp %D/info/dir
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 844593518cf..3c740f4ff4e 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:06 agc Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:24 seb Exp $
 # FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $
 
 DISTNAME=	gawk-3.0.4
@@ -15,4 +15,5 @@ INFO_FILES=	gawk.info
 
 GNU_CONFIGURE=	yes
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST
index ee6bc7dfe45..528b32cc779 100644
--- a/lang/gawk/PLIST
+++ b/lang/gawk/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:14 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:24 seb Exp $
 bin/gawk
 bin/igawk
-@unexec install-info --delete %D/info/gawk.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/gawk.info %D/info/dir
 info/gawk.info
-@exec install-info %D/info/gawk.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/gawk.info %D/info/dir
 libexec/awk/grcat
 libexec/awk/pwcat
 man/man1/gawk.1
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 4c803d220fc..2a50b6b3f6d 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2002/02/16 14:46:20 kent Exp $
+# $NetBSD: Makefile,v 1.35 2002/02/18 15:14:25 seb Exp $
 
 # Make sure that the version number in "Makefile.gcc" matches this.
 DISTNAME=		gcc-2.95.3
@@ -97,6 +97,7 @@ post-install:
 	-${RMDIR} ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${PKGVERSION}/include/v7
 .endif
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # Make bootstrap with compiler != gcc possible.
diff --git a/lang/gcc/PLIST b/lang/gcc/PLIST
index 40bea101474..5c4c14890c1 100644
--- a/lang/gcc/PLIST
+++ b/lang/gcc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/01/03 21:32:38 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/02/18 15:14:25 seb Exp $
 etc/gcc-2.95.3.mk
 ${PKGNAME}/bin/c++
 ${PKGNAME}/bin/c++filt
@@ -207,17 +207,17 @@ ${PKGNAME}/man/man1/cccp.1
 ${PKGNAME}/man/man1/g++.1
 ${PKGNAME}/man/man1/g77.1
 ${PKGNAME}/man/man1/gcc.1
-@unexec install-info --delete %D/info/chill.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/chill.info %D/info/dir
 info/chill.info
-@unexec install-info --delete %D/info/cpp.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/cpp.info %D/info/dir
 info/cpp.info
-@exec install-info %D/info/cpp.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/cpp.info %D/info/dir
 info/cpp.info-1
 info/cpp.info-2
 info/cpp.info-3
-@unexec install-info --delete %D/info/g77.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/g77.info %D/info/dir
 info/g77.info
-@exec install-info %D/info/g77.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/g77.info %D/info/dir
 info/g77.info-1
 info/g77.info-10
 info/g77.info-11
@@ -239,9 +239,9 @@ info/g77.info-6
 info/g77.info-7
 info/g77.info-8
 info/g77.info-9
-@unexec install-info --delete %D/info/gcc.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/gcc.info %D/info/dir
 info/gcc.info
-@exec install-info %D/info/gcc.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/gcc.info %D/info/dir
 info/gcc.info-1
 info/gcc.info-10
 info/gcc.info-11
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index 62e61e2dfd5..e3367e9fc6b 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/25 04:17:55 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 2002/02/18 15:14:25 seb Exp $
 
 DISTNAME=		gforth-0.5.0
 CATEGORIES=		lang
@@ -28,4 +28,5 @@ post-build:
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gforth/PLIST b/lang/gforth/PLIST
index 9f600245e0b..2880d294093 100644
--- a/lang/gforth/PLIST
+++ b/lang/gforth/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:24 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:25 seb Exp $
 bin/${PKGNAME}
 bin/gforth
 bin/gforth-fast
 bin/gforth-fast-0.5.0
 bin/gforthmi
 bin/gforthmi-0.5.0
-@unexec install-info --delete --info-dir=%D/info %D/info/gforth.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gforth.info
 info/gforth.info
-@exec install-info --info-dir=%D/info %D/info/gforth.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gforth.info
 info/gforth.info-1
 info/gforth.info-10
 info/gforth.info-11
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 6a111b5b07e..f11651d23c8 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/06/21 02:36:01 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2002/02/18 15:14:25 seb Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp
 #
 
@@ -21,4 +21,5 @@ USE_GNU_READLINE=	# defined
 INFO_FILES=		data-rep.info
 
 .include "../../devel/readline/buildlink.mk"
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/guile/PLIST b/lang/guile/PLIST
index ab56df6d8e2..8d0e9c69780 100644
--- a/lang/guile/PLIST
+++ b/lang/guile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:46 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:25 seb Exp $
 bin/guile
 bin/guile-config
 bin/guile-doc-snarf
@@ -92,9 +92,9 @@ include/libguile/vectors.h
 include/libguile/version.h
 include/libguile/vports.h
 include/libguile/weaks.h
-@unexec install-info --delete %D/info/data-rep.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/data-rep.info %D/info/dir
 info/data-rep.info
-@exec install-info %D/info/data-rep.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/data-rep.info %D/info/dir
 lib/libguile.a
 lib/libguile.la
 lib/libguile.so
diff --git a/lang/inform/Makefile b/lang/inform/Makefile
index 70c5f7cbb83..7a61d96408d 100644
--- a/lang/inform/Makefile
+++ b/lang/inform/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/06/22 03:41:49 nathanw Exp $
+# $NetBSD: Makefile,v 1.2 2002/02/18 15:14:25 seb Exp $
 
 DISTNAME=	inform-6.21.2
 CATEGORIES=	lang
@@ -12,4 +12,7 @@ LICENSE=	no-profit
 
 GNU_CONFIGURE=	yes
 
+INFO_FILES=	inform
+
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/inform/PLIST b/lang/inform/PLIST
index 984316174bd..a3a3291d27f 100644
--- a/lang/inform/PLIST
+++ b/lang/inform/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:39 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:25 seb Exp $
 bin/inform
 bin/inform-6.21
-@unexec install-info --delete %D/info/inform %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/inform %D/info/dir
 info/inform
 info/inform-1
 info/inform-2
@@ -17,7 +17,7 @@ info/inform-11
 info/inform-12
 info/inform-13
 info/inform-14
-@exec install-info %D/info/inform %D/info/dir
+@exec ${INSTALL_INFO} %D/info/inform %D/info/dir
 share/inform/6.21/module/parserm.m5
 share/inform/6.21/module/verblibm.m5
 share/inform/6.21/module/english.h
diff --git a/lang/japhar/Makefile b/lang/japhar/Makefile
index bc69078e8a0..f19bba40d38 100644
--- a/lang/japhar/Makefile
+++ b/lang/japhar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 09:07:14 agc Exp $
+# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:26 seb Exp $
 #
 
 DISTNAME=		japhar-0.08
@@ -21,4 +21,5 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig ${WRKSRC}/lib/libffi/ltconfig
 # The japhar tar archive uses ././@LongLink GNU tar hacks
 .undef EXTRACT_USING_PAX
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/japhar/PLIST b/lang/japhar/PLIST
index 507234dc304..55d14f4cb8e 100644
--- a/lang/japhar/PLIST
+++ b/lang/japhar/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:26 seb Exp $
 lib/libarch.a
 lib/libarch.la
 lib/libarch.so
@@ -144,8 +144,8 @@ include/japhar/jvmdiint.h
 include/fficonfig.h
 include/ffi.h
 include/ffi_mips.h
-@unexec install-info --delete %D/info/japhar.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/japhar.info %D/info/dir
 info/japhar.info
-@exec install-info %D/info/japhar.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/japhar.info %D/info/dir
 @dirrm include/japhar/private
 @dirrm include/japhar
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 01ba9b049f6..8b4c3c1fa5c 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/10/23 03:37:44 mycroft Exp $
+# $NetBSD: Makefile,v 1.19 2002/02/18 15:14:26 seb Exp $
 #
 
 DISTNAME=		librep-${REP_VERS}
@@ -22,6 +22,8 @@ GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-readline
 CONFIGURE_ARGS+=	--with-gmp
 CONFIGURE_ARGS+=	--enable-static
+TEXINFO_OVERRIDE=	YES
+TEXINFO_PATTERNS+=	Makedefs.in
 
 PLIST_SUBST+=		REP_VERS=${REP_VERS}
 
@@ -29,4 +31,5 @@ PLIST_SUBST+=		REP_VERS=${REP_VERS}
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../devel/gmp/buildlink.mk"
 .include "../../devel/readline/buildlink.mk"
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/librep/PLIST b/lang/librep/PLIST
index 2d9d95bda28..7c5a7b129b8 100644
--- a/lang/librep/PLIST
+++ b/lang/librep/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:24:01 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:26 seb Exp $
 bin/rep
 bin/rep-config
 bin/rep-remote
@@ -8,7 +8,7 @@ include/rep.h
 include/rep_lisp.h
 include/rep_regexp.h
 include/rep_subrs.h
-@unexec install-info --delete --info-dir=%D/info %D/info/librep.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/librep.info
 info/librep.info
 info/librep.info-1
 info/librep.info-2
@@ -19,7 +19,7 @@ info/librep.info-6
 info/librep.info-7
 info/librep.info-8
 info/librep.info-9
-@exec install-info --info-dir=%D/info %D/info/librep.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/librep.info
 lib/librep.a
 lib/librep.la
 lib/librep.so
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index 14bf7a03a1d..5922b4e7833 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/14 14:47:55 agc Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:26 seb Exp $
 
 DISTNAME=		mercury-compiler-0.10.1
 PKGNAME=		mercury-0.10.1
@@ -35,4 +35,5 @@ post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/samples
 	cd ${WRKSRC}/samples && ${PAX} -rw . ${PREFIX}/share/examples/mercury
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/mercury/PLIST b/lang/mercury/PLIST
index 8aa16406156..f0ce13be152 100644
--- a/lang/mercury/PLIST
+++ b/lang/mercury/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:24:11 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:26 seb Exp $
 bin/c2init
 bin/canonical_grade
 bin/info_to_mdb
@@ -17,7 +17,7 @@ bin/mprof_merge_runs
 bin/mtags
 bin/sicstus_conv
 bin/vpath_find
-@unexec install-info --delete --info-dir=%D/info %D/info/mercury.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/mercury.info
 info/mercury.info
 info/mercury_faq.info
 info/mercury_library.info
@@ -46,7 +46,7 @@ info/mercury_user_guide.info-1
 info/mercury_user_guide.info-2
 info/mercury_user_guide.info-3
 info/mercury_user_guide.info-4
-@exec install-info --info-dir=%D/info %D/info/mercury.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/mercury.info
 lib/mercury/bin/${MACHINE_ARCH}--${LOWER_OPSYS}/mercury_compile
 lib/mercury/bin/${MACHINE_ARCH}--${LOWER_OPSYS}/mercury_profile
 lib/mercury/inc/gc.h
diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile
index 4e089a3557b..677a267daec 100644
--- a/lang/pgcc/Makefile
+++ b/lang/pgcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/01/10 14:07:07 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2002/02/18 15:14:27 seb Exp $
 
 DISTNAME=		gcc-2.95.2
 PKGNAME=		pgcc-2.95.2.1
@@ -101,6 +101,7 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/etc/${PKGNAME}.mk
 .endif
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # Make bootstrap with compiler != gcc possible.
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 709008dc2bd..bdacc16a02a 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/01/31 14:08:58 mjl Exp $
+# $NetBSD: Makefile,v 1.9 2002/02/18 15:14:27 seb Exp $
 #
 
 DISTNAME=	smalltalk-1.95.10
@@ -26,4 +26,5 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 .include "../../devel/readline/buildlink.mk"
 .include "../../lang/tcl/buildlink.mk"
 .include "../../x11/tk/buildlink.mk"
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/smalltalk/PLIST b/lang/smalltalk/PLIST
index 6e319516fd0..2a704b902c9 100644
--- a/lang/smalltalk/PLIST
+++ b/lang/smalltalk/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2002/01/31 14:08:58 mjl Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/02/18 15:14:27 seb Exp $
 bin/gst
 bin/gst-config
 bin/gst-package
 include/gst.h
 include/gstpub.h
-@unexec install-info --delete --info-dir=%D/info %D/info/gst.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gst.info
 info/gst.info
 info/gst.info-1
 info/gst.info-10
@@ -26,7 +26,7 @@ info/gst.info-6
 info/gst.info-7
 info/gst.info-8
 info/gst.info-9
-@exec install-info --info-dir=%D/info %D/info/gst.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gst.info
 lib/libgst.la
 lib/libgst.a
 lib/smalltalk/blox-tk-1.95.10.so