[68369] trunk/dports/lang/php4

[ryandesign at macports.org]

Revision: 68369
          http://trac.macports.org/changeset/68369
Author:   ryandesign at macports.org
Date:     2010-06-01 23:56:47 -0700 (Tue, 01 Jun 2010)
Log Message:
-----------
php4: fix build failure with gettext 0.18; see #24934

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

Added Paths:
-----------
    trunk/dports/lang/php4/files/patch-ext-standard-string.c.diff

Modified: trunk/dports/lang/php4/Portfile
===================================================================
--- trunk/dports/lang/php4/Portfile	2010-06-02 05:47:54 UTC (rev 68368)
+++ trunk/dports/lang/php4/Portfile	2010-06-02 06:56:47 UTC (rev 68369)
@@ -53,6 +53,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
 
 set phpinidir           ${prefix}/etc/${my_name}

Added: trunk/dports/lang/php4/files/patch-ext-standard-string.c.diff
===================================================================
--- trunk/dports/lang/php4/files/patch-ext-standard-string.c.diff	                        (rev 0)
+++ trunk/dports/lang/php4/files/patch-ext-standard-string.c.diff	2010-06-02 06:56:47 UTC (rev 68369)
@@ -0,0 +1,12 @@
+--- a/ext/standard/string.c.orig	2007-12-31 01:22:53.000000000 -0600
++++ b/ext/standard/string.c	2010-06-02 01:41:51.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 "scanf.h"
+ #include "zend_API.h"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100601/b7f851ff/attachment.html>