<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1c2ed516d116ded1666fc3bd9c27e208933b6bc3">https://github.com/macports/macports-ports/commit/1c2ed516d116ded1666fc3bd9c27e208933b6bc3</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1c2ed516d11 saga: bump to 7.9.0 and sundry other improvements to the Portfile
</span>1c2ed516d11 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1c2ed516d116ded1666fc3bd9c27e208933b6bc3
</span>Author: Veence <vince@macports.org>
AuthorDate: Fri Mar 19 11:31:43 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> saga: bump to 7.9.0 and sundry other improvements to the Portfile
</span>---
gis/saga/Portfile | 77 ++++++++++++++++++++++++++++++++-----------------------
1 file changed, 45 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/saga/Portfile b/gis/saga/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4251f0ad2a2..b8415b14386 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/saga/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/saga/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,13 +3,14 @@
</span> PortSystem 1.0
PortGroup wxWidgets 1.0
wxWidgets.use wxWidgets-3.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
name saga
categories gis
license GPL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> #set branch [join [lrange [split ${version} .] 0 1] .]
platforms darwin
maintainers {vince @Veence} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +24,9 @@ long_description SAGA is yet another open source GIS targeted towards\
</span> homepage http://www.saga-gis.org/en/index.html
master_sites sourceforge:project/saga-gis/SAGA%20-%207/SAGA%20-%20${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 62dc55a24e32f4accb75222d83eb70a0c7135cb1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f3c0f805bd48c3afbad56a35b6b0aa40e8e92799ed0ef0d682aea275fa36fbbc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4742356
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9dac3784a44588af64f9dc95eeb38d8f24f6c348 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a1bdb725b42707134ed5003ccd484b8e0a3960147dd29c26f094fad9bb0f05d8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5529296
</span>
patchfiles patch-configure.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,12 +36,13 @@ depends_build port:autoconf \
</span>
depends_lib port:geos \
port:gdal \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj8 \
</span> port:liblas \
port:jasper \
port:fftw-3 \
port:unixODBC \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qhull
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qhull \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:triangle
</span>
depends_lib-append port:${wxWidgets.port}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,53 +59,64 @@ post-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append -I${prefix}/lib/proj6/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append -I${prefix}/lib/proj8/include
</span> configure.cxxflags-append -std=c++11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -L${prefix}/lib/proj6/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -L${prefix}/lib/proj8/lib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-openmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-debug \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-triangle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-libfire \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-openmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-debug \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libfire \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gui
</span>
variant gui description "build the GUI interface" {
configure.args-delete --disable-gui
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description "build Python 2.7 bindings" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python27\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python description "build Python 3.9 bindings" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python39 \
</span> port:swig-python
configure.args-append --enable-python
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PYTHON_VERSION=2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PYTHON=${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PYTHON_VERSION=3.9
</span> }
variant libfire {
configure.args-delete --disable-libfire
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql11 conflicts postgresql10 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-postgresql=${prefix}/lib/postgresql11/bin/pg_config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Database variants (carried over from gdal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_suffixes {10 11 12 13}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set portsgresql_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_default_variant "if {"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql10 conflicts postgresql11 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-postgresql=${prefix}/lib/postgresql10/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach s ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend portsgresql_variants postgresql${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set postgresql_default_variant "${postgresql_default_variant}!\[variant_isset postgresql${s}] && "
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset postgresql11] && ![variant_isset postgresql10]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +postgresql11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_default_variant [string range ${postgresql_default_variant} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_default_variant "${postgresql_default_variant}} {default_variants +postgresql${s}}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval $postgresql_default_variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach s ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set p postgresql${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set i [lsearch -exact ${portsgresql_variants} ${p}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set c [lreplace ${portsgresql_variants} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Enable PostgreSQL ${s} support" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-postgresql=${prefix}/lib/postgresql${s}/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PKG_CONFIG_PATH=${prefix}/lib/postgresql${s}/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${destroot}${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/lib/python2.7/site-packages \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${destroot}${frameworks_dir}/Python.framework/Versions/3.9/lib/python3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${destroot}${prefix}/lib/python3.9/site-packages \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/Python.framework/Versions/3.9/lib/python3.9/site-packages
</span> }
}
</pre><pre style='margin:0'>
</pre>