Remove a bogus patch, drop a MASTER_SITE, and fix PLIST.

4 files changed, 63 insertions, 107 deletions

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index e6c47b3961b..fe1cdd3b211 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2001/05/31 12:56:53 wennmach Exp $
+# $NetBSD: Makefile,v 1.11 2002/01/03 17:09:45 wiz Exp $
 
 DISTNAME=	octave-2.1.33
 PKGNAME=	octave-2.1.34
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \
-		ftp://ftp.math.uni-hamburg.de/pub/soft/math/octave/bleeding-edge/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/ \
 		ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/bleeding-edge/ \
 		ftp://ftp.task.gda.pl/pub/software/octave/bleeding-edge/
diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST
index 3260cf0d9cc..8675fac865d 100644
--- a/math/octave-current/PLIST
+++ b/math/octave-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:33:47 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/03 17:09:45 wiz Exp $
 bin/mkoctfile
 bin/mkoctfile-2.1.34
 bin/octave
@@ -219,6 +219,7 @@ include/${PKGNAME}/octave/pt-all.h
 include/${PKGNAME}/octave/pt-arg-list.h
 include/${PKGNAME}/octave/pt-assign.h
 include/${PKGNAME}/octave/pt-binop.h
+include/${PKGNAME}/octave/pt-bp.h
 include/${PKGNAME}/octave/pt-cell.h
 include/${PKGNAME}/octave/pt-check.h
 include/${PKGNAME}/octave/pt-cmd.h
@@ -297,16 +298,22 @@ info/octave.info-9
 @exec install-info %D/info/octave.info %D/info/dir
 lib/libcruft.a
 lib/libcruft.la
+lib/libcruft.so
+lib/libcruft.so.2
 lib/libcruft.so.2.34
 lib/liboctave.a
 lib/liboctave.la
+lib/liboctave.so
+lib/liboctave.so.2
 lib/liboctave.so.2.34
 lib/liboctinterp.a
 lib/liboctinterp.la
+lib/liboctinterp.so
+lib/liboctinterp.so.2
 lib/liboctinterp.so.2.34
 lib/octave
-libexec/octave/2.1.34/exec/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}/info-emacs-info
-libexec/octave/2.1.34/exec/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}/info-emacs-octave-help
+libexec/octave/2.1.34/exec/${MACHINE_GNU_PLATFORM}/info-emacs-info
+libexec/octave/2.1.34/exec/${MACHINE_GNU_PLATFORM}/info-emacs-octave-help
 libexec/octave/ls-R
 man/man1/octave-bug.1
 man/man1/octave.1
@@ -961,60 +968,60 @@ share/doc/html/octave/octave_fot.html
 share/doc/html/octave/octave_ovr.html
 share/octave/site/m/startup/octaverc
 share/octave/ls-R
-@dirrm include/${PKGNAME}/octave
-@dirrm include/${PKGNAME}
-@dirrm lib/${PKGNAME}
-@dirrm libexec/octave/2.1.34/exec/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}
-@dirrm libexec/octave/2.1.34/exec
-@dirrm libexec/octave/2.1.34/oct/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}
-@dirrm libexec/octave/2.1.34/oct
-@dirrm libexec/octave/2.1.34/site/oct/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}
-@dirrm libexec/octave/2.1.34/site/oct
-@dirrm libexec/octave/2.1.34/site
-@dirrm libexec/octave/2.1.34
-@dirrm libexec/octave/site/exec/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}
-@dirrm libexec/octave/site/exec
-@dirrm libexec/octave/site/oct/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}
-@dirrm libexec/octave/site/oct
-@dirrm libexec/octave/site
-@dirrm libexec/octave
-@dirrm share/octave/2.1.34/imagelib
-@dirrm share/octave/2.1.34/m/audio
-@dirrm share/octave/2.1.34/m/control/base
-@dirrm share/octave/2.1.34/m/control/hinf
-@dirrm share/octave/2.1.34/m/control/obsolete
-@dirrm share/octave/2.1.34/m/control/system
-@dirrm share/octave/2.1.34/m/control/util
-@dirrm share/octave/2.1.34/m/control
-@dirrm share/octave/2.1.34/m/elfun
-@dirrm share/octave/2.1.34/m/finance
-@dirrm share/octave/2.1.34/m/general
-@dirrm share/octave/2.1.34/m/image
-@dirrm share/octave/2.1.34/m/io
-@dirrm share/octave/2.1.34/m/linear-algebra
-@dirrm share/octave/2.1.34/m/miscellaneous
-@dirrm share/octave/2.1.34/m/plot
-@dirrm share/octave/2.1.34/m/polynomial
-@dirrm share/octave/2.1.34/m/quaternion
-@dirrm share/octave/2.1.34/m/set
-@dirrm share/octave/2.1.34/m/signal
-@dirrm share/octave/2.1.34/m/startup
-@dirrm share/octave/2.1.34/m/specfun
-@dirrm share/octave/2.1.34/m/special-matrix
-@dirrm share/octave/2.1.34/m/statistics/base
-@dirrm share/octave/2.1.34/m/statistics/distributions
-@dirrm share/octave/2.1.34/m/statistics/models
+@dirrm share/octave/site/m/startup
+@dirrm share/octave/site/m
+@dirrm share/octave/site
+@dirrm share/octave/2.1.34/site/m
+@dirrm share/octave/2.1.34/site
+@dirrm share/octave/2.1.34/m/time
+@dirrm share/octave/2.1.34/m/strings
 @dirrm share/octave/2.1.34/m/statistics/tests
+@dirrm share/octave/2.1.34/m/statistics/models
+@dirrm share/octave/2.1.34/m/statistics/distributions
+@dirrm share/octave/2.1.34/m/statistics/base
 @dirrm share/octave/2.1.34/m/statistics
-@dirrm share/octave/2.1.34/m/strings
-@dirrm share/octave/2.1.34/m/time
+@dirrm share/octave/2.1.34/m/startup
+@dirrm share/octave/2.1.34/m/special-matrix
+@dirrm share/octave/2.1.34/m/specfun
+@dirrm share/octave/2.1.34/m/signal
+@dirrm share/octave/2.1.34/m/set
+@dirrm share/octave/2.1.34/m/quaternion
+@dirrm share/octave/2.1.34/m/polynomial
+@dirrm share/octave/2.1.34/m/plot
+@dirrm share/octave/2.1.34/m/miscellaneous
+@dirrm share/octave/2.1.34/m/linear-algebra
+@dirrm share/octave/2.1.34/m/io
+@dirrm share/octave/2.1.34/m/image
+@dirrm share/octave/2.1.34/m/general
+@dirrm share/octave/2.1.34/m/finance
+@dirrm share/octave/2.1.34/m/elfun
+@dirrm share/octave/2.1.34/m/control/util
+@dirrm share/octave/2.1.34/m/control/system
+@dirrm share/octave/2.1.34/m/control/obsolete
+@dirrm share/octave/2.1.34/m/control/hinf
+@dirrm share/octave/2.1.34/m/control/base
+@dirrm share/octave/2.1.34/m/control
+@dirrm share/octave/2.1.34/m/audio
 @dirrm share/octave/2.1.34/m
-@dirrm share/octave/2.1.34/site/m
-@dirrm share/octave/2.1.34/site
+@dirrm share/octave/2.1.34/imagelib
 @dirrm share/octave/2.1.34
-@dirrm share/octave/site/m/startup
-@dirrm share/octave/site/m
-@dirrm share/octave/site
 @dirrm share/octave
-@dirrm share/doc/html/octave
 @dirrm share/doc/octave
+@dirrm share/doc/html/octave
+@dirrm libexec/octave/site/oct/${MACHINE_GNU_PLATFORM}
+@dirrm libexec/octave/site/oct
+@dirrm libexec/octave/site/exec/${MACHINE_GNU_PLATFORM}
+@dirrm libexec/octave/site/exec
+@dirrm libexec/octave/site
+@dirrm libexec/octave/2.1.34/site/oct/${MACHINE_GNU_PLATFORM}
+@dirrm libexec/octave/2.1.34/site/oct
+@dirrm libexec/octave/2.1.34/site
+@dirrm libexec/octave/2.1.34/oct/${MACHINE_GNU_PLATFORM}
+@dirrm libexec/octave/2.1.34/oct
+@dirrm libexec/octave/2.1.34/exec/${MACHINE_GNU_PLATFORM}
+@dirrm libexec/octave/2.1.34/exec
+@dirrm libexec/octave/2.1.34
+@dirrm libexec/octave
+@dirrm lib/${PKGNAME}
+@dirrm include/${PKGNAME}/octave
+@dirrm include/${PKGNAME}
diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index b55473b2779..e18763fb0dc 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2001/04/22 23:49:55 jtb Exp $
+$NetBSD: distinfo,v 1.9 2002/01/03 17:09:46 wiz Exp $
 
 SHA1 (octave-2.1.33.tar.bz2) = 15a07d08647a2c2aeedb31917ac41ed3b7bb4245
 Size (octave-2.1.33.tar.bz2) = 3740256 bytes
@@ -16,4 +16,3 @@ SHA1 (patch-ai) = 248dbc97c2233c47dc532f86b0fb2fd3ebd18068
 SHA1 (patch-aj) = 8e2bbe9afde5567540b32fc183f58b87fbf9a547
 SHA1 (patch-ak) = b998dfe27accebec38cffa38555a3e32932c0c07
 SHA1 (patch-al) = 7134c3cb12ce4fdd5cbe2a39c586aeac6dab2045
-SHA1 (patch-am) = ab5bfea86fcf6d646f6317e3daf53054662385f3
diff --git a/math/octave-current/patches/patch-am b/math/octave-current/patches/patch-am
deleted file mode 100644
index 40c0c61af31..00000000000
--- a/math/octave-current/patches/patch-am
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-am,v 1.2 2001/04/22 23:16:09 jtb Exp $
-
---- liboctave/oct-rl-edit.c.orig	Mon Apr 23 00:07:12 2001
-+++ liboctave/oct-rl-edit.c
-@@ -33,20 +33,20 @@
- 
- #include "oct-rl-edit.h"
- 
-+extern int screenheight;
-+
-+extern int screenwidth;
-+
- int
- octave_rl_screen_height (void)
- {
--  int rows, cols;
--  rl_get_screen_size (&rows, &cols);
--  return rows;
-+    return screenheight;
- }
- 
- int
- octave_rl_screen_width (void)
- {
--  int rows, cols;
--  rl_get_screen_size (&rows, &cols);
--  return cols;
-+    return screenwidth;
- }
- 
- void
-@@ -93,7 +93,7 @@
- {
-   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)
- {
--  return rl_completion_matches (text, f);
-+  return completion_matches (text, f);
- }
- 
- char