Changes 2.1.59:

* bug-fixes and clean-ups

6 files changed, 304 insertions, 34 deletions

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index ce407baf523..f31cde8da7f 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/09/11 21:47:43 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.33 2004/09/23 13:03:41 adam Exp $
 #
 
 DISTNAME=	octave-${OCTAVE_VER}
@@ -18,7 +18,7 @@ BUILD_DEPENDS+=	bison>=1.875:../../devel/bison
 BUILD_DEPENDS+=	gperf>=2.7:../../devel/gperf
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 
-OCTAVE_VER=	2.1.57
+OCTAVE_VER=	2.1.59
 CONFLICTS+=	octave-2.0.*
 
 .if (${MACHINE_ARCH} == "arm32")
@@ -53,7 +53,7 @@ UNWRAP_FILES+=	mkoctfile octave-bug src/oct-conf.h
 
 post-extract:
 	${FIND} ${WRKSRC}/doc -type f -name '*.info*' -exec ${RM} -f {} \;
-	${MKDIR} -p ${WRKSRC}/src/pic
+	${MKDIR} ${WRKSRC}/src/pic
 
 post-install:
 .for f in ${LIBOCTAVE_INFO}
diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST
index 958d533cb3d..b790346f436 100644
--- a/math/octave-current/PLIST
+++ b/math/octave-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2004/09/22 08:09:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2004/09/23 13:03:41 adam Exp $
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
 bin/octave
@@ -129,6 +129,12 @@ include/octave-${PKGVERSION}/octave/gripes.h
 include/octave-${PKGVERSION}/octave/help.h
 include/octave-${PKGVERSION}/octave/idx-vector.h
 include/octave-${PKGVERSION}/octave/input.h
+include/octave-${PKGVERSION}/octave/int16NDArray.h
+include/octave-${PKGVERSION}/octave/int32NDArray.h
+include/octave-${PKGVERSION}/octave/int64NDArray.h
+include/octave-${PKGVERSION}/octave/int8NDArray.h
+include/octave-${PKGVERSION}/octave/intNDArray.cc
+include/octave-${PKGVERSION}/octave/intNDArray.h
 include/octave-${PKGVERSION}/octave/kpse-xfns.h
 include/octave-${PKGVERSION}/octave/kpse.cc
 include/octave-${PKGVERSION}/octave/lex.h
@@ -171,6 +177,102 @@ include/octave-${PKGVERSION}/octave/mx-dm-cs.h
 include/octave-${PKGVERSION}/octave/mx-dm-m.h
 include/octave-${PKGVERSION}/octave/mx-dm-s.h
 include/octave-${PKGVERSION}/octave/mx-ext.h
+include/octave-${PKGVERSION}/octave/mx-i16-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-i16-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-i16-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-i16-nda.h
+include/octave-${PKGVERSION}/octave/mx-i16-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-i16-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-i16-ui64nda.h
+include/octave-${PKGVERSION}/octave/mx-i16-ui8nda.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-i32.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-i64.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-i8.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-nda.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-s.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-ui16.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-ui32.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-ui64.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-ui64nda.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-ui8.h
+include/octave-${PKGVERSION}/octave/mx-i16nda-ui8nda.h
+include/octave-${PKGVERSION}/octave/mx-i32-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-i32-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-i32-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-i32-nda.h
+include/octave-${PKGVERSION}/octave/mx-i32-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-i32-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-i32-ui64nda.h
+include/octave-${PKGVERSION}/octave/mx-i32-ui8nda.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-i16.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-i64.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-i8.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-nda.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-s.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-ui16.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-ui32.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-ui64.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-ui64nda.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-ui8.h
+include/octave-${PKGVERSION}/octave/mx-i32nda-ui8nda.h
+include/octave-${PKGVERSION}/octave/mx-i64-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-i64-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-i64-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-i64-nda.h
+include/octave-${PKGVERSION}/octave/mx-i64-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-i64-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-i64-ui64nda.h
+include/octave-${PKGVERSION}/octave/mx-i64-ui8nda.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-i16.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-i32.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-i8.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-nda.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-s.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-ui16.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-ui32.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-ui64.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-ui64nda.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-ui8.h
+include/octave-${PKGVERSION}/octave/mx-i64nda-ui8nda.h
+include/octave-${PKGVERSION}/octave/mx-i8-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-i8-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-i8-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-i8-nda.h
+include/octave-${PKGVERSION}/octave/mx-i8-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-i8-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-i8-ui64nda.h
+include/octave-${PKGVERSION}/octave/mx-i8-ui8nda.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-i16.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-i32.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-i64.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-nda.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-s.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-ui16.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-ui32.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-ui64.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-ui64nda.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-ui8.h
+include/octave-${PKGVERSION}/octave/mx-i8nda-ui8nda.h
 include/octave-${PKGVERSION}/octave/mx-inlines.cc
 include/octave-${PKGVERSION}/octave/mx-m-cdm.h
 include/octave-${PKGVERSION}/octave/mx-m-cm.h
@@ -178,12 +280,132 @@ include/octave-${PKGVERSION}/octave/mx-m-cs.h
 include/octave-${PKGVERSION}/octave/mx-m-dm.h
 include/octave-${PKGVERSION}/octave/mx-nda-cnda.h
 include/octave-${PKGVERSION}/octave/mx-nda-cs.h
+include/octave-${PKGVERSION}/octave/mx-nda-i16.h
+include/octave-${PKGVERSION}/octave/mx-nda-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-nda-i32.h
+include/octave-${PKGVERSION}/octave/mx-nda-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-nda-i64.h
+include/octave-${PKGVERSION}/octave/mx-nda-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-nda-i8.h
+include/octave-${PKGVERSION}/octave/mx-nda-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-nda-ui16.h
+include/octave-${PKGVERSION}/octave/mx-nda-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-nda-ui32.h
+include/octave-${PKGVERSION}/octave/mx-nda-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-nda-ui64.h
+include/octave-${PKGVERSION}/octave/mx-nda-ui64nda.h
+include/octave-${PKGVERSION}/octave/mx-nda-ui8.h
+include/octave-${PKGVERSION}/octave/mx-nda-ui8nda.h
 include/octave-${PKGVERSION}/octave/mx-op-defs.h
 include/octave-${PKGVERSION}/octave/mx-ops.h
 include/octave-${PKGVERSION}/octave/mx-s-cdm.h
 include/octave-${PKGVERSION}/octave/mx-s-cm.h
 include/octave-${PKGVERSION}/octave/mx-s-cnda.h
 include/octave-${PKGVERSION}/octave/mx-s-dm.h
+include/octave-${PKGVERSION}/octave/mx-s-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-s-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-s-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-s-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-s-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-s-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-s-ui64nda.h
+include/octave-${PKGVERSION}/octave/mx-s-ui8nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16-nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16-ui64nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16-ui8nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-i16.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-i32.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-i64.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-i8.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-s.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-ui32.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-ui64.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-ui64nda.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-ui8.h
+include/octave-${PKGVERSION}/octave/mx-ui16nda-ui8nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32-nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32-ui64nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32-ui8nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-i16.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-i32.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-i64.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-i8.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-s.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-ui16.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-ui64.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-ui64nda.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-ui8.h
+include/octave-${PKGVERSION}/octave/mx-ui32nda-ui8nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64-nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64-ui8nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-i16.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-i32.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-i64.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-i8.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-s.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-ui16.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-ui32.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-ui8.h
+include/octave-${PKGVERSION}/octave/mx-ui64nda-ui8nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8-nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8-ui64nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-i16.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-i16nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-i32.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-i32nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-i64.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-i64nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-i8.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-i8nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-s.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-ui16.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-ui16nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-ui32.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-ui32nda.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-ui64.h
+include/octave-${PKGVERSION}/octave/mx-ui8nda-ui64nda.h
 include/octave-${PKGVERSION}/octave/oct-alloc.h
 include/octave-${PKGVERSION}/octave/oct-cmplx.h
 include/octave-${PKGVERSION}/octave/oct-conf.h
@@ -194,6 +416,7 @@ include/octave-${PKGVERSION}/octave/oct-getopt.h
 include/octave-${PKGVERSION}/octave/oct-gperf.h
 include/octave-${PKGVERSION}/octave/oct-group.h
 include/octave-${PKGVERSION}/octave/oct-hist.h
+include/octave-${PKGVERSION}/octave/oct-inttypes.h
 include/octave-${PKGVERSION}/octave/oct-iostrm.h
 include/octave-${PKGVERSION}/octave/oct-lvalue.h
 include/octave-${PKGVERSION}/octave/oct-map.h
@@ -205,6 +428,8 @@ include/octave-${PKGVERSION}/octave/oct-rand.h
 include/octave-${PKGVERSION}/octave/oct-rl-edit.h
 include/octave-${PKGVERSION}/octave/oct-rl-hist.h
 include/octave-${PKGVERSION}/octave/oct-shlib.h
+include/octave-${PKGVERSION}/octave/oct-sort.cc
+include/octave-${PKGVERSION}/octave/oct-sort.h
 include/octave-${PKGVERSION}/octave/oct-stdstrm.h
 include/octave-${PKGVERSION}/octave/oct-stream.h
 include/octave-${PKGVERSION}/octave/oct-strstrm.h
@@ -213,6 +438,8 @@ include/octave-${PKGVERSION}/octave/oct-time.h
 include/octave-${PKGVERSION}/octave/oct.h
 include/octave-${PKGVERSION}/octave/octave.h
 include/octave-${PKGVERSION}/octave/ops.h
+include/octave-${PKGVERSION}/octave/ov-base-int.cc
+include/octave-${PKGVERSION}/octave/ov-base-int.h
 include/octave-${PKGVERSION}/octave/ov-base-mat.h
 include/octave-${PKGVERSION}/octave/ov-base-scalar.h
 include/octave-${PKGVERSION}/octave/ov-base.h
@@ -227,8 +454,15 @@ include/octave-${PKGVERSION}/octave/ov-cs-list.h
 include/octave-${PKGVERSION}/octave/ov-cx-mat.h
 include/octave-${PKGVERSION}/octave/ov-dld-fcn.h
 include/octave-${PKGVERSION}/octave/ov-fcn-handle.h
+include/octave-${PKGVERSION}/octave/ov-fcn-inline.h
+include/octave-${PKGVERSION}/octave/ov-int-traits.h
 include/octave-${PKGVERSION}/octave/ov-fcn.h
 include/octave-${PKGVERSION}/octave/ov-file.h
+include/octave-${PKGVERSION}/octave/ov-int16.h
+include/octave-${PKGVERSION}/octave/ov-int32.h
+include/octave-${PKGVERSION}/octave/ov-int64.h
+include/octave-${PKGVERSION}/octave/ov-int8.h
+include/octave-${PKGVERSION}/octave/ov-intx.h
 include/octave-${PKGVERSION}/octave/ov-list.h
 include/octave-${PKGVERSION}/octave/ov-mapper.h
 include/octave-${PKGVERSION}/octave/ov-range.h
@@ -237,7 +471,12 @@ include/octave-${PKGVERSION}/octave/ov-scalar.h
 include/octave-${PKGVERSION}/octave/ov-str-mat.h
 include/octave-${PKGVERSION}/octave/ov-streamoff.h
 include/octave-${PKGVERSION}/octave/ov-struct.h
+include/octave-${PKGVERSION}/octave/ov-type-conv.h
 include/octave-${PKGVERSION}/octave/ov-typeinfo.h
+include/octave-${PKGVERSION}/octave/ov-uint16.h
+include/octave-${PKGVERSION}/octave/ov-uint32.h
+include/octave-${PKGVERSION}/octave/ov-uint64.h
+include/octave-${PKGVERSION}/octave/ov-uint8.h
 include/octave-${PKGVERSION}/octave/ov-usr-fcn.h
 include/octave-${PKGVERSION}/octave/ov-va-args.h
 include/octave-${PKGVERSION}/octave/ov.h
@@ -289,6 +528,10 @@ include/octave-${PKGVERSION}/octave/systime.h
 include/octave-${PKGVERSION}/octave/syswait.h
 include/octave-${PKGVERSION}/octave/token.h
 include/octave-${PKGVERSION}/octave/toplev.h
+include/octave-${PKGVERSION}/octave/uint16NDArray.h
+include/octave-${PKGVERSION}/octave/uint32NDArray.h
+include/octave-${PKGVERSION}/octave/uint64NDArray.h
+include/octave-${PKGVERSION}/octave/uint8NDArray.h
 include/octave-${PKGVERSION}/octave/unwind-prot.h
 include/octave-${PKGVERSION}/octave/utils.h
 include/octave-${PKGVERSION}/octave/variables.h
@@ -586,6 +829,7 @@ share/octave/${PKGVERSION}/m/control/util/zgrownorm.m
 share/octave/${PKGVERSION}/m/control/util/zgscal.m
 share/octave/${PKGVERSION}/m/control/util/zgsgiv.m
 share/octave/${PKGVERSION}/m/control/util/zgshsr.m
+share/octave/${PKGVERSION}/m/deprecated/com2str.m
 share/octave/${PKGVERSION}/m/deprecated/is_bool.m
 share/octave/${PKGVERSION}/m/deprecated/is_complex.m
 share/octave/${PKGVERSION}/m/deprecated/is_global.m
@@ -611,7 +855,6 @@ share/octave/${PKGVERSION}/m/elfun/cot.m
 share/octave/${PKGVERSION}/m/elfun/coth.m
 share/octave/${PKGVERSION}/m/elfun/csc.m
 share/octave/${PKGVERSION}/m/elfun/csch.m
-share/octave/${PKGVERSION}/m/elfun/gcd.m
 share/octave/${PKGVERSION}/m/elfun/lcm.m
 share/octave/${PKGVERSION}/m/elfun/sec.m
 share/octave/${PKGVERSION}/m/elfun/sech.m
@@ -625,16 +868,22 @@ share/octave/${PKGVERSION}/m/finance/pv.m
 share/octave/${PKGVERSION}/m/finance/pvl.m
 share/octave/${PKGVERSION}/m/finance/rate.m
 share/octave/${PKGVERSION}/m/finance/vol.m
+share/octave/${PKGVERSION}/m/general/bitcmp.m
+share/octave/${PKGVERSION}/m/general/bitget.m
+share/octave/${PKGVERSION}/m/general/bitset.m
 share/octave/${PKGVERSION}/m/general/cart2pol.m
 share/octave/${PKGVERSION}/m/general/cart2sph.m
+share/octave/${PKGVERSION}/m/general/circshift.m
 share/octave/${PKGVERSION}/m/general/columns.m
 share/octave/${PKGVERSION}/m/general/common_size.m
 share/octave/${PKGVERSION}/m/general/deal.m
 share/octave/${PKGVERSION}/m/general/diff.m
+share/octave/${PKGVERSION}/m/general/flipdim.m
 share/octave/${PKGVERSION}/m/general/fliplr.m
 share/octave/${PKGVERSION}/m/general/flipud.m
 share/octave/${PKGVERSION}/m/general/int2str.m
 share/octave/${PKGVERSION}/m/general/is_duplicate_entry.m
+share/octave/${PKGVERSION}/m/general/isa.m
 share/octave/${PKGVERSION}/m/general/isdefinite.m
 share/octave/${PKGVERSION}/m/general/isscalar.m
 share/octave/${PKGVERSION}/m/general/issquare.m
@@ -654,8 +903,10 @@ share/octave/${PKGVERSION}/m/general/randperm.m
 share/octave/${PKGVERSION}/m/general/rem.m
 share/octave/${PKGVERSION}/m/general/repmat.m
 share/octave/${PKGVERSION}/m/general/rot90.m
+share/octave/${PKGVERSION}/m/general/rotdim.m
 share/octave/${PKGVERSION}/m/general/rows.m
 share/octave/${PKGVERSION}/m/general/shift.m
+share/octave/${PKGVERSION}/m/general/shiftdim.m
 share/octave/${PKGVERSION}/m/general/sph2cart.m
 share/octave/${PKGVERSION}/m/general/strerror.m
 share/octave/${PKGVERSION}/m/general/tril.m
@@ -997,7 +1248,6 @@ share/octave/${PKGVERSION}/m/statistics/tests/z_test_2.m
 share/octave/${PKGVERSION}/m/strings/base2dec.m
 share/octave/${PKGVERSION}/m/strings/bin2dec.m
 share/octave/${PKGVERSION}/m/strings/blanks.m
-share/octave/${PKGVERSION}/m/strings/com2str.m
 share/octave/${PKGVERSION}/m/strings/deblank.m
 share/octave/${PKGVERSION}/m/strings/dec2base.m
 share/octave/${PKGVERSION}/m/strings/dec2bin.m
@@ -1034,8 +1284,8 @@ share/octave/${PKGVERSION}/m/miscellaneous/unix.m
 share/octave/ls-R
 share/octave/site/m/startup/octaverc
 @dirrm share/octave/site/m/startup
-@dirrm share/octave/site/api-v8/m
-@dirrm share/octave/site/api-v8
+@dirrm share/octave/site/api-v10/m
+@dirrm share/octave/site/api-v10
 @dirrm share/octave/${PKGVERSION}/site/m
 @dirrm share/octave/${PKGVERSION}/site
 @dirrm share/octave/${PKGVERSION}/m/time
@@ -1073,8 +1323,8 @@ share/octave/site/m/startup/octaverc
 @dirrm share/octave/${PKGVERSION}/doc
 @dirrm share/octave/${PKGVERSION}
 @dirrm share/doc/html/octave
-@dirrm libexec/octave/site/oct/api-v8/${MACHINE_GNU_PLATFORM}
-@dirrm libexec/octave/site/oct/api-v8
+@dirrm libexec/octave/site/oct/api-v10/${MACHINE_GNU_PLATFORM}
+@dirrm libexec/octave/site/oct/api-v10
 @dirrm libexec/octave/site/oct/${MACHINE_GNU_PLATFORM}
 @dirrm libexec/octave/site/oct
 @dirrm libexec/octave/site/exec/${MACHINE_GNU_PLATFORM}
diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index 862ac8bd4fc..95da68e9ca7 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.18 2004/09/14 22:20:16 dmcmahill Exp $
+$NetBSD: distinfo,v 1.19 2004/09/23 13:03:41 adam Exp $
 
-SHA1 (octave-2.1.57.tar.bz2) = 126f79fd169a31883d7f7193caa459be19924acd
-Size (octave-2.1.57.tar.bz2) = 4202080 bytes
-SHA1 (patch-aa) = 6ba3dc53ef89230a623e33f5e9433691cdfedeeb
+SHA1 (octave-2.1.59.tar.bz2) = 2b019c7055b83002d761ca7c13510c57e0abbc4c
+Size (octave-2.1.59.tar.bz2) = 4288120 bytes
+SHA1 (patch-aa) = 63e8d273b47e54964ab3b86a424a36cd13583057
 SHA1 (patch-ac) = 201e5e6a58f6934371daa9ccac8d4f1f01533a4c
 SHA1 (patch-ad) = 03dfbfb17b1262d5094dbc42758a99011e05fdd4
 SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111
-SHA1 (patch-af) = 615b71576afc542c449aff41caf1333a04d9aeab
-SHA1 (patch-ag) = f073dd31da2aa86a38e9d5692748bf4e6be98fa7
+SHA1 (patch-af) = 9c1eb47e6ee46a41ba98d786a192663fc236aafc
+SHA1 (patch-ag) = f6c4263cf08985e4897ea69cce6a9c8b329ec48c
diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa
index c8e704b6f56..391e98fcd71 100644
--- a/math/octave-current/patches/patch-aa
+++ b/math/octave-current/patches/patch-aa
@@ -1,20 +1,27 @@
---- configure.orig	Fri Mar 12 19:39:23 2004
-+++ configure	Mon Sep  6 16:28:24 2004
-@@ -7931,5 +7931,5 @@
+$NetBSD: patch-aa,v 1.9 2004/09/23 13:03:41 adam Exp $
+
+--- configure.orig	2004-09-22 03:35:07.000000000 +0000
++++ configure
+@@ -8508,7 +8508,7 @@ if $have_fortran_compiler; then
+ %.c : %.f
  
  %.o : %.f
 -	$(FC) -c $(ALL_FFLAGS) -o $@ $<
 +	${LIBTOOL} --mode=compile --tag=CC $(FC) -c $(ALL_FFLAGS) $<
  
  pic/%.o : %.f
-@@ -9831,5 +9831,5 @@
+ 	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
+@@ -10718,7 +10718,7 @@ TEMPLATE_AR='$(AR)'
+ TEMPLATE_ARFLAGS="$ARFLAGS"
  library_path_var=LD_LIBRARY_PATH
  case "$canonical_host_type" in
 -  *-*-386bsd* | *-*-openbsd* | *-*-netbsd*)
 +  *-*-386bsd* | *-*-openbsd* )
      SH_LD=ld
      SH_LDFLAGS=-Bshareable
-@@ -18718,17 +18718,17 @@
+   ;;
+@@ -20739,19 +20739,19 @@ case "$canonical_host_type" in
+     cat << \EOF > $bsd_gcc_kluge_targets_frag
  
  lex.o: lex.cc
 -	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
@@ -37,3 +44,4 @@
 +	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
  
  EOF
+   ;;
diff --git a/math/octave-current/patches/patch-af b/math/octave-current/patches/patch-af
index 0b978706fba..74f151ad6b4 100644
--- a/math/octave-current/patches/patch-af
+++ b/math/octave-current/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2004/02/26 16:47:35 adam Exp $
+$NetBSD: patch-af,v 1.6 2004/09/23 13:03:41 adam Exp $
 
---- liboctave/Makefile.in.orig	2004-02-16 19:57:21.000000000 +0000
+--- liboctave/Makefile.in.orig	2004-09-02 01:28:50.000000000 +0000
 +++ liboctave/Makefile.in
-@@ -201,8 +201,9 @@ endif
+@@ -207,8 +207,9 @@ endif
  
  liboctave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
  	rm -f $@
@@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.5 2004/02/26 16:47:35 adam Exp $
  
  liboctave.$(SHLEXT_VER): liboctave.$(SHLEXT)
  	rm -f $@
-@@ -229,9 +230,8 @@ install-lib:
+@@ -235,9 +236,8 @@ install-lib:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
diff --git a/math/octave-current/patches/patch-ag b/math/octave-current/patches/patch-ag
index 0b7a6ac10c9..06123f2d669 100644
--- a/math/octave-current/patches/patch-ag
+++ b/math/octave-current/patches/patch-ag
@@ -1,8 +1,9 @@
-$NetBSD: patch-ag,v 1.9 2004/09/14 22:20:16 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.10 2004/09/23 13:03:41 adam Exp $
 
---- src/Makefile.in.orig	Fri Feb 20 21:16:54 2004
-+++ src/Makefile.in	Thu Sep  9 01:18:45 2004
-@@ -33,8 +33,8 @@
+--- src/Makefile.in.orig	2004-09-02 03:48:47.000000000 +0000
++++ src/Makefile.in
+@@ -32,10 +32,10 @@ CXXFLAGS_NO_PT_FLAGS = $(filter-out $(PT
+ ifeq ($(ENABLE_DYNAMIC_LINKING), true)
    ifdef CXXPICFLAG
      %.oct : pic/%.o octave$(EXEEXT)
 -	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS)
@@ -13,7 +14,9 @@ $NetBSD: patch-ag,v 1.9 2004/09/14 22:20:16 dmcmahill Exp $
 +	  ${LIBTOOL} --mode=link $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS)
    endif
  endif
-@@ -247,6 +247,7 @@
+ 
+@@ -267,8 +267,9 @@ libraries: $(LIBRARIES)
+ 
  liboctinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
  	rm -f $@
 -	$(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^
@@ -23,26 +26,34 @@ $NetBSD: patch-ag,v 1.9 2004/09/14 22:20:16 dmcmahill Exp $
 +		-version-info ${version:2.1.%=2:%}
  
  liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT)
-@@ -256,5 +257,5 @@
+ 	rm -f $@
+@@ -276,7 +277,7 @@ liboctinterp.$(SHLEXT_VER): liboctinterp
+ 
  liboctinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
  	rm -f $@
 -	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
 +	${LIBTOOL} --mode=link $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
  
  stamp-oct-links: $(OCT_FILES)
-@@ -268,4 +269,5 @@
+ 	if [ -n "$(OCT_FILES)" ]; then \
+@@ -288,6 +289,7 @@ stamp-prereq: defaults.h oct-conf.h oct-
+ 	touch stamp-prereq
  
  octave$(EXEEXT): stamp-prereq $(LIBRARIES) main.o $(DLD_STATIC_OBJ)
 +	${LIBTOOL} --mode=link \
  	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
  	$(ALL_LDFLAGS) -o $@ \
-@@ -348,4 +350,5 @@
+ 	main.o $(DLD_STATIC_OBJ) \
+@@ -368,6 +370,7 @@ install-strip:
+ install-bin:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
  	rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
 +	${LIBTOOL} --mode=install \
  	$(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
  	$(LN_S) octave-$(version)$(EXEEXT) $(DESTDIR)$(bindir)/octave$(EXEEXT)
-@@ -367,7 +370,6 @@
+ .PHONY: install-bin
+@@ -387,9 +390,8 @@ install-lib:
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
 -	  $(INSTALL_DATA) liboctinterp.$(LIBEXT) \
@@ -52,3 +63,4 @@ $NetBSD: patch-ag,v 1.9 2004/09/14 22:20:16 dmcmahill Exp $
 +	    ${PREFIX}/lib; \
  	fi
  	if $(SHARED_LIBS); then \
+ 	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLEXT_VER); \