[128555] trunk/dports/gis/saga

[vince at macports.org]

Revision: 128555
          https://trac.macports.org/changeset/128555
Author:   vince at macports.org
Date:     2014-11-23 00:00:19 -0800 (Sun, 23 Nov 2014)
Log Message:
-----------
saga: upgrade to 2.1.4

Modified Paths:
--------------
    trunk/dports/gis/saga/Portfile
    trunk/dports/gis/saga/files/patch-configure.diff

Modified: trunk/dports/gis/saga/Portfile
===================================================================
--- trunk/dports/gis/saga/Portfile	2014-11-23 06:12:49 UTC (rev 128554)
+++ trunk/dports/gis/saga/Portfile	2014-11-23 08:00:19 UTC (rev 128555)
@@ -7,7 +7,7 @@
 name                saga
 categories          gis
 license             GPL
-version             2.1.3
+version             2.1.4
 set branch          [join [lrange [split ${version} .] 0 1] .]
 platforms           darwin
 maintainers         vince openmaintainer
@@ -24,8 +24,8 @@
 distname            saga_${version}
 worksrcdir          saga-${version}
 
-checksums           rmd160  5bdff9359ec52d7274b7cdf247a4095d666b26fa \
-                    sha256  a357739b0ce553f24400bfb2860f3eef34b5cee08d20ae5bd83fb789622b25cb
+checksums           rmd160  da3376a4b9cea0cdfa112c0ce61c2da3efd81def \
+                    sha256  694e4102f592f512c635328c40fdeff33493f74698d9466bb654baf3247e7b76
 
 patchfiles          patch-saga_cmd_cpp.diff \
                     patch-configure.diff 
@@ -45,7 +45,7 @@
                     port:unixodbc
 
 post-patch  {
-    reinplace -E "s|wx-config|${wxWidgets.wxconfig}|" ${worksrcpath}/configure
+#    reinplace -E "s|wx-config|${wxWidgets.wxconfig}|" ${worksrcpath}/configure
 
     set mkfiles [exec find ${worksrcpath} -type f -name Makefile.in]
     foreach makefile ${mkfiles} {

Modified: trunk/dports/gis/saga/files/patch-configure.diff
===================================================================
--- trunk/dports/gis/saga/files/patch-configure.diff	2014-11-23 06:12:49 UTC (rev 128554)
+++ trunk/dports/gis/saga/files/patch-configure.diff	2014-11-23 08:00:19 UTC (rev 128555)
@@ -1,6 +1,6 @@
---- configure.orig	2014-11-04 14:30:20.000000000 +0100
-+++ configure	2014-11-04 14:32:39.000000000 +0100
-@@ -2600,13 +2600,13 @@
+--- 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.
  
@@ -16,18 +16,29 @@
  
  
  AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-@@ -19877,16 +19877,7 @@
+@@ -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 "`/opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.0/bin/wx-config --list | grep unicode`" != "" ; then
+    if true; then
+   SAGA_UNICODE_TRUE=
+   SAGA_UNICODE_FALSE='#'
+@@ -17792,16 +17792,7 @@
  	#
  	# linking flags needed when embedding
  	#
--	{ $as_echo "$as_me:$LINENO: checking python extra linking flags" >&5
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5
 -$as_echo_n "checking python extra linking flags... " >&6; }
 -	if test -z "$PYTHON_EXTRA_LDFLAGS"; then
 -		PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
 -			conf = distutils.sysconfig.get_config_var; \
 -			print (conf('LINKFORSHARED'))"`
 -	fi
--	{ $as_echo "$as_me:$LINENO: result: $PYTHON_EXTRA_LDFLAGS" >&5
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5
 -$as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; }
 -
 +    PYTHON_EXTRA_LDFLAGS=
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141123/2b8902d8/attachment-0001.html>