Changes 2.1.63:

* Bug fixes

6 files changed, 22 insertions, 25 deletions

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index 1bb0abf111a..706107e46e0 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2004/11/24 00:54:10 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.37 2004/11/25 12:59:21 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/ \
@@ -19,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.59
+OCTAVE_VER=	2.1.63
 CONFLICTS+=	octave-2.0.*
 
 .if (${MACHINE_ARCH} == "arm32")
diff --git a/math/octave-current/PLIST b/math/octave-current/PLIST
index b790346f436..9f5ee4e773c 100644
--- a/math/octave-current/PLIST
+++ b/math/octave-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/09/23 13:03:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/11/25 12:59:21 adam Exp $
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
 bin/octave
@@ -1284,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-v10/m
-@dirrm share/octave/site/api-v10
+@dirrm share/octave/site/api-v12/m
+@dirrm share/octave/site/api-v12
 @dirrm share/octave/${PKGVERSION}/site/m
 @dirrm share/octave/${PKGVERSION}/site
 @dirrm share/octave/${PKGVERSION}/m/time
@@ -1323,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-v10/${MACHINE_GNU_PLATFORM}
-@dirrm libexec/octave/site/oct/api-v10
+@dirrm libexec/octave/site/oct/api-v12/${MACHINE_GNU_PLATFORM}
+@dirrm libexec/octave/site/oct/api-v12
 @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 95da68e9ca7..89ff84f8b78 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2004/09/23 13:03:41 adam Exp $
+$NetBSD: distinfo,v 1.20 2004/11/25 12:59:21 adam Exp $
 
-SHA1 (octave-2.1.59.tar.bz2) = 2b019c7055b83002d761ca7c13510c57e0abbc4c
-Size (octave-2.1.59.tar.bz2) = 4288120 bytes
-SHA1 (patch-aa) = 63e8d273b47e54964ab3b86a424a36cd13583057
+SHA1 (octave-2.1.63.tar.bz2) = 33ab1d874c212fada1ed672319e908aed5cce330
+Size (octave-2.1.63.tar.bz2) = 4339124 bytes
+SHA1 (patch-aa) = f6ed4564543f8dc8ee5e368b07ca357d1eb7afc9
 SHA1 (patch-ac) = 201e5e6a58f6934371daa9ccac8d4f1f01533a4c
 SHA1 (patch-ad) = 03dfbfb17b1262d5094dbc42758a99011e05fdd4
 SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111
-SHA1 (patch-af) = 9c1eb47e6ee46a41ba98d786a192663fc236aafc
+SHA1 (patch-af) = 775eb3c4d4769aada0d01df228c8ca48c489842d
 SHA1 (patch-ag) = f6c4263cf08985e4897ea69cce6a9c8b329ec48c
diff --git a/math/octave-current/octave.mk b/math/octave-current/octave.mk
index 3f35734987d..d07f631e2ec 100644
--- a/math/octave-current/octave.mk
+++ b/math/octave-current/octave.mk
@@ -1,4 +1,4 @@
-# $NetBSD: octave.mk,v 1.1 2004/08/14 01:31:56 dmcmahill Exp $
+# $NetBSD: octave.mk,v 1.2 2004/11/25 12:59:21 adam Exp $
 #
 
 .include "../../mk/bsd.prefs.mk"
@@ -21,5 +21,3 @@ OCT_${_var_}!=  ${OCTAVE_CONFIG} -p ${_var_}
 .    undef _var_
 .  endif 
 .endif 
-
-
diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa
index 391e98fcd71..1e7cd545db7 100644
--- a/math/octave-current/patches/patch-aa
+++ b/math/octave-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2004/09/23 13:03:41 adam Exp $
+$NetBSD: patch-aa,v 1.10 2004/11/25 12:59:21 adam Exp $
 
---- configure.orig	2004-09-22 03:35:07.000000000 +0000
+--- configure.orig	2004-11-17 16:09:11.000000000 +0000
 +++ configure
-@@ -8508,7 +8508,7 @@ if $have_fortran_compiler; then
+@@ -8817,7 +8817,7 @@ if $have_fortran_compiler; then
  %.c : %.f
  
  %.o : %.f
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.9 2004/09/23 13:03:41 adam Exp $
  
  pic/%.o : %.f
  	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
-@@ -10718,7 +10718,7 @@ TEMPLATE_AR='$(AR)'
+@@ -11027,7 +11027,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.9 2004/09/23 13:03:41 adam Exp $
      SH_LD=ld
      SH_LDFLAGS=-Bshareable
    ;;
-@@ -20739,19 +20739,19 @@ case "$canonical_host_type" in
+@@ -21048,19 +21048,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-af b/math/octave-current/patches/patch-af
index 74f151ad6b4..a96cd83a3a6 100644
--- a/math/octave-current/patches/patch-af
+++ b/math/octave-current/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2004/09/23 13:03:41 adam Exp $
+$NetBSD: patch-af,v 1.7 2004/11/25 12:59:21 adam Exp $
 
---- liboctave/Makefile.in.orig	2004-09-02 01:28:50.000000000 +0000
+--- liboctave/Makefile.in.orig	2004-11-12 05:34:57.000000000 +0000
 +++ liboctave/Makefile.in
-@@ -207,8 +207,9 @@ endif
+@@ -208,8 +208,9 @@ endif
  
  liboctave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
  	rm -f $@
@@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.6 2004/09/23 13:03:41 adam Exp $
  
  liboctave.$(SHLEXT_VER): liboctave.$(SHLEXT)
  	rm -f $@
-@@ -235,9 +236,8 @@ install-lib:
+@@ -236,9 +237,8 @@ install-lib:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \