Revision: 103345 https://trac.macports.org/changeset/103345 Author: and.damore@macports.org Date: 2013-02-22 06:25:40 -0800 (Fri, 22 Feb 2013) Log Message: ----------- port py-spatialite: add explicit include and library paths, remove duplicated prototype declaration; fix #37635 Modified Paths: -------------- trunk/dports/python/py-spatialite/Portfile trunk/dports/python/py-spatialite/files/patch-setup_py.diff Modified: trunk/dports/python/py-spatialite/Portfile =================================================================== --- trunk/dports/python/py-spatialite/Portfile 2013-02-22 13:04:58 UTC (rev 103344) +++ trunk/dports/python/py-spatialite/Portfile 2013-02-22 14:25:40 UTC (rev 103345) @@ -39,8 +39,13 @@ port:proj patchfiles patch-setup_py.diff \ - patch-lib_dbapi2_py.diff + patch-lib_dbapi2_py.diff \ + patch-src_connection.diff + post-patch { + reinplace "s|%%PREFIX%%|${prefix}|" ${worksrcpath}/setup.py + } + post-destroot { xinstall -d ${destroot}${python.prefix}/share/doc/${subport} file copy ${worksrcpath}/doc ${destroot}${python.prefix}/share/doc/${subport} Modified: trunk/dports/python/py-spatialite/files/patch-setup_py.diff =================================================================== --- trunk/dports/python/py-spatialite/files/patch-setup_py.diff 2013-02-22 13:04:58 UTC (rev 103344) +++ trunk/dports/python/py-spatialite/files/patch-setup_py.diff 2013-02-22 14:25:40 UTC (rev 103345) @@ -1,6 +1,6 @@ ---- setup.py.orig 2012-08-18 16:47:34.000000000 +0200 -+++ setup.py 2012-08-18 16:47:54.000000000 +0200 -@@ -117,12 +117,7 @@ +--- setup.py_orig 2013-01-14 21:39:34.000000000 +1300 ++++ setup.py 2013-01-14 22:32:36.000000000 +1300 +@@ -117,12 +117,11 @@ # sometimes iconv is built in, sometimes it isn't if not self.compiler.has_function("iconv"): ext.libraries.append("iconv") @@ -11,6 +11,10 @@ - ext.library_dirs.append("/Library/Frameworks/GEOS.framework/unix/lib") - ext.library_dirs.append("/Library/Frameworks/PROJ.framework/unix/lib") + ext.libraries.append("charset") ++ ++ # Default locations for Macports ++ ext.include_dirs.append("%%PREFIX%%/include") ++ ext.library_dirs.append("%%PREFIX%%/lib") ext.define_macros.append(("SQLITE_ENABLE_FTS3", "1")) # build with fulltext search enabled ext.define_macros.append(("SQLITE_ENABLE_RTREE", "1")) # build with fulltext search enabled