[78087] trunk/dports/python

[jmr at macports.org]

Revision: 78087
          http://trac.macports.org/changeset/78087
Author:   jmr at macports.org
Date:     2011-04-23 03:35:32 -0700 (Sat, 23 Apr 2011)
Log Message:
-----------
py-gsl, py25-gsl: update to 0.9.5, fixes build with current gsl version (#24018)

Modified Paths:
--------------
    trunk/dports/python/py-gsl/Portfile
    trunk/dports/python/py25-gsl/Portfile

Modified: trunk/dports/python/py-gsl/Portfile
===================================================================
--- trunk/dports/python/py-gsl/Portfile	2011-04-23 10:06:58 UTC (rev 78086)
+++ trunk/dports/python/py-gsl/Portfile	2011-04-23 10:35:32 UTC (rev 78087)
@@ -5,8 +5,7 @@
 PortGroup               python24 1.0
 
 name                    py-gsl
-version                 0.9.1
-revision                1
+version                 0.9.5
 categories              python science
 platforms               darwin
 maintainers             nomaintainer
@@ -18,35 +17,29 @@
 homepage                http://pygsl.sourceforge.net/
 master_sites            sourceforge:pygsl
 distname                pygsl-${version}
-checksums               md5 72323e678ae5473d4a7d9cfc04dcb568
+checksums               md5 fca5cbda1380218a28f2ebdc15a224fb \
+                        sha1 718064cd6c9d50cae5048c920ab7ab2324d27c88 \
+                        rmd160 0b9d2654bc1cfb84649603b2680932c4ce47a849
 
 build.env               CFLAGS="-I${prefix}/include/gsl -I${prefix}/include/python2.4 -I${prefix}/include" \
                         LDFLAGS=-L${prefix}/lib
 
 depends_build           port:swig-python
+depends_lib             port:gsl
 
-pre-build {
-    # Resolve GSL version issue (1.9 vs 1.10) by re-creating this file using swig
-    eval file delete [glob ${worksrcpath}/swig_src/gslwrap_wrap.c]
-}
-
-
 variant numarray conflicts numpy Numeric description "Use numarray as array-object" {
-    depends_lib-append      port:gsl \
-                            port:py-numarray
+    depends_lib-append      port:py-numarray
     build.args              --array-object=numarray
 }
 variant Numeric conflicts numarray numpy description "Use Numeric as array-object" {
-    depends_lib-append      port:gsl \
-                            port:py-numeric
+    depends_lib-append      port:py-numeric
     build.args              --array-object=Numeric
 }
 variant numpy conflicts numarray Numeric description "Use numpy as array-object" {
-    depends_lib-append      port:gsl \
-                            port:py-numpy
+    depends_lib-append      port:py-numpy
     build.args              --array-object=numpy
 }
-if { ![variant_isset numarray] && ![variant_isset Numeric] && ![variant_isset numpy] } {
+if { ![variant_isset numarray] && ![variant_isset Numeric] } {
     default_variants        +numpy
 }
 

Modified: trunk/dports/python/py25-gsl/Portfile
===================================================================
--- trunk/dports/python/py25-gsl/Portfile	2011-04-23 10:06:58 UTC (rev 78086)
+++ trunk/dports/python/py25-gsl/Portfile	2011-04-23 10:35:32 UTC (rev 78087)
@@ -5,8 +5,7 @@
 PortGroup               python25 1.0
 
 name                    py25-gsl
-version                 0.9.1
-revision                1
+version                 0.9.5
 categories              python science
 platforms               darwin
 maintainers             nomaintainer
@@ -18,7 +17,9 @@
 homepage                http://pygsl.sourceforge.net/
 master_sites            sourceforge:pygsl
 distname                pygsl-${version}
-checksums               md5 72323e678ae5473d4a7d9cfc04dcb568
+checksums               md5 fca5cbda1380218a28f2ebdc15a224fb \
+                        sha1 718064cd6c9d50cae5048c920ab7ab2324d27c88 \
+                        rmd160 0b9d2654bc1cfb84649603b2680932c4ce47a849
 
 build.env               CFLAGS="-I${prefix}/include/gsl -I${prefix}/include/python2.5 -I${prefix}/include" \
                         LDFLAGS=-L${prefix}/lib
@@ -26,12 +27,6 @@
 depends_build           port:swig-python
 depends_lib             port:gsl
 
-pre-build {
-    # Resolve GSL version issue (1.9 vs 1.10/1.11) by re-creating this file using swig
-    eval file delete [glob ${worksrcpath}/swig_src/gslwrap_wrap.c]
-}
-
-
 variant numarray conflicts numpy Numeric description "Use numarray as array-object" {
     depends_lib-append      port:py25-numarray
     build.args              --array-object=numarray
@@ -44,7 +39,7 @@
     depends_lib-append      port:py25-numpy
     build.args              --array-object=numpy
 }
-if { ![variant_isset numarray] && ![variant_isset Numeric] && ![variant_isset numpy] } {
+if { ![variant_isset numarray] && ![variant_isset Numeric] } {
     default_variants        +numpy
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110423/0bdb270d/attachment.html>