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.

2 files changed, 72 insertions, 2 deletions

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