[70653] trunk/dports/lang/php5

[ryandesign at macports.org]

Revision: 70653
          http://trac.macports.org/changeset/70653
Author:   ryandesign at macports.org
Date:     2010-08-16 05:58:18 -0700 (Mon, 16 Aug 2010)
Log Message:
-----------
php5: add upstream patch which fixes php5-mysql's +mysqlnd variant; see #25789

Modified Paths:
--------------
    trunk/dports/lang/php5/Portfile

Added Paths:
-----------
    trunk/dports/lang/php5/files/patch-ext-mysqlnd-mysqlnd.h.diff

Modified: trunk/dports/lang/php5/Portfile
===================================================================
--- trunk/dports/lang/php5/Portfile	2010-08-16 12:19:13 UTC (rev 70652)
+++ trunk/dports/lang/php5/Portfile	2010-08-16 12:58:18 UTC (rev 70653)
@@ -6,6 +6,7 @@
 conflicts               php5-devel php52
 epoch                   1
 version                 5.3.3
+revision                1
 set major               [lindex [split ${version} .] 0]
 set my_name             php${major}
 dist_subdir             ${my_name}
@@ -48,8 +49,8 @@
 
 # Use -p1 to accommodate the Suhosin patch
 patch.pre_args          -p1
-patchfiles \
-    patch-scripts-php-config.in.diff
+patchfiles              patch-scripts-php-config.in.diff \
+                        patch-ext-mysqlnd-mysqlnd.h.diff
 
 use_autoconf            yes
 autoconf.cmd            ${prefix}/bin/autoconf213

Added: trunk/dports/lang/php5/files/patch-ext-mysqlnd-mysqlnd.h.diff
===================================================================
--- trunk/dports/lang/php5/files/patch-ext-mysqlnd-mysqlnd.h.diff	                        (rev 0)
+++ trunk/dports/lang/php5/files/patch-ext-mysqlnd-mysqlnd.h.diff	2010-08-16 12:58:18 UTC (rev 70653)
@@ -0,0 +1,11 @@
+--- a/ext/mysqlnd/mysqlnd.h	(revision 302330)
++++ b/ext/mysqlnd/mysqlnd.h	(revision 302331)
+@@ -286,7 +286,7 @@
+ 	long			debug_realloc_fail_threshold;
+ ZEND_END_MODULE_GLOBALS(mysqlnd)
+ 
+-PHPAPI ZEND_DECLARE_MODULE_GLOBALS(mysqlnd);
++PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd);
+ 
+ #ifdef ZTS
+ #define MYSQLND_G(v) TSRMG(mysqlnd_globals_id, zend_mysqlnd_globals *, v)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100816/44263276/attachment.html>