<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/81f2b8da05f2fc855bb44c69e9a8e483790f4a15">https://github.com/macports/macports-ports/commit/81f2b8da05f2fc855bb44c69e9a8e483790f4a15</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 81f2b8d gdal: bump to 2.3 and improve build system. Also new +lto variant
</span>81f2b8d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 81f2b8da05f2fc855bb44c69e9a8e483790f4a15
</span>Author: Veence <vince@macports.org>
AuthorDate: Fri May 18 08:47:46 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> gdal: bump to 2.3 and improve build system. Also new +lto variant
</span>---
gis/gdal/Portfile | 41 +++++++++++++++------------------
gis/gdal/files/template-ed-GDALmake_opt | 10 ++++++++
2 files changed, 29 insertions(+), 22 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 4e473da..68a0032 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;'>@@ -5,7 +5,7 @@ PortGroup mpi 1.0
</span> PortGroup muniversal 1.0
name gdal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.2.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.3.0
</span> revision 0
categories gis
license MIT BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,8 +26,8 @@ long_description GDAL is a translator library for raster geospatial \
</span> homepage http://www.gdal.org/
master_sites http://download.osgeo.org/gdal/${version}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c2a0fbaca8e8895fd8443b535ded768943afa5c8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b9d5a723787f3006a82cb276db171c721187b048b866c0e20e6df464d671a1a4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 26433559e74b07ff8c7c32cf59042b478e86e336 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2944bbfee009bf1ca092716e4fd547cb4ae2a1e8816186236110c22f11c7e1e9
</span>
compilers.choose cc cxx
mpi.setup
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,9 +38,6 @@ depends_build-append \
</span>
depends_lib-append port:zlib \
port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgeotiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:jpeg \
</span> port:giflib \
port:proj \
port:qhull \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,9 +54,9 @@ configure.args-append \
</span> --with-libz=${prefix} \
--without-liblzma \
--with-png=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libtiff=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-geotiff=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-jpeg=${prefix}\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libtiff=internal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-geotiff=internal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-jpeg=internal\
</span> --with-gif=${prefix} \
--with-static-proj4=${prefix}/lib/proj5 \
--with-qhull=yes \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,6 +123,8 @@ if {${configure.cxx_stdlib} != "libc++"} {
</span> # backported from master and could be applied everywhere
patchfiles-append \
patch-netcdfdataset_cpp.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-cpp14
</span> }
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,6 +148,10 @@ post-configure {
</span> # Set target to none
build.target
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant lto description {Enable Link Time Optimization} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-lto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant lzma \
description {Enable LZMA (7Z) compression support} {
depends_lib-append port:lzma
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -253,7 +256,7 @@ variant openjpeg \
</span> description {Enable OpenJPEG JPEG-2000 format support} {
depends_lib-append port:openjpeg
configure.args-delete --without-openjpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-openjpeg=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-openjpeg=${prefix}/include/openjpeg-2.3
</span> }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -350,20 +353,14 @@ if {${jpeg2k} > 1} {
</span> notes-append "Multiple drivers are able to open JPEG-2000 datasets. See https://trac.osgeo.org/gdal/wiki/ConfigOptions#GDAL_SKIP."
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Postconfigure hack to avoid read ${include} .h files before
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Postconfigure hack to avoid reading ${prefix}/*.h include files before
</span> # GDAL own include directories
<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;'>- set FRMT_PATH ${w}/ogr/ogrsf_frmts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach makefile [glob -dir $FRMT_PATH */GNUmakefile] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "s|\$\(EXPAT_INCLUDE\)||" $makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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;'>- reinplace -E "s|(GEOS_CFLAGS.*=).*|\\1|" ${w}/GDALmake.opt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|^CPPFLAGS.*|CPPFLAGS = -I\$(GDAL_ROOT)/port -I${prefix} -I${prefix}/include\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include/libqhull|" ${w}/GDALmake.opt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy -force ${filespath}/template-ed-GDALmake_opt /tmp/ed-GDALmake_opt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|@@@|${prefix}|" /tmp/ed-GDALmake_opt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exec /bin/ed -s ${worksrcpath}/GDALmake.opt < /tmp/ed-GDALmake_opt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete /tmp/ed-GDALmake_opt
</span> }
post-destroot {
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a5ba7a4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/CPPFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+s|-I@@@/include ||g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+s|-I@@@ ||g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I@@@/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+j
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+w
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Q
</span></pre><pre style='margin:0'>
</pre>