[71511] trunk/dports/databases/mysql5

[ryandesign at macports.org]

Revision: 71511
          http://trac.macports.org/changeset/71511
Author:   ryandesign at macports.org
Date:     2010-09-15 08:18:32 -0700 (Wed, 15 Sep 2010)
Log Message:
-----------
mysql5: fix build error in php5-mysql +mysql5; see #26480

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

Added Paths:
-----------
    trunk/dports/databases/mysql5/files/patch-include-Makefile.in.diff

Modified: trunk/dports/databases/mysql5/Portfile
===================================================================
--- trunk/dports/databases/mysql5/Portfile	2010-09-15 14:59:59 UTC (rev 71510)
+++ trunk/dports/databases/mysql5/Portfile	2010-09-15 15:18:32 UTC (rev 71511)
@@ -10,6 +10,7 @@
 name                    mysql5
 conflicts               mysql5-devel mysql4
 version                 5.1.50
+revision                1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 homepage                http://www.mysql.com/
 categories              databases
@@ -60,6 +61,7 @@
 
 patchfiles \
     patch-Makefile.in.diff \
+    patch-include-Makefile.in.diff \
     patch-mysql_secure_installation.sh.diff
 
 post-patch {

Added: trunk/dports/databases/mysql5/files/patch-include-Makefile.in.diff
===================================================================
--- trunk/dports/databases/mysql5/files/patch-include-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/databases/mysql5/files/patch-include-Makefile.in.diff	2010-09-15 15:18:32 UTC (rev 71511)
@@ -0,0 +1,22 @@
+http://bugs.mysql.com/bug.php?id=55846
+--- include/Makefile.in.orig	2010-08-03 12:28:49.000000000 -0500
++++ include/Makefile.in	2010-09-15 09:19:54.000000000 -0500
+@@ -405,7 +405,8 @@
+ 			decimal.h errmsg.h my_global.h my_net.h \
+ 			my_getopt.h sslopt-longopts.h my_dir.h \
+ 			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
+-			m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \
++			m_ctype.h my_attribute.h my_compiler.h \
++			$(HEADERS_GEN_CONFIGURE) \
+ 			$(HEADERS_GEN_MAKE)
+ 
+ noinst_HEADERS = config-win.h config-netware.h my_bit.h \
+@@ -416,7 +417,7 @@
+ 			my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
+ 			thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
+ 			my_handler.h my_time.h my_vle.h my_user.h \
+-			my_libwrap.h my_stacktrace.h my_compiler.h
++			my_libwrap.h my_stacktrace.h
+ 
+ EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100915/e3c750ed/attachment.html>