<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7bd182906a0fdcff28a5a53b1a2791059886b399">https://github.com/macports/macports-ports/commit/7bd182906a0fdcff28a5a53b1a2791059886b399</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 7bd1829  py-spatialite: build fix for relocated proj4
</span>7bd1829 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 7bd182906a0fdcff28a5a53b1a2791059886b399
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Apr 15 01:49:08 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    py-spatialite: build fix for relocated proj4
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Add proj4 include and lib paths to setup.py.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See https://trac.macports.org/ticket/56150
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes https://trac.macports.org/ticket/56175
</span>---
 python/py-spatialite/Portfile                  |  3 +++
 python/py-spatialite/files/patch-setup_py.diff | 24 ++++++++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spatialite/Portfile b/python/py-spatialite/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7c9a69f..4408384 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spatialite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spatialite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,10 @@ if {${name} ne ${subport}} {
</span>     patchfiles      patch-setup_py.diff \
                     patch-connection_h.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    set proj4_prefix ${prefix}/lib/proj49
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace -locale C "s|%%PROJ4_PREFIX%%|${proj4_prefix}|" ${worksrcpath}/setup.py
</span>         reinplace -locale C "s|%%PREFIX%%|${prefix}|" ${worksrcpath}/setup.py
     }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spatialite/files/patch-setup_py.diff b/python/py-spatialite/files/patch-setup_py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8e899d6..758c52e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spatialite/files/patch-setup_py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spatialite/files/patch-setup_py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.old   2016-10-23 12:59:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py       2016-10-23 13:00:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig  2013-11-22 11:52:20.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py       2018-04-14 15:08:56.000000000 -0700
</span> @@ -65,7 +65,7 @@
          if rc != 0:
              print "Is sphinx installed? If not, try 'sudo easy_install sphinx'."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,16 +9,19 @@
</span>  
  TRUTHY = ("yes", "true", "t", "1")
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -162,7 +162,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,7 +162,10 @@
</span>  
      def build_extension(self,ext):
          # Load includes from module directories first!
 -        include_dirs = []
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+        include_dirs = ["%%PREFIX%%/include"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        include_dirs = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          "%%PROJ4_PREFIX%%/include",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          "%%PREFIX%%/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  ]
</span>          include_dirs.extend(self.strip_includes(self.compiler.compiler))
          include_dirs.extend(self.strip_includes(self.compiler.compiler_so))
          include_dirs.extend(self.strip_includes(self.compiler.compiler_cxx))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -258,12 +258,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -258,21 +261,24 @@
</span>                          "src/prepare_protocol.c",
                          "src/statement.c",
                          "src/util.c",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +34,16 @@
</span>                      ],
                      include_dirs = [
 -                        os.path.join(AMALGAMATION_ROOT,"headers")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+                        "/opt/local/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                        "%%PROJ4_PREFIX%%/include",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                        "%%PREFIX%%/include"
</span>                      ],
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                     library_dirs = [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    library_dirs = [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                    library_dirs = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                        "%%PROJ4_PREFIX%%/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++              ],
</span>                      runtime_library_dirs = [],
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -272,7 +272,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     extra_objects = [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     define_macros = [
</span>                          ("VERSION",'"%s"' % PYSPATIALITE_VERSION),
                          ("SQLITE_ENABLE_RTREE", "1"),   # build with fulltext search enabled
                          ("NDEBUG","1"),
</pre><pre style='margin:0'>

</pre>