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.

26 files changed, 194 insertions, 52 deletions

diff --git a/math/calc/Makefile b/math/calc/Makefile
index 288e279ee69..91ed583a987 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/04/14 21:43:50 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:29 seb Exp $
 
 DISTNAME=	calc-2.02f
 CATEGORIES=	math
@@ -29,4 +29,5 @@ do-install:
 	${WRKSRC}/calccard.tex ${PREFIX}/${SITE_LISP}/calc
 	${INSTALL_DATA} ${WRKSRC}/calc.info* ${PREFIX}/info
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/calc/PLIST b/math/calc/PLIST
index 10e0dbcc9f3..420a89f6602 100644
--- a/math/calc/PLIST
+++ b/math/calc/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:10 zuntum Exp $
-@unexec install-info --delete --info-dir=%D/info %D/info/calc.info
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:29 seb Exp $
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/calc.info
 info/calc.info
 info/calc.info-1
 info/calc.info-10
@@ -35,7 +35,7 @@ info/calc.info-6
 info/calc.info-7
 info/calc.info-8
 info/calc.info-9
-@exec install-info --info-dir=%D/info %D/info/calc.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/calc.info
 ${SITE_LISP}/calc/calc-aent.el
 ${SITE_LISP}/calc/calc-aent.elc
 ${SITE_LISP}/calc/calc-alg-2.el
diff --git a/math/calc/distinfo b/math/calc/distinfo
index 6454274d138..abc9f5d13ad 100644
--- a/math/calc/distinfo
+++ b/math/calc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 08:45:38 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/02/18 15:14:29 seb Exp $
 
 SHA1 (calc-2.02f.tar.gz) = 1a1d54fb90725aacaf1c9308a94be4b813ac4880
 Size (calc-2.02f.tar.gz) = 831865 bytes
-SHA1 (patch-aa) = 14d11b1b7f8db0a8929a5ac632aa3571bee05652
+SHA1 (patch-aa) = 38688806fb5b62e7ac3ca1783376abfb79fd2bfe
 SHA1 (patch-ab) = f8634afae8f7236bcf2e4c232e5cd60d5500e0cb
diff --git a/math/calc/patches/patch-aa b/math/calc/patches/patch-aa
index 4bd04c828a0..b632b4b4d9a 100644
--- a/math/calc/patches/patch-aa
+++ b/math/calc/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2000/12/13 23:51:35 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2002/02/18 15:14:29 seb Exp $
 
---- Makefile.orig	Mon Dec 16 04:50:45 1996
+--- Makefile.orig	Mon Dec 16 05:50:45 1996
 +++ Makefile
-@@ -29,10 +29,10 @@
+@@ -29,10 +29,9 @@
  
  
  # Programs.
@@ -11,11 +11,10 @@ $NetBSD: patch-aa,v 1.2 2000/12/13 23:51:35 jtb Exp $
  TEX      = tex
  TEXINDEX = texindex
 -MAKEINFO = makeinfo
-+MAKEINFO = makeinfo --no-validate
  MAKE	 = make
  ECHO	 = @echo
  REMOVE	 = -rm -f
-@@ -54,13 +54,10 @@
+@@ -54,13 +53,10 @@
  # to make the steps more explicit while the `make' is in progress.
  all:
  	$(MAKE) compile
@@ -29,14 +28,14 @@ $NetBSD: patch-aa,v 1.2 2000/12/13 23:51:35 jtb Exp $
  	$(MAKE) info
  	$(ECHO) "Calc is now installed."
  
-@@ -83,9 +80,9 @@
+@@ -83,9 +79,9 @@
  # Format the Calc manual for the Info system using makeinfo.
  info: calc.info
  calc.info: calc.texinfo
 -	-$(MAKEINFO) calc.texinfo
 -	$(ECHO) "Please ignore warnings for Copying, Getting Started, and Interactive Tutorial."
 -	$(MAKE) texinfo
-+	$(MAKEINFO) calc.texinfo
++	$(MAKEINFO) --no-validate calc.texinfo
 +#	$(ECHO) "Please ignore warnings for Copying, Getting Started, and Interactive Tutorial."
 +#	$(MAKE) texinfo
  
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 45dbef6599d..e38b5a62816 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/27 22:22:22 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:29 seb Exp $
 
 DISTNAME=		fftw-2.1.3
 CATEGORIES=		math
@@ -16,5 +16,7 @@ CONFIGURE_ARGS+=	--enable-i386-hacks
 USE_FORTRAN=		yes
 USE_GMAKE=		yes
 INFO_FILES=		fftw.info
+TEXINFO_OVERRIDE=	YES
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/fftw/PLIST b/math/fftw/PLIST
index cfe17bbf90c..27d89febea3 100644
--- a/math/fftw/PLIST
+++ b/math/fftw/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:23 zuntum Exp $
-@unexec install-info --delete %D/info/fftw.info %D/info/dir
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:29 seb Exp $
+@unexec ${INSTALL_INFO} --delete %D/info/fftw.info %D/info/dir
 info/fftw.info
 info/fftw.info-1
 info/fftw.info-2
 info/fftw.info-3
 info/fftw.info-4
 info/fftw.info-5
-@exec install-info %D/info/fftw.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/fftw.info %D/info/dir
 include/fftw.h
 include/rfftw.h
 lib/libfftw.a
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index cf843b3bbdb..0a13a3e1b82 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/22 12:58:40 agc Exp $
+# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:30 seb Exp $
 #
 
 DISTNAME=	gsl-1.0
@@ -22,8 +22,8 @@ HOMEPAGE=	http://sources.redhat.com/gsl/
 COMMENT=	The GNU Scientific Library
 
 GNU_CONFIGURE=		yes
-USE_GTEXINFO=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/gsl/PLIST b/math/gsl/PLIST
index a06353df86a..864bc956018 100644
--- a/math/gsl/PLIST
+++ b/math/gsl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/22 12:58:40 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:31 seb Exp $
 bin/gsl-config
 bin/gsl-histogram
 bin/gsl-randist
@@ -207,7 +207,7 @@ include/gsl/gsl_vector_uint.h
 include/gsl/gsl_vector_ulong.h
 include/gsl/gsl_vector_ushort.h
 include/gsl/gsl_version.h
-@unexec install-info --delete --info-dir=%D/info %D/info/gsl-ref.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gsl-ref.info
 info/gsl-ref.info
 info/gsl-ref.info-1
 info/gsl-ref.info-10
@@ -231,7 +231,7 @@ info/gsl-ref.info-6
 info/gsl-ref.info-7
 info/gsl-ref.info-8
 info/gsl-ref.info-9
-@exec install-info --info-dir=%D/info %D/info/gsl-ref.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gsl-ref.info
 lib/libgsl.a
 lib/libgsl.la
 lib/libgsl.so
diff --git a/math/mcsim/Makefile b/math/mcsim/Makefile
index 8b96f2045d1..db62ee7e992 100644
--- a/math/mcsim/Makefile
+++ b/math/mcsim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/04/29 01:15:06 jtb Exp $
+# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:31 seb Exp $
 
 DISTNAME=	mcsim-4.2.0
 CATEGORIES=	math
@@ -11,7 +11,7 @@ WRKSRC=		${WRKDIR}/mcsim
 INFO_FILES=	mcsim
 
 post-build:
-	cd ${WRKSRC}/doc && makeinfo mcsim.texinfo
+	cd ${WRKSRC}/doc && ${MAKEINFO} mcsim.texinfo
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mod/mod ${PREFIX}/bin
@@ -25,4 +25,5 @@ do-install:
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} mcsim mcsim-1 mcsim-2 	\
 		mcsim-3	${PREFIX}/info/
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/mcsim/PLIST b/math/mcsim/PLIST
index acac60c767a..e2b31f7650e 100644
--- a/math/mcsim/PLIST
+++ b/math/mcsim/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:12 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:31 seb Exp $
 bin/mcsim
 bin/mod
-@unexec install-info --delete --info-dir=%D/info %D/info/mcsim
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/mcsim
 info/mcsim
 info/mcsim-1
 info/mcsim-2
 info/mcsim-3
-@exec install-info --info-dir=%D/info %D/info/mcsim
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/mcsim
 share/doc/html/mcsim/mcsim.html
 share/doc/mcsim/About-Datasets.txt
 share/doc/mcsim/About-Doc.txt
diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index fe1cdd3b211..b4fc80b2f9e 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/01/03 17:09:45 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/02/18 15:14:32 seb Exp $
 
 DISTNAME=	octave-2.1.33
 PKGNAME=	octave-2.1.34
@@ -26,7 +26,6 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_FORTRAN=	yes
 USE_GMAKE=	yes
-USE_GTEXINFO=	yes
 CONFIGURE_ARGS+=--with-g77
 CONFIGURE_ARGS+=--enable-shared --enable-rpath
 CONFIGURE_ARGS+=-prefix=${PREFIX}
@@ -60,4 +59,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/$f ${PREFIX}/share/doc/html/octave
 .endfor
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST
index 8675fac865d..41efa1ae971 100644
--- a/math/octave-current/PLIST
+++ b/math/octave-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/03 17:09:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:32 seb Exp $
 bin/mkoctfile
 bin/mkoctfile-2.1.34
 bin/octave
@@ -272,8 +272,8 @@ include/${PKGNAME}/octave/vx-s-ccv.h
 include/${PKGNAME}/octave/vx-s-crv.h
 include/${PKGNAME}/octave/xdiv.h
 include/${PKGNAME}/octave/xpow.h
-@unexec install-info --delete %D/info/liboctave.info %D/info/dir
-@unexec install-info --delete %D/info/octave.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/liboctave.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/octave.info %D/info/dir
 info/liboctave.info
 info/liboctave.info-1
 info/liboctave.info-2
@@ -294,8 +294,8 @@ info/octave.info-6
 info/octave.info-7
 info/octave.info-8
 info/octave.info-9
-@exec install-info %D/info/liboctave.info %D/info/dir
-@exec install-info %D/info/octave.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/liboctave.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/octave.info %D/info/dir
 lib/libcruft.a
 lib/libcruft.la
 lib/libcruft.so
diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index e18763fb0dc..4cffa349b8b 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/01/03 17:09:46 wiz Exp $
+$NetBSD: distinfo,v 1.10 2002/02/18 15:14:32 seb Exp $
 
 SHA1 (octave-2.1.33.tar.bz2) = 15a07d08647a2c2aeedb31917ac41ed3b7bb4245
 Size (octave-2.1.33.tar.bz2) = 3740256 bytes
@@ -14,5 +14,9 @@ SHA1 (patch-ag) = c848d3dff78de1975b376b133c514068d956db31
 SHA1 (patch-ah) = 5e1b20562559124a33bbdcdff2194805929d06f9
 SHA1 (patch-ai) = 248dbc97c2233c47dc532f86b0fb2fd3ebd18068
 SHA1 (patch-aj) = 8e2bbe9afde5567540b32fc183f58b87fbf9a547
-SHA1 (patch-ak) = b998dfe27accebec38cffa38555a3e32932c0c07
+SHA1 (patch-ak) = 3de50cdd07f3ceca1aa0cd34442f873f0348122f
 SHA1 (patch-al) = 7134c3cb12ce4fdd5cbe2a39c586aeac6dab2045
+SHA1 (patch-am) = a5e0b06a9bc1209a4463e7fd8655d1e674476a85
+SHA1 (patch-an) = 47bffab64a8094c7846d22eaa7860e529cb587bc
+SHA1 (patch-ao) = 053de6f1f6f1bed959e63752c31ea54ac03985fc
+SHA1 (patch-ap) = a7c1ccd8ba7bd51d6cba0a3428ab7c4cc8e0e1f5
diff --git a/math/octave-current/patches/patch-ak b/math/octave-current/patches/patch-ak
index a34f35d33fa..096daee62da 100644
--- a/math/octave-current/patches/patch-ak
+++ b/math/octave-current/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
+$NetBSD: patch-ak,v 1.2 2002/02/18 15:14:32 seb Exp $
 
---- kpathsea/Makefile.in.orig	Thu Apr 27 10:05:26 2000
-+++ kpathsea/Makefile.in	Thu Apr 27 10:08:11 2000
+--- kpathsea/Makefile.in.orig	Mon May  4 18:36:19 1998
++++ kpathsea/Makefile.in
 @@ -148,6 +148,7 @@
  INSTALL_SCRIPT = $(INSTALL_PROGRAM)
  INSTALL_DATA = @INSTALL_DATA@
@@ -10,7 +10,15 @@ $NetBSD: patch-ak,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
  INSTALL_LIBTOOL_PROG = INSTALL_PROGRAM='$(INSTALL_PROGRAM)' $(LIBTOOL) install-prog
  
  # Creating (symbolic) links.
-@@ -253,7 +254,7 @@
+@@ -189,7 +190,6 @@
+ # End of programs.make.
+ 
+ # texi.make -- making .dvi and .info from .texi.
+-MAKEINFO = makeinfo
+ MAKEINFO_FLAGS = --paragraph-indent=2 -I$(srcdir)
+ 
+ TEXI2DVI = texi2dvi
+@@ -253,7 +253,7 @@
  
  $(kpathsea): $(objects) klibtool.version
  	$(LIBTOOL) archive $(AR) $(ARFLAGS) $@ $(objects)
diff --git a/math/octave-current/patches/patch-am b/math/octave-current/patches/patch-am
new file mode 100644
index 00000000000..c99ed5bb867
--- /dev/null
+++ b/math/octave-current/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.4 2002/02/18 15:14:32 seb Exp $
+
+--- readline/doc/Makefile.in.orig	Sun Feb 17 16:26:41 2002
++++ readline/doc/Makefile.in
+@@ -41,7 +41,6 @@
+ BUILD_DIR = @BUILD_DIR@
+ TEXINPUTDIR = $(srcdir)
+ 
+-MAKEINFO    = LANGUAGE= makeinfo
+ TEXI2DVI    = $(srcdir)/texi2dvi
+ TEXI2HTML   = $(srcdir)/texi2html
+ QUIETPS     = #set this to -q to shut up dvips
diff --git a/math/octave-current/patches/patch-an b/math/octave-current/patches/patch-an
new file mode 100644
index 00000000000..4966144e7eb
--- /dev/null
+++ b/math/octave-current/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2002/02/18 15:14:32 seb Exp $
+
+--- doc/faq/Makefile.in.orig	Sun Feb 17 16:26:40 2002
++++ doc/faq/Makefile.in
+@@ -39,7 +39,7 @@
+ .PHONY: all
+ 
+ Octave-FAQ.info: Octave-FAQ.texi
+-	-makeinfo -I$(srcdir) $(srcdir)/Octave-FAQ.texi
++	-$(MAKEINFO) -I$(srcdir) $(srcdir)/Octave-FAQ.texi
+ 
+ Octave-FAQ.dvi: Octave-FAQ.texi
+ 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \
diff --git a/math/octave-current/patches/patch-ao b/math/octave-current/patches/patch-ao
new file mode 100644
index 00000000000..41695a0ea33
--- /dev/null
+++ b/math/octave-current/patches/patch-ao
@@ -0,0 +1,30 @@
+$NetBSD: patch-ao,v 1.1 2002/02/18 15:14:32 seb Exp $
+
+--- doc/interpreter/Makefile.in.orig	Sun Feb 17 16:26:40 2002
++++ doc/interpreter/Makefile.in
+@@ -81,7 +81,7 @@
+ 	@mv $@.t $@
+ 
+ octave.info: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
+-	-makeinfo -I$(srcdir) -I$(srcdir)/.. $<
++	-$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $<
+ 
+ octave.dvi: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
+ 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \
+@@ -93,14 +93,14 @@
+ 
+ ../../INSTALL.OCTAVE: install.texi
+ 	rm -f INSTALL
+-	-makeinfo -D INSTALLONLY \
++	-$(MAKEINFO) -D INSTALLONLY \
+ 	  --no-validate --no-headers --no-split --output INSTALL \
+ 	  -I$(srcdir) -I$(srcdir)/.. $<
+ 	mv INSTALL ../../INSTALL.OCTAVE
+ 
+ ../../BUGS: bugs.texi
+ 	rm -f BUGS
+-	-makeinfo -D BUGSONLY \
++	-$(MAKEINFO) -D BUGSONLY \
+ 	  --no-validate --no-headers --no-split --output BUGS \
+ 	  -I$(srcdir) -I$(srcdir)/.. $<
+ 	mv BUGS ../../BUGS
diff --git a/math/octave-current/patches/patch-ap b/math/octave-current/patches/patch-ap
new file mode 100644
index 00000000000..a834440009e
--- /dev/null
+++ b/math/octave-current/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2002/02/18 15:14:32 seb Exp $
+
+--- doc/liboctave/Makefile.in.orig	Sun Feb 17 16:26:40 2002
++++ doc/liboctave/Makefile.in
+@@ -43,7 +43,7 @@
+ .PHONY: all
+ 
+ liboctave.info: $(TEXINFO) ../conf.texi
+-	-makeinfo -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
++	-$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
+ 
+ liboctave.dvi: $(TEXINFO) ../conf.texi
+ 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \
diff --git a/math/octave/Makefile b/math/octave/Makefile
index de354406d64..45e0419dccd 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/02/17 20:30:39 seb Exp $
+# $NetBSD: Makefile,v 1.29 2002/02/18 15:14:33 seb Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp
 
 DISTNAME=	octave-2.0.16
@@ -60,4 +60,5 @@ post-patch:
 	fi
 .endif
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/octave/PLIST b/math/octave/PLIST
index 88284b1e665..a02cb1d9b01 100644
--- a/math/octave/PLIST
+++ b/math/octave/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:51 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:33 seb Exp $
 bin/octave
 bin/octave-bug
 bin/mkoctfile
@@ -209,8 +209,8 @@ include/${PKGNAME}/oct-conf.h
 include/${PKGNAME}/oct-gperf.h
 @exec ln -s ${PKGNAME} %D/include/octave
 @unexec ${RM} -f %D/include/octave
-@unexec install-info --delete %D/info/octave.info %D/info/dir
-@unexec install-info --delete %D/info/liboctave.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/octave.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/liboctave.info %D/info/dir
 info/octave.info
 info/octave.info-1
 info/octave.info-10
@@ -228,8 +228,8 @@ info/liboctave.info
 info/liboctave.info-1
 info/liboctave.info-2
 info/liboctave.info-3
-@exec install-info %D/info/liboctave.info %D/info/dir
-@exec install-info %D/info/octave.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/liboctave.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/octave.info %D/info/dir
 lib/${PKGNAME}/libcruft.a
 lib/${PKGNAME}/liboctave.a
 lib/${PKGNAME}/liboctinterp.a
diff --git a/math/octave/distinfo b/math/octave/distinfo
index 9ae503dc154..bd075e4a3c7 100644
--- a/math/octave/distinfo
+++ b/math/octave/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 03:03:24 dmcmahill Exp $
+$NetBSD: distinfo,v 1.3 2002/02/18 15:14:33 seb Exp $
 
 SHA1 (octave-2.0.16.tar.gz) = 50db40d260e5294520af67d03c2933567cec31e0
 Size (octave-2.0.16.tar.gz) = 3840681 bytes
@@ -8,3 +8,6 @@ SHA1 (patch-ae) = 385d3b34764c245530378a04c42735b597c881e4
 SHA1 (patch-af) = 8e1f3e3b4f18eeaa77c60ab887d9898b8e5936cc
 SHA1 (patch-ag) = c31a22e4feb22b2ee10301556bf2d497e5c1c895
 SHA1 (patch-ah) = faf342ddb0eeb91927dc119670e2124a214e5346
+SHA1 (patch-ai) = 033c68b15de66e5b7c26d579d39ab20bad57a1e1
+SHA1 (patch-aj) = ce0e8b477c45ef93959bb264dfc85357b34ed454
+SHA1 (patch-ak) = acf783819036e5b8d2cf0e082855e8c24a1aad6d
diff --git a/math/octave/patches/patch-ai b/math/octave/patches/patch-ai
new file mode 100644
index 00000000000..e9bb39a5f23
--- /dev/null
+++ b/math/octave/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2002/02/18 15:14:33 seb Exp $
+
+--- doc/liboctave/Makefile.in.orig	Sun Feb 17 22:48:00 2002
++++ doc/liboctave/Makefile.in
+@@ -43,7 +43,7 @@
+ .PHONY: all
+ 
+ liboctave.info: $(TEXINFO) ../conf.texi
+-	-makeinfo -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
++	-$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
+ 
+ liboctave.dvi: $(TEXINFO) ../conf.texi
+ 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" ; \
diff --git a/math/octave/patches/patch-aj b/math/octave/patches/patch-aj
new file mode 100644
index 00000000000..992dd3c4b1d
--- /dev/null
+++ b/math/octave/patches/patch-aj
@@ -0,0 +1,29 @@
+$NetBSD: patch-aj,v 1.1 2002/02/18 15:14:33 seb Exp $
+
+--- doc/interpreter/Makefile.in.orig	Sun Feb 17 22:48:00 2002
++++ doc/interpreter/Makefile.in
+@@ -56,7 +56,7 @@
+ .PHONY: all
+ 
+ octave.info: $(TEXINFO) ../conf.texi
+-	-makeinfo -I$(srcdir) -I$(srcdir)/.. $(srcdir)/octave.texi
++	-$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $(srcdir)/octave.texi
+ 
+ octave.dvi: $(TEXINFO) ../conf.texi
+ 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" ; \
+@@ -67,13 +67,13 @@
+ 	-dvips -o octave.ps octave.dvi
+ 
+ ../../INSTALL.OCTAVE: install.texi
+-	-makeinfo -D INSTALLONLY \
++	-$(MAKEINFO) -D INSTALLONLY \
+ 	  --no-validate --no-headers --no-split --output INSTALL \
+ 	  -I$(srcdir) -I$(srcdir)/.. $(srcdir)/install.texi
+ 	mv INSTALL ../../INSTALL.OCTAVE
+ 
+ ../../BUGS: bugs.texi
+-	-makeinfo -D BUGSONLY \
++	-$(MAKEINFO) -D BUGSONLY \
+ 	  --no-validate --no-headers --no-split --output BUGS \
+ 	  -I$(srcdir) -I$(srcdir)/.. $(srcdir)/bugs.texi
+ 	mv BUGS ../../BUGS
diff --git a/math/octave/patches/patch-ak b/math/octave/patches/patch-ak
new file mode 100644
index 00000000000..747e8c07f9a
--- /dev/null
+++ b/math/octave/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2002/02/18 15:14:33 seb Exp $
+
+--- doc/faq/Makefile.in.orig	Sun Feb 17 22:48:00 2002
++++ doc/faq/Makefile.in
+@@ -39,7 +39,7 @@
+ .PHONY: all
+ 
+ Octave-FAQ.info: Octave-FAQ.texi
+-	-makeinfo -I$(srcdir) $(srcdir)/Octave-FAQ.texi
++	-$(MAKEINFO) -I$(srcdir) $(srcdir)/Octave-FAQ.texi
+ 
+ Octave-FAQ.dvi: Octave-FAQ.texi
+ 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" ; \
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 150c273cf68..913ecd84c80 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/08/27 14:35:11 tron Exp $
+# $NetBSD: Makefile,v 1.19 2002/02/18 15:14:33 seb Exp $
 #
 
 DISTNAME=	pspp-0.3.0
@@ -20,7 +20,6 @@ BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
 BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=	yes
-USE_GTEXINFO=	yes
 USE_LIBINTL=	yes
 CPPFLAGS+=	-Dunix=1
 MAKE_ENV+=	pkgsysconfdir="${PREFIX}/etc/pspp"
@@ -28,4 +27,5 @@ MAKE_ENV+=	pkgsysconfdir="${PREFIX}/etc/pspp"
 pre-configure:
 	cd ${WRKSRC}; ${LOCALBASE}/bin/autoconf
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/pspp/PLIST b/math/pspp/PLIST
index aa85871d316..2a663a00c6e 100644
--- a/math/pspp/PLIST
+++ b/math/pspp/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:33:59 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:33 seb Exp $
 bin/pspp
 etc/pspp/devices
 etc/pspp/html-prologue
 etc/pspp/papersize
 etc/pspp/ps-prologue
-@unexec install-info --delete %D/info/pspp.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/pspp.info %D/info/dir
 info/pspp.info
 info/pspp.info-1
 info/pspp.info-2
@@ -14,7 +14,7 @@ info/pspp.info-5
 info/pspp.info-6
 info/pspp.info-7
 info/pspp.info-8
-@exec install-info %D/info/pspp.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/pspp.info %D/info/dir
 share/doc/pspp/NEWS
 share/doc/pspp/README
 share/doc/pspp/TODO