[66481] trunk/dports/python/py26-rtree

[stromnov at macports.org]

Revision: 66481
          http://trac.macports.org/changeset/66481
Author:   stromnov at macports.org
Date:     2010-04-14 05:11:20 -0700 (Wed, 14 Apr 2010)
Log Message:
-----------
py26-rtree: update to 0.6.0

Modified Paths:
--------------
    trunk/dports/python/py26-rtree/Portfile
    trunk/dports/python/py26-rtree/files/patch-rtree_core.py.diff

Removed Paths:
-------------
    trunk/dports/python/py26-rtree/files/patch-setup.cfg.diff

Modified: trunk/dports/python/py26-rtree/Portfile
===================================================================
--- trunk/dports/python/py26-rtree/Portfile	2010-04-14 11:54:47 UTC (rev 66480)
+++ trunk/dports/python/py26-rtree/Portfile	2010-04-14 12:11:20 UTC (rev 66481)
@@ -5,7 +5,7 @@
 PortGroup           python26 1.0
 
 name                py26-rtree
-version             0.5.0
+version             0.6.0
 categories          python devel
 platforms           darwin
 maintainers         stromnov openmaintainer
@@ -20,20 +20,17 @@
 master_sites        http://pypi.python.org/packages/source/R/Rtree/
 distname            Rtree-${version}
 
-depends_lib-append  port:spatialindex \
+depends_lib-append  port:spatialindex
+
+depends_build-append \
                     port:py26-distribute
 
-checksums           md5     fc9a23178bb031923a83fe213e6fdb25 \
-                    sha1    79dbbdab0a8455d8940efb0df643d943a06227e6 \
-                    rmd160  b056b105b61bb9bad1c4376fd13421c4a4ffc325
+checksums           md5     5edbb1bd9923fcaeae05a678fd74c9a1 \
+                    sha1    1564ee6051767481f5acd8f5e09547f709ebe06a \
+                    rmd160  5251d9c823ccc585ed441ab59d3ad67344ad989f
 
-patchfiles          patch-setup.cfg.diff \
-                    patch-rtree_core.py.diff
+patchfiles          patch-rtree_core.py.diff
 
-post-patch {
-    reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/setup.cfg
-}
-
-livecheck.type          regex
-livecheck.url           ${master_sites}
-livecheck.regex         "Rtree-(\\d+(?:\\.\\d+)*)${extract.suffix}"
+livecheck.type      regex
+livecheck.url       ${master_sites}
+livecheck.regex     "Rtree-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Modified: trunk/dports/python/py26-rtree/files/patch-rtree_core.py.diff
===================================================================
--- trunk/dports/python/py26-rtree/files/patch-rtree_core.py.diff	2010-04-14 11:54:47 UTC (rev 66480)
+++ trunk/dports/python/py26-rtree/files/patch-rtree_core.py.diff	2010-04-14 12:11:20 UTC (rev 66481)
@@ -1,19 +1,11 @@
---- rtree/core.py.orig	2009-08-04 21:42:57.000000000 +0400
-+++ rtree/core.py	2009-12-26 11:07:14.000000000 +0300
-@@ -92,9 +92,15 @@
-     lib_name = 'libsidx.so'
+--- rtree/core.py.orig	2010-03-05 05:28:17.000000000 +0300
++++ rtree/core.py	2010-04-13 23:37:25.000000000 +0400
+@@ -78,7 +78,7 @@
+     platform = os.uname()[0]
+     lib_name = 'libspatialindex_c.so'
      if platform == 'Darwin':
+-        lib_name = 'libspatialindex_c.dylib'
++        lib_name = find_library('libspatialindex_c.dylib')
          free = ctypes.CDLL(find_library('libc')).free
-+        lib_name_darwin = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', lib_name))
-+        if os.path.exists(lib_name_darwin):
-+            try:
-+                rt = ctypes.CDLL(lib_name_darwin)
-+            except OSError:
-+                rt = ctypes.CDLL(lib_name)
-     else:        
+     else:
          free = ctypes.CDLL(find_library('libc.so.6')).free
--    rt = ctypes.CDLL(lib_name)
-+        rt = ctypes.CDLL(lib_name)
- else:
-     raise RTreeError('Unsupported OS "%s"' % os.name)
- 

Deleted: trunk/dports/python/py26-rtree/files/patch-setup.cfg.diff
===================================================================
--- trunk/dports/python/py26-rtree/files/patch-setup.cfg.diff	2010-04-14 11:54:47 UTC (rev 66480)
+++ trunk/dports/python/py26-rtree/files/patch-setup.cfg.diff	2010-04-14 12:11:20 UTC (rev 66481)
@@ -1,12 +0,0 @@
---- setup.cfg.orig	2009-12-25 18:56:46.000000000 +0300
-+++ setup.cfg	2009-12-25 18:57:28.000000000 +0300
-@@ -4,7 +4,7 @@
- tag_svn_revision = 0
- 
- [build_ext]
--include-dirs = /usr/local/include:/usr/local/include/spatialindex
--library-dirs = /usr/local/lib
-+include-dirs = @@PREFIX@@/include:@@PREFIX@@/include/spatialindex
-+library-dirs = @@PREFIX@@/lib
- define = 
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100414/3566c863/attachment.html>