[38953] trunk/dports/python
ram at macports.org
ram at macports.org
Sun Aug 3 13:42:18 PDT 2008
Revision: 38953
http://trac.macosforge.org/projects/macports/changeset/38953
Author: ram at macports.org
Date: 2008-08-03 13:42:18 -0700 (Sun, 03 Aug 2008)
Log Message:
-----------
py-matplotlib-basemap/py2-matplotlib-basemap: fix lint warnings
Modified Paths:
--------------
trunk/dports/python/py-matplotlib-basemap/Portfile
trunk/dports/python/py25-matplotlib-basemap/Portfile
Added Paths:
-----------
trunk/dports/python/py-matplotlib-basemap/files/patch-setup.py.diff
trunk/dports/python/py-matplotlib-basemap/files/patch-src_geoslib.c.diff
trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py.diff
trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c.diff
Removed Paths:
-------------
trunk/dports/python/py-matplotlib-basemap/files/patch-setup.py
trunk/dports/python/py-matplotlib-basemap/files/patch-src_geoslib.c
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/py-matplotlib-basemap/Portfile
===================================================================
--- trunk/dports/python/py-matplotlib-basemap/Portfile 2008-08-03 20:42:09 UTC (rev 38952)
+++ trunk/dports/python/py-matplotlib-basemap/Portfile 2008-08-03 20:42:18 UTC (rev 38953)
@@ -27,8 +27,8 @@
universal_variant no
-patchfiles patch-setup.py \
- patch-src_geoslib.c
+patchfiles patch-setup.py.diff \
+ patch-src_geoslib.c.diff
post-destroot {
delete ${destroot}${python.pkgd}/mpl_toolkits/__init__.py
Deleted: trunk/dports/python/py-matplotlib-basemap/files/patch-setup.py
===================================================================
--- trunk/dports/python/py-matplotlib-basemap/files/patch-setup.py 2008-08-03 20:42:09 UTC (rev 38952)
+++ trunk/dports/python/py-matplotlib-basemap/files/patch-setup.py 2008-08-03 20:42:18 UTC (rev 38953)
@@ -1,20 +0,0 @@
---- 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']
Copied: trunk/dports/python/py-matplotlib-basemap/files/patch-setup.py.diff (from rev 38952, trunk/dports/python/py-matplotlib-basemap/files/patch-setup.py)
===================================================================
--- trunk/dports/python/py-matplotlib-basemap/files/patch-setup.py.diff (rev 0)
+++ trunk/dports/python/py-matplotlib-basemap/files/patch-setup.py.diff 2008-08-03 20:42:18 UTC (rev 38953)
@@ -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']
Deleted: trunk/dports/python/py-matplotlib-basemap/files/patch-src_geoslib.c
===================================================================
--- trunk/dports/python/py-matplotlib-basemap/files/patch-src_geoslib.c 2008-08-03 20:42:09 UTC (rev 38952)
+++ trunk/dports/python/py-matplotlib-basemap/files/patch-src_geoslib.c 2008-08-03 20:42:18 UTC (rev 38953)
@@ -1,11 +0,0 @@
---- 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__
Copied: trunk/dports/python/py-matplotlib-basemap/files/patch-src_geoslib.c.diff (from rev 38952, trunk/dports/python/py-matplotlib-basemap/files/patch-src_geoslib.c)
===================================================================
--- trunk/dports/python/py-matplotlib-basemap/files/patch-src_geoslib.c.diff (rev 0)
+++ trunk/dports/python/py-matplotlib-basemap/files/patch-src_geoslib.c.diff 2008-08-03 20:42:18 UTC (rev 38953)
@@ -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__
Modified: trunk/dports/python/py25-matplotlib-basemap/Portfile
===================================================================
--- trunk/dports/python/py25-matplotlib-basemap/Portfile 2008-08-03 20:42:09 UTC (rev 38952)
+++ trunk/dports/python/py25-matplotlib-basemap/Portfile 2008-08-03 20:42:18 UTC (rev 38953)
@@ -27,8 +27,8 @@
universal_variant no
-patchfiles patch-setup.py \
- patch-src_geoslib.c
+patchfiles patch-setup.py.diff \
+ patch-src_geoslib.c.diff
post-destroot {
delete ${destroot}${python.pkgd}/mpl_toolkits/__init__.py
Deleted: trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py
===================================================================
--- trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py 2008-08-03 20:42:09 UTC (rev 38952)
+++ trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py 2008-08-03 20:42:18 UTC (rev 38953)
@@ -1,20 +0,0 @@
---- 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']
Copied: trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py.diff (from rev 38952, trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py)
===================================================================
--- trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py.diff (rev 0)
+++ trunk/dports/python/py25-matplotlib-basemap/files/patch-setup.py.diff 2008-08-03 20:42:18 UTC (rev 38953)
@@ -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']
Deleted: trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c
===================================================================
--- trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c 2008-08-03 20:42:09 UTC (rev 38952)
+++ trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c 2008-08-03 20:42:18 UTC (rev 38953)
@@ -1,11 +0,0 @@
---- 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__
Copied: trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c.diff (from rev 38952, trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c)
===================================================================
--- trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c.diff (rev 0)
+++ trunk/dports/python/py25-matplotlib-basemap/files/patch-src_geoslib.c.diff 2008-08-03 20:42:18 UTC (rev 38953)
@@ -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/20080803/8ea0d73c/attachment-0001.html
More information about the macports-changes
mailing list