<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/78b7d391a1dbf0e1c77c2af474794336fc89c945">https://github.com/macports/macports-ports/commit/78b7d391a1dbf0e1c77c2af474794336fc89c945</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 78b7d39 saga: create a gui variant and remove an obsolete patch
</span>78b7d39 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 78b7d391a1dbf0e1c77c2af474794336fc89c945
</span>Author: Veence <vince@macports.org>
AuthorDate: Fri Dec 8 17:35:09 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> saga: create a gui variant and remove an obsolete patch
</span>---
gis/saga/Portfile | 41 +++++++++++++++++-----------------
gis/saga/files/patch-saga_cmd_cpp.diff | 10 ---------
2 files changed, 21 insertions(+), 30 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 2548241..83459cd 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;'>@@ -7,7 +7,7 @@ name saga
</span> categories gis
license GPL
version 6.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> #set branch [join [lrange [split ${version} .] 0 1] .]
platforms darwin
maintainers vince openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,14 +30,11 @@ checksums rmd160 dc08c3dab177b9989396599f0fc7c9a30a12de8a \
</span> patchfiles patch-configure.diff
# patch-saga_cmd_cpp.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-wxWidgets.use wxWidgets-3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:autoconf \
port:automake \
port:libtool
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:${wxWidgets.port} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:geos \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:geos \
</span> port:gdal \
port:proj \
port:jasper \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,26 +42,30 @@ depends_lib port:${wxWidgets.port} \
</span> port:unixodbc \
port:qhull
<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:#e0ffe0;'>+configure.args --disable-openmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-debug \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-triangle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libfire
</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;'>+variant gui description "build the GUI interface" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxWidgets-3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#ffe0e0;'>-#use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#autoreconf.args -i
</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:#ffe0e0;'>-configure.args --disable-openmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-debug \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-triangle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-libfire
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 description "build Python 2.7 bindings" {
</span> depends_lib-append port:python27\
port:swig-python
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append --enable-python
configure.env-append PYTHON="${prefix}/bin/python2.7"
configure.env-append PYTHON_VERSION="2.7"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +80,7 @@ variant postgresql10 conflicts postgresql96 {
</span> configure.args-append --with-postgresql=${prefix}/lib/postgresql10/bin/pg_config
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql96 conflicts postgresql95 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql96 conflicts postgresql10 {
</span> depends_lib-append port:postgresql96
configure.args-append --with-postgresql=${prefix}/lib/postgresql96/bin/pg_config
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/saga/files/patch-saga_cmd_cpp.diff b/gis/saga/files/patch-saga_cmd_cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8f94424..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/saga/files/patch-saga_cmd_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2013-07-27 12:43:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/saga_core/saga_cmd/saga_cmd.cpp 2013-07-27 12:43:44.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,6 +63,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //---------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <wx/app.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <wx/utils.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <locale.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "callback.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>