<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/73f6c980bb02dcd3cda694f6732b45136b4c6a4f">https://github.com/macports/macports-ports/commit/73f6c980bb02dcd3cda694f6732b45136b4c6a4f</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 73f6c98 gdal: more cleaning up
</span>73f6c98 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 73f6c980bb02dcd3cda694f6732b45136b4c6a4f
</span>Author: Veence <vince@macports.org>
AuthorDate: Tue May 22 13:37:49 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> gdal: more cleaning up
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix a regression with spatialite
</span><span style='display:block; white-space:pre;color:#404040;'> * Deletes /usr/local/include from CPPFLAGS
</span><span style='display:block; white-space:pre;color:#404040;'> * Make some optional drivers mandatory
</span><span style='display:block; white-space:pre;color:#404040;'> * Try to fix < 10.9 builds failing at link time
</span>---
gis/gdal/Portfile | 51 ++++++++++-----------------------
gis/gdal/files/template-ed-GDALmake_opt | 1 +
2 files changed, 16 insertions(+), 36 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 a25bc43..3e12866 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;'>@@ -6,7 +6,7 @@ PortGroup cxx11 1.1
</span> PortGroup muniversal 1.0
github.setup OSGeo gdal 4243624
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.3.0.20180521
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.3.0.20180522
</span> categories gis
license MIT BSD
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,11 +37,16 @@ patchfiles patch-gdalwarpkernel_opencl_h.diff \
</span> patch-ogr_api_cpp.diff \
patch-scripts-GNUmakefile.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/55752
</span> platform darwin {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/55752
</span> if {${os.major} < 12} {
patchfiles-append MacTypes.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/56517
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.cxx_stdlib} eq "macports-libstdc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -stdlib=macports-libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +60,9 @@ depends_lib-append port:zlib \
</span> port:proj \
port:qhull \
port:sqlite3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:spatialite
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:spatialite \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:charls
</span>
set PYINST ""
set OPENCLBASE "/System/Library/Frameworks/OpenCL.framework/"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,13 +78,16 @@ configure.args-append \
</span> --with-libtiff=internal \
--with-geotiff=internal \
--with-jpeg=internal\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-charls=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-charls=yes \
</span> --with-gif=yes \
--with-proj=${prefix}/lib/proj5 \
--with-qhull=yes \
--with-pam \
--with-sqlite3=yes \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-spatialite=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-spatialite=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-curl=${prefix}/bin/curl-config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-geos=${prefix}/bin/geos-config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-expat=${prefix} \
</span> --without-pg \
--without-grass \
--without-libgrass \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,15 +111,11 @@ configure.args-append \
</span> --without-ingres \
--without-xerces \
--without-odbc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-curl \
</span> --without-idb \
--without-sde \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-geos \
</span> --without-opencl \
--without-perl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-php \
</span> --without-python \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-expat \
</span> --without-poppler \
--mandir=${prefix}/share/man
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,18 +160,6 @@ variant lzma \
</span> configure.args-append --with-liblzma=yes
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant geos description {Enable GEOS geometry engine functionality} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:geos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-geos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-geos=${prefix}/bin/geos-config
</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 curl description {Enable curl support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:curl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-curl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-curl=${prefix}/bin/curl-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant grass description {Enable GRASS 7 GIS I/O} {
if {[catch {lindex [registry_active grass7] 0}]} {
ui_error "The grass variant requires grass 7 to be installed."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,12 +180,6 @@ variant grass description {Enable GRASS 7 GIS I/O} {
</span> configure.args-append --with-grass=${prefix}/share/grass-7.4.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant charls description {Build with CharLS} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:charls
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-charls=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-charls=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant mrsid description {Enable MrSID file format} {
depends_lib-append port:geoexpress-sdk
configure.args-delete --without-mrsid
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -280,19 +268,12 @@ variant openjpeg \
</span> configure.args-append --with-openjpeg=${prefix}/include/openjpeg-2.3
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant xerces description {Enable xerces XML support for GML file format} {
depends_lib-append path:include/xercesc/util/XercesVersion.hpp:xercesc3
configure.args-delete --without-xerces
configure.args-append --with-xerces=${prefix}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant expat description {Enable expat XML support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:expat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-expat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-expat=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Database variants
set postgresql_suffixes {95 96 10}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -362,8 +343,6 @@ variant perf description {Optimize for speed} {
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +expat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set jpeg2k 0
foreach jpeg2kVariant {jasper openjpeg ecw} {
if {[variant_isset ${jpeg2kVariant}]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/template-ed-GDALmake_opt b/gis/gdal/files/template-ed-GDALmake_opt
</span><span style='display:block; white-space:pre;color:#808080;'>index a2b9256..ecfdb09 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/template-ed-GDALmake_opt
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/files/template-ed-GDALmake_opt
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,6 @@
</span> /CPPFLAGS
s|-I@PREFIX@/include ||g
<span style='display:block; white-space:pre;background:#e0ffe0;'>+s|-I/usr/local/include ||g
</span> a
-I@PREFIX@/include
.
</pre><pre style='margin:0'>
</pre>