Changes 2.1.65:

* Bug-fixes and improvements

7 files changed, 47 insertions, 45 deletions

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index 0f34be54514..3acc5e2311b 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.40 2005/01/13 15:41:53 adam Exp $
+# $NetBSD: Makefile,v 1.41 2005/02/22 14:02:30 adam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 PKGNAME=	octave-current-${OCTAVE_VER}
-PKGREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/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/
+MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/ \
+		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/ \
+		ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/ \
+		ftp://ftp.task.gda.pl/pub/software/octave/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
@@ -18,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.1.64
+OCTAVE_VER=	2.1.65
 CONFLICTS+=	octave-2.0.*
 
 .if (${MACHINE_ARCH} == "arm32")
@@ -71,15 +70,15 @@ post-build:
 
 post-install:
 .for f in ${LIBOCTAVE_INFO}
-	${INSTALL_DATA} ${WRKSRC}/doc/liboctave/$f ${PREFIX}/info
+	${INSTALL_DATA} ${WRKSRC}/doc/liboctave/${f} ${PREFIX}/info
 .endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/octave/${OCTAVE_VER}/doc
 .for f in ${OCTAVE_DOC}
-	${INSTALL_DATA} ${WRKSRC}/doc/$f ${PREFIX}/share/octave/${OCTAVE_VER}/doc
+	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/octave/${OCTAVE_VER}/doc
 .endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/octave
 .for f in ${OCTAVE_HTML}
-	${INSTALL_DATA} ${WRKSRC}/doc/$f ${PREFIX}/share/doc/html/octave
+	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/html/octave
 .endfor
 
 .include "../../audio/libsndfile/buildlink3.mk"
diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST
index 83f5670c942..d3eaba02855 100644
--- a/math/octave-current/PLIST
+++ b/math/octave-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2005/01/13 15:41:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2005/02/22 14:02:30 adam Exp $
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
 bin/octave
@@ -440,7 +440,9 @@ 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.cc
 include/octave-${PKGVERSION}/octave/ov-base-mat.h
+include/octave-${PKGVERSION}/octave/ov-base-scalar.cc
 include/octave-${PKGVERSION}/octave/ov-base-scalar.h
 include/octave-${PKGVERSION}/octave/ov-base.h
 include/octave-${PKGVERSION}/octave/ov-bool-mat.h
@@ -455,9 +457,9 @@ 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-int-traits.h
 include/octave-${PKGVERSION}/octave/ov-int16.h
 include/octave-${PKGVERSION}/octave/ov-int32.h
 include/octave-${PKGVERSION}/octave/ov-int64.h
@@ -640,6 +642,7 @@ share/doc/html/octave/Octave-FAQ_1.html
 share/doc/html/octave/Octave-FAQ_10.html
 share/doc/html/octave/Octave-FAQ_11.html
 share/doc/html/octave/Octave-FAQ_12.html
+share/doc/html/octave/Octave-FAQ_13.html
 share/doc/html/octave/Octave-FAQ_2.html
 share/doc/html/octave/Octave-FAQ_3.html
 share/doc/html/octave/Octave-FAQ_4.html
@@ -825,8 +828,8 @@ share/octave/${PKGVERSION}/m/control/system/__tfl__.m
 share/octave/${PKGVERSION}/m/control/system/__zp2ssg2__.m
 share/octave/${PKGVERSION}/m/control/system/abcddim.m
 share/octave/${PKGVERSION}/m/control/system/buildssic.m
-share/octave/${PKGVERSION}/m/control/system/cellidx.m
 share/octave/${PKGVERSION}/m/control/system/c2d.m
+share/octave/${PKGVERSION}/m/control/system/cellidx.m
 share/octave/${PKGVERSION}/m/control/system/d2c.m
 share/octave/${PKGVERSION}/m/control/system/dmr2d.m
 share/octave/${PKGVERSION}/m/control/system/fir2sys.m
@@ -957,6 +960,7 @@ 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/ind2sub.m
 share/octave/${PKGVERSION}/m/general/int2str.m
 share/octave/${PKGVERSION}/m/general/is_duplicate_entry.m
 share/octave/${PKGVERSION}/m/general/isa.m
@@ -985,6 +989,7 @@ 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/sub2ind.m
 share/octave/${PKGVERSION}/m/general/tril.m
 share/octave/${PKGVERSION}/m/general/triu.m
 share/octave/${PKGVERSION}/m/image/colormap.m
@@ -1022,18 +1027,25 @@ share/octave/${PKGVERSION}/m/linear-algebra/rank.m
 share/octave/${PKGVERSION}/m/linear-algebra/trace.m
 share/octave/${PKGVERSION}/m/linear-algebra/vec.m
 share/octave/${PKGVERSION}/m/linear-algebra/vech.m
+share/octave/${PKGVERSION}/m/miscellaneous/PKG_ADD
 share/octave/${PKGVERSION}/m/miscellaneous/bincoeff.m
 share/octave/${PKGVERSION}/m/miscellaneous/bug_report.m
 share/octave/${PKGVERSION}/m/miscellaneous/comma.m
+share/octave/${PKGVERSION}/m/miscellaneous/computer.m
 share/octave/${PKGVERSION}/m/miscellaneous/cputime.m
+share/octave/${PKGVERSION}/m/miscellaneous/delete.m
+share/octave/${PKGVERSION}/m/miscellaneous/dir.m
 share/octave/${PKGVERSION}/m/miscellaneous/dump_prefs.m
 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/is_leap_year.m
+share/octave/${PKGVERSION}/m/miscellaneous/ispc.m
+share/octave/${PKGVERSION}/m/miscellaneous/isunix.m
 share/octave/${PKGVERSION}/m/miscellaneous/list_primes.m
 share/octave/${PKGVERSION}/m/miscellaneous/menu.m
+share/octave/${PKGVERSION}/m/miscellaneous/not.m
 share/octave/${PKGVERSION}/m/miscellaneous/pack.m
 share/octave/${PKGVERSION}/m/miscellaneous/paren.m
 share/octave/${PKGVERSION}/m/miscellaneous/path.m
@@ -1044,6 +1056,7 @@ share/octave/${PKGVERSION}/m/miscellaneous/tempname.m
 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/unix.m
 share/octave/${PKGVERSION}/m/miscellaneous/version.m
 share/octave/${PKGVERSION}/m/miscellaneous/xor.m
 share/octave/${PKGVERSION}/m/plot/PKG_ADD
@@ -1347,21 +1360,11 @@ 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/${PKGVERSION}/m/general/ind2sub.m
-share/octave/${PKGVERSION}/m/general/sub2ind.m
-share/octave/${PKGVERSION}/m/miscellaneous/PKG_ADD
-share/octave/${PKGVERSION}/m/miscellaneous/computer.m
-share/octave/${PKGVERSION}/m/miscellaneous/delete.m
-share/octave/${PKGVERSION}/m/miscellaneous/dir.m
-share/octave/${PKGVERSION}/m/miscellaneous/ispc.m
-share/octave/${PKGVERSION}/m/miscellaneous/isunix.m
-share/octave/${PKGVERSION}/m/miscellaneous/not.m
-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-v12/m
-@dirrm share/octave/site/api-v12
+@dirrm share/octave/site/api-v13/m
+@dirrm share/octave/site/api-v13
 @dirrm share/octave/${PKGVERSION}/site/m
 @dirrm share/octave/${PKGVERSION}/site
 @dirrm share/octave/${PKGVERSION}/m/time
@@ -1399,8 +1402,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-v12/${MACHINE_GNU_PLATFORM}
-@dirrm libexec/octave/site/oct/api-v12
+@dirrm libexec/octave/site/oct/api-v13/${MACHINE_GNU_PLATFORM}
+@dirrm libexec/octave/site/oct/api-v13
 @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 d0e729f560e..31c78e07ac0 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.23 2005/01/13 15:41:53 adam Exp $
+$NetBSD: distinfo,v 1.24 2005/02/22 14:02:31 adam Exp $
 
-SHA1 (octave-2.1.64.tar.bz2) = 90f54fd7515cc3c629ef9104d3879d62a14b2a12
-Size (octave-2.1.64.tar.bz2) = 4341798 bytes
-SHA1 (patch-aa) = f6ed4564543f8dc8ee5e368b07ca357d1eb7afc9
+SHA1 (octave-2.1.65.tar.bz2) = f423b85860fe4734caecaba1d065fd016e90f4f1
+Size (octave-2.1.65.tar.bz2) = 4352497 bytes
+SHA1 (patch-aa) = e2d8591c222f3b67b5d9798ea349c4d4ce2eae91
 SHA1 (patch-ac) = 201e5e6a58f6934371daa9ccac8d4f1f01533a4c
-SHA1 (patch-ad) = 03dfbfb17b1262d5094dbc42758a99011e05fdd4
+SHA1 (patch-ad) = d162862a0e45ddf15de438d8e7b0386ccfe7390e
 SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111
-SHA1 (patch-af) = 775eb3c4d4769aada0d01df228c8ca48c489842d
-SHA1 (patch-ag) = 4a09959aa2ae9dbc9ae35d8fcf65630bb8d48788
+SHA1 (patch-af) = d40167a2469729969d4e52daeb9f6921dc37df78
+SHA1 (patch-ag) = 2d68c950f93ac67af4319368c55ca4edb96a61c3
 SHA1 (patch-ah) = f7009d8b35354a1d403d5bdeae68a211435b004c
diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa
index 1e7cd545db7..b1e9788e7fd 100644
--- a/math/octave-current/patches/patch-aa
+++ b/math/octave-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2004/11/25 12:59:21 adam Exp $
+$NetBSD: patch-aa,v 1.11 2005/02/22 14:02:31 adam Exp $
 
---- configure.orig	2004-11-17 16:09:11.000000000 +0000
+--- configure.orig	2005-02-18 04:55:38.000000000 +0000
 +++ configure
-@@ -8817,7 +8817,7 @@ if $have_fortran_compiler; then
+@@ -8824,7 +8824,7 @@ if $have_fortran_compiler; then
  %.c : %.f
  
  %.o : %.f
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.10 2004/11/25 12:59:21 adam Exp $
  
  pic/%.o : %.f
  	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
-@@ -11027,7 +11027,7 @@ TEMPLATE_AR='$(AR)'
+@@ -11034,7 +11034,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.10 2004/11/25 12:59:21 adam Exp $
      SH_LD=ld
      SH_LDFLAGS=-Bshareable
    ;;
-@@ -21048,19 +21048,19 @@ case "$canonical_host_type" in
+@@ -21138,19 +21138,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-ad b/math/octave-current/patches/patch-ad
index a194aa0ef56..6436f11a08b 100644
--- a/math/octave-current/patches/patch-ad
+++ b/math/octave-current/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2004/02/26 16:47:35 adam Exp $
+$NetBSD: patch-ad,v 1.5 2005/02/22 14:02:31 adam Exp $
 
 --- libcruft/Makefile.in.orig	2004-02-16 19:57:21.000000000 +0000
 +++ libcruft/Makefile.in
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.4 2004/02/26 16:47:35 adam Exp $
 -	  $(INSTALL_DATA) libcruft.$(LIBEXT) \
 -	    $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \
 -	  $(RANLIB) $(DESTDIR)$(octlibdir)/libcruft.$(LIBEXT) ; \
-+	  ${LIBTOOL} --mode=install $(INSTALL_DATA) libcruft.$(LIBEXT) \
++	  ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcruft.$(LIBEXT) \
 +	    ${PREFIX}/lib; \
  	fi
  	if $(SHARED_LIBS); then \
diff --git a/math/octave-current/patches/patch-af b/math/octave-current/patches/patch-af
index a96cd83a3a6..6082177c77a 100644
--- a/math/octave-current/patches/patch-af
+++ b/math/octave-current/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.7 2004/11/25 12:59:21 adam Exp $
+$NetBSD: patch-af,v 1.8 2005/02/22 14:02:31 adam Exp $
 
 --- liboctave/Makefile.in.orig	2004-11-12 05:34:57.000000000 +0000
 +++ liboctave/Makefile.in
@@ -21,7 +21,7 @@ $NetBSD: patch-af,v 1.7 2004/11/25 12:59:21 adam Exp $
 -	  $(INSTALL_DATA) liboctave.$(LIBEXT) \
 -	    $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
 -	  $(RANLIB) $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \
-+	  ${LIBTOOL} --mode=install $(INSTALL_DATA) liboctave.$(LIBEXT) \
++	  ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctave.$(LIBEXT) \
 +	    ${PREFIX}/lib; \
  	fi
  	if $(SHARED_LIBS); then \
diff --git a/math/octave-current/patches/patch-ag b/math/octave-current/patches/patch-ag
index 5c1f5b0cff7..36fd1ae59df 100644
--- a/math/octave-current/patches/patch-ag
+++ b/math/octave-current/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.11 2005/01/13 15:41:54 adam Exp $
+$NetBSD: patch-ag,v 1.12 2005/02/22 14:02:31 adam Exp $
 
 --- src/Makefile.in.orig	2004-11-12 05:34:58.000000000 +0000
 +++ src/Makefile.in
@@ -67,7 +67,7 @@ $NetBSD: patch-ag,v 1.11 2005/01/13 15:41:54 adam Exp $
 -	  $(INSTALL_DATA) liboctinterp.$(LIBEXT) \
 -	    $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
 -	  $(RANLIB) $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
-+	  ${LIBTOOL} --mode=install $(INSTALL_DATA) liboctinterp.$(LIBEXT) \
++	  ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctinterp.$(LIBEXT) \
 +	    ${PREFIX}/lib; \
  	fi
  	if $(SHARED_LIBS); then \