Changes: hard to determine, looks like mostly bug-fixes

5 files changed, 59 insertions, 29 deletions

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index 3f371db6dc8..7183e9b1ef2 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/12/24 09:53:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/23 13:26:20 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.52
+OCTAVE_VER=	2.1.53
 CONFLICTS+=	octave-2.0.*
 
 .if (${MACHINE_ARCH} == "arm32")
diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST
index e10a2346103..affb74f7f54 100644
--- a/math/octave-current/PLIST
+++ b/math/octave-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/04 11:15:37 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/01/23 13:26:20 adam Exp $
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
 bin/octave
@@ -332,17 +332,17 @@ lib/libcruft.a
 lib/libcruft.la
 lib/libcruft.so
 lib/libcruft.so.2
-lib/libcruft.so.2.52
+lib/libcruft.so.2.53
 lib/liboctave.a
 lib/liboctave.la
 lib/liboctave.so
 lib/liboctave.so.2
-lib/liboctave.so.2.52
+lib/liboctave.so.2.53
 lib/liboctinterp.a
 lib/liboctinterp.la
 lib/liboctinterp.so
 lib/liboctinterp.so.2
-lib/liboctinterp.so.2.52
+lib/liboctinterp.so.2.53
 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
@@ -362,7 +362,9 @@ share/doc/html/octave/Octave-FAQ_6.html
 share/doc/html/octave/Octave-FAQ_7.html
 share/doc/html/octave/Octave-FAQ_8.html
 share/doc/html/octave/Octave-FAQ_9.html
-share/doc/html/octave/Octave-FAQ_foot.html
+share/doc/html/octave/Octave-FAQ_abt.html
+share/doc/html/octave/Octave-FAQ_fot.html
+share/doc/html/octave/Octave-FAQ_ovr.html
 share/doc/html/octave/Octave-FAQ_toc.html
 share/doc/html/octave/liboctave_1.html
 share/doc/html/octave/liboctave_10.html
@@ -374,7 +376,12 @@ share/doc/html/octave/liboctave_15.html
 share/doc/html/octave/liboctave_16.html
 share/doc/html/octave/liboctave_17.html
 share/doc/html/octave/liboctave_18.html
+share/doc/html/octave/liboctave_19.html
 share/doc/html/octave/liboctave_2.html
+share/doc/html/octave/liboctave_20.html
+share/doc/html/octave/liboctave_21.html
+share/doc/html/octave/liboctave_22.html
+share/doc/html/octave/liboctave_23.html
 share/doc/html/octave/liboctave_3.html
 share/doc/html/octave/liboctave_4.html
 share/doc/html/octave/liboctave_5.html
@@ -382,6 +389,8 @@ share/doc/html/octave/liboctave_6.html
 share/doc/html/octave/liboctave_7.html
 share/doc/html/octave/liboctave_8.html
 share/doc/html/octave/liboctave_9.html
+share/doc/html/octave/liboctave_abt.html
+share/doc/html/octave/liboctave_ovr.html
 share/doc/html/octave/liboctave_toc.html
 share/doc/html/octave/octave_1.html
 share/doc/html/octave/octave_10.html
@@ -423,12 +432,23 @@ share/doc/html/octave/octave_42.html
 share/doc/html/octave/octave_43.html
 share/doc/html/octave/octave_44.html
 share/doc/html/octave/octave_45.html
+share/doc/html/octave/octave_46.html
+share/doc/html/octave/octave_47.html
+share/doc/html/octave/octave_48.html
+share/doc/html/octave/octave_49.html
 share/doc/html/octave/octave_5.html
+share/doc/html/octave/octave_50.html
+share/doc/html/octave/octave_51.html
+share/doc/html/octave/octave_52.html
+share/doc/html/octave/octave_53.html
+share/doc/html/octave/octave_54.html
 share/doc/html/octave/octave_6.html
 share/doc/html/octave/octave_7.html
 share/doc/html/octave/octave_8.html
 share/doc/html/octave/octave_9.html
-share/doc/html/octave/octave_foot.html
+share/doc/html/octave/octave_abt.html
+share/doc/html/octave/octave_fot.html
+share/doc/html/octave/octave_ovr.html
 share/doc/html/octave/octave_toc.html
 share/octave/${PKGVERSION}/doc/Octave-FAQ.ps
 share/octave/${PKGVERSION}/doc/liboctave.ps
@@ -1029,11 +1049,21 @@ share/octave/${PKGVERSION}/m/time/asctime.m
 share/octave/${PKGVERSION}/m/time/clock.m
 share/octave/${PKGVERSION}/m/time/ctime.m
 share/octave/${PKGVERSION}/m/time/date.m
+share/octave/2.1.53/m/general/ind2sub.m
+share/octave/2.1.53/m/general/sub2ind.m
+share/octave/2.1.53/m/miscellaneous/PKG_ADD
+share/octave/2.1.53/m/miscellaneous/computer.m
+share/octave/2.1.53/m/miscellaneous/delete.m
+share/octave/2.1.53/m/miscellaneous/dir.m
+share/octave/2.1.53/m/miscellaneous/ispc.m
+share/octave/2.1.53/m/miscellaneous/isunix.m
+share/octave/2.1.53/m/miscellaneous/not.m
+share/octave/2.1.53/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-v3/m
-@dirrm share/octave/site/api-v3
+@dirrm share/octave/site/api-v4/m
+@dirrm share/octave/site/api-v4
 @dirrm share/octave/${PKGVERSION}/site/m
 @dirrm share/octave/${PKGVERSION}/site
 @dirrm share/octave/${PKGVERSION}/m/time
@@ -1071,17 +1101,17 @@ 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-v3/${MACHINE_GNU_PLATFORM}
-@dirrm libexec/octave/site/oct/api-v3
+@dirrm libexec/octave/site/oct/api-v4/${MACHINE_GNU_PLATFORM}
+@dirrm libexec/octave/site/oct/api-v4
 @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/${PKGVERSION}/site/exec/${MACHINE_GNU_PLATFORM}
-@dirrm libexec/octave/${PKGVERSION}/site/exec
 @dirrm libexec/octave/${PKGVERSION}/site/oct/${MACHINE_GNU_PLATFORM}
 @dirrm libexec/octave/${PKGVERSION}/site/oct
+@dirrm libexec/octave/${PKGVERSION}/site/exec/${MACHINE_GNU_PLATFORM}
+@dirrm libexec/octave/${PKGVERSION}/site/exec
 @dirrm libexec/octave/${PKGVERSION}/site
 @dirrm libexec/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}
 @dirrm libexec/octave/${PKGVERSION}/oct
diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index d1f64e69cbb..14f9f949ca4 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2003/12/04 11:15:37 adam Exp $
+$NetBSD: distinfo,v 1.14 2004/01/23 13:26:20 adam Exp $
 
-SHA1 (octave-2.1.52.tar.bz2) = 50a2a48ff44635ceb0a03e1b979367d29aeebbc7
-Size (octave-2.1.52.tar.bz2) = 3869247 bytes
-SHA1 (patch-aa) = f8a65d2fef4e957d66856a5228fd8f1d98e2d810
+SHA1 (octave-2.1.53.tar.bz2) = 6c5122be89c5f997c2de6c4a8f25a9551b5d5cfa
+Size (octave-2.1.53.tar.bz2) = 4184523 bytes
+SHA1 (patch-aa) = 5377b595ca28fc1a2b8e010d7b8c22c75e31ea4b
 SHA1 (patch-ac) = e788ad9681bbc91fb986c1a53bc7405319990891
 SHA1 (patch-ad) = 879339a2600ad0d29e4e1123815ee402cf977bea
 SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111
 SHA1 (patch-af) = f4448a1d9be8fb44d56afdd3de54264159cea6af
-SHA1 (patch-ag) = 1a0f09384f7591726e24a559d65ef17b03e86583
+SHA1 (patch-ag) = 96aca7c59bfebbd1462c09ec9f8000f210123cb8
diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa
index 65641578fd3..94b83473049 100644
--- a/math/octave-current/patches/patch-aa
+++ b/math/octave-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2003/12/04 11:15:37 adam Exp $
+$NetBSD: patch-aa,v 1.5 2004/01/23 13:26:20 adam Exp $
 
---- configure.orig	2003-11-20 12:44:49.000000000 +0100
+--- configure.orig	2004-01-23 04:15:38.000000000 +0000
 +++ configure
-@@ -7984,7 +7984,7 @@ if $have_fortran_compiler; then
+@@ -8048,7 +8048,7 @@ if $have_fortran_compiler; then
  %.c : %.f
  
  %.o : %.f
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2003/12/04 11:15:37 adam Exp $
  
  pic/%.o : %.f
  	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
-@@ -18762,19 +18762,19 @@ case "$canonical_host_type" in
+@@ -18826,19 +18826,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 67eb963574e..74f91f0978e 100644
--- a/math/octave-current/patches/patch-ag
+++ b/math/octave-current/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.5 2003/12/04 11:15:37 adam Exp $
+$NetBSD: patch-ag,v 1.6 2004/01/23 13:26:20 adam Exp $
 
---- src/Makefile.in.orig	2003-11-15 03:41:38.000000000 +0100
+--- src/Makefile.in.orig	2004-01-23 04:13:58.000000000 +0000
 +++ src/Makefile.in
-@@ -244,8 +244,9 @@ libraries: $(LIBRARIES)
+@@ -247,8 +247,9 @@ libraries: $(LIBRARIES)
  
  liboctinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
  	rm -f $@
@@ -14,7 +14,7 @@ $NetBSD: patch-ag,v 1.5 2003/12/04 11:15:37 adam Exp $
  
  liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT)
  	rm -f $@
-@@ -265,6 +266,7 @@ stamp-prereq: defaults.h oct-conf.h oct-
+@@ -268,6 +269,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.5 2003/12/04 11:15:37 adam Exp $
  	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
  	$(ALL_LDFLAGS) -o $@ \
  	main.o $(DLD_STATIC_OBJ) \
-@@ -345,6 +347,7 @@ install-strip:
+@@ -348,6 +350,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.5 2003/12/04 11:15:37 adam Exp $
  	$(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
  	$(LN_S) octave-$(version)$(EXEEXT) $(DESTDIR)$(bindir)/octave$(EXEEXT)
  .PHONY: install-bin
-@@ -364,9 +367,8 @@ install-lib:
+@@ -367,9 +370,8 @@ install-lib:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \