<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/da1205ed6f932f150c183c11bb1e8d1122e5c663">https://github.com/macports/macports-ports/commit/da1205ed6f932f150c183c11bb1e8d1122e5c663</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 da1205ed6f9 p5-dbd-mysql: Fix variant conflicts issues and update perl versions
</span>da1205ed6f9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit da1205ed6f932f150c183c11bb1e8d1122e5c663
</span>Author: jhoyt4 <john.hoyt@gmail.com>
AuthorDate: Sun Nov 24 08:50:42 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> p5-dbd-mysql: Fix variant conflicts issues and update perl versions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix issue where multiple variant conflicts were being set as a single
</span><span style='display:block; white-space:pre;color:#404040;'> conflict. Fixing this also allowed for the removal of the
</span><span style='display:block; white-space:pre;color:#404040;'> active_vartiants workaround.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - fix variant conflicts
</span><span style='display:block; white-space:pre;color:#404040;'> - remove active variants workaround
</span><span style='display:block; white-space:pre;color:#404040;'> - fix typos
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60517
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/71360
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/71381
</span>---
perl/p5-dbd-mysql/Portfile | 32 ++++++--------------------------
1 file changed, 6 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-dbd-mysql/Portfile b/perl/p5-dbd-mysql/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a7b905734f..605ab436ad2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-dbd-mysql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-dbd-mysql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ long_description {*}${description}
</span> ###############################################################################
# Create an array of DBD:MYSQL versions
###############################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# "DBD:MYSQL Major Verion" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "DBD:MYSQL Major Version" {
</span> # version DBD:MYSQL version
# rmd160 value
# sha256 value
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,9 +85,9 @@ perl5.setup DBD-mysql [lindex [array get $install_version versio
</span> checksums rmd160 [lindex [array get $install_version rmd160] 1] \
sha256 [lindex [array get $install_version sha256] 1] \
size [lindex [array get $install_version size] 1]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# version gets set to the "current version" values to prevenet constant upgraing by port upgrade
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# version gets set to the "current version" values to prevent constant upgrading by port upgrade
</span> version [perl5_convert_version [lindex [array get version_current version] 1]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
if {${perl5.major} != ""} {
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,17 +99,12 @@ if {${perl5.major} != ""} {
</span> port:p${perl5.major}-dbi
# loop over the array creating the specified variants
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # with the multiple versioning change, the conflicts lists no longer apepears
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to be enforced, so this will be handled later in the pre-fetch stage with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # active_vaiants. The conflicts list is left here so the user gets the approprate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # warning when running port variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the {*} is necessary to break out the conflict_list into multiple variants vs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # one single incorrectly formatted conflict
</span> foreach variant_name [array names db_variants] {
set idx [lsearch [array names db_variants] $variant_name]
set conflict_list [lreplace [array names db_variants] $idx $idx]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant $variant_name conflicts $conflict_list description "build with $variant_name" {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset $variant_name]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set active_conflicts $conflict_list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant $variant_name conflicts {*}$conflict_list description "build with $variant_name" {}
</span> }
# add the build dependencies, this must be done outside the variant call to work
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,21 +120,6 @@ if {${perl5.major} != ""} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Use active_variants to enforce that only one variant can be installed at any given time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set result [active_variants p${perl5.major}-dbd-mysql $active_conflicts ""]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **** p${perl5.major}-dbd-mysql can only have one active variant installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **** If you need this vaiant, deactivate the previously installed one with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **** port deactivate p${perl5.major}-dbd-mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **** or uninstall is with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **** sudo port uninstall p${perl5.major}-dbd-mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ****"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Error: p${perl5.major}-dbd-mysql variant already installed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # livecheck workaround due to MetaCPAN indexing failure
livecheck.type regex
livecheck.url https://cpan.metacpan.org/authors/id/D/DV/DVEEDEN
</pre><pre style='margin:0'>
</pre>