[38825] trunk/dports/python/py25-matplotlib-basemap

[landonf at macports.org]

Revision: 38825
          http://trac.macosforge.org/projects/macports/changeset/38825
Author:   landonf at macports.org
Date:     2008-07-31 22:54:23 -0700 (Thu, 31 Jul 2008)
Log Message:
-----------
Update to lock to GEOS 2 -- requires fairly small changes. Test procedure:
   - Verified that the py25-matplotlib-basemap _geoslib.so linked against the geos2 port geos dylib.
   - Ran test.py and sanity-checked the output. 

Please let me know if there are any issues and I'll do my best to fix them rapidly.

Modified Paths:
--------------
    trunk/dports/python/py25-matplotlib-basemap/Portfile

Added Paths:
-----------
    trunk/dports/python/py25-matplotlib-basemap/files/
    trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py
    trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c

Modified: trunk/dports/python/py25-matplotlib-basemap/Portfile
===================================================================
--- trunk/dports/python/py25-matplotlib-basemap/Portfile	2008-08-01 05:49:34 UTC (rev 38824)
+++ trunk/dports/python/py25-matplotlib-basemap/Portfile	2008-08-01 05:54:23 UTC (rev 38825)
@@ -21,11 +21,14 @@
                   sha1 1eb8cdeb605c59e2a7510ac4fae77633f15f0e1d \
                   rmd160 18d5cc303efef8b7d9d20b5c4c3ceba26778a791
 
-depends_lib-append  port:py25-matplotlib \
-                    port:geos
+depends_lib-append  port:py25-matplotlib
+                    port:geos2
 
 universal_variant no
 
+patchfiles        patch-setup.py \
+                  patch-src_geoslib.c
+
 post-destroot {
   delete ${destroot}${python.pkgd}/mpl_toolkits/__init__.py
   delete ${destroot}${python.pkgd}/mpl_toolkits/__init__.pyc

Added: trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py
===================================================================
--- trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py	                        (rev 0)
+++ trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py	2008-08-01 05:54:23 UTC (rev 38825)
@@ -0,0 +1,20 @@
+--- setup.py.orig	2008-07-31 22:20:38.000000000 -0700
++++ setup.py	2008-07-31 22:41:58.000000000 -0700
+@@ -37,7 +37,7 @@
+ def checkversion(GEOS_dir):
+     """check geos C-API header file (geos_c.h)"""
+     try:
+-        f = open(os.path.join(GEOS_dir,'include/geos_c.h'))
++        f = open(os.path.join(GEOS_dir,'include/geos2_c.h'))
+     except IOError:
+         return None
+     geos_version = None
+@@ -96,7 +96,7 @@
+                             library_dirs=geos_library_dirs,
+                             runtime_library_dirs=geos_library_dirs,
+                             include_dirs=geos_include_dirs,
+-                            libraries=['geos_c','geos']))
++                            libraries=['geos2_c','geos2']))
+ 
+ # install shapelib and dbflib.
+ packages = packages + ['shapelib','dbflib']

Added: trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c
===================================================================
--- trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c	                        (rev 0)
+++ trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c	2008-08-01 05:54:23 UTC (rev 38825)
@@ -0,0 +1,11 @@
+--- src/_geoslib.c.orig	2008-07-31 22:26:20.000000000 -0700
++++ src/_geoslib.c	2008-07-31 22:26:30.000000000 -0700
+@@ -31,7 +31,7 @@
+ #endif
+ #include <math.h>
+ #include "numpy/arrayobject.h"
+-#include "geos_c.h"
++#include "geos2_c.h"
+ 
+ 
+ #ifdef __GNUC__
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080731/34160c79/attachment.html