[69949] trunk/dports/lang/php52

[ryandesign at macports.org]

Revision: 69949
          http://trac.macports.org/changeset/69949
Author:   ryandesign at macports.org
Date:     2010-07-23 05:36:22 -0700 (Fri, 23 Jul 2010)
Log Message:
-----------
php52: update to 5.2.14

Modified Paths:
--------------
    trunk/dports/lang/php52/Portfile
    trunk/dports/lang/php52/files/patch-bind.diff

Removed Paths:
-------------
    trunk/dports/lang/php52/files/patch-ext-standard-string.c.diff

Modified: trunk/dports/lang/php52/Portfile
===================================================================
--- trunk/dports/lang/php52/Portfile	2010-07-23 10:43:54 UTC (rev 69948)
+++ trunk/dports/lang/php52/Portfile	2010-07-23 12:36:22 UTC (rev 69949)
@@ -4,8 +4,7 @@
 
 name                    php52
 conflicts               php5 php5-devel php5-gd php5-iconv php5-mbstring php5-sqlite
-version                 5.2.13
-revision        2
+version                 5.2.14
 set major               [lindex [split ${version} .] 0]
 set my_name             php${major}
 dist_subdir             ${my_name}
@@ -28,9 +27,9 @@
 
 checksums \
     [suffix ${distname}] \
-    md5     eb4d0766dc4fb9667f05a68b6041e7d1 \
-    sha1    7127a21f1b493e3cd43f45cadecdb46b623eb1fb \
-    rmd160  9e21d32a7b757d25ed827834b26235ea1eebfcc8
+    md5     bfdfc0e62fe437020cc04078269d1414 \
+    sha1    311b44b2c0f2eea8ab8dab876d2a6b6e7a55632e \
+    rmd160  f699488f5b266a1c5e36df570c4d5896dc4e0aea
 
 depends_build \
     port:pkgconfig \
@@ -59,7 +58,6 @@
 # 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
 
@@ -372,15 +370,15 @@
         }
     }
     #set suhosin_patch_version   ${version}-0.9.7
-    set suhosin_patch_version   5.2.11-0.9.7
+    set suhosin_patch_version   5.2.13-0.9.7
     set suhosin_patch           suhosin-patch-${suhosin_patch_version}.patch.gz
     patch_sites-append          http://download.suhosin.org/
     patchfiles-append           ${suhosin_patch}
     checksums-append \
         ${suhosin_patch} \
-            md5     8f9de4d97fae6eba163cf3699509a260 \
-            sha1    248419332131efc53f3306c2a57a4b1a9dc92cc1 \
-            rmd160  0f6d442aace34c221f9fbff42a63e7f3b4489f15
+            md5     8188e119ce7abce98b8f004de46fbac5 \
+            sha1    e2faf8db2d7facbd44cee2f737ce87732835d341 \
+            rmd160  63a022a5bf0fb8c6688f4c0ebcfaa8a437ea6935
 }
 
 destroot.args \

Modified: trunk/dports/lang/php52/files/patch-bind.diff
===================================================================
--- trunk/dports/lang/php52/files/patch-bind.diff	2010-07-23 10:43:54 UTC (rev 69948)
+++ trunk/dports/lang/php52/files/patch-bind.diff	2010-07-23 12:36:22 UTC (rev 69949)
@@ -1,8 +1,8 @@
---- a/ext/standard/config.m4.orig	2007-07-11 06:56:03.000000000 -0500
-+++ b/ext/standard/config.m4	2008-11-13 02:19:46.000000000 -0600
+--- a/ext/standard/config.m4.orig	2009-11-27 17:41:13.000000000 -0600
++++ b/ext/standard/config.m4	2010-07-23 06:21:42.000000000 -0500
 @@ -311,9 +311,9 @@
  dnl Detect library functions needed by php dns_xxx functions
- dnl ext/standard/dns.h will collect these in a single define: HAVE_DNS_FUNCS
+ dnl ext/standard/php_dns.h will collect these in a single define: HAVE_DNS_FUNCS
  dnl
 -PHP_CHECK_FUNC(res_nmkquery, resolv, bind, socket)
 -PHP_CHECK_FUNC(res_nsend, resolv, bind, socket)
@@ -11,5 +11,5 @@
 +PHP_CHECK_FUNC(res_nsend, resolv, socket)
 +PHP_CHECK_FUNC(dn_expand, resolv, socket)
  
- dnl
- dnl Check if atof() accepts NAN
+ dnl OSX has the dns functions in libc but remaps them in resolv.h for bind so linking fails
+ case $host_alias in

Deleted: trunk/dports/lang/php52/files/patch-ext-standard-string.c.diff
===================================================================
--- trunk/dports/lang/php52/files/patch-ext-standard-string.c.diff	2010-07-23 10:43:54 UTC (rev 69948)
+++ trunk/dports/lang/php52/files/patch-ext-standard-string.c.diff	2010-07-23 12:36:22 UTC (rev 69949)
@@ -1,12 +0,0 @@
---- 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>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100723/c04e615d/attachment-0001.html>