diff --git a/perl/p5-capture-tiny/Portfile b/perl/p5-capture-tiny/Portfile index 93edbfc62ff2b..f1ff8b76bcd5f 100644 --- a/perl/p5-capture-tiny/Portfile +++ b/perl/p5-capture-tiny/Portfile @@ -3,7 +3,7 @@ PortSystem 1.0 PortGroup perl5 1.0 -perl5.branches 5.28 5.30 5.32 5.34 +perl5.branches 5.28 5.30 5.32 5.34 5.36 5.38 perl5.setup Capture-Tiny 0.50 ../../authors/id/D/DA/DAGOLDEN revision 0 maintainers nomaintainer diff --git a/perl/p5-dbd-mysql/Portfile b/perl/p5-dbd-mysql/Portfile index 5a7b905734f8e..2dbad57c74766 100644 --- a/perl/p5-dbd-mysql/Portfile +++ b/perl/p5-dbd-mysql/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup perl5 1.0 PortGroup active_variants 1.1 -perl5.branches 5.28 5.30 5.32 5.34 +perl5.branches 5.28 5.30 5.32 5.34 5.36 5.38 license {Artistic-1 GPL} maintainers nomaintainer description DBD::mysql - MySQL driver for the Perl5 Database Interface (DBI) @@ -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 @@ -51,6 +51,13 @@ array set db_variants { mariadb10_4 mariadb-10.4 percona "" } +# mariadb-10.2 does not build on Sequoia (macOS 15 / darin 24) 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.platform} eq "darwin" && ${os.major} < 24} { + append db_variants(mariadb10_2) mariadb-10.2 +} + # check to see if a variant was set by the user set any_sql no @@ -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 \ @@ -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 @@ -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 diff --git a/perl/p5-dbi/Portfile b/perl/p5-dbi/Portfile index b2a26cea32faf..722bd9702c5a8 100644 --- a/perl/p5-dbi/Portfile +++ b/perl/p5-dbi/Portfile @@ -3,7 +3,7 @@ PortSystem 1.0 PortGroup perl5 1.0 -perl5.branches 5.28 5.30 5.32 5.34 +perl5.branches 5.28 5.30 5.32 5.34 5.36 5.38 perl5.setup DBI 1.646 ../../authors/id/H/HM/HMBRAND license {Artistic-1 GPL} maintainers nomaintainer diff --git a/perl/p5-devel-checklib/Portfile b/perl/p5-devel-checklib/Portfile index 577e3f96ac359..ddb70e6af7433 100644 --- a/perl/p5-devel-checklib/Portfile +++ b/perl/p5-devel-checklib/Portfile @@ -3,7 +3,7 @@ PortSystem 1.0 PortGroup perl5 1.0 -perl5.branches 5.28 5.30 5.32 5.34 +perl5.branches 5.28 5.30 5.32 5.34 5.36 5.38 perl5.setup Devel-CheckLib 1.16 revision 1 license {Artistic-1 GPL} diff --git a/perl/p5-mock-config/Portfile b/perl/p5-mock-config/Portfile index 8067b1fc94f3d..12242c727b901 100644 --- a/perl/p5-mock-config/Portfile +++ b/perl/p5-mock-config/Portfile @@ -3,7 +3,7 @@ PortSystem 1.0 PortGroup perl5 1.0 -perl5.branches 5.28 5.30 5.32 5.34 +perl5.branches 5.28 5.30 5.32 5.34 5.36 5.38 perl5.setup Mock-Config 0.03 ../../authors/id/R/RU/RURBAN revision 0 license {Artistic-1 GPL} diff --git a/perl/p5-test-deep/Portfile b/perl/p5-test-deep/Portfile index bc37c0da2ac5e..64822c22c3ff3 100644 --- a/perl/p5-test-deep/Portfile +++ b/perl/p5-test-deep/Portfile @@ -3,7 +3,7 @@ PortSystem 1.0 PortGroup perl5 1.0 -perl5.branches 5.28 5.30 5.32 5.34 +perl5.branches 5.28 5.30 5.32 5.34 5.36 5.38 perl5.setup Test-Deep 1.204 revision 0 license {Artistic-1 GPL} diff --git a/perl/p5-time-hires/Portfile b/perl/p5-time-hires/Portfile index cacd0432b0142..e9d7a99f2387f 100644 --- a/perl/p5-time-hires/Portfile +++ b/perl/p5-time-hires/Portfile @@ -3,7 +3,7 @@ PortSystem 1.0 PortGroup perl5 1.0 -perl5.branches 5.28 5.30 5.32 5.34 +perl5.branches 5.28 5.30 5.32 5.34 5.36 5.38 perl5.setup Time-HiRes 1.9764 revision 0 license {Artistic-1 GPL}