<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/54cccce369f6a6b6abb2916a0d0632c080819d1c">https://github.com/macports/macports-ports/commit/54cccce369f6a6b6abb2916a0d0632c080819d1c</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 54cccce saga: revert some changes (configure file is confusing)
</span>54cccce is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 54cccce369f6a6b6abb2916a0d0632c080819d1c
</span>Author: Veence <vince@macports.org>
AuthorDate: Fri Dec 8 18:13:36 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> saga: revert some changes (configure file is confusing)
</span>---
gis/saga/Portfile | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
<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 83459cd..9ff0215 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;'>@@ -2,6 +2,7 @@
</span>
PortSystem 1.0
PortGroup wxWidgets 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+wxWidgets.use wxWidgets-3.0
</span>
name saga
categories gis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +29,6 @@ checksums rmd160 dc08c3dab177b9989396599f0fc7c9a30a12de8a \
</span> sha256 da5767d339c3a2cd9d5905a66251e44b8be7325aa10b673db7ea55a8d4bffe6e
patchfiles patch-configure.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-saga_cmd_cpp.diff
</span>
depends_build port:autoconf \
port:automake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,26 +40,27 @@ depends_lib port:geos \
</span> port:jasper \
port:fftw-3 \
port:unixodbc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qhull
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qhull \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${wxWidgets.port}
</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;'>+ reinplace -E "s|wx-config|${wxWidgets.wxconfig}|" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mkfiles [exec find ${worksrcpath} -type f -name Makefile.in]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach makefile ${mkfiles} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|wx-config|${wxWidgets.wxconfig}|" ${makefile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.args --disable-openmp \
--enable-debug \
--disable-triangle \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-libfire
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libfire \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gui
</span>
variant gui description "build the GUI interface" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- wxWidgets.use wxWidgets-3.0
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|wx-config|${wxWidgets.wxconfig}|" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mkfiles [exec find ${worksrcpath} -type f -name Makefile.in]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach makefile ${mkfiles} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|wx-config|${wxWidgets.wxconfig}|" ${makefile}
</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;'>+ configure.args-delete --disable-gui
</span> }
variant python27 description "build Python 2.7 bindings" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +86,9 @@ variant postgresql96 conflicts postgresql10 {
</span> configure.args-append --with-postgresql=${prefix}/lib/postgresql96/bin/pg_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +python27 +postgresql10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset postgresql10] && ![variant_isset postgresql96]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +postgresql10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-destroot {
if {[variant_isset python27]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,7 +98,7 @@ post-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -gdwarf-3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append -gdwarf-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -gdwarf-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append -gdwarf-3
</span>
livecheck.regex ${name}_(\[0-9a-z.\]+)${extract.suffix}
</pre><pre style='margin:0'>
</pre>