Ticket #44484: p5-dbd-mysql.diff

p5-dbd-mysql/Portfile

@@ -20 +20 @@
 
     depends_lib-append          port:p${perl5.major}-dbi
 
-    variant mysql4 conflicts mysql5 mysql51 mysql55 mariadb percona description {build with mysql4 port} {
+    variant mysql4 conflicts mysql51 mysql55 mysql56 mariadb55 percona55 description {build with mysql4 port} {
         depends_lib-append      port:mysql4
     }
 
-    variant mysql5 conflicts mysql4 mysql51 mysql55 mariadb percona description {build with mysql5 port} {
-        depends_lib-append      path:bin/mysql_config5:mysql5
-        configure.args-append   --mysql_config=${prefix}/bin/mysql_config5
-    }
-
-    variant mysql51 conflicts mysql4 mysql5 mysql55 mariadb percona description {build with mysql51 port} {
+    variant mysql51 conflicts mysql4 mysql55 mysql56 mariadb55 percona55 description {build with mysql51 port} {
         depends_lib-append      port:mysql51
         configure.args-append   --mysql_config=${prefix}/lib/mysql51/bin/mysql_config
     }
 
-    variant mysql55 conflicts mysql4 mysql5 mysql51 mariadb percona description {build with mysql55 port} {
+    variant mysql55 conflicts mysql4 mysql51 mysql56 mariadb55 percona55 description {build with mysql55 port} {
         depends_lib-append      port:mysql55
         configure.args-append   --mysql_config=${prefix}/lib/mysql55/bin/mysql_config
     }
 
-    variant mariadb conflicts mysql4 mysql5 mysql51 mysql55 percona description {build with mariadb port} {
+    variant mysql56 conflicts mysql4 mysql51 mysql55 mariadb55 percona55 description {build with mysql56 port} {
+        depends_lib-append      port:mysql56
+        configure.args-append   --mysql_config=${prefix}/lib/mysql56/bin/mysql_config
+    }
+
+    variant mariadb55 conflicts mysql4 mysql51 mysql55 mysql56 percona55 description {build with mariadb port} {
         depends_lib-append      port:mariadb
         configure.args-append   --mysql_config=${prefix}/lib/mariadb/bin/mysql_config
     }
 
-    variant percona conflicts mysql4 mysql5 mysql51 mysql55 mariadb description {build with percona port} {
+    variant percona55 conflicts mysql4 mysql51 mysql55 mysql56 mariadb55 description {build with percona port} {
         depends_lib-append      port:percona
         configure.args-append   --mysql_config=${prefix}/lib/percona/bin/mysql_config
     }
 
+    # If legacy +mysql5 variant change to replacement +mysql51 variant.
+    if {[variant_isset mysql5]} {
+        default_variants-append +mysql51
+    }
+
     if {   ![variant_isset mysql4]
-        && ![variant_isset mysql5]
         && ![variant_isset mysql51]
         && ![variant_isset mysql55]
-        && ![variant_isset mariadb]
-        && ![variant_isset percona]
+        && ![variant_isset mysql56]
+        && ![variant_isset mariadb55]
+        && ![variant_isset percona55]
     } {
-        default_variants        +mysql5
+        default_variants        +mariadb55
     }
 }