[71825] trunk/dports/python

[snc at macports.org]

Revision: 71825
          http://trac.macports.org/changeset/71825
Author:   snc at macports.org
Date:     2010-09-23 17:56:30 -0700 (Thu, 23 Sep 2010)
Log Message:
-----------
py2[6-7]-shapely: update to 1.2.5

Modified Paths:
--------------
    trunk/dports/python/py26-shapely/Portfile
    trunk/dports/python/py26-shapely/files/patch-shapely_geos.py.diff
    trunk/dports/python/py27-shapely/Portfile
    trunk/dports/python/py27-shapely/files/patch-shapely_geos.py.diff

Modified: trunk/dports/python/py26-shapely/Portfile
===================================================================
--- trunk/dports/python/py26-shapely/Portfile	2010-09-24 00:48:55 UTC (rev 71824)
+++ trunk/dports/python/py26-shapely/Portfile	2010-09-24 00:56:30 UTC (rev 71825)
@@ -5,7 +5,7 @@
 PortGroup       python26 1.0
 
 name            py26-shapely
-version         1.2.3
+version         1.2.5
 categories      python devel
 platforms       darwin
 maintainers     snc openmaintainer
@@ -27,8 +27,8 @@
 depends_lib-append      port:geos
 depends_build-append    port:py26-distribute
 
-checksums           md5     711b210a3149b1478a591e761d26c677 \
-                    sha1    b5ab1792e0f043312ef2f7f58cc2035c08c6dd0f
+checksums           md5     a6ffa32e80773bb0e235778a2a28932a \
+                    sha1    4c7932b011113d9580eb35ee994759496fe89955
 
 patchfiles      patch-shapely_geos.py.diff \
                 patch-setup.py.diff

Modified: trunk/dports/python/py26-shapely/files/patch-shapely_geos.py.diff
===================================================================
--- trunk/dports/python/py26-shapely/files/patch-shapely_geos.py.diff	2010-09-24 00:48:55 UTC (rev 71824)
+++ trunk/dports/python/py26-shapely/files/patch-shapely_geos.py.diff	2010-09-24 00:56:30 UTC (rev 71825)
@@ -1,15 +1,11 @@
---- shapely/geos.py.orig	2009-09-17 19:01:35.000000000 +0400
-+++ shapely/geos.py	2009-09-17 19:02:28.000000000 +0400
-@@ -27,10 +27,10 @@
-     if lib is None:
-         ## try a few more locations
-         lib_paths = [
-+            # local macports
-+            '@PREFIX@/lib/libgeos_c.dylib',
+--- shapely/geos.py.orig	2010-09-23 20:55:14.000000000 -0400
++++ shapely/geos.py	2010-09-23 20:55:25.000000000 -0400
+@@ -53,7 +53,7 @@
              # The Framework build from Kyng Chaos:
              "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
--            # macports
+             # macports
 -            '/opt/local/lib/libgeos_c.dylib',
-         ]
-         for path in lib_paths:
-             if os.path.exists(path):
++            '@PREFIX@/lib/libgeos_c.dylib',
+     ]
+     _lgeos = load_dll('geos_c', fallbacks=alt_paths)
+     free = load_dll('c').free

Modified: trunk/dports/python/py27-shapely/Portfile
===================================================================
--- trunk/dports/python/py27-shapely/Portfile	2010-09-24 00:48:55 UTC (rev 71824)
+++ trunk/dports/python/py27-shapely/Portfile	2010-09-24 00:56:30 UTC (rev 71825)
@@ -5,7 +5,7 @@
 PortGroup       python27 1.0
 
 name            py27-shapely
-version         1.2.3
+version         1.2.5
 categories      python devel
 platforms       darwin
 maintainers     snc openmaintainer
@@ -27,8 +27,8 @@
 depends_lib-append      port:geos
 depends_build-append    port:py27-distribute
 
-checksums           md5     711b210a3149b1478a591e761d26c677 \
-                    sha1    b5ab1792e0f043312ef2f7f58cc2035c08c6dd0f
+checksums           md5     a6ffa32e80773bb0e235778a2a28932a \
+                    sha1    4c7932b011113d9580eb35ee994759496fe89955
 
 patchfiles      patch-shapely_geos.py.diff \
                 patch-setup.py.diff

Modified: trunk/dports/python/py27-shapely/files/patch-shapely_geos.py.diff
===================================================================
--- trunk/dports/python/py27-shapely/files/patch-shapely_geos.py.diff	2010-09-24 00:48:55 UTC (rev 71824)
+++ trunk/dports/python/py27-shapely/files/patch-shapely_geos.py.diff	2010-09-24 00:56:30 UTC (rev 71825)
@@ -1,15 +1,11 @@
---- shapely/geos.py.orig	2009-09-17 19:01:35.000000000 +0400
-+++ shapely/geos.py	2009-09-17 19:02:28.000000000 +0400
-@@ -27,10 +27,10 @@
-     if lib is None:
-         ## try a few more locations
-         lib_paths = [
-+            # local macports
-+            '@PREFIX@/lib/libgeos_c.dylib',
+--- shapely/geos.py.orig	2010-09-23 20:50:17.000000000 -0400
++++ shapely/geos.py	2010-09-23 20:50:48.000000000 -0400
+@@ -53,7 +53,7 @@
              # The Framework build from Kyng Chaos:
              "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
--            # macports
+             # macports
 -            '/opt/local/lib/libgeos_c.dylib',
-         ]
-         for path in lib_paths:
-             if os.path.exists(path):
++            '@PREFIX@/lib/libgeos_c.dylib',
+     ]
+     _lgeos = load_dll('geos_c', fallbacks=alt_paths)
+     free = load_dll('c').free
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100923/fb5e3efb/attachment.html>