Revision: 117474 https://trac.macports.org/changeset/117474 Author: vince@macports.org Date: 2014-02-28 03:30:58 -0800 (Fri, 28 Feb 2014) Log Message: ----------- Bump to version 2.1.1 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-02-28 10:19:50 UTC (rev 117473) +++ trunk/dports/gis/saga/Portfile 2014-02-28 11:30:58 UTC (rev 117474) @@ -7,8 +7,8 @@ name saga categories gis license GPL -version 2.1.0 -revision 3 +version 2.1.1 +#revision 3 platforms darwin maintainers vince openmaintainer @@ -20,16 +20,17 @@ homepage http://www.saga-gis.org/en/index.html -master_sites ftp://ftp.cimaxonline.fr -distname saga_${version}_src +master_sites http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.1/SAGA%202.1.1 +distname saga_${version} +worksrcdir saga-${version} -use_zip yes +#use_zip yes -checksums rmd160 558332c890049c8c05b802aa2e413be2314697df \ - sha256 eb4cfd9e1028a52d272bc2fe878ba4971b70fb79e6f73234e4c1519586a58a6c +checksums rmd160 61a74a1ac3abb2eabe184140be217fda1e83bb40 \ + sha256 254fb0fb885ffe73aa2a024f774e05ee0fb1625d89754f70b6020a7d34bbd2fe -patchfiles patch-configure_in.diff \ - patch-saga_cmd_cpp.diff +patchfiles patch-saga_cmd_cpp.diff \ + patch-configure.diff wxWidgets.use wxWidgets-3.0 @@ -46,16 +47,16 @@ port:unixodbc post-patch { - reinplace -E "s|wx-config|${wxWidgets.wxconfig}|" ${worksrcpath}/configure.in + reinplace -E "s|wx-config|${wxWidgets.wxconfig}|" ${worksrcpath}/configure - set mkfiles [exec find ${worksrcpath} -type f -name Makefile.am] + set mkfiles [exec find ${worksrcpath} -type f -name Makefile.in] foreach makefile ${mkfiles} { reinplace -E "s|wx-config|${wxWidgets.wxconfig}|" ${makefile} } } -use_autoreconf yes -autoreconf.args -i +#use_autoreconf yes +#autoreconf.args -i configure.args --disable-openmp configure.cppflags-append -I${prefix}/lib/proj47/include @@ -66,7 +67,17 @@ configure.args-append --enable-python } +variant postgresql92 conflict postgresql93 { + depends_lib-append port:postgresql92 + configure.args-append --with-postgresql=${prefix}/lib/postgresql92/bin/pg_config +} +variant postgresql93 conflicts postgresql92 { + depends_lib-append port:postgresql93 + configure.args-append --with-postgresql=${prefix}/lib/postgresql93/bin/pg_config +} + + livecheck.type regex livecheck.url ${master_sites} livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)\\.tar Modified: trunk/dports/gis/saga/files/patch-configure.diff =================================================================== --- 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) @@ -1,24 +1,35 @@ ---- 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; } +--- configure.old 2014-02-28 12:11:50.000000000 +0100 ++++ configure 2014-02-28 12:13:12.000000000 +0100 +@@ -2600,13 +2600,13 @@ -- -- # -- # linking flags needed when embedding -- # -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5 + # 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 -$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:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5 +- { $as_echo "$as_me:$LINENO: result: $PYTHON_EXTRA_LDFLAGS" >&5 -$as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; } -- -- ++ PYTHON_EXTRA_LDFLAGS= + + # - # final check to see if everything compiles alright - #