[35021] trunk/dports/databases/mysql5-devel/Portfile

[ryandesign at macports.org]

Revision: 35021
          http://trac.macosforge.org/projects/macports/changeset/35021
Author:   ryandesign at macports.org
Date:     2008-03-14 04:05:34 -0700 (Fri, 14 Mar 2008)

Log Message:
-----------
mysql5-devel: revert a change in 5.1.23-rc which caused php5 +mysql to fail.
This is a local fix for MySQL bug 34655.
Closes MacPorts #14387.

Modified Paths:
--------------
    trunk/dports/databases/mysql5-devel/Portfile

Modified: trunk/dports/databases/mysql5-devel/Portfile
===================================================================
--- trunk/dports/databases/mysql5-devel/Portfile	2008-03-14 09:51:50 UTC (rev 35020)
+++ trunk/dports/databases/mysql5-devel/Portfile	2008-03-14 11:05:34 UTC (rev 35021)
@@ -6,7 +6,7 @@
 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
@@ -68,6 +68,23 @@
 # the following is in store for future
 #    --program-suffix=5
 
+# Locally fix http://bugs.mysql.com/bug.php?id=34655
+# This only applies to 5.1.23-rc.
+# Remove it when updating to 5.1.24-rc or later.
+post-patch {
+    reinplace -E {s/client_(last_errno|last_error)/\1/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/net_serv.cc \
+        ${worksrcpath}/sql/repl_failsafe.cc \
+        ${worksrcpath}/sql-common/client.c
+}
+
 post-configure {
     reinplace "s;openssl_includes = -I;openssl_includes_includes = -I${prefix}/include/openssl;" ${worksrcpath}/tests/Makefile
 }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080314/297fb739/attachment.html