<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/40178d117592ec4d09b2ed6476c75e3abf073a20">https://github.com/macports/macports-ports/commit/40178d117592ec4d09b2ed6476c75e3abf073a20</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 40178d117592ec4d09b2ed6476c75e3abf073a20
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Mon Aug 21 09:11:31 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> xylib: update to 1.6
</span>---
math/xylib/Portfile | 46 +++++++++++++++++++++++------------
math/xylib/files/patch-configure.diff | 16 ------------
2 files changed, 31 insertions(+), 31 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/xylib/Portfile b/math/xylib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5dbd300f1c6..e88c1404e02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/xylib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/xylib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,16 +2,17 @@
</span>
PortSystem 1.0
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup wxWidgets 1.0
</span>
boost.depends_type build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-boost.version 1.71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+wxWidgets.use wxWidgets-3.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name xylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup wojdyr xylib 1.6 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories math
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span> license LGPL-2.1
description library for reading x-y data files
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,17 +21,34 @@ long_description xylib is a portable library for reading files that contain \
</span> x-y data from powder diffraction, spectroscopy and other \
experimental methods.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://xylib.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/xylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://xylib.sourceforge.net
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 69f2bb1d11305912eecd488b06ec0b46ae807119 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8a32a0f201e47c8f0665da44af6a1eac0aa06aa9bb61a7bd226bb723e9aebebf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 67e7607791cccfea01e7e21e10eb0bc7391802b6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 37774980be4693f178c6638478b7e050dc5c5730c547517a4b83b7e027bff39c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 606455
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${wxWidgets.port} \
</span> port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WX_CONFIG=${wxWidgets.wxconfig}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_SHARED_LIBS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGUI=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_BZIP2=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_ZLIB=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gui description "Build GUI" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGUI=OFF -DGUI=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;'>+if {(${os.platform} eq "darwin" && ${os.major} > 9) || ${os.platform} ne "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-destroot {
set docdir ${prefix}/share/doc/${subport}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,5 +59,3 @@ post-destroot {
</span> TODO \
${destroot}${docdir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/xylib/files/patch-configure.diff b/math/xylib/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2096cafceb8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/xylib/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/wojdyr/xylib/issues/4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/wojdyr/xylib/commit/eb40b1cd39c2d2bcac255bafba1f848975cb0bb0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2013-08-01 18:54:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2013-11-14 05:26:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15846,9 +15846,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # in this header would cause problems in programs using xylib.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uses_tr1_memory=`grep '#define XYLIB_USE_TR1_MEMORY ' $srcdir/xylib/cache.h | sed 's/.*\([01]\)/\1/g'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$ac_cv_header_tr1_memory" = "yes" && test $uses_tr1_memory != "1"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sed -i 's/\(#define XYLIB_USE_TR1_MEMORY\) 0/\1 1/' $srcdir/xylib/cache.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed -i.bak 's/\(#define XYLIB_USE_TR1_MEMORY\) 0/\1 1/' $srcdir/xylib/cache.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif test "$ac_cv_header_tr1_memory" != "yes" && test $uses_tr1_memory = "1"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sed -i 's/\(#define XYLIB_USE_TR1_MEMORY\) 1/\1 0/' $srcdir/xylib/cache.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed -i.bak 's/\(#define XYLIB_USE_TR1_MEMORY\) 1/\1 0/' $srcdir/xylib/cache.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this is used in Makefile.am to define XYLIB_DLL when building xyconv
</span></pre><pre style='margin:0'>
</pre>