<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/888adc1ac0255b1447afe8d51d8197175f2ec5ef">https://github.com/macports/macports-ports/commit/888adc1ac0255b1447afe8d51d8197175f2ec5ef</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 888adc1ac0255b1447afe8d51d8197175f2ec5ef
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed May 29 02:49:36 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> plplot: non-functional: make portfile readable
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-authored-by: Ryan Carsten Schmidt <ryandesign@macports.org>
</span>---
science/plplot/Portfile | 134 +++++++++++++++++++-----------------------------
1 file changed, 53 insertions(+), 81 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 d6554ef399d..7aa68e4e8aa 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;'>@@ -8,20 +8,19 @@ PortGroup wxWidgets 1.0
</span> name plplot
version 5.15.0
revision 6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {takeshi @tenomoto} openmaintainer
categories science
license LGPL
description Scientific plotting package, double precision version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ebfca2cb1221e2cafa9e8d002cea421b8123b224 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b92de4d8f626a9b20c84fc94f4f6a9976edd76e33fb1eae44f6804bdcc628c7b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 15380293
</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> master_sites sourceforge:project/${name}/${name}/${version}%20Source/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://plplot.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://plplot.sourceforge.net
</span> set description_base "PLplot is a cross-platform software package for \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-creating scientific plots. To help accomplish that task it is organized as a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-core C library, language bindings for that library, and device drivers which \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-control how the plots are presented in non-interactive and interactive \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+creating scientific plots. To help accomplish that task it is organized \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+as a core C library, language bindings for that library, and device drivers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+which control how the plots are presented in non-interactive and interactive \
</span> plotting contexts."
long_description ${description_base} This port uses double precision.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,24 +29,24 @@ patchfiles-append patch-src-plmap.c.diff
</span>
compilers.choose fc f90
compilers.setup default_fortran
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2011
</span>
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:qhull \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span> port:antigraingeometry \
port:fontconfig \
port:freefont-ttf \
port:freetype \
port:libharu \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span> port:libLASi \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig-tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qhull \
</span> port:shapelib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:swig-tcl \
</span> port:tcl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|-ObjC|-ObjC -framework AquaTerm|" ${worksrcpath}/cmake/modules/aqt.cmake
reinplace "s|-framework AquaTerm|-F${frameworks_dir} -framework AquaTerm|" ${worksrcpath}/cmake/modules/aqt.cmake
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,9 +172,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_fortran=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_fortran=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_Fortran_COMPILER=\"${configure.fc}\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_fortran=OFF -DENABLE_fortran=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCMAKE_Fortran_COMPILER=\"${configure.fc}\" \
</span> -DF95_MOD_DIR=${prefix}/include/plplot
if {[variant_isset g95]} {
configure.args-append -DCMAKE_Fortran_FLAGS=\"${configure.fflags} -fno-second-underscore\"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,17 +184,16 @@ if {[fortran_variant_isset]} {
</span> }
variant octave description {Add support for Octave} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:swig-octave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_octave=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_octave=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- license-append GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:swig-octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_octave=OFF -DENABLE_octave=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license-append GPL-2+
</span> }
variant java description {Add support for Java} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:swig-java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_java=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_java=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:swig-java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_java=OFF -DENABLE_java=ON
</span> }
variant ocaml description {Add support for OCaml} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,9 +203,8 @@ variant ocaml description {Add support for OCaml} {
</span> port:swig-ocaml \
port:ocaml-camlidl \
port:ocaml-findlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_ocaml=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_ocaml=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOCAML_HAS_CAIRO=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_ocaml=OFF -DENABLE_ocaml=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DOCAML_HAS_CAIRO=OFF \
</span> -DOCAML_HAS_GTK=OFF
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -216,16 +212,14 @@ variant python27 description {Add support for python27} {
</span> depends_lib-append port:python27 \
port:py27-numpy \
port:swig-python
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_python=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_python=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DHAVE_NUMPY:BOOL=ON \
</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 -DHAVE_NUMPY:BOOL=ON \
</span> -DPYTHON_INCLUDE_PATH=${frameworks_dir}/Python.framework/Versions/2.7/Headers
}
variant py27_pyqt4 requires python27 description {Add support for pyQT4 using python27} {
depends_lib-append port:py27-pyqt4
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_pyqt4=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_pyqt4=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_pyqt4=OFF -DENABLE_pyqt4=ON
</span> }
variant gdc description {Use dmd variant instead} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,8 +233,7 @@ variant dmd description {Add support for D} {
</span> patch-examples-d.diff \
patch-bindings-d-plplot.d.diff \
patch-cmake-modules-language_support-cmake-CMakeDInformation.cmake.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_d=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_d=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_d=OFF -DENABLE_d=ON
</span> configure.env-append D_PATH=${prefix}
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,8 +244,7 @@ variant dmd description {Add support for D} {
</span>
variant lua description {Add support for Lua} {
depends_lib-append port:swig-lua
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_lua=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_lua=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_lua=OFF -DENABLE_lua=ON
</span> }
variant deprecated description {Allow build of deprecated API} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,48 +253,33 @@ variant deprecated description {Allow build of deprecated API} {
</span>
variant aquaterm description {Add support for Aquaterm} {
depends_lib-append port:aquaterm
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DPLD_aqt=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPLD_aqt=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DAQT_FRAMEWORK=${frameworks_dir}/AquaTerm.framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPLD_aqt=OFF -DPLD_aqt=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DAQT_FRAMEWORK=${frameworks_dir}/AquaTerm.framework
</span> }
variant qt4 description {Add support for Qt4} {
depends_lib-append bin:qmake:qt4-mac
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_qt=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_bmpqt=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_jpgqt=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_pngqt=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_ppmqt=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_epsqt=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_pdfqt=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_tiffqt=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_qtwidget=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_svgqt=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_extqt=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_memqt=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_qtwidget=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_qt=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4/bin/qmake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_bmpqt=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_jpgqt=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_pngqt=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_ppmqt=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_epsqt=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_pdfqt=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_tiffqt=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_qtwidget=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_svgqt=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_extqt=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_memqt=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_qtwidget=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_qt=OFF -DENABLE_qt=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPLD_bmpqt=OFF -DPLD_bmpqt=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPLD_epsqt=OFF -DPLD_epsqt=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPLD_extqt=OFF -DPLD_extqt=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPLD_jpgqt=OFF -DPLD_jpgqt=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPLD_memqt=OFF -DPLD_memqt=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPLD_pdfqt=OFF -DPLD_pdfqt=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPLD_pngqt=OFF -DPLD_pngqt=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPLD_ppmqt=OFF -DPLD_ppmqt=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPLD_qtwidget=OFF -DPLD_qtwidget=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPLD_svgqt=OFF -DPLD_svgqt=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPLD_tiffqt=OFF -DPLD_tiffqt=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4/bin/qmake
</span> }
variant wxwidgets description {Add support for wxWidgets} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # It is needed to use C++ subports, otherwise build suceeds but binaries fail to launch:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # It is needed to use C++ subports, otherwise build succeeds but binaries fail to launch:
</span> # Fatal Error: Mismatch between the program and library build versions detected.
# The library used 3.0 (wchar_t,compiler with C++ ABI 1002,wx containers,compatible with 2.8),
# and your program used 3.0 (wchar_t,compiler with C++ ABI 1018,wx containers,compatible with 2.8).
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Also, wxWidgets-3.0 does not work correctly on early macOS versions, use wxGTK there.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Also, wxWidgets-3.0 does not work correctly on early macOS versions; use wxGTK there.
</span> if {${os.platform} eq "darwin" && ${os.major} > 10} {
wxWidgets.use wxWidgets-3.0-cxx11
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -315,22 +292,17 @@ variant wxwidgets description {Add support for wxWidgets} {
</span> -DOLD_WXWIDGETS=ON
}
depends_lib-append port:${wxWidgets.port}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DPLD_wxwidgets=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_wxwidgets=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPLD_wxwidgets=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_wxwidgets=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPLD_wxwidgets=OFF -DPLD_wxwidgets=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_wxwidgets=OFF -DENABLE_wxwidgets=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig}
</span> }
# X11 notes: Tk binding fails in configure
variant x11 {
depends_lib-append path:lib/pkgconfig/pango.pc:pango
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPLD_xcairo=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_xwin=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_xfig=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DPLD_xcairo=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_xwin=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPLD_xfig=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DPLD_xcairo=OFF -DPLD_xcairo=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPLD_xfig=OFF -DPLD_xfig=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPLD_xwin=OFF -DPLD_xwin=ON
</span> }
livecheck.type regex
</pre><pre style='margin:0'>
</pre>