<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c657026bd53ad74ec63600c554fc0364891abbc5">https://github.com/macports/macports-ports/commit/c657026bd53ad74ec63600c554fc0364891abbc5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c657026bd53 gnutls: revert change to muniversal 1.1 PortGroup
</span>c657026bd53 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c657026bd53ad74ec63600c554fc0364891abbc5
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Sat Feb 25 11:37:05 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> gnutls: revert change to muniversal 1.1 PortGroup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/66998
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-ports/commit/205879d66a328f24c9349f082d694f3976a07efe
</span>---
devel/gnutls/Portfile | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gnutls/Portfile b/devel/gnutls/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 67f26610a6f..9b060debfbf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gnutls/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gnutls/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup active_variants 1.1
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup conflicts_build 1.0
PortGroup legacysupport 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span>
name gnutls
version 3.7.9
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,8 +155,32 @@ variant guile description {Build guile bindings} {
</span> configure.args-replace --disable-guile --enable-guile
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-triplet.add_host all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-triplet.add_build all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_host(i386) i686-apple-${os.platform}${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_host(ppc) powerpc-apple-${os.platform}${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_host(ppc64) powerpc64-apple-${os.platform}${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(ppc) --build=powerpc-apple-${os.platform}${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(ppc64) --build=powerpc64-apple-${os.platform}${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --host=i686-apple-${os.platform}${os.major} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --build=i686-apple-${os.platform}${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --host=powerpc-apple-${os.platform}${os.major} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --build=powerpc-apple-${os.platform}${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --host=powerpc64-apple-${os.platform}${os.major} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --build=powerpc64-apple-${os.platform}${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --host=${build_arch}-apple-${os.platform}${os.major} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --build=${build_arch}-apple-${os.platform}${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
test.run yes
test.target check
</pre><pre style='margin:0'>
</pre>