Ticket #14579: mysql5.diff

perl/p5-dbd-mysql/Portfile

@@ -13 +13 @@
 checksums                md5 133ac08c22bb19194ad8b895e3204310
 
 depends_lib-append       port:p5-dbi \
-                         port:mysql5 \
                          port:zlib
 
-configure.args-append    --mysql_config=${prefix}/bin/mysql_config5
+variant mysql3 conflicts mysql4 mysql5 description {build with mysql3 port} {
+    depends_lib-append       port:mysql3
+}
 
-variant mysqlbinary conflicts mysql3 mysql4 description {build with binary from mysql website} {
-    depends_lib-delete       port:mysql5
-    configure.args-delete    --mysql_config=${prefix}/bin/mysql_config5
-    configure.args-append    --mysql_config=/usr/local/mysql/bin/mysql_config
+variant mysql4 conflicts mysql3 mysql5 description {build with mysql4 port} {
+    depends_lib-append       port:mysql4
 }
 
-variant mysql3 conflicts mysqlbinary mysql4 description {build with mysql3 port} {
-    depends_lib-delete       port:mysql5
-    depends_lib-append       port:mysql3
-    configure.args-delete    --mysql_config=${prefix}/bin/mysql_config5
+variant mysql5 conflicts mysql3 mysql4 description {build with mysql5 port (default)} {
+    depends_lib-append       path:${prefix}/bin/mysql_config5:mysql5
+    configure.args-append    --mysql_config=${prefix}/bin/mysql_config5
 }
 
-variant mysql4 conflicts mysqlbinary mysql3 description {build with mysql4 port} {
-    depends_lib-delete       port:mysql5
-    depends_lib-append       port:mysql4
-    configure.args-delete    --mysql_config=${prefix}/bin/mysql_config5
+if {![variant_isset mysql3] && ![variant_isset mysql4]} {
+    default_variants +mysql5
 }
+
+pre-fetch {
+    if {![variant_isset mysql3] && ![variant_isset mysql4] && ![variant_isset mysql5]} {
+        return -code error "you must select either mysql3, mysql4 or mysql5"
+    }
+}

databases/mysql5-devel/Portfile

@@ -6 +6 @@
 set vers                5.1.23
 version                 ${vers}-rc
 set branch              [join [lrange [split ${version} .] 0 1] .]
-revision                1
+revision                2
 homepage                http://www.mysql.com/
 categories              databases
 platforms               darwin
@@ -70 +70 @@
 
 post-configure {
     reinplace "s;openssl_includes = -I;openssl_includes_includes = -I${prefix}/include/openssl;" ${worksrcpath}/tests/Makefile
+    # Reverting member names in mysql_com.h
+    # Remove this when 5.1.24-RC is released.
+    # http://bugs.mysql.com/bug.php?id=34655
+    reinplace "s/client_last_errno/last_errno/g" \
+        ${worksrcpath}/include/mysql_com.h \
+        ${worksrcpath}/include/mysql_h.ic \
+        ${worksrcpath}/libmysql/libmysql.c \
+        ${worksrcpath}/libmysql/manager.c \
+        ${worksrcpath}/libmysqld/lib_sql.cc \
+        ${worksrcpath}/libmysqld/libmysqld.c \
+        ${worksrcpath}/server-tools/instance-manager/mysql_connection.cc \
+        ${worksrcpath}/sql-common/client.c \
+        ${worksrcpath}/sql/log_event.cc \
+        ${worksrcpath}/sql/log_event_old.cc \
+        ${worksrcpath}/sql/net_serv.cc \
+        ${worksrcpath}/sql/repl_failsafe.cc
 }
 
 platform darwin 6 {