Revision: 68370 http://trac.macports.org/changeset/68370 Author: ryandesign@macports.org Date: 2010-06-02 00:18:39 -0700 (Wed, 02 Jun 2010) Log Message: ----------- php52: fix build failure with gettext 0.18; see #24934 Modified Paths: -------------- trunk/dports/lang/php52/Portfile Added Paths: ----------- trunk/dports/lang/php52/files/patch-ext-standard-string.c.diff Modified: trunk/dports/lang/php52/Portfile =================================================================== --- trunk/dports/lang/php52/Portfile 2010-06-02 06:56:47 UTC (rev 68369) +++ trunk/dports/lang/php52/Portfile 2010-06-02 07:18:39 UTC (rev 68370) @@ -59,6 +59,7 @@ # Use -p1 to accommodate the Suhosin patch patch.pre_args -p1 patchfiles \ + patch-ext-standard-string.c.diff \ patch-scripts-php-config.in.diff \ patch-bind.diff Copied: trunk/dports/lang/php52/files/patch-ext-standard-string.c.diff (from rev 68369, trunk/dports/lang/php4/files/patch-ext-standard-string.c.diff) =================================================================== --- trunk/dports/lang/php52/files/patch-ext-standard-string.c.diff (rev 0) +++ trunk/dports/lang/php52/files/patch-ext-standard-string.c.diff 2010-06-02 07:18:39 UTC (rev 68370) @@ -0,0 +1,12 @@ +--- a/ext/standard/string.c.orig 2010-02-01 06:59:08.000000000 -0600 ++++ b/ext/standard/string.c 2010-06-02 01:49:05.000000000 -0500 +@@ -39,6 +39,9 @@ + #endif + #ifdef HAVE_LIBINTL + # include <libintl.h> /* For LC_MESSAGES */ ++ #ifdef setlocale ++ # undef setlocale /* Uh, libintl, don't F* our symbols please */ ++ #endif + #endif + + #include <math.h>