[prev in list] [next in list] [prev in thread] [next in thread]
List: macports-changes
Subject: [114142] trunk/dports/python/py-spatialite
From: vince () macports ! org
Date: 2013-11-30 11:11:02
Message-ID: 20131130111103.122D4140E6F () svn ! macports ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 114142
https://trac.macports.org/changeset/114142
Author: vince@macports.org
Date: 2013-11-30 03:11:02 -0800 (Sat, 30 Nov 2013)
Log Message:
-----------
Bump to 3.0.1-alpha, the previous version does not compile anymore.
Since the project has moved to GitHub, makes the port part of github group, too.
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-11-30 11:03:47 UTC (rev 114141)
+++ trunk/dports/python/py-spatialite/Portfile 2013-11-30 11:11:02 UTC (rev 114142)
@@ -2,14 +2,14 @@
PortSystem 1.0
PortGroup python 1.0
+PortGroup github 1.0
name py-spatialite
# pyspatialite comes in several flavors according the spatialite API it's going to work with
-version 2.6.2
-revision 1
+version 3.0.1
set spatialite-compat "-spatialite.2.3.1"
-license ZLIB
+license BSD
maintainers and.damore openmaintainer
description Python interface to SQLite 3 and Spatialite
long_description \
@@ -21,12 +21,11 @@
platforms darwin
homepage http://pypi.python.org/pypi/pyspatialite/${version}${spatialite-compat}
-master_sites http://pypi.python.org/packages/source/p/pyspatialite
-distname pyspatialite-${version}${spatialite-compat}
+github.setup lokkju pyspatialite 3.0.1-alpha-0
-checksums md5 9b996455e8080dbeef5f0cdcb23c16e0 \
- sha1 f4b2785f2da727eab36297653ec330b7ad7fd114 \
- rmd160 d3a2717cb91c774b4e8714b097cb0d0018ad67d3
+checksums md5 b006a6fdc23a26400ea5b0d1ca6ab471 \
+ sha1 e9f60f6a46b6e523ddcf94fd7ec7c113985246fc \
+ rmd160 b6f7ff630e35cf0b0dbdd81b834d36c5fe162f91
# have to check if it works with 3.x
python.versions 24 25 26 27
@@ -38,9 +37,9 @@
port:geos \
port:proj
- patchfiles patch-setup_py.diff \
- patch-lib_dbapi2_py.diff \
- patch-src_connection.diff
+ patchfiles patch-setup_py.diff
+# patch-lib_dbapi2_py.diff \
+# patch-src_connection.diff
post-patch {
reinplace -locale C "s|%%PREFIX%%|${prefix}|" ${worksrcpath}/setup.py
Modified: trunk/dports/python/py-spatialite/files/patch-setup_py.diff
===================================================================
--- trunk/dports/python/py-spatialite/files/patch-setup_py.diff 2013-11-30 11:03:47 UTC (rev 114141)
+++ trunk/dports/python/py-spatialite/files/patch-setup_py.diff 2013-11-30 11:11:02 UTC (rev 114142)
@@ -1,20 +1,10 @@
---- 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")
--
-- #Default locations for Mac
-- ext.include_dirs.append("/Library/Frameworks/GEOS.framework/unix/include/")
-- ext.include_dirs.append("/Library/Frameworks/PROJ.framework/unix/include/")
-- 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")
+--- setup.py.old 2013-11-30 11:54:05.000000000 +0100
++++ setup.py 2013-11-30 11:53:34.000000000 +0100
+@@ -170,6 +170,7 @@
+ include_dirs.extend(self.strip_includes(self.compiler.linker_exe))
+ include_dirs.extend(self.strip_includes(self.compiler.preprocessor))
+ self.compiler.include_dirs.extend(self.uniq(include_dirs))
++ self.compiler.include_dirs.append('%%PREFIX%%/include')
- 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
+ if self.with_proj4:
+ self.check_header(ext,"proj_api.h")
[Attachment #5 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[114142] trunk/dports/python/py-spatialite</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="https://trac.macports.org/changeset/114142">114142</a></dd> <dt>Author</dt> \
<dd>vince@macports.org</dd> <dt>Date</dt> <dd>2013-11-30 03:11:02 -0800 (Sat, 30 Nov \
2013)</dd> </dl>
<h3>Log Message</h3>
<pre>Bump to 3.0.1-alpha, the previous version does not compile anymore.
Since the project has moved to GitHub, makes the port part of github group, \
too.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyspatialitePortfile">trunk/dports/python/py-spatialite/Portfile</a></li>
<li><a href="#trunkdportspythonpyspatialitefilespatchsetup_pydiff">trunk/dports/python/py-spatialite/files/patch-setup_py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpyspatialitePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-spatialite/Portfile (114141 \
=> 114142)</h4> <pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-spatialite/Portfile 2013-11-30 11:03:47 \
UTC (rev 114141)
+++ trunk/dports/python/py-spatialite/Portfile 2013-11-30 11:11:02 UTC (rev 114142)
</span><span class="lines">@@ -2,14 +2,14 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup python 1.0
</span><ins>+PortGroup github 1.0
</ins><span class="cx"> name py-spatialite
</span><span class="cx">
</span><span class="cx"> # pyspatialite comes in several flavors according the \
spatialite API it's going to work with </span><del>-version 2.6.2
-revision 1
</del><ins>+version 3.0.1
</ins><span class="cx"> set spatialite-compat "-spatialite.2.3.1"
</span><span class="cx">
</span><del>-license ZLIB
</del><ins>+license BSD
</ins><span class="cx"> maintainers and.damore openmaintainer
</span><span class="cx"> description Python interface to SQLite 3 and \
Spatialite </span><span class="cx"> long_description \
</span><span class="lines">@@ -21,12 +21,11 @@
</span><span class="cx"> platforms darwin
</span><span class="cx">
</span><span class="cx"> homepage \
http://pypi.python.org/pypi/pyspatialite/${version}${spatialite-compat} \
</span><del>-master_sites \
http://pypi.python.org/packages/source/p/pyspatialite
-distname pyspatialite-${version}${spatialite-compat}
</del><ins>+github.setup lokkju pyspatialite 3.0.1-alpha-0
</ins><span class="cx">
</span><del>-checksums md5 9b996455e8080dbeef5f0cdcb23c16e0 \
- sha1 f4b2785f2da727eab36297653ec330b7ad7fd114 \
- rmd160 d3a2717cb91c774b4e8714b097cb0d0018ad67d3
</del><ins>+checksums md5 b006a6fdc23a26400ea5b0d1ca6ab471 \
+ sha1 e9f60f6a46b6e523ddcf94fd7ec7c113985246fc \
+ rmd160 b6f7ff630e35cf0b0dbdd81b834d36c5fe162f91
</ins><span class="cx">
</span><span class="cx"> # have to check if it works with 3.x
</span><span class="cx"> python.versions 24 25 26 27
</span><span class="lines">@@ -38,9 +37,9 @@
</span><span class="cx"> port:geos \
</span><span class="cx"> port:proj
</span><span class="cx">
</span><del>- patchfiles patch-setup_py.diff \
- patch-lib_dbapi2_py.diff \
- patch-src_connection.diff
</del><ins>+ patchfiles patch-setup_py.diff
+# patch-lib_dbapi2_py.diff \
+# patch-src_connection.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace -locale C \
"s|%%PREFIX%%|${prefix}|" ${worksrcpath}/setup.py \
</span></span></pre></div> <a \
id="trunkdportspythonpyspatialitefilespatchsetup_pydiff"></a> <div \
class="modfile"><h4>Modified: \
trunk/dports/python/py-spatialite/files/patch-setup_py.diff (114141 => 114142)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/dports/python/py-spatialite/files/patch-setup_py.diff 2013-11-30 11:03:47 UTC \
(rev 114141)
+++ trunk/dports/python/py-spatialite/files/patch-setup_py.diff 2013-11-30 11:11:02 \
UTC (rev 114142) </span><span class="lines">@@ -1,20 +1,10 @@
</span><del>---- 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")
--
-- #Default locations for Mac
-- ext.include_dirs.append("/Library/Frameworks/GEOS.framework/unix/include/")
-- ext.include_dirs.append("/Library/Frameworks/PROJ.framework/unix/include/")
-- 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")
</del><ins>+--- setup.py.old 2013-11-30 11:54:05.000000000 +0100
++++ setup.py 2013-11-30 11:53:34.000000000 +0100
+@@ -170,6 +170,7 @@
+ include_dirs.extend(self.strip_includes(self.compiler.linker_exe))
+ include_dirs.extend(self.strip_includes(self.compiler.preprocessor))
+ self.compiler.include_dirs.extend(self.uniq(include_dirs))
++ self.compiler.include_dirs.append('%%PREFIX%%/include')
</ins><span class="cx">
</span><del>- 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 </del><ins>+ if self.with_proj4:
+ self.check_header(ext,"proj_api.h")
</ins></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
macports-changes mailing list
macports-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic