<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2575c11554ba0b01eafcac48a867c7fec141ae7f">https://github.com/macports/macports-ports/commit/2575c11554ba0b01eafcac48a867c7fec141ae7f</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 2575c11554b mathgl: update to 2.5, drop qt4 variant, update python to 3.8
</span>2575c11554b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2575c11554ba0b01eafcac48a867c7fec141ae7f
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Wed Dec 8 11:13:50 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> mathgl: update to 2.5, drop qt4 variant, update python to 3.8
</span>---
math/mathgl/Portfile | 47 +++++++++++++++++++++----------------
math/mathgl/files/patch-python.diff | 11 ---------
2 files changed, 27 insertions(+), 31 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/mathgl/Portfile b/math/mathgl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d6dee520271..a99f777d071 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/mathgl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/mathgl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,25 +4,26 @@ PortSystem 1.0
</span> PortGroup cmake 1.0
name mathgl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.4.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories math
license GPL-3
maintainers {mps @Schamschula} openmaintainer
description MathGL is a library for making high-quality scientific graphics.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description} MathGL is also a library for the fast data plotting \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and data processing of large data arrays a library for working in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- window and console modes and for easy embedding into other programs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and a library with large and growing set of graphics.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description} MathGL is also a library for the fast data \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plotting and data processing of large data arrays a library for \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ working in window and console modes and for easy embedding into \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ other programs and a library with large and growing set of graphics.
</span> platforms darwin
homepage http://mathgl.sourceforge.net/
master_sites sourceforge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ff6b87430832ea45a68ebd2f581ccfa0d3b22a8a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0e5977196635962903eaff9b2f759e5b89108339b6e71427036c92bfaf3149e9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 23917716
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6abade12b455817a82b98752a384af5bc4f7ef63 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f58178a31f35cc5a75ed3ef1dce8cdaf4102903e69672ef38cebfe648ba927db \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23974688
</span>
depends_lib-append path:lib/libfltk.dylib:fltk \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-runtime \
</span> port:giflib \
port:libpng \
path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +32,10 @@ depends_lib-append path:lib/libfltk.dylib:fltk \
</span> port:hdf5
# find correct site-package location
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#patchfiles-append patch-python.diff
</span>
configure.args-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-arma=OFF \
</span> -Denable-fltk=ON \
-Denable-gif=ON \
-Denable-png=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,12 +60,17 @@ configure.args-append \
</span> configure.cflags-append \
-DH5_USE_18_API
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt4 description {Enable Qt4 widget} conflicts qt5 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -Denable-qt4=OFF -Denable-qt4=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt5 description {Enable Qt5 widget} conflicts qt4 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# currently broken
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://sourceforge.net/p/mathgl/discussion/508393/thread/fb61ebd073/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# variant arma description {Enable armadillo support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compiler.thread_local_storage yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# depends_lib-append port:armadillo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-replace -Denable-arma=OFF -Denable-arma=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt5 description {Enable Qt5 widget} {
</span> PortGroup qt5 1.0
depends_lib-append port:qt5-qtwebkit
configure.args-replace -Denable-qt5=OFF -Denable-qt5=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,15 +79,15 @@ variant qt5 description {Enable Qt5 widget} conflicts qt4 {
</span> #configure.args-append -Denable-json-sample=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description {Enable python 2.7 interface} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 description {Enable python 3.8 interface} {
</span> depends_build-append port:swig-python
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python38 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py38-numpy
</span>
configure.args-replace -Denable-python=OFF -Denable-python=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python3.8
</span> }
#currently broken
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/mathgl/files/patch-python.diff b/math/mathgl/files/patch-python.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4810de94f72..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/mathgl/files/patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lang/CMakeLists.txt.orig 2016-06-19 10:01:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lang/CMakeLists.txt 2016-12-17 15:47:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_directories(${PYTHON_INCLUDE_DIR} ${NUMPY_INCLUDE_PATH})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- execute_process(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(prefix='${CMAKE_INSTALL_PREFIX}')"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OUTPUT_VARIABLE MGL_PYTHON_SITE_PACKAGES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SWIG_MODULE_mathgl_EXTRA_DEPS numpy.i ${src_imp_dep})
</span></pre><pre style='margin:0'>
</pre>