<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7e931b723ec1b7f8ea11991bb3174846ffde9412">https://github.com/macports/macports-ports/commit/7e931b723ec1b7f8ea11991bb3174846ffde9412</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7e931b723ec1b7f8ea11991bb3174846ffde9412
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Dec 17 16:30:49 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> mathgl: enable more capabilities
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add support for writing to a png file, a jpeg file, a qt4 window,
</span><span style='display:block; white-space:pre;color:#404040;'> and a qt5 window.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add zlib support.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix python support.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove unused dependencies on ruby and guile.
</span>---
math/mathgl/Portfile | 64 +++++++++++++++++++++++++++++++++----
math/mathgl/files/patch-jpeg.diff | 11 +++++++
math/mathgl/files/patch-python.diff | 11 +++++++
3 files changed, 80 insertions(+), 6 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 f38ddb8..a493ad3 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;'>@@ -1,11 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
PortGroup cmake 1.0
name mathgl
version 2.3.5.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories math
license GPL-3
maintainers mps openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,22 +23,74 @@ checksums rmd160 d0cfad3fff8c11870b388997fe0735c653e29eb5 \
</span>
depends_lib-append path:lib/libfltk.dylib:fltk \
port:giflib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span> port:gsl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:guile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hdf5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ruby22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hdf5
</span>
patchfiles patch-CMakeLists.txt.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# gif_lib.h defines TRUE and FALSE as a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "backward-compatibility hack; these will go away in 5.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TRUE and FALSE are also defined in jmorecfg.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-jpeg.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# find correct site-package location
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-fltk=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-gif=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-png=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-jpeg=ON \
</span> -Denable-gsl=ON \
-Denable-hdf5=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Denable-openmp=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-openmp=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-zlib=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-glut=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-wx=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-pdf=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-qt4=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-qt5=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-python=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-lua=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Denable-octave=OFF
</span>
configure.cflags-append \
-DH5_USE_18_API
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt4 description {Enable Qt4 widget} conflicts qt5 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Denable-qt4=OFF -Denable-qt4=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} conflicts qt4 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qt5-qtwebkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Denable-qt5=OFF -Denable-qt5=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid dependency on qt5-qtwebkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #configure.args-append -Denable-json-sample=OFF
</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 python27 description {Enable python 2.7 interface} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Denable-python=OFF -Denable-python=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7
</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;'>+#currently broken
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#variant pdf description {Enable pdf support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# depends_lib-append port:libharu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-replace -Denable-pdf=OFF -Denable-pdf=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url ${homepage}/doc_en/Download.html
livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/mathgl/files/patch-jpeg.diff b/math/mathgl/files/patch-jpeg.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5fbf3ca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/mathgl/files/patch-jpeg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/export.cpp.orig 2016-06-19 10:01:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/export.cpp 2016-12-17 13:57:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,6 +41,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if MGL_HAVE_GIF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gif_lib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef TRUE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef FALSE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //-----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int MGL_NO_EXPORT mgl_pnga_save(const char *fname, int w, int h, unsigned char **p)
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4810de9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/mathgl/files/patch-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lang/CMakeLists.txt.orig 2016-06-19 10:01:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lang/CMakeLists.txt 2016-12-17 15:47:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories(${PYTHON_INCLUDE_DIR} ${NUMPY_INCLUDE_PATH})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 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:#e0ffe0;'>++ COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OUTPUT_VARIABLE MGL_PYTHON_SITE_PACKAGES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(SWIG_MODULE_mathgl_EXTRA_DEPS numpy.i ${src_imp_dep})
</span></pre><pre style='margin:0'>
</pre>