<!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>[117474] 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/117474">117474</a></dd>
<dt>Author</dt> <dd>vince@macports.org</dd>
<dt>Date</dt> <dd>2014-02-28 03:30:58 -0800 (Fri, 28 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Bump to version 2.1.1</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 (117473 => 117474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/saga/Portfile 2014-02-28 10:19:50 UTC (rev 117473)
+++ trunk/dports/gis/saga/Portfile 2014-02-28 11:30:58 UTC (rev 117474)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> name saga
</span><span class="cx"> categories gis
</span><span class="cx"> license GPL
</span><del>-version 2.1.0
-revision 3
</del><ins>+version 2.1.1
+#revision 3
</ins><span class="cx"> platforms darwin
</span><span class="cx"> maintainers vince openmaintainer
</span><span class="cx">
</span><span class="lines">@@ -20,16 +20,17 @@
</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 ftp://ftp.cimaxonline.fr
-distname saga_${version}_src
</del><ins>+master_sites http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.1/SAGA%202.1.1
+distname saga_${version}
+worksrcdir saga-${version}
</ins><span class="cx">
</span><del>-use_zip yes
</del><ins>+#use_zip yes
</ins><span class="cx">
</span><del>-checksums rmd160 558332c890049c8c05b802aa2e413be2314697df \
- sha256 eb4cfd9e1028a52d272bc2fe878ba4971b70fb79e6f73234e4c1519586a58a6c
</del><ins>+checksums rmd160 61a74a1ac3abb2eabe184140be217fda1e83bb40 \
+ sha256 254fb0fb885ffe73aa2a024f774e05ee0fb1625d89754f70b6020a7d34bbd2fe
</ins><span class="cx">
</span><del>-patchfiles patch-configure_in.diff \
- patch-saga_cmd_cpp.diff
</del><ins>+patchfiles patch-saga_cmd_cpp.diff \
+ patch-configure.diff
</ins><span class="cx">
</span><span class="cx"> wxWidgets.use wxWidgets-3.0
</span><span class="cx">
</span><span class="lines">@@ -46,16 +47,16 @@
</span><span class="cx"> port:unixodbc
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><del>- reinplace -E "s|wx-config|${wxWidgets.wxconfig}|" ${worksrcpath}/configure.in
</del><ins>+ reinplace -E "s|wx-config|${wxWidgets.wxconfig}|" ${worksrcpath}/configure
</ins><span class="cx">
</span><del>- set mkfiles [exec find ${worksrcpath} -type f -name Makefile.am]
</del><ins>+ set mkfiles [exec find ${worksrcpath} -type f -name Makefile.in]
</ins><span class="cx"> foreach makefile ${mkfiles} {
</span><span class="cx"> reinplace -E "s|wx-config|${wxWidgets.wxconfig}|" ${makefile}
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-use_autoreconf yes
-autoreconf.args -i
</del><ins>+#use_autoreconf yes
+#autoreconf.args -i
</ins><span class="cx">
</span><span class="cx"> configure.args --disable-openmp
</span><span class="cx"> configure.cppflags-append -I${prefix}/lib/proj47/include
</span><span class="lines">@@ -66,7 +67,17 @@
</span><span class="cx"> configure.args-append --enable-python
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant postgresql92 conflict postgresql93 {
+ depends_lib-append port:postgresql92
+ configure.args-append --with-postgresql=${prefix}/lib/postgresql92/bin/pg_config
+}
</ins><span class="cx">
</span><ins>+variant postgresql93 conflicts postgresql92 {
+ depends_lib-append port:postgresql93
+ configure.args-append --with-postgresql=${prefix}/lib/postgresql93/bin/pg_config
+}
+
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${master_sites}
</span><span class="cx"> livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)\\.tar
</span></span></pre></div>
<a id="trunkdportsgissagafilespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/saga/files/patch-configure.diff (117473 => 117474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/saga/files/patch-configure.diff 2014-02-28 10:19:50 UTC (rev 117473)
+++ trunk/dports/gis/saga/files/patch-configure.diff 2014-02-28 11:30:58 UTC (rev 117474)
</span><span class="lines">@@ -1,24 +1,35 @@
</span><del>---- configure.orig 2013-07-25 20:38:44.000000000 +0200
-+++ configure 2013-07-25 20:39:35.000000000 +0200
-@@ -17589,21 +17589,6 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5
- $as_echo "$PYTHON_EXTRA_LIBS" >&6; }
</del><ins>+--- configure.old 2014-02-28 12:11:50.000000000 +0100
++++ configure 2014-02-28 12:13:12.000000000 +0100
+@@ -2600,13 +2600,13 @@
</ins><span class="cx">
</span><del>--
-- #
-- # linking flags needed when embedding
-- #
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5
</del><ins>+ # 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"}
+@@ -19879,15 +19879,7 @@
+ #
+ # linking flags needed when embedding
+ #
+- { $as_echo "$as_me:$LINENO: checking python extra linking flags" >&5
</ins><span class="cx"> -$as_echo_n "checking python extra linking flags... " >&6; }
</span><span class="cx"> - if test -z "$PYTHON_EXTRA_LDFLAGS"; then
</span><span class="cx"> - PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
</span><span class="cx"> - conf = distutils.sysconfig.get_config_var; \
</span><span class="cx"> - print (conf('LINKFORSHARED'))"`
</span><span class="cx"> - fi
</span><del>-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5
</del><ins>+- { $as_echo "$as_me:$LINENO: result: $PYTHON_EXTRA_LDFLAGS" >&5
</ins><span class="cx"> -$as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; }
</span><del>--
--
</del><ins>++ PYTHON_EXTRA_LDFLAGS=
+
+
</ins><span class="cx"> #
</span><del>- # final check to see if everything compiles alright
- #
</del></span></pre>
</div>
</div>
</body>
</html>