<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/868fe5bdde5d2d59389663dbb33af319cec4126f">https://github.com/macports/macports-ports/commit/868fe5bdde5d2d59389663dbb33af319cec4126f</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 868fe5b gdal: enable sqlite3 and spatialite support by default
</span>868fe5b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 868fe5bdde5d2d59389663dbb33af319cec4126f
</span>Author: Veence <vince@macports.org>
AuthorDate: Wed Apr 4 14:46:10 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> gdal: enable sqlite3 and spatialite support by default
</span>---
gis/gdal/Portfile | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aad7c16..0043045 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,9 @@ depends_lib-append port:zlib \
</span> port:jpeg \
port:giflib \
port:proj4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qhull
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qhull \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:spatialite
</span>
set PYINST ""
set OPENCLBASE "/System/Library/Frameworks/OpenCL.framework/"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,6 +64,8 @@ configure.args-append \
</span> --with-static-proj4=${prefix}/lib/proj49 \
--with-qhull=yes \
--with-pam \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sqlite3=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-spatialite=${prefix} \
</span> --without-pg \
--without-grass \
--without-libgrass \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,8 +90,6 @@ configure.args-append \
</span> --without-xerces \
--without-odbc \
--without-curl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-sqlite3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-spatialite \
</span> --without-idb \
--without-sde \
--without-geos \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -292,24 +294,6 @@ variant mysql57 description {Enable MySQL 5 support} {
</span> configure.args-append --with-mysql=${prefix}/lib/mysql57/bin/mysql_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant sqlite3 description {Enable SQLite3 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-sqlite3=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach w ${worksrcpath_dirs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|^LIBS(.*)\\\\$|LIBS\\1 -lsqlite3 \\\\|" ${w}/GDALmake.opt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant spatialite description {Enable SpartiaLite support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:spatialite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-spatialite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-spatialite=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant odbc description {Enable ODBC support} {
depends_lib-append port:unixODBC
configure.args-delete --without-odbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -359,6 +343,7 @@ post-configure {
</span> reinplace -q "s|\$\(EXPAT_INCLUDE\)||" $makefile
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|^LIBS(.*)\\\\$|LIBS\\1 -lsqlite3 \\\\|" ${w}/GDALmake.opt
</span> reinplace -E "s|(GEOS_CFLAGS.*=).*|\\1|" ${w}/GDALmake.opt
reinplace -E "s|^CPPFLAGS.*|CPPFLAGS = -I\$(GDAL_ROOT)/port -I${prefix} -I${prefix}/include\
-I${prefix}/include/libqhull|" ${w}/GDALmake.opt
</pre><pre style='margin:0'>
</pre>