<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/216ccac434fb61d04a79762b82d3059c96d75c63">https://github.com/macports/macports-ports/commit/216ccac434fb61d04a79762b82d3059c96d75c63</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 216ccac grass7: bump to 7.8.1 and make postgresql 12 the default DB
</span>216ccac is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 216ccac434fb61d04a79762b82d3059c96d75c63
</span>Author: Veence <vince@macports.org>
AuthorDate: Wed Dec 18 09:40:59 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> grass7: bump to 7.8.1 and make postgresql 12 the default DB
</span>---
gis/grass7/Portfile | 143 ++++++++++++++++++++++++++++++++++------------------
1 file changed, 93 insertions(+), 50 deletions(-)
<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 b22b3fc..0e4cf055 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;'>@@ -2,11 +2,12 @@
</span>
PortSystem 1.0
PortGroup wxWidgets 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OSGeo grass 7.8.1
</span> name grass7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.6.1
</span> 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 0
</span> set realVersion ${version}
#distname grass-${version}
distname grass-${realVersion}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +23,9 @@ long_description GRASS is a Geographic Information System (GIS) used for \
</span> homepage http://grass.osgeo.org/
master_sites ${homepage}grass[join [lrange [split ${realVersion} .] 0 1] {}]/source/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 30b043d97048526ebf25823f2dec4e2da8c993bc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 59952303
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e485707ec58adf3205cf042bd7e324e5eaf754a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6ae578fd67afcce7abec4ba4505dcc55b3d2dfe0ca46b99d966cb148c654abb3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 60527722
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,50 +38,20 @@ depends_lib port:bzip2 \
</span> port:libpng \
port:liblas\
path:lib/pkgconfig/cairo.pc:cairo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:readline \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-pillow \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline
</span>
patchfiles patch-configure.diff \
patch-Install_make.diff \
patch-libraster_gdal_c.diff \
vector_v.in.pdal_Makefile.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_bin ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse f ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file extension ${f}] eq ".py"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "s|/usr/bin/env python|${python_bin}|" ${f}
</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;'>- reinplace "s|PYVER.*|PYVER = 2.7|" ${worksrcpath}/macosx/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^PYTHON.*|PYTHON = ${python_bin}|" ${worksrcpath}/include/Make/Platform.make.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/lib/raster/gdal.c
</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;'>-# PROJ version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj4 description {Builds with PROJ4 4.x} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset proj4]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PROJ "proj49"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PROJ "proj6"
</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;'>-depends_lib-append port:[string range ${PROJ} 0 end-1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env PATH=$::env(PATH):${prefix}/lib/${PROJ}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env PATH=$::env(PATH):${prefix}/lib/${PROJ}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --with-proj-includes=${prefix}/lib/${PROJ}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-libs=${prefix}/lib/${PROJ}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-share=${prefix}/lib/${PROJ}/share/proj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.ldflags-append -framework OpenCL
configure.args-append \
--prefix=${prefix}/share \
--exec-prefix=${prefix} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-opengl=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-opencl=yes \
</span> --with-bzlib \
--with-bzlib-includes=${prefix}/include \
--with-bzlib-libs=${prefix}/lib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,9 +76,7 @@ configure.args-append \
</span> --with-cairo \
--with-cairo-includes=${prefix}/include/cairo \
--with-cairo-libs=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-opengl=osx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-opencl=yes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-blas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-blas=no \
</span> --with-lapack=no \
--with-readline \
--with-readline-includes=${prefix}/include/readline \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,14 +84,81 @@ configure.args-append \
</span>
build.target default
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python 3 variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_suffixes {34 35 36 37}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vrt python${pyver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyversion [string index ${pyver} 0].[string index ${pyver} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${python_variants} ${vrt}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conf [lreplace ${python_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${vrt} description "Use Python ${pyversion}" conflicts {*}${conf} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python${pyver} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pyver}-pillow \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${pyver}-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:py${pyver}-psycopg2
</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;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_bin ${prefix}/bin/python${pyversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse f ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file extension ${f}] eq ".py"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|/usr/bin/env python3|${python_bin}|" ${f}
</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;'>+ reinplace "s|PYVER.*|PYVER = ${pyversion}|" ${worksrcpath}/macosx/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|^PYTHON.*|PYTHON = ${python_bin}|" ${worksrcpath}/include/Make/Platform.make.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/lib/raster/gdal.c
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pydefault "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach suffix ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pydefault "${pydefault}!\[variant_isset python${suffix}\] && "
</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;'>+set pydefault [string range ${pydefault} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pydefault "${pydefault}} { default_variants +python37 }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval ${pydefault}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PROJ version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj4 description {Builds with PROJ4 4.x} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset proj4]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PROJ "proj49"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PROJ "proj6"
</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;'>+depends_lib-append port:[string range ${PROJ} 0 end-1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PATH=$::env(PATH):${prefix}/lib/${PROJ}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env PATH=$::env(PATH):${prefix}/lib/${PROJ}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --with-proj-includes=${prefix}/lib/${PROJ}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-libs=${prefix}/lib/${PROJ}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-share=${prefix}/lib/${PROJ}/share/proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant gui description {Builds with WxPython GUI} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.use wxPython-3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxWidgets-3.2
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${wxWidgets.port} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${pyver}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py${pyver}-wxpython-4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-opengl=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-opengl=osx
</span> }
variant mysql5 description {Add MySQL 5 support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +170,7 @@ variant mysql5 description {Add MySQL 5 support} {
</span> }
# PostGreSQL variants (from the GDAL port)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_suffixes {11 10 95 96}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_suffixes {12 11 10}
</span>
set postgresql_variants {}
foreach suffix ${postgresql_suffixes} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,7 +200,7 @@ foreach suffix ${postgresql_suffixes} {
</span> }
set pgdefault [string range ${pgdefault} 0 end-4]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pgdefault "${pgdefault}} { default_variants +postgresql11 }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgdefault "${pgdefault}} { default_variants +postgresql12 }"
</span>
eval ${pgdefault}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,10 +220,17 @@ variant ffmpeg description {Add ffmpeg support} {
</span> --with-ffmpeglibs=${prefix}/lib
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant atlas description {Use Atlas for BLAS/LAPACK} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:atlas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-append --with-libblas=${prefix}/lib/libtatlas.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-append --with-liblapack=${prefix}/lib/libtatlas.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant openblas description {Use OpenBLAS for BLAS/LAPACK} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openblas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-blas=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-lapack=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-blas=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-lapack=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-blas-includes=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-libblas=${prefix}/lib/libopenblas.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-lapack-includes=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-liblapack=${prefix}/lib/libopenblas.dylib
</span> }
post-configure {
</pre><pre style='margin:0'>
</pre>