<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1e9cbd14f0337c44361ce37db752d04168f19a49">https://github.com/macports/macports-ports/commit/1e9cbd14f0337c44361ce37db752d04168f19a49</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1e9cbd14f0337c44361ce37db752d04168f19a49
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Mon Aug 21 03:25:12 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> fityk: update to 1.3.2
</span>---
math/fityk/Portfile | 32 ++++++++++++++++++--------------
math/fityk/files/patch-fix-doc.diff | 11 +++++++++++
2 files changed, 29 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/fityk/Portfile b/math/fityk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3fe91ceb30e..439f98571df 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/fityk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/fityk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,9 +6,8 @@ PortGroup github 1.0
</span> PortGroup wxWidgets 1.0
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup wojdyr fityk 1.3.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup wojdyr fityk 1.3.2 v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name fityk
</span> categories math
license GPL-2
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,13 +19,13 @@ long_description fityk is a program for nonlinear fitting of analytical \
</span> experimental data). There are also people using it to \
remove the baseline from data, or to display data only.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://fityk.nieto.pl/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://fityk.nieto.pl
</span> github.tarball_from releases
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 443a9a2cfbc3b79fdd3ce80fa7862c83a30d1876 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3d88feb96dbdca70fbfb5f8fa994cea01e77723751e5957094ca46a0c6d511fe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1518937
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8560d216333498082389da0eb9f709f0492a42e9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6da5eb6279d90b241108e36c2d4880cafec82d7225a5d49a28675a07b4360f0b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1611794
</span>
app.name fityk
app.executable fityk
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,19 +36,24 @@ wxWidgets.use wxWidgets-3.0
</span> # WARNING: dvipng command 'dvipng' cannot be run (needed for math display), check the pngmath_dvipng setting
depends_build-append port:swig-lua
<span style='display:block; white-space:pre;background:#ffe0e0;'>-boost.version 1.71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/wojdyr/fityk/issues/56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fix-doc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard \
2011
use_autoreconf yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver_nodot [string map {. {}} ${py_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:lua \
</span> port:ncurses \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_ver_nodot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${wxWidgets.port} \
</span> port:xylib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lua \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
depends_run port:gnuplot
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,10 +72,10 @@ if {[string match *clang* ${configure.compiler}]} {
</span> }
variant docs description {Build and install documentation} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py27-sphinx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py${py_ver_nodot}-sphinx
</span> # TODO: use a python PortGroup and variable
pre-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|sphinx-build|${frameworks_dir}/Python.framework/Versions/2.7/bin/sphinx-build|" ${worksrcpath}/doc/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|sphinx-build|${frameworks_dir}/Python.framework/Versions/${py_ver}/bin/sphinx-build|" ${worksrcpath}/doc/Makefile
</span> system -W ${worksrcpath}/doc make
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/fityk/files/patch-fix-doc.diff b/math/fityk/files/patch-fix-doc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b254500c283
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/fityk/files/patch-fix-doc.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;'>+--- doc/Makefile 2022-05-01 22:03:21.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/Makefile 2023-08-22 19:12:33.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SPHINX = sphinx-build -a -d ./doctrees/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-html: *.rst fitheme/* fitheme/static/* conf.py help-message.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++html: *.rst fitheme/* fitheme/static/* conf.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(SPHINX) -b html . html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f html/objects.inv html/.buildinfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>