<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/69a33fc69ca3da5969d68fc77df2edb584e62134">https://github.com/macports/macports-ports/commit/69a33fc69ca3da5969d68fc77df2edb584e62134</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 69a33fc69ca3da5969d68fc77df2edb584e62134
</span>Author: Veence <vince@macports.org>
AuthorDate: Tue Apr 10 13:55:33 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> grass7: adds a +proj4 variant
</span>---
gis/grass7/Portfile | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 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 6a425d6..18bd36d 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;'>@@ -5,7 +5,7 @@ PortGroup wxWidgets 1.0
</span>
name grass7
version 7.4.0
<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;'>@@ -32,7 +32,6 @@ depends_lib port:bzip2 \
</span> port:geos \
port:tiff \
port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj4\
</span> port:liblas\
path:lib/pkgconfig/cairo.pc:cairo \
port:readline \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,10 +57,26 @@ post-patch {
</span> ui_warn "WARNING! Experimental build. Report any problems."
}
<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:#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 "proj5"
</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> configure.ldflags-append -framework OpenCL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span> --prefix=${prefix}/share \
--exec-prefix=${prefix} \
--with-bzlib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,9 +92,6 @@ configure.args \
</span> --with-tiff-libs=${prefix}/lib \
--with-png-includes=${prefix}/include \
--with-png-libs=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --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> --with-geos \
--with-geos-includes=${prefix}/include \
--with-geos-libs=${prefix}/lib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +109,6 @@ configure.args \
</span> --with-readline-includes=${prefix}/include/readline \
--with-readline-libs=${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env PATH=$::env(PATH):${prefix}/lib/proj49/bin
</span> build.target default
variant gui description {Builds with WxPython GUI} {
</pre><pre style='margin:0'>
</pre>