Bad patch.

2 files changed, 31 insertions, 52 deletions

diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index e926a1364a6..fa3da54eba0 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2001/04/22 22:58:47 jtb Exp $
+$NetBSD: distinfo,v 1.7 2001/04/22 23:16:09 jtb Exp $
 
 SHA1 (octave-2.1.33.tar.bz2) = 15a07d08647a2c2aeedb31917ac41ed3b7bb4245
 Size (octave-2.1.33.tar.bz2) = 3740256 bytes
@@ -16,4 +16,4 @@ SHA1 (patch-ai) = 248dbc97c2233c47dc532f86b0fb2fd3ebd18068
 SHA1 (patch-aj) = 8e2bbe9afde5567540b32fc183f58b87fbf9a547
 SHA1 (patch-ak) = b998dfe27accebec38cffa38555a3e32932c0c07
 SHA1 (patch-al) = 7134c3cb12ce4fdd5cbe2a39c586aeac6dab2045
-SHA1 (patch-am) = f87943ebbd64a2995c7a433b29fc80a027548239
+SHA1 (patch-am) = ab5bfea86fcf6d646f6317e3daf53054662385f3
diff --git a/math/octave-current/patches/patch-am b/math/octave-current/patches/patch-am
index a140ae453fa..40c0c61af31 100644
--- a/math/octave-current/patches/patch-am
+++ b/math/octave-current/patches/patch-am
@@ -1,70 +1,49 @@
-$NetBSD: patch-am,v 1.1 2001/04/22 22:58:47 jtb Exp $
+$NetBSD: patch-am,v 1.2 2001/04/22 23:16:09 jtb Exp $
 
---- liboctave/oct-rl-edit.c.orig	Sun Apr 22 23:54:15 2001
+--- liboctave/oct-rl-edit.c.orig	Mon Apr 23 00:07:12 2001
 +++ liboctave/oct-rl-edit.c
-@@ -33,36 +33,20 @@
+@@ -33,20 +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;
--
++extern int screenheight;
++
++extern int screenwidth;
++
  int
  octave_rl_screen_height (void)
  {
--  return screenheight;
+-  int rows, cols;
+-  rl_get_screen_size (&rows, &cols);
+-  return rows;
++    return screenheight;
  }
  
  int
  octave_rl_screen_width (void)
  {
--  return screenwidth;
+-  int rows, cols;
+-  rl_get_screen_size (&rows, &cols);
+-  return cols;
++    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)
+@@ -93,7 +93,7 @@
  {
--  return rl_blink_matching_paren;
-+  rl_variable_bind ("blink-matching-paren", val ? "1" : "0");
- }
- 
- void
-@@ -95,7 +79,7 @@
- void
- octave_rl_newline (void)
+   if (rl_undo_list)
+     {
+-      rl_free_undo_list ();
++      free_undo_list ();
+ 
+       rl_undo_list = 0;
+     }
+@@ -221,7 +221,7 @@
+ char **
+ octave_rl_completion_matches (const char *text, rl_completer_fcn_ptr f)
  {
--  rl_newline ();
-+  rl_newline (1, '\n');
+-  return rl_completion_matches (text, f);
++  return completion_matches (text, f);
  }
  
- 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
+ char