<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b86467c2e75a8d3d40206fb8a99084a3cb3ae53e">https://github.com/macports/macports-ports/commit/b86467c2e75a8d3d40206fb8a99084a3cb3ae53e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b86467c2e75a8d3d40206fb8a99084a3cb3ae53e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Dec 20 04:54:12 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> chrony: Fix default variants
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Only enable the +nettle variant by default if the conflicting +tomcrypt
</span><span style='display:block; white-space:pre;color:#404040;'> variant hasn't been selected by the user.
</span>---
sysutils/chrony/Portfile | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/chrony/Portfile b/sysutils/chrony/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 57cec9fafab..b9bd775a6b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/chrony/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/chrony/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,9 +29,8 @@ long_description Chrony can synchronise the system clock with NTP servers, \
</span> homepage https://chrony.tuxfamily.org/
master_sites https://download.tuxfamily.org/chrony/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +libedit +nettle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --localstatedir=${prefix}/var \
--sysconfdir=${prefix}/etc \
--with-pidfile=${prefix}/var/run/chronyd.pid \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +39,7 @@ configure.args --localstatedir=${prefix}/var \
</span> --without-nettle \
--without-nss \
--without-tomcrypt
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.target install install-docs
destroot.keepdirs ${destroot}${prefix}/var/log/${name} \
${destroot}${prefix}/var/run/${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +68,12 @@ variant tomcrypt conflicts nettle description {Use tomcrypt for additional hash
</span> configure.args-delete --without-tomcrypt
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +libedit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset tomcrypt]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +nettle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace -W ${worksrcpath} "s|/etc/|${prefix}/etc/|g" \
examples/chrony.conf.example2 \
</pre><pre style='margin:0'>
</pre>