[85067] trunk/dports/lang/php5-devel

[ryandesign at macports.org]

Revision: 85067
          http://trac.macports.org/changeset/85067
Author:   ryandesign at macports.org
Date:     2011-10-08 16:40:20 -0700 (Sat, 08 Oct 2011)
Log Message:
-----------
php5-devel: merge r85066 from php5: fix nanosleep detection; see #31530

Revision Links:
--------------
    http://trac.macports.org/changeset/85066

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

Added Paths:
-----------
    trunk/dports/lang/php5-devel/files/patch-configure.in.diff

Property Changed:
----------------
    trunk/dports/lang/php5-devel/


Property changes on: trunk/dports/lang/php5-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/lang/php5:52241-52279,53127,56346,56392,56403,58589
   + /trunk/dports/lang/php5:52241-52279,53127,56346,56392,56403,58589,85066

Modified: trunk/dports/lang/php5-devel/Portfile
===================================================================
--- trunk/dports/lang/php5-devel/Portfile	2011-10-08 23:24:05 UTC (rev 85066)
+++ trunk/dports/lang/php5-devel/Portfile	2011-10-08 23:40:20 UTC (rev 85067)
@@ -7,6 +7,7 @@
 conflicts               php5 php52
 epoch                   1
 version                 5.3.8
+revision                1
 set major               [lindex [split ${version} .] 0]
 set my_name             php${major}
 dist_subdir             ${my_name}
@@ -48,7 +49,8 @@
 
 # Use -p1 to accommodate the Suhosin patch
 patch.pre_args          -p1
-patchfiles              patch-scripts-php-config.in.diff
+patchfiles              patch-configure.in.diff \
+                        patch-scripts-php-config.in.diff
 
 use_autoconf            yes
 autoconf.cmd            ${prefix}/bin/autoconf213

Copied: trunk/dports/lang/php5-devel/files/patch-configure.in.diff (from rev 85066, trunk/dports/lang/php5/files/patch-configure.in.diff)
===================================================================
--- trunk/dports/lang/php5-devel/files/patch-configure.in.diff	                        (rev 0)
+++ trunk/dports/lang/php5-devel/files/patch-configure.in.diff	2011-10-08 23:40:20 UTC (rev 85067)
@@ -0,0 +1,12 @@
+# Revert change to configure.in made between php 5.3.3 and 5.3.4 that disabled time_nanosleep on OS X.
+--- a/configure.in.orig	2010-12-08 15:38:51.000000000 -0600
++++ b/configure.in	2010-07-21 05:50:07.000000000 -0500
+@@ -611,7 +611,7 @@
+ )
+ 
+ dnl Some systems (like OpenSolaris) do not have nanosleep in libc
+-PHP_CHECK_FUNC_LIB(nanosleep, rt)
++PHP_CHECK_FUNC(nanosleep, rt)
+ 
+ dnl Check for getaddrinfo, should be a better way, but...
+ dnl Also check for working getaddrinfo
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111008/fad69ceb/attachment.html>