Convert to USE_NEW_TEXINFO.

Add patch file to add an Info directory entry to liboctave.texi.
Remove now unnecessary patch files and trim one of its
"info" bits.

9 files changed, 27 insertions, 90 deletions

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index 6fa2a8e67de..a6d764dc880 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/08/02 20:25:27 seb Exp $
+# $NetBSD: Makefile,v 1.19 2003/08/02 21:18:04 seb Exp $
 
 DISTNAME=	octave-2.1.33
 PKGNAME=	octave-2.1.34
@@ -43,6 +43,8 @@ USE_GNU_READLINE=		# defined
 BUILDLINK_DEPENDS.readline=	readline>=4.0
 LDFLAGS+=	-L${BUILDLINK_PREFIX.readline}/lib
 
+USE_NEW_TEXINFO=	YES
+USE_MAKEINFO=	YES
 INFO_FILES=	octave.info liboctave.info
 LIBOCTAVE_INFO=	liboctave.info liboctave.info-1 \
 		liboctave.info-2 liboctave.info-3
@@ -69,5 +71,4 @@ post-install:
 .endfor
 
 .include "../../devel/readline/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST
index 41efa1ae971..8e4180656b3 100644
--- a/math/octave-current/PLIST
+++ b/math/octave-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:32 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/08/02 21:18:05 seb Exp $
 bin/mkoctfile
 bin/mkoctfile-2.1.34
 bin/octave
@@ -272,8 +272,6 @@ 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
 info/liboctave.info
 info/liboctave.info-1
 info/liboctave.info-2
@@ -294,8 +292,6 @@ 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
 lib/libcruft.a
 lib/libcruft.la
 lib/libcruft.so
diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index 0842c0434b7..7eaa8f77c9a 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2002/03/07 06:18:35 jmc Exp $
+$NetBSD: distinfo,v 1.12 2003/08/02 21:18:06 seb Exp $
 
 SHA1 (octave-2.1.33.tar.bz2) = 15a07d08647a2c2aeedb31917ac41ed3b7bb4245
 Size (octave-2.1.33.tar.bz2) = 3740256 bytes
@@ -14,9 +14,6 @@ SHA1 (patch-ag) = 4fa71fc9adc0b8bfcaa9f859e4342e8e6ce0c5ab
 SHA1 (patch-ah) = 5e1b20562559124a33bbdcdff2194805929d06f9
 SHA1 (patch-ai) = 248dbc97c2233c47dc532f86b0fb2fd3ebd18068
 SHA1 (patch-aj) = 8e2bbe9afde5567540b32fc183f58b87fbf9a547
-SHA1 (patch-ak) = 3de50cdd07f3ceca1aa0cd34442f873f0348122f
+SHA1 (patch-ak) = 9d2eddf1a099f852edb1d94eb2361c2c7b402714
 SHA1 (patch-al) = 7134c3cb12ce4fdd5cbe2a39c586aeac6dab2045
-SHA1 (patch-am) = a5e0b06a9bc1209a4463e7fd8655d1e674476a85
-SHA1 (patch-an) = 47bffab64a8094c7846d22eaa7860e529cb587bc
-SHA1 (patch-ao) = 053de6f1f6f1bed959e63752c31ea54ac03985fc
-SHA1 (patch-ap) = a7c1ccd8ba7bd51d6cba0a3428ab7c4cc8e0e1f5
+SHA1 (patch-aq) = 511d7b42d23ef5e956060e4031105370e1824e2b
diff --git a/math/octave-current/patches/patch-ak b/math/octave-current/patches/patch-ak
index 096daee62da..30c341ffd99 100644
--- a/math/octave-current/patches/patch-ak
+++ b/math/octave-current/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 2002/02/18 15:14:32 seb Exp $
+$NetBSD: patch-ak,v 1.3 2003/08/02 21:18:07 seb Exp $
 
 --- kpathsea/Makefile.in.orig	Mon May  4 18:36:19 1998
 +++ kpathsea/Makefile.in
@@ -10,14 +10,6 @@ $NetBSD: patch-ak,v 1.2 2002/02/18 15:14:32 seb Exp $
  INSTALL_LIBTOOL_PROG = INSTALL_PROGRAM='$(INSTALL_PROGRAM)' $(LIBTOOL) install-prog
  
  # Creating (symbolic) links.
-@@ -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
diff --git a/math/octave-current/patches/patch-am b/math/octave-current/patches/patch-am
deleted file mode 100644
index c99ed5bb867..00000000000
--- a/math/octave-current/patches/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
deleted file mode 100644
index 4966144e7eb..00000000000
--- a/math/octave-current/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 41695a0ea33..00000000000
--- a/math/octave-current/patches/patch-ao
+++ /dev/null
@@ -1,30 +0,0 @@
-$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
deleted file mode 100644
index a834440009e..00000000000
--- a/math/octave-current/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$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-current/patches/patch-aq b/math/octave-current/patches/patch-aq
new file mode 100644
index 00000000000..f6609cfb2ab
--- /dev/null
+++ b/math/octave-current/patches/patch-aq
@@ -0,0 +1,19 @@
+$NetBSD: patch-aq,v 1.1 2003/08/02 21:18:14 seb Exp $
+
+--- doc/liboctave/liboctave.texi.orig	2000-03-08 09:30:06.000000000 +0000
++++ doc/liboctave/liboctave.texi
+@@ -5,6 +5,14 @@
+ \input texinfo  @c -*-texinfo-*-
+ @setfilename liboctave.info
+ 
++@ifinfo
++@format
++START-INFO-DIR-ENTRY
++* LibOctave: (liboctave).     Octave library for numerical computations.
++END-INFO-DIR-ENTRY
++@end format
++@end ifinfo
++
+ @c @smallbook
+ @c @setchapternewpage odd
+ @c @cropmarks