From b3a0a2a699525998d80bd0aabc7a383d3a44fe40 Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Tue, 10 May 2011 11:23:48 +0000
Subject: Update ruby-rb-gsl package to 1.14.7.

* pkgsrc change: fix conflicts of some functions name with newer gsl.


Sat Feb 26 08:18:45 PST 2011
  * Ruby/GSL 1.14.7
    * Fix conversion of non-DFLOAT NArray to GSL::Vector and
      GSL::Vector::Complex.

Thu Feb 24 10:27:08 PST 2011
  * Ruby/GSL 1.14.6
    * Add Vector::Complex support to NArray conversions
    * Raise exception when trying to create View from NArray object of
      incompatible type.
---
 math/ruby-rb-gsl/Makefile                          |  6 +++---
 math/ruby-rb-gsl/distinfo                          | 10 +++++----
 .../patches/patch-ext_matrix__complex.c            | 24 ++++++++++++++++++++++
 .../patches/patch-ext_vector__complex.c            | 24 ++++++++++++++++++++++
 4 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 math/ruby-rb-gsl/patches/patch-ext_matrix__complex.c
 create mode 100644 math/ruby-rb-gsl/patches/patch-ext_vector__complex.c

(limited to 'math/ruby-rb-gsl')

diff --git a/math/ruby-rb-gsl/Makefile b/math/ruby-rb-gsl/Makefile
index 2894947632f..88a8a320ca8 100644
--- a/math/ruby-rb-gsl/Makefile
+++ b/math/ruby-rb-gsl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2011/02/21 16:01:18 taca Exp $
+# $NetBSD: Makefile,v 1.10 2011/05/10 11:23:48 taca Exp $
 
-DISTNAME=	rb-gsl-1.14.5
+DISTNAME=	rb-gsl-1.14.7
 PKGREVISION=	1
 CATEGORIES=	math ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/73285/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/74341/
 EXTRACT_SUFX=	.tgz
 
 
diff --git a/math/ruby-rb-gsl/distinfo b/math/ruby-rb-gsl/distinfo
index 3cd01d3b79c..41690c0acfa 100644
--- a/math/ruby-rb-gsl/distinfo
+++ b/math/ruby-rb-gsl/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.6 2010/12/04 04:09:57 taca Exp $
+$NetBSD: distinfo,v 1.7 2011/05/10 11:23:48 taca Exp $
 
-SHA1 (rb-gsl-1.14.5.tgz) = 96982751db9489aece90534555c731e8b4e3a143
-RMD160 (rb-gsl-1.14.5.tgz) = f1fc68476f17ec599c27332f0e7ffac58a20b892
-Size (rb-gsl-1.14.5.tgz) = 613584 bytes
+SHA1 (rb-gsl-1.14.7.tgz) = 2ce82d5e6d03dea2e0b27165fb91a8981e190f7a
+RMD160 (rb-gsl-1.14.7.tgz) = 90661a3eae170c70fe4994ef87a0199d95fd4aed
+Size (rb-gsl-1.14.7.tgz) = 614583 bytes
+SHA1 (patch-ext_matrix__complex.c) = 97c93f34b794866366f74269b14e2b7179e6440e
+SHA1 (patch-ext_vector__complex.c) = 83913d55f40ca6539344acf7a60a88e312eab9c7
diff --git a/math/ruby-rb-gsl/patches/patch-ext_matrix__complex.c b/math/ruby-rb-gsl/patches/patch-ext_matrix__complex.c
new file mode 100644
index 00000000000..547e5b74db1
--- /dev/null
+++ b/math/ruby-rb-gsl/patches/patch-ext_matrix__complex.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-ext_matrix__complex.c,v 1.1 2011/05/10 11:23:48 taca Exp $
+
+Avoid the same function name on new gsl.
+
+--- ext/matrix_complex.c.orig	2010-11-10 21:43:10.000000000 +0000
++++ ext/matrix_complex.c
+@@ -1520,7 +1520,7 @@ static VALUE rb_gsl_matrix_complex_indge
+ }
+ 
+ 
+-static int gsl_matrix_complex_equal(const gsl_matrix_complex *m1,
++static int _gsl_matrix_complex_equal(const gsl_matrix_complex *m1,
+   const gsl_matrix_complex *m2, double eps)
+ {
+   gsl_complex z1, z2;
+@@ -1555,7 +1555,7 @@ static VALUE rb_gsl_matrix_complex_equal
+   Data_Get_Struct(obj, gsl_matrix_complex, m1);
+   CHECK_MATRIX_COMPLEX(argv[0]);
+   Data_Get_Struct(argv[0], gsl_matrix_complex, m2);
+-  ret = gsl_matrix_complex_equal(m1, m2, eps);
++  ret = _gsl_matrix_complex_equal(m1, m2, eps);
+   if (ret == 1) return Qtrue;
+   else return Qfalse;
+ }
diff --git a/math/ruby-rb-gsl/patches/patch-ext_vector__complex.c b/math/ruby-rb-gsl/patches/patch-ext_vector__complex.c
new file mode 100644
index 00000000000..297222d9bc4
--- /dev/null
+++ b/math/ruby-rb-gsl/patches/patch-ext_vector__complex.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-ext_vector__complex.c,v 1.1 2011/05/10 11:23:48 taca Exp $
+
+Avoid the same function name on new gsl.
+
+--- ext/vector_complex.c.orig	2011-02-14 22:59:45.000000000 +0000
++++ ext/vector_complex.c
+@@ -1986,7 +1986,7 @@ static VALUE rb_gsl_vector_complex_zip(i
+   return ary;
+ }
+ 
+-static int gsl_vector_complex_equal(const gsl_vector_complex *v1,
++static int _gsl_vector_complex_equal(const gsl_vector_complex *v1,
+   const gsl_vector_complex *v2, double eps)
+ {
+   gsl_complex z1, z2;
+@@ -2019,7 +2019,7 @@ static VALUE rb_gsl_vector_complex_equal
+   Data_Get_Struct(obj, gsl_vector_complex, v1);
+   CHECK_VECTOR_COMPLEX(argv[0]);
+   Data_Get_Struct(argv[0], gsl_vector_complex, v2);
+-  ret = gsl_vector_complex_equal(v1, v2, eps);
++  ret = _gsl_vector_complex_equal(v1, v2, eps);
+   if (ret == 1) return Qtrue;
+   else return Qfalse;
+ }
-- 
cgit v1.2.3