[22032] trunk/dports/www/php5

[source_changes at macosforge.org]

Revision: 22032
          http://trac.macosforge.org/projects/macports/changeset/22032
Author:   ryandesign at macports.org
Date:     2007-02-14 23:27:41 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
Fix PHP bug 40410, which apparently prevented php 5.2.1 from compiling properly on Mac OS X 10.2.x and 10.3.x. (10.4.x was unaffected.)

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

Added Paths:
-----------
    trunk/dports/www/php5/files/patch-posix.c.diff

Modified: trunk/dports/www/php5/Portfile
===================================================================
--- trunk/dports/www/php5/Portfile	2007-02-15 06:22:54 UTC (rev 22031)
+++ trunk/dports/www/php5/Portfile	2007-02-15 07:27:41 UTC (rev 22032)
@@ -94,6 +94,8 @@
 		CPPFLAGS="-I${prefix}/include -no-cpp-precomp -DBIND_8_COMPAT" \
 		LIBS=-ldl
 	configure.args-append --enable-sqlite-utf8
+	# Work around php bug #40410; should be able to remove this once php 5.2.2 is released
+	patchfiles-append patch-posix.c.diff
 }
 
 platform darwin 7 {
@@ -101,6 +103,8 @@
 		CPPFLAGS="-I${prefix}/include -no-cpp-precomp" \
 		LIBS=-ldl
 	configure.args-append --enable-sqlite-utf8
+	# Work around php bug #40410; should be able to remove this once php 5.2.2 is released
+	patchfiles-append patch-posix.c.diff
 }
 
 platform darwin 8 {

Added: trunk/dports/www/php5/files/patch-posix.c.diff
===================================================================
--- trunk/dports/www/php5/files/patch-posix.c.diff	                        (rev 0)
+++ trunk/dports/www/php5/files/patch-posix.c.diff	2007-02-15 07:27:41 UTC (rev 22032)
@@ -0,0 +1,38 @@
+--- ext/posix/posix.c.orig	Thu Jan 11 19:46:11 2007
++++ ext/posix/posix.c	Fri Feb  9 05:30:59 2007
+@@ -16,7 +16,7 @@
+    +----------------------------------------------------------------------+
+  */
+ 
+-/* $Id: posix.c,v 1.70.2.3.2.12 2007/01/12 01:46:11 iliaa Exp $ */
++/* $Id: posix.c,v 1.70.2.3.2.13 2007/02/09 10:15:46 tony2001 Exp $ */
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+@@ -147,7 +147,7 @@
+ static PHP_MINFO_FUNCTION(posix)
+ {
+ 	php_info_print_table_start();
+-	php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.12 $");
++	php_info_print_table_row(2, "Revision", "$Revision: 1.70.2.3.2.13 $");
+ 	php_info_print_table_end();
+ }
+ /* }}} */
+@@ -884,7 +884,7 @@
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &gid) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+-#ifdef HAVE_GETGRGID_R
++#if defined(ZTS) && defined(HAVE_GETGRGID_R) && defined(_SC_GETGR_R_SIZE_MAX)
+ 	
+ 	grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+ 	grbuf = emalloc(grbuflen);
+@@ -909,7 +909,7 @@
+ 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to convert posix group struct to array");
+ 		RETVAL_FALSE;
+ 	}
+-#ifdef HAVE_GETGRGID_R
++#if defined(ZTS) && defined(HAVE_GETGRGID_R) && defined(_SC_GETGR_R_SIZE_MAX)
+ 	efree(grbuf);
+ #endif
+ }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070214/2eeffbfe/attachment.html