Skip to content

Commit

Permalink
p5-dbd-mysql: Fix variant conflicts issues and update perl versions
Browse files Browse the repository at this point in the history
  Fix issue where mulitple variant conflicts were being set as a single
  conflict. Fixing this also allowed for the removal of the
  active_vartiants workaround.

  - fix variant conflicts
  - remove active variants workaround
  - add mariab10_2 for legacy compatability
  - fix typos
  - add variants for perl 5.36 and 5.38

Closes: https://trac.macports.org/ticket/60517
Closes: https://trac.macports.org/ticket/71360
Closes: https://trac.macports.org/ticket/71381
  • Loading branch information
jhoyt4 committed Nov 24, 2024
1 parent 804bf78 commit 9b08de3
Showing 1 changed file with 13 additions and 26 deletions.
39 changes: 13 additions & 26 deletions perl/p5-dbd-mysql/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ long_description {*}${description}
###############################################################################
# Create an array of DBD:MYSQL versions
###############################################################################
# "DBD:MYSQL Major Verion" {
# "DBD:MYSQL Major Version" {
# version DBD:MYSQL version
# rmd160 value
# sha256 value
Expand Down Expand Up @@ -51,6 +51,13 @@ array set db_variants {
mariadb10_4 mariadb-10.4
percona ""
}
# mariadb-10.2 does not build on Sequoia (15) and likely will not get
# updated as it is end of life. Add it only for OS versions earlier
# than Sequoia for legacy support
if {${os.major} < 15} {
append db_variants(mariadb10_2) mariadb-10.2
}


# check to see if a variant was set by the user
set any_sql no
Expand Down Expand Up @@ -85,9 +92,9 @@ perl5.setup DBD-mysql [lindex [array get $install_version versio
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]
# version gets set to the "current version" values to prevenet constant upgraing by port upgrade
# version gets set to the "current version" values to prevent constant upgrading by port upgrade
version [perl5_convert_version [lindex [array get version_current version] 1]]
revision 0
revision 1

if {${perl5.major} != ""} {
depends_build-append \
Expand All @@ -99,17 +106,12 @@ if {${perl5.major} != ""} {
port:p${perl5.major}-dbi

# loop over the array creating the specified variants
# with the multiple versioning change, the conflicts lists no longer apepears
# to be enforced, so this will be handled later in the pre-fetch stage with
# active_vaiants. The conflicts list is left here so the user gets the approprate
# warning when running port variant
# the {*} is necessary to break out the conflict_list into multiple variants vs.
# one single incorrectly formatted conflict
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]
variant $variant_name conflicts $conflict_list description "build with $variant_name" {}
if {[variant_isset $variant_name]} {
set active_conflicts $conflict_list
}
variant $variant_name conflicts {*}$conflict_list description "build with $variant_name" {}
}

# add the build dependencies, this must be done outside the variant call to work
Expand All @@ -125,21 +127,6 @@ if {${perl5.major} != ""} {
}
}

# Use active_variants to enforce that only one variant can be installed at any given time
pre-fetch {
if {![catch {set result [active_variants p${perl5.major}-dbd-mysql $active_conflicts ""]}]} {
ui_error "
****
**** p${perl5.major}-dbd-mysql can only have one active variant installed
**** If you need this vaiant, deactivate the previously installed one with
**** port deactivate p${perl5.major}-dbd-mysql
**** or uninstall is with
**** sudo port uninstall p${perl5.major}-dbd-mysql
****"
error "Error: p${perl5.major}-dbd-mysql variant already installed"
}
}

# livecheck workaround due to MetaCPAN indexing failure
livecheck.type regex
livecheck.url https://cpan.metacpan.org/authors/id/D/DV/DVEEDEN
Expand Down

0 comments on commit 9b08de3

Please sign in to comment.