<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/eb9357a25f17f52dd40c4c7a2684493eb3b4848b">https://github.com/macports/macports-ports/commit/eb9357a25f17f52dd40c4c7a2684493eb3b4848b</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 eb9357a25f1 gdal: upgrade to 3.3.0 postgis3: update to 3.1.2 grass7/liblas/osm2pgrouting/pdal/saga: minor improvements, mainly introduce +proj8 variant and make it the default
</span>eb9357a25f1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit eb9357a25f17f52dd40c4c7a2684493eb3b4848b
</span>Author: Veence <vince@macports.org>
AuthorDate: Thu May 27 18:58:00 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> gdal: upgrade to 3.3.0
</span><span style='display:block; white-space:pre;color:#404040;'> postgis3: update to 3.1.2
</span><span style='display:block; white-space:pre;color:#404040;'> grass7/liblas/osm2pgrouting/pdal/saga: minor improvements, mainly introduce +proj8 variant and make it the default
</span>---
databases/postgis3/Portfile | 35 +++++++++++++++++++++++------------
gis/gdal/Portfile | 30 ++++++++++++++++--------------
gis/grass7/Portfile | 2 +-
gis/liblas/Portfile | 17 ++++++++++++-----
gis/osm2pgrouting/Portfile | 2 --
gis/pdal/Portfile | 2 +-
gis/saga/Portfile | 2 +-
python/py-gdal/Portfile | 8 ++++----
8 files changed, 58 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgis3/Portfile b/databases/postgis3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f42eb0e50b8..489ea2cfe11 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortSystem 1.0
</span> name postgis3
categories databases gis
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.1.2
</span> revision 0
platforms darwin
maintainers {vince @Veence} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ homepage http://postgis.net/
</span> master_sites http://download.osgeo.org/postgis/source
distname postgis-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 39c8a4d8bbaba127223ff19a9ebe2b08a3b3c0d2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 07fedbd046cbed55d24bb22474890a4651d0223b6e12d2dac1517b9a43674817 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 16871696
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 237468e8c3dd12f6e96103c0be6f52cbf67639f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2cdd3760176926704b4eb25ff3357543c9637dee74425a49082906857c7e0732 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17266501
</span>
depends_build port:autoconf \
port:automake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,8 @@ depends_build port:autoconf \
</span> depends_lib port:geos\
port:libiconv\
port:libxml2\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:json-c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:json-c\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:protobuf-c
</span>
# PostGIS 2.0 is not compatible with PostGIS 1.5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,6 +86,7 @@ variant raster description {Build raster support} {
</span>
depends_lib-append port:gdal
configure.args-append --with-raster
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-gdalconfig=${prefix}/bin/gdal-config
</span> }
variant topology description {Build topology support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,19 +99,28 @@ variant sfcgal description {Uses SFCGAL for 3D queries} {
</span> configure.args-append --with-sfcgal=${prefix}/bin/sfcgal-config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj6 conflicts proj7 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj6 conflicts {proj7 proj8} {
</span> depends_lib-append port:proj6
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-projdir=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append PROJ_CFLAGS=-I${prefix}/lib/proj6/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append PROJ_LIBS="-L/opt/local/lib/proj6/lib -lproj"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj7 conflicts proj6 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj7 conflicts {proj6 proj8} {
</span> depends_lib-append port:proj7
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-projdir=${prefix}/lib/proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append PROJ_CFLAGS=-I${prefix}/lib/proj7/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append PROJ_LIBS="-L/opt/local/lib/proj7/lib -lproj"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +raster +topology
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset proj6] && ![variant_isset proj7]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj8 conflicts {proj6 proj7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append PROJ_CFLAGS=-I${prefix}/lib/proj8/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append PROJ_LIBS="-L/opt/local/lib/proj8/lib -lproj"
</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;'>+default_variants +raster +topology
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset proj6] && ![variant_isset proj7] && ![variant_isset proj8]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +proj8
</span> }
# Port phases
<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 69d9dd32922..bdf15a47a7e 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;'>@@ -11,11 +11,12 @@ PortGroup conflicts_build 1.0
</span> PortGroup debug 1.0
mpi.setup
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup OSGeo gdal 3.2.2 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d58c88f673c0e529436f87d2f1329d9743920a8d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a7e1e414e5c405af48982bf4724a3da64a05770254f2ce8affb5f58a7604ca57 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12251728
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OSGeo gdal 3.3.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9d8da2bf3977a2a7bed1f748146dfee6904b76db \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 190c8f4b56afc767f43836b2a5cd53cc52ee7fdc25eb78c6079c5a244e28efa7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12923948
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
categories gis
license MIT BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,6 +94,7 @@ configure.args-append \
</span> --enable-driver-esric \
--enable-driver-fit \
--enable-driver-gff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-driver-grib \
</span> --enable-driver-gsg \
--enable-driver-gxf \
--enable-driver-hf2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -299,11 +301,6 @@ post-configure {
</span> # Set target to none
build.target
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant grib description {Builds with grib2 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:wgrib2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-driver-grib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant lto description {Enable Link Time Optimization} {
configure.args-append --enable-lto
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -555,18 +552,23 @@ variant cfitsio description {Enable fits support} {
</span> configure.optflags -DGDAL_COMPILATION
# Proj version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj6 conflicts proj7 description {Use proj 6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj6 conflicts {proj7 proj8} description {Use proj 6} {
</span> depends_lib-append port:proj6
configure.args-append --with-proj=${prefix}/lib/proj6
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj7 conflicts proj6 description {Use proj 7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj7 conflicts {proj6 proj8} description {Use proj 7} {
</span> depends_lib-append port:proj7
configure.args-append --with-proj=${prefix}/lib/proj7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset proj6] && ![variant_isset proj7]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj8 conflicts {proj6 proj7} description {Use proj 7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-proj=${prefix}/lib/proj8
</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;'>+if {![variant_isset proj6] && ![variant_isset proj7] && ![variant_isset proj8]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +proj8
</span> }
# Can be removed after June 2021.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/Portfile b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d8da9a4fb1c..b1ce5b2088b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup debug 1.0
</span> github.setup OSGeo grass 7.8.5
name grass7
set main_version [join [lrange [split ${version} "."] 0 1] ""]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> set realVersion ${version}
#distname grass-${version}
distname grass-${realVersion}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/liblas/Portfile b/gis/liblas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dce86acc3ae..e9c65273bf1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/liblas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/liblas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup github 1.0
</span>
github.setup libLAS libLAS 70a170b086cbd8b639f500d8d40d90b05fcccb04
version 1.8.1-20210507
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 c9a134f8dbfc76035d1a902a0ba1f194bbf3f0dd \
sha256 5a72982cf00d2562284fd394055e7c2bdc38f391a38ce2eab99d913a662b812d \
size 10743378
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ configure.args-append \
</span> -DWITH_GDAL=ON \
-DWITH_LASZIP=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj6 conflicts proj7 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj6 conflicts {proj7 proj8} {
</span> configure.args-append \
-DPROJ4_INCLUDE_DIR=${prefix}/lib/proj6 \
-DPROJ4_LIBRARY=${prefix}/lib/proj6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,15 +44,22 @@ variant proj6 conflicts proj7 {
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj7 conflicts proj6 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj7 conflicts {proj6 proj8} {
</span> configure.args-append \
-DPROJ4_INCLUDE_DIR=${prefix}/lib/proj7 \
-DPROJ4_LIBRARY=${prefix}/lib/proj7
depends_lib-append port:proj7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset proj6] && ![variant_isset proj7]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj8 conflicts {proj6 proj7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ4_INCLUDE_DIR=${prefix}/lib/proj8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ4_LIBRARY=${prefix}/lib/proj8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj8
</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;'>+if {![variant_isset proj6] && ![variant_isset proj7] && ![variant_isset proj8]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +proj8
</span> }
depends_lib-append port:boost \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/osm2pgrouting/Portfile b/gis/osm2pgrouting/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 934bf00e083..ff448d69eb8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/osm2pgrouting/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/osm2pgrouting/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,5 +72,3 @@ set pgdefault [string range ${pgdefault} 0 end-4]
</span> set pgdefault "${pgdefault}} { default_variants +postgresql${suffix} }"
eval ${pgdefault}
<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;color:#808080;'>diff --git a/gis/pdal/Portfile b/gis/pdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d45bc80258..f9b553716b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/pdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/pdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup cmake 1.1
</span> PortGroup github 1.0
github.setup PDAL PDAL 2.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories gis
license BSD
platforms darwin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/saga/Portfile b/gis/saga/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8dde362bc63..701319fcb79 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/saga/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/saga/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@ depends_lib port:geos \
</span> port:liblas \
port:jasper \
port:fftw-3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:unixODBC \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libodbc.dylib:unixODBC \
</span> port:qhull \
port:triangle
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gdal/Portfile b/python/py-gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 96484bd7d72..23c388e1795 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup python 1.0
</span> name py-gdal
python.rootname GDAL
# keep version in sync with gdal; rebuilt after gdal update
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.3.0
</span> revision 0
categories-append gis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@ long_description This Python package and extensions are a number of tools for
</span>
homepage https://www.gdal.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5b7a2df1517cba4b4bd1a22164271fba6ccd8e25 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 41e928fbe6880a7b38124b8dff9efe82f3d4e1bc17f771fda46bf222289ab9a4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 604248
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 36e6ca95a27aa5ed2b27922d590135e2ed417fd6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ed314a0b3f8b3729a9f6d8ca23f21473c2ff4a946d1a2969e0a1937bf0f4e700 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 743089
</span>
python.versions 27 35 36 37 38 39
</pre><pre style='margin:0'>
</pre>