From 49c14c2c393ed8e464a29e1117b9702e5920373a Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Tue, 15 Aug 2000 21:01:51 +0000
Subject: USE_PKGLIBTOOL -> USE_LIBTOOL

---
 math/octave/Makefile         |  4 ++--
 math/octave/files/patch-sum  |  5 +++--
 math/octave/patches/patch-aa | 14 ++++++++++++--
 math/octave/patches/patch-ah | 13 +++++++++++++
 4 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 math/octave/patches/patch-ah

(limited to 'math/octave')

diff --git a/math/octave/Makefile b/math/octave/Makefile
index ebaf04d73ed..7270c1f3087 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/06/01 11:23:35 rh Exp $
+# $NetBSD: Makefile,v 1.17 2000/08/15 21:01:51 wiz Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp
 
 DISTNAME=	octave-2.0.16
@@ -19,7 +19,7 @@ DEPENDS+=	gnuplot-3.7:../../graphics/gnuplot
 USE_X11=		yes
 GNU_CONFIGURE=		yes
 USE_FORTRAN=		yes
-USE_PKGLIBTOOL=		yes
+USE_LIBTOOL=		yes
 USE_GMAKE=		yes
 CONFIGURE_ENV+=		CPPFLAGS=-I${WRKDIR}/include
 LDFLAGS+=		-Wl,-R${PREFIX}/lib -L${PREFIX}/lib
diff --git a/math/octave/files/patch-sum b/math/octave/files/patch-sum
index 52fa959cf5d..fa6a54df754 100644
--- a/math/octave/files/patch-sum
+++ b/math/octave/files/patch-sum
@@ -1,7 +1,8 @@
-$NetBSD: patch-sum,v 1.3 2000/05/02 18:48:42 danw Exp $
+$NetBSD: patch-sum,v 1.4 2000/08/15 21:01:52 wiz Exp $
 
-MD5 (patch-aa) = 6b7ff860a79a2f0b5ddca6f27701e45d
+MD5 (patch-aa) = cc95fecaebfbf678bccb3de39a5189e0
 MD5 (patch-ac) = 2a6442eada33ed4e4f398e532e1596b3
 MD5 (patch-ae) = 1393f300cc9c83023bc15b03a9450733
 MD5 (patch-af) = 2537d9b77f550c0c8646ddcafff0bcd5
 MD5 (patch-ag) = 6f4a16ccee9db496344b3f7caf121e41
+MD5 (patch-ah) = 2c364792ad2a632d3e1399acc3503205
diff --git a/math/octave/patches/patch-aa b/math/octave/patches/patch-aa
index 6f8318d5488..3e3c43f8dd0 100644
--- a/math/octave/patches/patch-aa
+++ b/math/octave/patches/patch-aa
@@ -1,6 +1,16 @@
-$NetBSD: patch-aa,v 1.5 2000/05/02 18:48:42 danw Exp $
+$NetBSD: patch-aa,v 1.6 2000/08/15 21:01:52 wiz Exp $
+
 --- configure.orig	Sun Jan 30 03:26:06 2000
-+++ configure	Wed Apr 26 20:36:07 2000
++++ configure	Tue Aug 15 02:50:10 2000
+@@ -786,7 +786,7 @@
+ 
+ 
+ 
+-LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.$(LIBEXT)'
++LIBKPATHSEA='$(TOPDIR)/kpathsea/STATIC/libkpathsea.$(LIBEXT)'
+ 
+ 
+ ### Make it possible to have Octave's array and matrix classes do bounds
 @@ -5180,7 +5180,7 @@
  
  
diff --git a/math/octave/patches/patch-ah b/math/octave/patches/patch-ah
new file mode 100644
index 00000000000..02acc408ce2
--- /dev/null
+++ b/math/octave/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2000/08/15 21:01:52 wiz Exp $
+
+--- configure.in.orig	Tue Aug 15 01:59:47 2000
++++ configure.in	Tue Aug 15 01:59:30 2000
+@@ -143,7 +143,7 @@
+ AC_SUBST(LIBREADLINE)
+ AC_SUBST(READLINE_DIR)
+ 
+-LIBKPATHSEA='$(TOPDIR)/kpathsea/libkpathsea.$(LIBEXT)'
++LIBKPATHSEA='$(TOPDIR)/kpathsea/STATIC/libkpathsea.$(LIBEXT)'
+ AC_SUBST(LIBKPATHSEA)
+ 
+ ### Make it possible to have Octave's array and matrix classes do bounds
-- 
cgit v1.2.3