<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/6c65924620907c897b14e67e14a1bd0de7da03c6">https://github.com/macports/macports-ports/commit/6c65924620907c897b14e67e14a1bd0de7da03c6</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 6c65924 grass7: + Rework proj variants to get rid of an old "proj" dependency; \ get rid of the OpenCL framework, which pulls in system sqlite3 causing a clash with Macport's sqlite3.
</span>6c65924 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6c65924620907c897b14e67e14a1bd0de7da03c6
</span>Author: Veence <vince@macports.org>
AuthorDate: Wed May 13 18:25:52 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> grass7: + Rework proj variants to get rid of an old "proj" dependency; \
</span><span style='display:block; white-space:pre;color:#404040;'> get rid of the OpenCL framework, which pulls in system sqlite3 causing a clash with Macport's sqlite3.
</span>---
gis/grass7/Portfile | 48 +++++++++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 21 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 7d9ab8c..ee12b73 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;'>@@ -3,11 +3,12 @@
</span> PortSystem 1.0
PortGroup wxWidgets 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup debug 1.0
</span>
github.setup OSGeo grass 7.8.3
name grass7
set main_version [join [lrange [split ${version} "."] 0 1] ""]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> set realVersion ${version}
#distname grass-${version}
distname grass-${realVersion}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,16 +42,14 @@ depends_lib port:bzip2 \
</span> port:readline
patchfiles patch-configure.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Install_make.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Install_make.diff \
</span> patch-libraster_gdal_c.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -framework OpenCL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append \
--prefix=${prefix}/share \
--exec-prefix=${prefix} \
--with-opengl=no \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-opencl=yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-opencl=no \
</span> --with-bzlib \
--with-bzlib-includes=${prefix}/include \
--with-bzlib-libs=${prefix}/lib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,11 +106,11 @@ post-patch {
</span> if [variant_isset python${pyver}] {
set pyversion [string index ${pyver} 0].[string index ${pyver} 1]
set pybin ${prefix}/bin/python${pyversion}
<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 python3|${pybin}|" ${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:#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|${pybin}|" ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span> reinplace "s|PYVER.*|PYVER = ${pyversion}|" ${worksrcpath}/macosx/Makefile
reinplace "s|^PYTHON.*|PYTHON = ${pybin}|" ${worksrcpath}/include/Make/Platform.make.in
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/lib/raster/gdal.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,20 +132,27 @@ eval ${pydefault}
</span>
# PROJ version
<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:#e0ffe0;'>+variant proj4 conflicts proj6 description {Builds with PROJ4.9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env PATH=$::env(PATH):${prefix}/lib/proj49/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env PATH=$::env(PATH):${prefix}/lib/proj49/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-proj-includes=${prefix}/lib/proj49/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-libs=${prefix}/lib/proj49/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-share=${prefix}/lib/proj49/share/proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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:#e0ffe0;'>+variant proj6 conflicts proj4 description {Builds with PROJ6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env PATH=$::env(PATH):${prefix}/lib/proj6/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env PATH=$::env(PATH):${prefix}/lib/proj6/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-proj-includes=${prefix}/lib/proj6/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-libs=${prefix}/lib/proj6/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-share=${prefix}/lib/proj6/share/proj
</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:#e0ffe0;'>+if {![variant_isset proj4] && ![variant_isset proj6]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant gui description {Builds with WxPython GUI} {
</pre><pre style='margin:0'>
</pre>