Changes 2.1.57:

* bug fix release

5 files changed, 27 insertions, 27 deletions

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index 481d25fd1db..c0d3c62d862 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/02/26 16:47:35 adam Exp $
+# $NetBSD: Makefile,v 1.29 2004/03/29 16:20:16 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.55
+OCTAVE_VER=	2.1.57
 CONFLICTS+=	octave-2.0.*
 
 .if (${MACHINE_ARCH} == "arm32")
diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST
index 394934b69eb..eb7bdd68b0f 100644
--- a/math/octave-current/PLIST
+++ b/math/octave-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/03/08 19:36:22 seb Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/03/29 16:20:16 adam Exp $
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
 bin/octave
@@ -311,17 +311,17 @@ lib/libcruft.a
 lib/libcruft.la
 lib/libcruft.so
 lib/libcruft.so.2
-lib/libcruft.so.2.55
+lib/libcruft.so.2.57
 lib/liboctave.a
 lib/liboctave.la
 lib/liboctave.so
 lib/liboctave.so.2
-lib/liboctave.so.2.55
+lib/liboctave.so.2.57
 lib/liboctinterp.a
 lib/liboctinterp.la
 lib/liboctinterp.so
 lib/liboctinterp.so.2
-lib/liboctinterp.so.2.55
+lib/liboctinterp.so.2.57
 libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/info-emacs-info
 libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/info-emacs-octave-help
 libexec/octave/ls-R
@@ -641,6 +641,7 @@ share/octave/${PKGVERSION}/m/general/cart2pol.m
 share/octave/${PKGVERSION}/m/general/cart2sph.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/fliplr.m
 share/octave/${PKGVERSION}/m/general/flipud.m
@@ -715,7 +716,6 @@ share/octave/${PKGVERSION}/m/miscellaneous/etime.m
 share/octave/${PKGVERSION}/m/miscellaneous/fileparts.m
 share/octave/${PKGVERSION}/m/miscellaneous/flops.m
 share/octave/${PKGVERSION}/m/miscellaneous/fullfile.m
-share/octave/${PKGVERSION}/m/miscellaneous/horzcat.m
 share/octave/${PKGVERSION}/m/miscellaneous/is_leap_year.m
 share/octave/${PKGVERSION}/m/miscellaneous/list_primes.m
 share/octave/${PKGVERSION}/m/miscellaneous/menu.m
@@ -730,7 +730,6 @@ share/octave/${PKGVERSION}/m/miscellaneous/texas_lotto.m
 share/octave/${PKGVERSION}/m/miscellaneous/tic.m
 share/octave/${PKGVERSION}/m/miscellaneous/toc.m
 share/octave/${PKGVERSION}/m/miscellaneous/version.m
-share/octave/${PKGVERSION}/m/miscellaneous/vertcat.m
 share/octave/${PKGVERSION}/m/miscellaneous/xor.m
 share/octave/${PKGVERSION}/m/plot/PKG_ADD
 share/octave/${PKGVERSION}/m/plot/__axis_label__.m
@@ -1047,8 +1046,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-v6/m
-@dirrm share/octave/site/api-v6
+@dirrm share/octave/site/api-v8/m
+@dirrm share/octave/site/api-v8
 @dirrm share/octave/${PKGVERSION}/site/m
 @dirrm share/octave/${PKGVERSION}/site
 @dirrm share/octave/${PKGVERSION}/m/time
@@ -1086,8 +1085,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-v6/${MACHINE_GNU_PLATFORM}
-@dirrm libexec/octave/site/oct/api-v6
+@dirrm libexec/octave/site/oct/api-v8/${MACHINE_GNU_PLATFORM}
+@dirrm libexec/octave/site/oct/api-v8
 @dirrm libexec/octave/site/oct/${MACHINE_GNU_PLATFORM}
 @dirrm libexec/octave/site/oct
 @dirrm libexec/octave/site/exec/${MACHINE_GNU_PLATFORM}
@@ -1104,5 +1103,6 @@ share/octave/site/m/startup/octaverc
 @dirrm libexec/octave/${PKGVERSION}/exec
 @dirrm libexec/octave/${PKGVERSION}
 @dirrm libexec/octave
+@dirrm lib/octave-${PKGVERSION}
 @dirrm include/octave-${PKGVERSION}/octave
 @dirrm include/octave-${PKGVERSION}
diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index 0c52cb154ef..08535bfa032 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.15 2004/02/26 16:47:35 adam Exp $
+$NetBSD: distinfo,v 1.16 2004/03/29 16:20:16 adam Exp $
 
-SHA1 (octave-2.1.55.tar.bz2) = fe6cda19a51943fc6e8037c6676d2ad4aa91cee3
-Size (octave-2.1.55.tar.bz2) = 4197965 bytes
-SHA1 (patch-aa) = 987d081e29539c2b6730e35bd784ac9a82c961e8
+SHA1 (octave-2.1.57.tar.bz2) = 126f79fd169a31883d7f7193caa459be19924acd
+Size (octave-2.1.57.tar.bz2) = 4202080 bytes
+SHA1 (patch-aa) = 866fb23c00ff01da8c1f98609827d709227932ae
 SHA1 (patch-ac) = 201e5e6a58f6934371daa9ccac8d4f1f01533a4c
 SHA1 (patch-ad) = 03dfbfb17b1262d5094dbc42758a99011e05fdd4
 SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111
 SHA1 (patch-af) = 615b71576afc542c449aff41caf1333a04d9aeab
-SHA1 (patch-ag) = 96aca7c59bfebbd1462c09ec9f8000f210123cb8
+SHA1 (patch-ag) = 02b49432a3f6fbda100555f114b9df38b85c20b3
diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa
index 87b891affc0..cb39b71832f 100644
--- a/math/octave-current/patches/patch-aa
+++ b/math/octave-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2004/02/26 16:47:35 adam Exp $
+$NetBSD: patch-aa,v 1.7 2004/03/29 16:20:16 adam Exp $
 
---- configure.orig	2004-02-20 21:17:41.000000000 +0000
+--- configure.orig	2004-03-05 19:16:10.000000000 +0000
 +++ configure
-@@ -7977,7 +7977,7 @@ if $have_fortran_compiler; then
+@@ -7930,7 +7930,7 @@ if $have_fortran_compiler; then
  %.c : %.f
  
  %.o : %.f
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.6 2004/02/26 16:47:35 adam Exp $
  
  pic/%.o : %.f
  	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
-@@ -18764,19 +18764,19 @@ case "$canonical_host_type" in
+@@ -18717,19 +18717,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-ag b/math/octave-current/patches/patch-ag
index 74f91f0978e..3a43a0789d5 100644
--- a/math/octave-current/patches/patch-ag
+++ b/math/octave-current/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.6 2004/01/23 13:26:20 adam Exp $
+$NetBSD: patch-ag,v 1.7 2004/03/29 16:20:16 adam Exp $
 
---- src/Makefile.in.orig	2004-01-23 04:13:58.000000000 +0000
+--- src/Makefile.in.orig	2004-02-20 21:16:54.000000000 +0000
 +++ src/Makefile.in
-@@ -247,8 +247,9 @@ libraries: $(LIBRARIES)
+@@ -246,8 +246,9 @@ libraries: $(LIBRARIES)
  
  liboctinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
  	rm -f $@
@@ -14,7 +14,7 @@ $NetBSD: patch-ag,v 1.6 2004/01/23 13:26:20 adam Exp $
  
  liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT)
  	rm -f $@
-@@ -268,6 +269,7 @@ stamp-prereq: defaults.h oct-conf.h oct-
+@@ -267,6 +268,7 @@ stamp-prereq: defaults.h oct-conf.h oct-
  	touch stamp-prereq
  
  octave$(EXEEXT): stamp-prereq $(LIBRARIES) main.o $(DLD_STATIC_OBJ)
@@ -22,7 +22,7 @@ $NetBSD: patch-ag,v 1.6 2004/01/23 13:26:20 adam Exp $
  	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
  	$(ALL_LDFLAGS) -o $@ \
  	main.o $(DLD_STATIC_OBJ) \
-@@ -348,6 +350,7 @@ install-strip:
+@@ -347,6 +349,7 @@ install-strip:
  install-bin:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
  	rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
@@ -30,7 +30,7 @@ $NetBSD: patch-ag,v 1.6 2004/01/23 13:26:20 adam Exp $
  	$(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
  	$(LN_S) octave-$(version)$(EXEEXT) $(DESTDIR)$(bindir)/octave$(EXEEXT)
  .PHONY: install-bin
-@@ -367,9 +370,8 @@ install-lib:
+@@ -366,9 +369,8 @@ install-lib:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \