Remove "xstopx.f" and "dostop.c" from libcruft/misc. They've been deprecated

and cause problems if left.

Touch "parse.cc" and "parse.h" so that they won't get remade. (The configure
script doesn't detect bison correctly anyway).

Remove a duplicate entry from PLIST.

Make it work with the readline currently in pkgsrc.

5 files changed, 90 insertions, 7 deletions

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index a28851e523e..1378500cdd8 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/22 20:23:01 jtb Exp $
+# $NetBSD: Makefile,v 1.8 2001/04/22 22:58:47 jtb Exp $
 
 DISTNAME=	octave-2.1.33
 PKGNAME=	octave-2.1.34
@@ -45,6 +45,10 @@ OCTAVE_DOC=	faq/Octave-FAQ.ps interpreter/octave.ps \
 OCTAVE_HTML=	faq/Octave-FAQ_toc.html interpreter/octave_*.html \
 		liboctave/liboctave_*.html
 
+post-patch:
+	@cd ${WRKSRC}/libcruft/misc && ${RM} -f xstopx.f dostop.c
+	cd ${WRKSRC} && ${TOUCH} parse.cc parse.h
+
 post-install:
 .for f in ${LIBOCTAVE_INFO}
 	${INSTALL_DATA} ${WRKSRC}/doc/liboctave/$f ${PREFIX}/info
diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index 7d9ac55e92f..e926a1364a6 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/04/22 20:23:02 jtb Exp $
+$NetBSD: distinfo,v 1.6 2001/04/22 22:58:47 jtb Exp $
 
 SHA1 (octave-2.1.33.tar.bz2) = 15a07d08647a2c2aeedb31917ac41ed3b7bb4245
 Size (octave-2.1.33.tar.bz2) = 3740256 bytes
@@ -9,10 +9,11 @@ SHA1 (patch-ab) = 99b395668fd8a48ec03e47f2d24613128c0289da
 SHA1 (patch-ac) = bc02ce0417c8d921eb9aa3dc06e84f99cb45eaf3
 SHA1 (patch-ad) = 9d4e10e9097d98901ff5aa313b81b306d3b4e51b
 SHA1 (patch-ae) = f9c943521ea21ea6e452ffa50862dfbd9efc3cf8
-SHA1 (patch-af) = 5e5b4a92f5f5fbd23eb5471568fe7a87b85bf90a
+SHA1 (patch-af) = 5f03d2e78003ce5e256174d56533afc77f824108
 SHA1 (patch-ag) = 2ffd116b1b26d95541d89b5c3d37f2b59cdc413a
 SHA1 (patch-ah) = 5e1b20562559124a33bbdcdff2194805929d06f9
 SHA1 (patch-ai) = 248dbc97c2233c47dc532f86b0fb2fd3ebd18068
 SHA1 (patch-aj) = 8e2bbe9afde5567540b32fc183f58b87fbf9a547
 SHA1 (patch-ak) = b998dfe27accebec38cffa38555a3e32932c0c07
 SHA1 (patch-al) = 7134c3cb12ce4fdd5cbe2a39c586aeac6dab2045
+SHA1 (patch-am) = f87943ebbd64a2995c7a433b29fc80a027548239
diff --git a/math/octave-current/patches/patch-af b/math/octave-current/patches/patch-af
index baefdb1d2f9..20e6837bd61 100644
--- a/math/octave-current/patches/patch-af
+++ b/math/octave-current/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2001/04/22 20:23:02 jtb Exp $
+$NetBSD: patch-af,v 1.3 2001/04/22 22:58:47 jtb Exp $
 
 --- liboctave/Makefile.in.orig	Sun Apr 22 20:22:11 2001
 +++ liboctave/Makefile.in	Sun Apr 22 20:47:03 2001
@@ -28,7 +28,7 @@ $NetBSD: patch-af,v 1.2 2001/04/22 20:23:02 jtb Exp $
 -    libraries:
 -  endif
 -endif
-++libraries: liboctave.$(LIBEXT)
++libraries: liboctave.$(LIBEXT)
  .PHONY: libraries
  
  liboctave.$(LIBEXT): $(OBJECTS)
diff --git a/math/octave-current/patches/patch-am b/math/octave-current/patches/patch-am
new file mode 100644
index 00000000000..a140ae453fa
--- /dev/null
+++ b/math/octave-current/patches/patch-am
@@ -0,0 +1,70 @@
+$NetBSD: patch-am,v 1.1 2001/04/22 22:58:47 jtb Exp $
+
+--- liboctave/oct-rl-edit.c.orig	Sun Apr 22 23:54:15 2001
++++ liboctave/oct-rl-edit.c
+@@ -33,36 +33,20 @@
+ 
+ #include "oct-rl-edit.h"
+ 
+-/* It would be nice if readline.h declared these, I think. */
+-
+-extern int rl_blink_matching_paren;
+-
+-extern int screenheight;
+-
+-extern int screenwidth;
+-
+ int
+ octave_rl_screen_height (void)
+ {
+-  return screenheight;
+ }
+ 
+ int
+ octave_rl_screen_width (void)
+ {
+-  return screenwidth;
+ }
+ 
+ void
+-octave_set_rl_blink_matching_paren_flag (int val)
+-{
+-  rl_blink_matching_paren = val;
+-}
+-
+-int
+-octave_get_rl_blink_matching_paren_flag (void)
++octave_rl_enable_paren_matching (int val)
+ {
+-  return rl_blink_matching_paren;
++  rl_variable_bind ("blink-matching-paren", val ? "1" : "0");
+ }
+ 
+ void
+@@ -95,7 +79,7 @@
+ void
+ octave_rl_newline (void)
+ {
+-  rl_newline ();
++  rl_newline (1, '\n');
+ }
+ 
+ void
+@@ -130,7 +114,7 @@
+      init file to take advantage of the conditional parsing feature
+      based on rl_readline_name; */
+ 
+-  rl_re_read_init_file ();
++  rl_re_read_init_file (0, 0);
+ }
+ 
+ char *
+@@ -169,7 +153,7 @@
+   if (f && *f)
+     rl_read_init_file (f);
+   else
+-    rl_re_read_init_file ();
++    rl_re_read_init_file (0, 0);
+ }
+ 
+ void
diff --git a/math/octave-current/pkg/PLIST b/math/octave-current/pkg/PLIST
index 23540757df4..c77c95f3d5e 100644
--- a/math/octave-current/pkg/PLIST
+++ b/math/octave-current/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2001/04/22 20:33:27 jtb Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/04/22 22:58:48 jtb Exp $
 bin/mkoctfile
 bin/mkoctfile-2.1.34
 bin/octave
@@ -491,6 +491,8 @@ share/octave/2.1.34/m/finance/pv.m
 share/octave/2.1.34/m/finance/pvl.m
 share/octave/2.1.34/m/finance/rate.m
 share/octave/2.1.34/m/finance/vol.m
+share/octave/2.1.34/m/general/cart2pol.m
+share/octave/2.1.34/m/general/cart2sph.m
 share/octave/2.1.34/m/general/columns.m
 share/octave/2.1.34/m/general/common_size.m
 share/octave/2.1.34/m/general/diff.m
@@ -508,6 +510,7 @@ share/octave/2.1.34/m/general/nargchk.m
 share/octave/2.1.34/m/general/nextpow2.m
 share/octave/2.1.34/m/general/num2str.m
 share/octave/2.1.34/m/general/perror.m
+share/octave/2.1.34/m/general/pol2cart.m
 share/octave/2.1.34/m/general/postpad.m
 share/octave/2.1.34/m/general/prepad.m
 share/octave/2.1.34/m/general/randperm.m
@@ -516,12 +519,14 @@ share/octave/2.1.34/m/general/reshape.m
 share/octave/2.1.34/m/general/rot90.m
 share/octave/2.1.34/m/general/rows.m
 share/octave/2.1.34/m/general/shift.m
+share/octave/2.1.34/m/general/sph2cart.m
 share/octave/2.1.34/m/general/strerror.m
 share/octave/2.1.34/m/general/tril.m
 share/octave/2.1.34/m/general/triu.m
 share/octave/2.1.34/m/image/colormap.m
 share/octave/2.1.34/m/image/gray.m
 share/octave/2.1.34/m/image/gray2ind.m
+share/octave/2.1.34/m/image/hsv2rgb.m
 share/octave/2.1.34/m/image/image.m
 share/octave/2.1.34/m/image/imagesc.m
 share/octave/2.1.34/m/image/imshow.m
@@ -530,6 +535,7 @@ share/octave/2.1.34/m/image/ind2rgb.m
 share/octave/2.1.34/m/image/loadimage.m
 share/octave/2.1.34/m/image/ntsc2rgb.m
 share/octave/2.1.34/m/image/ocean.m
+share/octave/2.1.34/m/image/rgb2hsv.m
 share/octave/2.1.34/m/image/rgb2ind.m
 share/octave/2.1.34/m/image/rgb2ntsc.m
 share/octave/2.1.34/m/image/saveimage.m
@@ -840,10 +846,12 @@ share/octave/2.1.34/m/statistics/tests/welch_test.m
 share/octave/2.1.34/m/statistics/tests/wilcoxon_test.m
 share/octave/2.1.34/m/statistics/tests/z_test.m
 share/octave/2.1.34/m/statistics/tests/z_test_2.m
+share/octave/2.1.34/m/strings/base2dec.m
 share/octave/2.1.34/m/strings/bin2dec.m
 share/octave/2.1.34/m/strings/blanks.m
 share/octave/2.1.34/m/strings/com2str.m
 share/octave/2.1.34/m/strings/deblank.m
+share/octave/2.1.34/m/strings/dec2base.m
 share/octave/2.1.34/m/strings/dec2bin.m
 share/octave/2.1.34/m/strings/dec2hex.m
 share/octave/2.1.34/m/strings/findstr.m
@@ -855,6 +863,7 @@ share/octave/2.1.34/m/strings/rindex.m
 share/octave/2.1.34/m/strings/split.m
 share/octave/2.1.34/m/strings/str2mat.m
 share/octave/2.1.34/m/strings/str2num.m
+share/octave/2.1.34/m/strings/strjust.m
 share/octave/2.1.34/m/strings/strcat.m
 share/octave/2.1.34/m/strings/strcmp.m
 share/octave/2.1.34/m/strings/strrep.m
@@ -917,7 +926,6 @@ share/doc/html/octave/octave_30.html
 share/doc/html/octave/octave_31.html
 share/doc/html/octave/octave_32.html
 share/doc/html/octave/octave_34.html
-share/doc/html/octave/octave_34.html
 share/doc/html/octave/octave_35.html
 share/doc/html/octave/octave_36.html
 share/doc/html/octave/octave_37.html