<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/70a743c8ad122aebcc57325ebbf4cebe1b0f9b8b">https://github.com/macports/macports-ports/commit/70a743c8ad122aebcc57325ebbf4cebe1b0f9b8b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 70a743c8ad122aebcc57325ebbf4cebe1b0f9b8b
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Apr 21 08:04:30 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> rpm54: add variant +perl5_28
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * allow perl5 portgroup to determine the default variant
</span><span style='display:block; white-space:pre;color:#404040;'> * ensure ossp-uuid uses the same variant
</span>---
sysutils/rpm54/Portfile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/rpm54/Portfile b/sysutils/rpm54/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c89a16d..f7c99ea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/rpm54/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/rpm54/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span> PortGroup perl5 1.0
name rpm54
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,12 +62,12 @@ extract.post_args "| cpio -dvim"
</span> build.type gnu
# use perl5 port group to create variants to match dependency ossp-uuid
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# set default variant to perl5_24 (#52081)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ensure ossp-uuid uses same variant
</span>
perl5.conflict_variants yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.branches 5.26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.default_branch 5.26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.branches 5.26 5.28
</span> perl5.create_variants ${perl5.branches}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants ossp-uuid ${perl5.variant}
</span>
configure.args --disable-nls \
--infodir=${prefix}/share/info \
</pre><pre style='margin:0'>
</pre>