Update to Octave 3.2.4, this is bug fixing release.

pkgsrc changes: fix shared library versions.

5 files changed, 15 insertions, 16 deletions

diff --git a/math/octave/Makefile b/math/octave/Makefile
index 450a5abfd4b..99c3e6082fd 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.85 2010/01/17 12:02:26 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2010/02/12 00:41:48 asau Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
-PKGREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.octave.org/pub/octave/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +13,7 @@ BUILD_DEPENDS+=	bison>=1.875:../../devel/bison
 BUILD_DEPENDS+=	gperf>=2.7:../../devel/gperf
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 
-OCTAVE_VER=	3.2.3
+OCTAVE_VER=	3.2.4
 CONFLICTS+=	octave-2.*
 
 .if (${MACHINE_ARCH} == "arm32")
diff --git a/math/octave/distinfo b/math/octave/distinfo
index 31edb0c72a3..cad9271f81c 100644
--- a/math/octave/distinfo
+++ b/math/octave/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.25 2009/12/22 17:46:17 drochner Exp $
+$NetBSD: distinfo,v 1.26 2010/02/12 00:41:48 asau Exp $
 
-SHA1 (octave-3.2.3.tar.bz2) = 7a188ffd55ac1efb2f480fa2aed94e66d3596f34
-RMD160 (octave-3.2.3.tar.bz2) = 30c1892544ba67054f1888758ebc2b1ede8848c0
-Size (octave-3.2.3.tar.bz2) = 12085781 bytes
+SHA1 (octave-3.2.4.tar.bz2) = 7de078564027108f3436f3ba7bf5993a6b411a67
+RMD160 (octave-3.2.4.tar.bz2) = 6dcdea7ef2431b8427da5e6b9d2113e0e5736f43
+Size (octave-3.2.4.tar.bz2) = 12080959 bytes
 SHA1 (patch-ab) = 55983c073f773c8f5aa6147a65f03e0351c6ece4
 SHA1 (patch-ac) = fa39afe6f033e0be57ffde20d49b845c0243f91d
-SHA1 (patch-ad) = 621496f7a0c57fb6d5157ddb737366747f1e19d2
-SHA1 (patch-af) = f3080fa8afbb3863b6b88832fb3b46fe7005476e
-SHA1 (patch-ag) = 0694e61d1a45c242756821ebcbefd37c1f468e9e
+SHA1 (patch-ad) = fc1fa488273878595fdef9ee1c2fcf9a4262e9e3
+SHA1 (patch-af) = b6b7c7a2c220997126769163fb1347ed7f5bfcb8
+SHA1 (patch-ag) = c4d6f230a9761cb5d16a8e8c76a34fe1ef68c584
 SHA1 (patch-ah) = a2c6e3c6cb4c4570647edb4f484f514d75dda3ba
 SHA1 (patch-ai) = d7b4841238f7358bea50dd1b1b22cd94ab2af229
 SHA1 (patch-ak) = 98aa84ac66fac0b7b0dcdb69e911dc9d42fd6673
diff --git a/math/octave/patches/patch-ad b/math/octave/patches/patch-ad
index 494a5f12f79..8a1bb384643 100644
--- a/math/octave/patches/patch-ad
+++ b/math/octave/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.6 2009/07/19 00:33:10 asau Exp $
+$NetBSD: patch-ad,v 1.7 2010/02/12 00:41:48 asau Exp $
 
 --- libcruft/Makefile.in.orig	2009-05-25 10:04:58.000000000 +0400
 +++ libcruft/Makefile.in	2009-06-28 21:21:33.000000000 +0400
@@ -9,7 +9,7 @@ $NetBSD: patch-ad,v 1.6 2009/07/19 00:33:10 asau Exp $
 -	$(AR) $(ARFLAGS) $@ $^
 -	$(RANLIB) $@
 +	${LIBTOOL} --mode=link ${CC} -o libcruft.$(LIBEXT) $(CRUFT_OBJ:.o=.lo) \
-+		-rpath ${PREFIX}/lib -version-info ${version:3.2.%=3:2:%}
++		-rpath ${PREFIX}/lib -version-number ${version:3.2.%=3:2:%}
  
  $(SHLPRE)cruft.$(SHLEXT_VER): $(SHLPRE)cruft.$(SHLEXT)
  	rm -f $@
diff --git a/math/octave/patches/patch-af b/math/octave/patches/patch-af
index adcd552e5ba..7a4baddde62 100644
--- a/math/octave/patches/patch-af
+++ b/math/octave/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.6 2009/07/19 00:33:10 asau Exp $
+$NetBSD: patch-af,v 1.7 2010/02/12 00:41:48 asau Exp $
 
 --- liboctave/Makefile.in.orig	2009-05-25 10:04:59.000000000 +0400
 +++ liboctave/Makefile.in	2009-06-28 21:21:57.000000000 +0400
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.6 2009/07/19 00:33:10 asau Exp $
 -	$(RANLIB) $@
 +	${LIBTOOL} --mode=link ${CC} -o liboctave.$(LIBEXT) \
 +		$(LIBOCTAVE_OBJECTS:.o=.lo) -rpath ${PREFIX}/lib \
-+		-version-info ${version:3.2.%=3:2:%}
++		-version-number ${version:3.2.%=3:2:%}
  
  $(SHLPRE)octave.$(SHLEXT_VER): $(SHLPRE)octave.$(SHLEXT)
  	rm -f $@
diff --git a/math/octave/patches/patch-ag b/math/octave/patches/patch-ag
index 1788dc48758..edf8255fa20 100644
--- a/math/octave/patches/patch-ag
+++ b/math/octave/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.7 2009/12/22 17:46:17 drochner Exp $
+$NetBSD: patch-ag,v 1.8 2010/02/12 00:41:48 asau Exp $
 
 --- src/Makefile.in.orig	2009-06-03 12:32:49.000000000 +0000
 +++ src/Makefile.in
@@ -19,7 +19,7 @@ $NetBSD: patch-ag,v 1.7 2009/12/22 17:46:17 drochner Exp $
 -	$(RANLIB) $@
 +	${LIBTOOL} --mode=link ${CC} -o liboctinterp.$(LIBEXT) \
 +		$(OBJECTS:.o=.lo) $(XERBLA:.o=.lo) -rpath ${PREFIX}/lib \
-+		-version-info ${version:3.2.%=3:2:%} $(OCTINTERP_LINK_DEPS)
++		-version-number ${version:3.2.%=3:2:%} $(OCTINTERP_LINK_DEPS)
  
  $(SHLPRE)octinterp.$(SHLEXT_VER): $(SHLPRE)octinterp.$(SHLEXT)
  	rm -f $@