Ticket #39940: patch-devel-apr-util.diff

devel/apr-util/Portfile

@@ -4 +4 @@
 
 name            apr-util
 version         1.5.2
-revision        1
+revision        2
 categories      devel
 maintainers     geeklair.net:dluke
 platforms       darwin
@@ -117 +117 @@
                                 }
                         }
 
-variant mysql5  description {Build with MySQL5 suppoprt} {
-                depends_lib-append path:bin/mysql_config5:mysql5
+variant mysql5 conflicts mysql51 mysql55 mysql56 mariadb percona description {Enable MySQL 5.1 support} {
+                depends_lib-append port:mysql5
                 configure.args-delete --without-mysql
                 configure.args-append --with-mysql=yes
-                configure.env-append MYSQL_CONFIG=${prefix}/bin/mysql_config5
+                configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql5/bin/mysql_config
                 }
 
+variant mysql51 conflicts mysql5 mysql55 mysql56 mariadb percona description {Enable MySQL 5.1 support} {
+                depends_lib-append port:mysql51
+                configure.args-delete --without-mysql
+                configure.args-append --with-mysql=yes
+                configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql51/bin/mysql_config
+                }
+
+variant mysql55 conflicts mysql5 mysql51 mysql56 mariadb percona description {Enable MySQL 5.5 support} {
+                depends_lib-append port:mysql55
+                configure.args-delete --without-mysql
+                configure.args-append --with-mysql=yes
+                configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql55/bin/mysql_config
+                }
+
+variant mysql56 conflicts mysql5 mysql51 mysql55 mariadb percona description {Enable MySQL 5.6 support} {
+                depends_lib-append port:mysql56
+                configure.args-delete --without-mysql
+                configure.args-append --with-mysql=yes
+                configure.env-append MYSQL_CONFIG=${prefix}/lib/mysql56/bin/mysql_config
+                }
+
+variant mariadb conflicts mysql5 mysql51 mysql55 mysql56 percona description {Enable MariaDB (MySQL) support} {
+                depends_lib-append port:mariadb
+                configure.args-delete --without-mysql
+                configure.args-append --with-mysql=yes
+                configure.env-append MYSQL_CONFIG=${prefix}/lib/mariadb/bin/mysql_config
+                }
+
+variant percona conflicts mysql5 mysql51 mysql55 mysql56 mariadb description {Enable Percona (MySQL) support} {
+                depends_lib-append port:percona
+                configure.args-delete --without-mysql
+                configure.args-append --with-mysql=yes
+                configure.env-append MYSQL_CONFIG=${prefix}/lib/percona/bin/mysql_config
+                }
+
 livecheck.type  regex
 livecheck.url   http://apache.org/dist/apr/
 livecheck.regex {APR-util (\d+(?:\.\d+)*) is the latest available version}