<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/c3b4ae259244701eaed86b109a14878e66ad6608">https://github.com/macports/macports-ports/commit/c3b4ae259244701eaed86b109a14878e66ad6608</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 c3b4ae25924 grass7: get rid of obsolete proj4 variant and introduce proj7 variant
</span>c3b4ae25924 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c3b4ae259244701eaed86b109a14878e66ad6608
</span>Author: Veence <vince@macports.org>
AuthorDate: Tue Aug 25 09:12:29 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> grass7: get rid of obsolete proj4 variant and introduce proj7 variant
</span>---
gis/grass7/Portfile | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 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 f13f3249449..01bd936655a 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.3
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;background:#e0e0e0;'>@@ -130,16 +130,16 @@ set pydefault "${pydefault}} { default_variants +python38 }"
</span>
eval ${pydefault}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj4 conflicts proj6 description {Build with PROJ 4} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env PATH=$::env(PATH):${prefix}/lib/proj49/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env PATH=$::env(PATH):${prefix}/lib/proj49/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-proj-includes=${prefix}/lib/proj49/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-libs=${prefix}/lib/proj49/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-share=${prefix}/lib/proj49/share/proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj7 conflicts proj6 description {Build with PROJ 7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env PATH=$::env(PATH):${prefix}/lib/proj7/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env PATH=$::env(PATH):${prefix}/lib/proj7/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-proj-includes=${prefix}/lib/proj7/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-libs=${prefix}/lib/proj7/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-share=${prefix}/lib/proj7/share/proj
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj6 conflicts proj4 description {Build with PROJ 6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj6 conflicts proj7 description {Build with PROJ 6} {
</span> depends_lib-append port:proj6
configure.env PATH=$::env(PATH):${prefix}/lib/proj6/bin
build.env PATH=$::env(PATH):${prefix}/lib/proj6/bin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,8 +148,8 @@ variant proj6 conflicts proj4 description {Build with PROJ 6} {
</span> --with-proj-share=${prefix}/lib/proj6/share/proj
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset proj4] && ![variant_isset proj6]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset proj7] && ![variant_isset proj6]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +proj7
</span> }
variant gui description {Build with wxPython GUI} {
</pre><pre style='margin:0'>
</pre>