[148588] trunk/dports/gis/saga

[vince at macports.org]

Revision: 148588
          https://trac.macports.org/changeset/148588
Author:   vince at macports.org
Date:     2016-05-11 23:54:31 -0700 (Wed, 11 May 2016)
Log Message:
-----------
saga: bump to 2.2.7 and upgrade postgresql variants and add default variants

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	2016-05-12 06:37:34 UTC (rev 148587)
+++ trunk/dports/gis/saga/Portfile	2016-05-12 06:54:31 UTC (rev 148588)
@@ -7,7 +7,7 @@
 name                saga
 categories          gis
 license             GPL
-version             2.1.4
+version             2.2.7
 set branch          [join [lrange [split ${version} .] 0 1] .]
 platforms           darwin
 maintainers         vince openmaintainer
@@ -20,15 +20,15 @@
 
 homepage            http://www.saga-gis.org/en/index.html
 
-master_sites        sourceforge:project/saga-gis/SAGA%20-%20${branch}/SAGA%20${version}/
+master_sites        sourceforge:project/saga-gis/SAGA%20-%20${branch}/SAGA%20${version}
 distname            saga_${version}
 worksrcdir          saga-${version}
 
-checksums           rmd160  da3376a4b9cea0cdfa112c0ce61c2da3efd81def \
-                    sha256  694e4102f592f512c635328c40fdeff33493f74698d9466bb654baf3247e7b76
+checksums           rmd160  bc47877963b18f1a8627427e292ec81864a69cd2 \
+                    sha256  6be4b844226bc48da4f2deb39bc732767b939e72b76506abf03f8170c54cb671
 
-patchfiles          patch-saga_cmd_cpp.diff \
-                    patch-configure.diff 
+patchfiles          patch-configure.diff
+#                    patch-saga_cmd_cpp.diff 
 
 wxWidgets.use       wxWidgets-3.0
 
@@ -56,24 +56,29 @@
 #use_autoreconf              yes
 #autoreconf.args             -i
 
-configure.args              --disable-openmp
+configure.args              --disable-openmp \
+                            --enable-debug
 
 variant python27 {
     depends_lib-append      port:python27\
                             port:swig-python
     configure.args-append   --enable-python
+    configure.env-append    PYTHON="${prefix}/bin/python2.7"
+    configure.env-append    PYTHON_VERSION="2.7"
 }
 
-variant postgresql92 conflicts postgresql93 {
-    depends_lib-append      port:postgresql92
-    configure.args-append   --with-postgresql=${prefix}/lib/postgresql92/bin/pg_config
+variant postgresql95 conflicts postgresql94 {
+    depends_lib-append      port:postgresql95
+    configure.args-append   --with-postgresql=${prefix}/lib/postgresql95/bin/pg_config
 }
 
-variant postgresql93 conflicts postgresql92 {
-    depends_lib-append      port:postgresql93
-    configure.args-append   --with-postgresql=${prefix}/lib/postgresql93/bin/pg_config
+variant postgresql94 conflicts postgresql93 {
+    depends_lib-append      port:postgresql94
+    configure.args-append   --with-postgresql=${prefix}/lib/postgresql94/bin/pg_config
 }
 
+default_variants    +postgresql95 +python27
+
 post-destroot {
     if {[variant_isset python27]} {
         file mkdir ${destroot}${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7
@@ -82,4 +87,7 @@
     }
 }
 
+configure.ldflags-append -gdwarf-3
+configure.cxxflags-append  -gdwarf-3
+
 livecheck.regex             ${name}_(\[0-9a-z.\]+)${extract.suffix}

Modified: trunk/dports/gis/saga/files/patch-configure.diff
===================================================================
--- 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)
@@ -1,33 +1,6 @@
---- 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 @@
+--- configure.orig	2016-05-12 08:39:14.000000000 +0200
++++ configure	2016-05-12 08:40:48.000000000 +0200
+@@ -17863,16 +17863,7 @@
  	#
  	# linking flags needed when embedding
  	#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160511/bf465037/attachment.html>