<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[148588] trunk/dports/gis/saga</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/148588">148588</a></dd>
<dt>Author</dt> <dd>vince@macports.org</dd>
<dt>Date</dt> <dd>2016-05-11 23:54:31 -0700 (Wed, 11 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>saga: bump to 2.2.7 and upgrade postgresql variants and add default variants</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgissagaPortfile">trunk/dports/gis/saga/Portfile</a></li>
<li><a href="#trunkdportsgissagafilespatchconfigurediff">trunk/dports/gis/saga/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgissagaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/saga/Portfile (148587 => 148588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/saga/Portfile 2016-05-12 06:37:34 UTC (rev 148587)
+++ trunk/dports/gis/saga/Portfile 2016-05-12 06:54:31 UTC (rev 148588)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> name saga
</span><span class="cx"> categories gis
</span><span class="cx"> license GPL
</span><del>-version 2.1.4
</del><ins>+version 2.2.7
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers vince openmaintainer
</span><span class="lines">@@ -20,15 +20,15 @@
</span><span class="cx">
</span><span class="cx"> homepage http://www.saga-gis.org/en/index.html
</span><span class="cx">
</span><del>-master_sites sourceforge:project/saga-gis/SAGA%20-%20${branch}/SAGA%20${version}/
</del><ins>+master_sites sourceforge:project/saga-gis/SAGA%20-%20${branch}/SAGA%20${version}
</ins><span class="cx"> distname saga_${version}
</span><span class="cx"> worksrcdir saga-${version}
</span><span class="cx">
</span><del>-checksums rmd160 da3376a4b9cea0cdfa112c0ce61c2da3efd81def \
- sha256 694e4102f592f512c635328c40fdeff33493f74698d9466bb654baf3247e7b76
</del><ins>+checksums rmd160 bc47877963b18f1a8627427e292ec81864a69cd2 \
+ sha256 6be4b844226bc48da4f2deb39bc732767b939e72b76506abf03f8170c54cb671
</ins><span class="cx">
</span><del>-patchfiles patch-saga_cmd_cpp.diff \
- patch-configure.diff
</del><ins>+patchfiles patch-configure.diff
+# patch-saga_cmd_cpp.diff
</ins><span class="cx">
</span><span class="cx"> wxWidgets.use wxWidgets-3.0
</span><span class="cx">
</span><span class="lines">@@ -56,24 +56,29 @@
</span><span class="cx"> #use_autoreconf yes
</span><span class="cx"> #autoreconf.args -i
</span><span class="cx">
</span><del>-configure.args --disable-openmp
</del><ins>+configure.args --disable-openmp \
+ --enable-debug
</ins><span class="cx">
</span><span class="cx"> variant python27 {
</span><span class="cx"> depends_lib-append port:python27\
</span><span class="cx"> port:swig-python
</span><span class="cx"> configure.args-append --enable-python
</span><ins>+ configure.env-append PYTHON="${prefix}/bin/python2.7"
+ configure.env-append PYTHON_VERSION="2.7"
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant postgresql92 conflicts postgresql93 {
- depends_lib-append port:postgresql92
- configure.args-append --with-postgresql=${prefix}/lib/postgresql92/bin/pg_config
</del><ins>+variant postgresql95 conflicts postgresql94 {
+ depends_lib-append port:postgresql95
+ configure.args-append --with-postgresql=${prefix}/lib/postgresql95/bin/pg_config
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant postgresql93 conflicts postgresql92 {
- depends_lib-append port:postgresql93
- configure.args-append --with-postgresql=${prefix}/lib/postgresql93/bin/pg_config
</del><ins>+variant postgresql94 conflicts postgresql93 {
+ depends_lib-append port:postgresql94
+ configure.args-append --with-postgresql=${prefix}/lib/postgresql94/bin/pg_config
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+default_variants +postgresql95 +python27
+
</ins><span class="cx"> post-destroot {
</span><span class="cx"> if {[variant_isset python27]} {
</span><span class="cx"> file mkdir ${destroot}${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7
</span><span class="lines">@@ -82,4 +87,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+configure.ldflags-append -gdwarf-3
+configure.cxxflags-append -gdwarf-3
+
</ins><span class="cx"> livecheck.regex ${name}_(\[0-9a-z.\]+)${extract.suffix}
</span></span></pre></div>
<a id="trunkdportsgissagafilespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/saga/files/patch-configure.diff (148587 => 148588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/saga/files/patch-configure.diff 2016-05-12 06:37:34 UTC (rev 148587)
+++ trunk/dports/gis/saga/files/patch-configure.diff 2016-05-12 06:54:31 UTC (rev 148588)
</span><span class="lines">@@ -1,33 +1,6 @@
</span><del>---- configure.orig 2014-11-13 09:33:26.000000000 +0100
-+++ configure 2014-11-22 21:04:52.000000000 +0100
-@@ -2996,13 +2996,13 @@
-
- # Some tools Automake needs.
-
--ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
-
-
- AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
--AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
-
-
- AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-@@ -16942,8 +16942,8 @@
- # conditionals
-
- # wxwidgets
--# the test could be extended to check for wx-config --version too
--if test "`wx-config --list | grep unicode`" != "" ; then
-+# the test could be extended to check for /opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.0/bin/wx-config --version too
-+if test "`wx-config --list | grep unicode`" != "" ; then
- if true; then
- SAGA_UNICODE_TRUE=
- SAGA_UNICODE_FALSE='#'
-@@ -17792,16 +17792,7 @@
</del><ins>+--- configure.orig 2016-05-12 08:39:14.000000000 +0200
++++ configure 2016-05-12 08:40:48.000000000 +0200
+@@ -17863,16 +17863,7 @@
</ins><span class="cx"> #
</span><span class="cx"> # linking flags needed when embedding
</span><span class="cx"> #
</span></span></pre>
</div>
</div>
</body>
</html>