Changes 2.1.71:

* Bug fixes

4 files changed, 15 insertions, 16 deletions

diff --git a/math/octave/Makefile b/math/octave/Makefile
index 195e68d1182..9f2588e7920 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2005/05/31 17:24:23 drochner Exp $
+# $NetBSD: Makefile,v 1.58 2005/07/01 11:49:02 adam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 CATEGORIES=	math
@@ -24,10 +24,9 @@ BROKEN=		Internal compiler error occurs on arm32 (even with gcc-2.95.3)
 .endif
 
 USE_GNU_READLINE=	yes
-USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_MAKEINFO=		yes
-USE_PERL5=		build
+USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		yes
 
 GCC_REQD=		3.0
diff --git a/math/octave/distinfo b/math/octave/distinfo
index 78eddaa9ab0..dee4d361a3b 100644
--- a/math/octave/distinfo
+++ b/math/octave/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2005/05/31 17:24:23 drochner Exp $
+$NetBSD: distinfo,v 1.11 2005/07/01 11:49:02 adam Exp $
 
 SHA1 (octave-2.1.71.tar.bz2) = 0c15d86c155e00dbff1e21be859ff82e7331b311
 RMD160 (octave-2.1.71.tar.bz2) = 6728c64c63ac356908922ef8477e117cf944a7b2
 Size (octave-2.1.71.tar.bz2) = 5784751 bytes
-SHA1 (patch-aa) = ca699fc526b9513778aceb209a295af14622ae3d
-SHA1 (patch-ac) = 5bc6461cad01273f2ebb07c40dfb6515a4e9994d
+SHA1 (patch-aa) = ea72cbdcc89f81a52ade5166855461774d6187b1
+SHA1 (patch-ac) = 13ea6b2076a2b0325e3cf66230db55d0580b584f
 SHA1 (patch-ad) = d162862a0e45ddf15de438d8e7b0386ccfe7390e
 SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111
 SHA1 (patch-af) = d40167a2469729969d4e52daeb9f6921dc37df78
diff --git a/math/octave/patches/patch-aa b/math/octave/patches/patch-aa
index cccbe83863a..15514400b46 100644
--- a/math/octave/patches/patch-aa
+++ b/math/octave/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2005/05/26 21:11:35 jlam Exp $
+$NetBSD: patch-aa,v 1.11 2005/07/01 11:49:02 adam Exp $
 
---- configure.orig	2005-05-05 15:10:00.000000000 -0400
+--- configure.orig	2005-05-18 20:25:53.000000000 +0000
 +++ configure
-@@ -8824,7 +8824,7 @@ if $have_fortran_compiler; then
+@@ -8823,7 +8823,7 @@ if $have_fortran_compiler; then
  %.c : %.f
  
  %.o : %.f
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.10 2005/05/26 21:11:35 jlam Exp $
  
  pic/%.o : %.f
  	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
-@@ -11034,7 +11034,7 @@ TEMPLATE_AR='$(AR)'
+@@ -11033,7 +11033,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 2005/05/26 21:11:35 jlam Exp $
      SH_LD=ld
      SH_LDFLAGS=-Bshareable
    ;;
-@@ -21138,19 +21138,19 @@ case "$canonical_host_type" in
+@@ -20486,19 +20486,19 @@ case "$canonical_host_type" in
      cat << \EOF > $bsd_gcc_kluge_targets_frag
  
  lex.o: lex.cc
@@ -45,7 +45,7 @@ $NetBSD: patch-aa,v 1.10 2005/05/26 21:11:35 jlam Exp $
  
  EOF
    ;;
-@@ -21278,9 +21278,9 @@ then
+@@ -20626,9 +20626,9 @@ then
    rm -rf "$tmp"
  
  fi
diff --git a/math/octave/patches/patch-ac b/math/octave/patches/patch-ac
index a3f5ca2b7b3..759e32b58c5 100644
--- a/math/octave/patches/patch-ac
+++ b/math/octave/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2005/04/01 10:15:47 adam Exp $
+$NetBSD: patch-ac,v 1.5 2005/07/01 11:49:02 adam Exp $
 
---- Makeconf.in.orig	2005-02-24 04:56:07.000000000 +0000
+--- Makeconf.in.orig	2005-05-18 12:19:58.000000000 +0000
 +++ Makeconf.in
 @@ -73,7 +73,7 @@ SHLBIN = @SHLBIN@
  SHLBIN_VER = @SHLBIN_VER@
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.4 2005/04/01 10:15:47 adam Exp $
  
  # Fortran to C translator and associated flags.
  
-@@ -158,7 +158,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@
+@@ -157,7 +157,7 @@ BUILD_LDFLAGS = @BUILD_LDFLAGS@
  SH_LD = @SH_LD@
  SH_LDFLAGS = @SH_LDFLAGS@
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.4 2005/04/01 10:15:47 adam Exp $
  DL_LDFLAGS = @DL_LDFLAGS@
  
  SONAME_FLAGS = @SONAME_FLAGS@
-@@ -337,10 +337,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
+@@ -335,10 +335,10 @@ NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@
  # How to make .o files:
  
  %.o : %.c