Changes 2.9.2:

* Bug fixes

6 files changed, 30 insertions, 26 deletions

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index 48725e585c5..ec5669d1056 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/04/11 21:46:30 tv Exp $
+# $NetBSD: Makefile,v 1.47 2005/04/27 14:31:05 adam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 PKGNAME=	octave-current-${OCTAVE_VER}
@@ -17,7 +17,7 @@ BUILD_DEPENDS+=	bison>=1.875:../../devel/bison
 BUILD_DEPENDS+=	gperf>=2.7:../../devel/gperf
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 
-OCTAVE_VER=	2.9.1
+OCTAVE_VER=	2.9.2
 CONFLICTS+=	octave-2.*
 
 .if (${MACHINE_ARCH} == "arm32")
diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST
index 5f407969054..5236575794d 100644
--- a/math/octave-current/PLIST
+++ b/math/octave-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2005/04/01 10:15:19 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2005/04/27 14:31:05 adam Exp $
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
 bin/octave
@@ -444,6 +444,7 @@ include/octave-${PKGVERSION}/octave/oct-stream.h
 include/octave-${PKGVERSION}/octave/oct-strstrm.h
 include/octave-${PKGVERSION}/octave/oct-syscalls.h
 include/octave-${PKGVERSION}/octave/oct-time.h
+include/octave-${PKGVERSION}/octave/oct-types.h
 include/octave-${PKGVERSION}/octave/oct.h
 include/octave-${PKGVERSION}/octave/octave.h
 include/octave-${PKGVERSION}/octave/ops.h
@@ -585,6 +586,7 @@ include/octave-${PKGVERSION}/octave/vx-s-ccv.h
 include/octave-${PKGVERSION}/octave/vx-s-crv.h
 include/octave-${PKGVERSION}/octave/xdiv.h
 include/octave-${PKGVERSION}/octave/xpow.h
+include/octave-${PKGVERSION}/octave/zfstream.h
 lib/libcruft.la
 lib/liboctave.la
 lib/liboctinterp.la
@@ -599,6 +601,7 @@ libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_replot__.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_set__.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_show__.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__gnuplot_splot__.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__qp__.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/airy.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/balance.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/besselh.oct
@@ -669,6 +672,7 @@ libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/lpsolve_options.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/lsode.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/lsode_options.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/lu.oct
+libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/luinc.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/max.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/min.oct
 libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/minmax.oct
@@ -1142,6 +1146,8 @@ share/octave/${PKGVERSION}/m/miscellaneous/version.m
 share/octave/${PKGVERSION}/m/miscellaneous/xor.m
 share/octave/${PKGVERSION}/m/optimization/glpk.m
 share/octave/${PKGVERSION}/m/optimization/glpkmex.m
+share/octave/${PKGVERSION}/m/optimization/qp.m
+share/octave/${PKGVERSION}/m/optimization/sqp.m
 share/octave/${PKGVERSION}/m/plot/PKG_ADD
 share/octave/${PKGVERSION}/m/plot/__axis_label__.m
 share/octave/${PKGVERSION}/m/plot/__errcomm__.m
@@ -1469,8 +1475,6 @@ share/octave/${PKGVERSION}/m/time/date.m
 share/octave/ls-R
 share/octave/site/m/startup/octaverc
 @dirrm share/octave/site/m/startup
-@dirrm share/octave/site/api-v14/m
-@dirrm share/octave/site/api-v14
 @dirrm share/octave/${PKGVERSION}/site/m
 @dirrm share/octave/${PKGVERSION}/site
 @dirrm share/octave/${PKGVERSION}/m/time
@@ -1510,8 +1514,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-v14/${MACHINE_GNU_PLATFORM}
-@dirrm libexec/octave/site/oct/api-v14
+@dirrm libexec/octave/site/oct/api-v15/${MACHINE_GNU_PLATFORM}
+@dirrm libexec/octave/site/oct/api-v15
 @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 497eed466d4..7dc3548a400 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.29 2005/04/01 10:15:19 adam Exp $
+$NetBSD: distinfo,v 1.30 2005/04/27 14:31:05 adam Exp $
 
-SHA1 (octave-2.9.1.tar.bz2) = 6c9ea48e014c39116a8525844c01ab4599731816
-RMD160 (octave-2.9.1.tar.bz2) = 61424c0c137dde2a991fc8454b623a154cf4bdda
-Size (octave-2.9.1.tar.bz2) = 6076652 bytes
-SHA1 (patch-aa) = 474c343f7ef3a3bc841f70936594356b2e11555a
-SHA1 (patch-ac) = 01431b785951d868c14ac1cd0b56ab16474f5901
+SHA1 (octave-2.9.2.tar.bz2) = 53ea2f6a4007fdad374161d5e04f87a3aaf839c0
+RMD160 (octave-2.9.2.tar.bz2) = a4a6dcfa8935db5397db8e6a7633b3dc55f314ff
+Size (octave-2.9.2.tar.bz2) = 6166148 bytes
+SHA1 (patch-aa) = 479f436f9d75979122bb4244e6fc660e53510d92
+SHA1 (patch-ac) = 16ec66a68e5ed80064d811cd1c8dda226a2f5ede
 SHA1 (patch-ad) = 01d0fb5878897a91d33e2cb7cbc6d2575a04c464
 SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111
-SHA1 (patch-af) = 957e6d1b58e5fd217ba49e8450a2a291789ae679
+SHA1 (patch-af) = 265a320a349818412b7c469039bf9847fbaf687e
 SHA1 (patch-ag) = ab4ea66196487e4e5fac195b0f4867124dd60fe6
 SHA1 (patch-ah) = f7009d8b35354a1d403d5bdeae68a211435b004c
diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa
index 9d86193f580..1df6c2da396 100644
--- a/math/octave-current/patches/patch-aa
+++ b/math/octave-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2005/04/01 10:15:19 adam Exp $
+$NetBSD: patch-aa,v 1.13 2005/04/27 14:31:05 adam Exp $
 
---- configure.orig	2005-03-27 12:38:36.000000000 +0000
+--- configure.orig	2005-04-22 17:34:21.000000000 +0000
 +++ configure
-@@ -9079,7 +9079,7 @@ if $have_fortran_compiler; then
+@@ -10521,7 +10521,7 @@ if $have_fortran_compiler; then
  %.c : %.f
  
  %.o : %.f
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.12 2005/04/01 10:15:19 adam Exp $
  
  pic/%.o : %.f
  	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
-@@ -11709,7 +11709,7 @@ TEMPLATE_AR='$(AR)'
+@@ -13229,7 +13229,7 @@ TEMPLATE_AR='$(AR)'
  TEMPLATE_ARFLAGS="$ARFLAGS"
  library_path_var=LD_LIBRARY_PATH
  case "$canonical_host_type" in
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.12 2005/04/01 10:15:19 adam Exp $
      SH_LD=ld
      SH_LDFLAGS=-Bshareable
    ;;
-@@ -21162,19 +21162,19 @@ case "$canonical_host_type" in
+@@ -22682,19 +22682,19 @@ case "$canonical_host_type" in
      cat << \EOF > $bsd_gcc_kluge_targets_frag
  
  lex.o: lex.cc
diff --git a/math/octave-current/patches/patch-ac b/math/octave-current/patches/patch-ac
index 080b7b1318e..bdef180943c 100644
--- a/math/octave-current/patches/patch-ac
+++ b/math/octave-current/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.5 2005/04/01 10:15:19 adam Exp $
+$NetBSD: patch-ac,v 1.6 2005/04/27 14:31:05 adam Exp $
 
---- Makeconf.in.orig	2005-03-27 12:38:19.000000000 +0000
+--- Makeconf.in.orig	2005-04-21 14:55:16.000000000 +0000
 +++ Makeconf.in
 @@ -73,7 +73,7 @@ SHLBIN = @SHLBIN@
  SHLBIN_VER = @SHLBIN_VER@
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.5 2005/04/01 10:15:19 adam Exp $
  DL_LDFLAGS = @DL_LDFLAGS@
  
  SONAME_FLAGS = @SONAME_FLAGS@
-@@ -344,10 +344,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
+@@ -347,10 +347,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
  # How to make .o files:
  
  %.o : %.c
diff --git a/math/octave-current/patches/patch-af b/math/octave-current/patches/patch-af
index 842d23d9582..c3494871b3f 100644
--- a/math/octave-current/patches/patch-af
+++ b/math/octave-current/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.9 2005/04/01 10:15:19 adam Exp $
+$NetBSD: patch-af,v 1.10 2005/04/27 14:31:05 adam Exp $
 
---- liboctave/Makefile.in.orig	2005-03-15 20:54:12.000000000 +0000
+--- liboctave/Makefile.in.orig	2005-04-21 16:18:17.000000000 +0000
 +++ liboctave/Makefile.in
-@@ -228,8 +228,9 @@ endif
+@@ -229,8 +229,9 @@ endif
  
  liboctave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
  	rm -f $@
@@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.9 2005/04/01 10:15:19 adam Exp $
  
  liboctave.$(SHLEXT_VER): liboctave.$(SHLEXT)
  	rm -f $@
-@@ -256,9 +257,8 @@ install-lib:
+@@ -257,9 +258,8 @@ install-lib:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \