<pre style='margin:0'>
Takeshi Enomoto (tenomoto) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/da6d0873cae07ad1452c0fe0316a10bd3c472cda">https://github.com/macports/macports-ports/commit/da6d0873cae07ad1452c0fe0316a10bd3c472cda</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit da6d0873cae07ad1452c0fe0316a10bd3c472cda
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Mon Aug 12 12:04:58 2019 +0900
<span style='display:block; white-space:pre;color:#404040;'> plplot: update to 5.15.0
</span>---
science/plplot/Portfile | 23 ++++++++---------
.../plplot/files/patch-bindings-d-plplot.d.diff | 29 ++++++++++++++++++++++
.../files/patch-bindings-ocaml-CMakeLists.txt.diff | 11 --------
.../patch-bindings-ocaml-plplot_core.idl.diff | 8 +++---
...age_support-cmake-CMakeTestDCompiler.cmake.diff | 8 +++---
...ge_support-cmake-Platform-Darwin-dmd.cmake.diff | 4 +--
6 files changed, 50 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/plplot/Portfile b/science/plplot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e87632..d402bdc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/plplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/plplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,16 +6,16 @@ PortGroup compilers 1.0
</span> PortGroup wxWidgets 1.0
name plplot
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.13.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.15.0
</span> platforms darwin
maintainers {takeshi @tenomoto} openmaintainer
categories science
license LGPL
description Scientific plotting package, double precision version
master_sites sourceforge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cab9a3de2a6c73636c8d1f47c12efc88702a5aad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ec36bbee8b03d9d1c98f8fd88f7dc3415560e559b53eb1aa991c2dcf61b25d2b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 16269842
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ebfca2cb1221e2cafa9e8d002cea421b8123b224 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b92de4d8f626a9b20c84fc94f4f6a9976edd76e33fb1eae44f6804bdcc628c7b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 15380293
</span> homepage http://plplot.sourceforge.net/
set description_base "PLplot is a cross-platform software package for \
creating scientific plots. To help accomplish that task it is organized as a \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,13 +101,12 @@ configure.args-append -DBUILD_SHARED_LIBS=ON \
</span> -DPLD_qtwidget=OFF \
-DENABLE_ada=OFF \
-DENABLE_d=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_f95=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_fortran=OFF \
</span> -DENABLE_itcl=OFF \
-DENABLE_java=OFF \
-DENABLE_lua=OFF \
-DENABLE_ocaml=OFF \
-DENABLE_octave=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_pdl=OFF \
</span> -DENABLE_pyqt4=OFF \
-DENABLE_pyqt5=OFF \
-DENABLE_python=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,7 +126,7 @@ post-configure {
</span> }
if {[variant_isset universal]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\" -DENABLE_f95:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\" -DENABLE_fortran:BOOL=OFF
</span> } else {
# Adhoc fix
# cmake passes -arch to Fortran compiler
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,8 +168,8 @@ if {[variant_isset py27_pyqt4]} {
</span>
if {[fortran_variant_isset]} {
configure.ld_archflags ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_f95=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_f95=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -DENABLE_fortran=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_fortran=ON \
</span> -DCMAKE_Fortran_COMPILER=\"${configure.fc}\" \
-DF95_MOD_DIR=${prefix}/include/plplot
if {[variant_isset g95]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,8 +194,7 @@ variant java description {Add support for Java} {
</span> }
variant ocaml description {Add support for OCaml} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-bindings-ocaml-plplot_core.idl.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-bindings-ocaml-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-bindings-ocaml-plplot_core.idl.diff
</span> depends_lib-append port:ocaml \
port:swig-ocaml \
port:ocaml-camlidl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,7 +237,8 @@ variant gdc description {Use dmd variant instead} {
</span> variant dmd description {Add support for D} {
depends_lib-append port:dmd
patchfiles-append patch-cmake-modules-language_support-cmake-CMakeTestDCompiler.cmake.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-modules-language_support-cmake-Platform-Darwin-dmd.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-modules-language_support-cmake-Platform-Darwin-dmd.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-bindings-d-plplot.d.diff
</span> configure.args-delete -DENABLE_d=OFF
configure.args-append -DENABLE_d=ON
configure.env-append D_PATH=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/plplot/files/patch-bindings-d-plplot.d.diff b/science/plplot/files/patch-bindings-d-plplot.d.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..04711a3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/plplot/files/patch-bindings-d-plplot.d.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bindings/d/plplot.d.orig 2019-06-02 08:24:33.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bindings/d/plplot.d 2019-08-12 11:47:36.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -298,7 +298,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Get the current device (keyword) name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void plgdev( out string p_dev )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char cdev[1024];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char[1024] cdev;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c_plgdev( cdev.ptr );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_dev = to!string( cdev.ptr );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -306,7 +306,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Get the (current) output file name. Must be preallocated to >80 bytes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void plgfnam( out string fnam )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char cfnam[1024];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char[1024] cfnam;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c_plgfnam( cfnam.ptr );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fnam = to!string( cfnam.ptr );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -337,7 +337,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Get the current library version number
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void plgver( out string p_ver )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- char cver[1024];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char[1024] cver;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c_plgver( cver.ptr );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p_ver = to!string( cver.ptr );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/plplot/files/patch-bindings-ocaml-CMakeLists.txt.diff b/science/plplot/files/patch-bindings-ocaml-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 451dd3e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/plplot/files/patch-bindings-ocaml-CMakeLists.txt.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;'>---- bindings/ocaml/CMakeLists.txt.orig 2017-01-29 10:50:34.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bindings/ocaml/CMakeLists.txt 2017-07-17 15:06:35.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -105,7 +105,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_BINARY_DIR}/libplplot_stubs.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${OCAMLC} -ccopt -I${CAMLIDL_LIB_DIR} -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${OCAMLC} -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DPLPLOT_HAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl -L${CMAKE_BINARY_DIR}/src -lplplot ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o ${ocaml_STATIC_FLAGS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl -L${CMAKE_BINARY_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o ${ocaml_STATIC_FLAGS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEPENDS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/plplot/files/patch-bindings-ocaml-plplot_core.idl.diff b/science/plplot/files/patch-bindings-ocaml-plplot_core.idl.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 965cfde..27d0d43 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/plplot/files/patch-bindings-ocaml-plplot_core.idl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/plplot/files/patch-bindings-ocaml-plplot_core.idl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bindings/ocaml/plplot_core.idl.orig 2015-08-13 02:35:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bindings/ocaml/plplot_core.idl 2016-03-05 22:08:31.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -204,9 +204,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bindings/ocaml/plplot_core.idl.orig 2019-06-02 08:24:33.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bindings/ocaml/plplot_core.idl 2019-08-12 10:55:30.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -243,9 +243,6 @@
</span> PLFLT plgwidth(void);
PLFLT plgchrht(void);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span> // plstripc function
quote(mlmli,
"external plstripc : string -> string -> float -> float -> float -> float -> \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -327,8 +324,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -366,8 +363,8 @@
</span> ml_plsexit ()");
quote(mli, "val plunset_exit : unit -> unit");
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/plplot/files/patch-cmake-modules-language_support-cmake-CMakeTestDCompiler.cmake.diff b/science/plplot/files/patch-cmake-modules-language_support-cmake-CMakeTestDCompiler.cmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 95e255a..1ade228 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/plplot/files/patch-cmake-modules-language_support-cmake-CMakeTestDCompiler.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/plplot/files/patch-cmake-modules-language_support-cmake-CMakeTestDCompiler.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake.orig 2015-08-13 02:35:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2016-04-24 19:29:08.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,8 +97,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake.orig 2019-06-02 08:24:33.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2019-08-12 11:38:09.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,8 +98,8 @@
</span> OUTPUT_VARIABLE OUTPUT)
ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span> OUTPUT_VARIABLE OUTPUT)
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ENDIF(CMAKE_COMPILER_IS_GDC)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,8 +137,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,8 +138,8 @@
</span> OUTPUT_VARIABLE OUTPUT)
ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/plplot/files/patch-cmake-modules-language_support-cmake-Platform-Darwin-dmd.cmake.diff b/science/plplot/files/patch-cmake-modules-language_support-cmake-Platform-Darwin-dmd.cmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 66b9206..92914ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/plplot/files/patch-cmake-modules-language_support-cmake-Platform-Darwin-dmd.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/plplot/files/patch-cmake-modules-language_support-cmake-Platform-Darwin-dmd.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/modules/language_support/cmake/Platform/Darwin-dmd.cmake.orig 2015-08-13 02:35:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/modules/language_support/cmake/Platform/Darwin-dmd.cmake 2010-03-25 06:00:17.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/modules/language_support/cmake/Platform/Darwin-dmd.cmake.orig 2019-06-02 08:24:33.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/modules/language_support/cmake/Platform/Darwin-dmd.cmake 2019-08-12 11:40:59.000000000 +0900
</span> @@ -25,7 +25,7 @@
#ENDFOREACH(item)
ENDIF(CMAKE_D_BUILD_DOCS)
</pre><pre style='margin:0'>
</pre>