[141718] trunk/dports/python/py-shapely

[snc at macports.org]

Revision: 141718
          https://trac.macports.org/changeset/141718
Author:   snc at macports.org
Date:     2015-10-26 15:59:12 -0700 (Mon, 26 Oct 2015)
Log Message:
-----------
py-shapely: update to 1.5.13

Modified Paths:
--------------
    trunk/dports/python/py-shapely/Portfile

Added Paths:
-----------
    trunk/dports/python/py-shapely/files/patch-shapely_geos.py.diff

Removed Paths:
-------------
    trunk/dports/python/py-shapely/files/patch-shapely_libgeos.py.diff

Modified: trunk/dports/python/py-shapely/Portfile
===================================================================
--- trunk/dports/python/py-shapely/Portfile	2015-10-26 22:56:29 UTC (rev 141717)
+++ trunk/dports/python/py-shapely/Portfile	2015-10-26 22:59:12 UTC (rev 141718)
@@ -5,7 +5,7 @@
 PortGroup           python 1.0
 
 name                py-shapely
-version             1.5.12
+version             1.5.13
 python.versions     27 33 34
 categories-append     devel
 platforms       darwin
@@ -25,18 +25,18 @@
 distname            Shapely-${version}
 master_sites        https://pypi.python.org/packages/source/S/Shapely
 
-checksums           rmd160  09415ae53fa16edfa9895890120c1ce7ad23789b \
-                    sha256  dcb88e52146f29344fe7d05cbc1a50a20ce7d65659ea610b99c944ec622971b7
+checksums           rmd160  ec43a5e5e84bc6df9f7b630fc3b6c14c6bb4c55b \
+                    sha256  68f8efb43112e8ef1f7e56e2c9eef64e0cbc1c19528c627696fb07345075a348
 
 if {${name} ne ${subport}} {
     depends_lib-append      port:geos
     depends_build-append    port:py${python.version}-cython \
                             port:py${python.version}-setuptools
 
-    patchfiles      patch-shapely_libgeos.py.diff
+    patchfiles      patch-shapely_geos.py.diff
 
     post-patch {
-            reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/shapely/libgeos.py
+            reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/shapely/geos.py
             reinplace s|\\\"cython\\\"|"${python.prefix}/bin/cython"| ${worksrcpath}/setup.py
     }
 

Added: trunk/dports/python/py-shapely/files/patch-shapely_geos.py.diff
===================================================================
--- trunk/dports/python/py-shapely/files/patch-shapely_geos.py.diff	                        (rev 0)
+++ trunk/dports/python/py-shapely/files/patch-shapely_geos.py.diff	2015-10-26 22:59:12 UTC (rev 141718)
@@ -0,0 +1,20 @@
+--- shapely/geos.py.orig	2015-10-26 18:49:11.000000000 -0400
++++ shapely/geos.py	2015-10-26 18:49:22.000000000 -0400
+@@ -86,7 +86,7 @@
+                 # The Framework build from Kyng Chaos
+                 "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
+                 # macports
+-                '/opt/local/lib/libgeos_c.dylib',
++                '@PREFIX@/lib/libgeos_c.dylib',
+             ]
+             _lgeos = load_dll('geos_c', fallbacks=alt_paths,
+                               mode=(DEFAULT_MODE | 16))
+@@ -119,7 +119,7 @@
+                     # The Framework build from Kyng Chaos
+                     "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
+                     # macports
+-                    '/opt/local/lib/libgeos_c.dylib',
++                    '@PREFIX@/lib/libgeos_c.dylib',
+                 ]
+             _lgeos = load_dll('geos_c', fallbacks=alt_paths)
+ 

Deleted: trunk/dports/python/py-shapely/files/patch-shapely_libgeos.py.diff
===================================================================
--- trunk/dports/python/py-shapely/files/patch-shapely_libgeos.py.diff	2015-10-26 22:56:29 UTC (rev 141717)
+++ trunk/dports/python/py-shapely/files/patch-shapely_libgeos.py.diff	2015-10-26 22:59:12 UTC (rev 141718)
@@ -1,11 +0,0 @@
---- shapely/libgeos.py.orig	2015-09-04 13:46:16.000000000 -0400
-+++ shapely/libgeos.py	2015-09-04 13:45:42.000000000 -0400
-@@ -167,7 +167,7 @@
-                     # The Framework build from Kyng Chaos
-                     "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
-                     # macports
--                    '/opt/local/lib/libgeos_c.dylib',
-+                    '@PREFIX@/lib/libgeos_c.dylib',
-                 ]
-             lgeos = load_dll('geos_c', fallbacks=alt_paths)
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/c7658135/attachment-0001.html>