<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/62cc698a512b406125a139d1a757f4a555112468">https://github.com/macports/macports-ports/commit/62cc698a512b406125a139d1a757f4a555112468</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 62cc698a gdal: Further refinements -
</span>62cc698a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 62cc698a512b406125a139d1a757f4a555112468
</span>Author: Veence <vince@macports.org>
AuthorDate: Wed May 23 10:23:05 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> gdal: Further refinements -
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Eliminates a patch in Portfile after upstream committed a fix
</span><span style='display:block; white-space:pre;color:#404040;'> * Tries to mix cxx11 and mpi PortGroups in order to allow for correct builds with mpi
</span><span style='display:block; white-space:pre;color:#404040;'> * Deletes an obsolete pre-c++11 patch (GDAL cannot compile with pre-c++11 compilers anymore)
</span>---
gis/gdal/Portfile | 40 ++++++++++++++---------------
gis/gdal/files/patch-netcdfdataset_cpp.diff | 11 --------
2 files changed, 20 insertions(+), 31 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 488b020..cdc5477 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,16 +5,14 @@ PortGroup github 1.0
</span> PortGroup cxx11 1.1
PortGroup muniversal 1.0
PortGroup mpi 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+mpi.setup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup OSGeo gdal 4243624
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.3.0.20180522
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OSGeo gdal fd8952b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.3.0.20180523
</span> categories gis
license MIT BSD
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# MPI stuff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compilers.choose cc cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-mpi.setup
</span>
maintainers {vince @Veence} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +28,9 @@ long_description GDAL is a translator library for raster geospatial \
</span>
homepage http://www.gdal.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 eb822afdcffce6f0c1f3f059c37f29a95d40d7c4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 60325d2cfbcad85a5096172eb2ef45f3ad45b3199de1d48274606619de4f1cc7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21378413
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8833f4a163b469b05c658de2773b31d4b67ac930 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bd50eaa6235347e18e7cd71deab823f4d91c7b4dcb81e6bfba55e2cae6647013 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21378342
</span>
worksrcdir ${worksrcpath}/gdal
patchfiles patch-gdalwarpkernel_opencl_h.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,8 +47,8 @@ platform darwin {
</span> }
# see https://trac.macports.org/ticket/56517
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cxx_stdlib} eq "macports-libstdc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -stdlib=macports-libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *clang* ${configure.cxx}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -stdlib=${configure.cxx_stdlib}
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,14 +171,6 @@ variant grass description {Enable GRASS 7 GIS I/O} {
</span> return -code error "Missing GRASS 7."
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Workaround a missing header (trac issue #633)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|(^CPPFLAGS.*)|\\1 \$(PROJ_INCLUDE)|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/frmts/grass/GNUmakefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|(^CPPFLAGS.*)|\\1 \$(PROJ_INCLUDE)|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/ogr/ogrsf_frmts/grass/GNUmakefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-delete --without-grass
configure.args-append --with-grass=${prefix}/share/grass-7.4.0
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -241,17 +231,27 @@ variant hdf4 description {Enable HDF4 file format} {
</span> }
variant hdf5 description {Enable HDF5 file format} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset mpich] || [variant_isset mpich-devel] || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [variant_isset openmpi] || [variant_isset openmpi_devel]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpi.enforce_variant hdf5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:hdf5
configure.args-delete --without-hdf5
configure.args-append --with-hdf5=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mpi.enforce_variant hdf5
</span> }
variant netcdf description {Enable NetCDF file format} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset mpich] || [variant_isset mpich-devel] || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [variant_isset openmpi] || [variant_isset openmpi_devel]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpi.enforce_variant netcdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:netcdf
configure.args-delete --without-netcdf
configure.args-append --with-netcdf=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mpi.enforce_variant netcdf
</span> }
variant grib description {Enable GRIB (weather) file format} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-netcdfdataset_cpp.diff b/gis/gdal/files/patch-netcdfdataset_cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 72421c6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/files/patch-netcdfdataset_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- frmts/netcdf/netcdfdataset.cpp.orig 2017-08-01 17:04:53.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ frmts/netcdf/netcdfdataset.cpp 2017-08-01 17:06:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4642,7 +4642,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* rint() */
</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;'>--#ifdef HAVE_CXX11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef NOT_HAVE_CXX11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double netCDFDataset::rint( double dfX )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return std::round(dfX);
</span></pre><pre style='margin:0'>
</pre>