[58589] trunk/dports/lang/php5
ryandesign at macports.org
ryandesign at macports.org
Thu Oct 1 05:57:22 PDT 2009
Revision: 58589
http://trac.macports.org/changeset/58589
Author: ryandesign at macports.org
Date: 2009-10-01 05:57:22 -0700 (Thu, 01 Oct 2009)
Log Message:
-----------
php5: update to 5.3.0_3:
* remove odbc support which is now in the php5-odbc port (#19091)
* remove snmp support which is now in the php5-snmp port (#19091)
* remove dba support which is now in the php5-dba port (#20056)
* fix php-config --includes so it contains -I${prefix}/include (#20627)
* move conf file from extras-conf to extra to match the rest of apache2's extra conf files (#21217)
* prevent installation with the +apache2 variant when apache2 is not built with the +preforkmpm variant (#21281)
* update suhosin patch to version 5.3.0-0.9.8 final (#21737)
* fix intermittent open_basedir corruption issues (#21738)
Modified Paths:
--------------
trunk/dports/lang/php5/Portfile
Added Paths:
-----------
trunk/dports/lang/php5/files/patch-main-fopen_wrappers.c.diff
trunk/dports/lang/php5/files/patch-scripts-php-config.in.diff
Modified: trunk/dports/lang/php5/Portfile
===================================================================
--- trunk/dports/lang/php5/Portfile 2009-10-01 12:54:01 UTC (rev 58588)
+++ trunk/dports/lang/php5/Portfile 2009-10-01 12:57:22 UTC (rev 58589)
@@ -6,7 +6,7 @@
conflicts php5-devel php52
epoch 1
version 5.3.0
-revision 2
+revision 3
set major [lindex [split ${version} .] 0]
set my_name php${major}
dist_subdir ${my_name}
@@ -50,7 +50,9 @@
# Use -p1 to accommodate the Suhosin patch
patch.pre_args -p1
patchfiles \
+ patch-scripts-php-config.in.diff \
patch-ext-mysqlnd-mysqlnd_portability.h.diff \
+ patch-main-fopen_wrappers.c.diff \
patch-bind.diff
use_autoconf yes
@@ -69,7 +71,6 @@
--disable-all \
--enable-bcmath \
--enable-ctype \
- --enable-dba \
--enable-dom \
--enable-fileinfo \
--enable-filter \
@@ -103,8 +104,7 @@
platform macosx {
configure.args-append \
- --with-ldap=/usr \
- --with-iodbc=/usr
+ --with-ldap=/usr
}
variant no_web conflicts apache apache2 fastcgi description {Don't include any web server support} {}
@@ -128,6 +128,14 @@
# Build an Apache 2.2 module. Keep the options here in sync with those in the
# relevant part of the post-destroot phase.
variant apache2 conflicts apache no_web description {Add Apache 2.2 web server module} {
+ pre-extract {
+ # Checking for mod_cgi.so is a convenient way to verify apache2 is using its
+ # +preforkmpm variant. (+eventmpm and +workermpm instead provide mod_cgid.so.)
+ if {![file exists ${prefix}/apache2/modules/mod_cgi.so]} {
+ ui_error "To use ${name} with the +apache2 variant, apache2 must be installed with the +preforkmpm variant."
+ return -code error "incompatible apache2 installation"
+ }
+ }
destroot.violate_mtree yes
depends_lib-append \
port:apache2
@@ -149,6 +157,7 @@
foreach {old_variant new_port} {
gmp gmp
imap imap
+ macports_snmp snmp
mssql mssql
mysql3 mysql
mysql4 mysql
@@ -159,6 +168,7 @@
postgresql82 postgresql
postgresql83 postgresql
pspell pspell
+ snmp snmp
sockets sockets
sqlite sqlite
tidy tidy
@@ -172,20 +182,6 @@
}]
}
-variant snmp conflicts macports_snmp description {Add SNMP support using Apple SNMP} {
- # This compiles PHP5 with SNMP linked against Apple's included NET-SNMP.
- configure.args-append \
- --with-snmp=/usr
-}
-
-variant macports_snmp conflicts snmp description {Add SNMP support using MacPorts SNMP} {
- # This compiles PHP with SNMP linked against MacPorts' NET-SNMP.
- depends_lib-append \
- port:net-snmp
- configure.args-append \
- --with-snmp=${prefix}
-}
-
variant ipc description {Add semaphore, shared memory and IPC functions} {
configure.args-append \
--enable-shmop \
@@ -226,15 +222,16 @@
return -code error "incompatible Mac OS X version"
}
}
- set suhosin_patch_version ${version}-0.9.8-BETA-1
+ set suhosin_patch_version ${version}-0.9.8
set suhosin_patch suhosin-patch-${suhosin_patch_version}.patch.gz
patch_sites-append http://download.suhosin.org/
patchfiles-append ${suhosin_patch}
+ patchfiles-delete patch-main-fopen_wrappers.c.diff
checksums-append \
${suhosin_patch} \
- md5 62dc36545b86bf86e44ada1fccc17d0a \
- sha1 8bad461c7b16febc1d2f6bcbf4c8e10428569591 \
- rmd160 d89fd850dbba853aa881454be7995e2d6dff2490
+ md5 a23a3d54e177ac0ad30f78d928ba8177 \
+ sha1 f2cdce64a9811a5712bcb038b8d4411f5817abfd \
+ rmd160 d01333d55a8288506060053be31c00a24dd14836
}
destroot.args \
@@ -247,17 +244,17 @@
# Copy the Apache 1 module.
if { [variant_isset apache] } {
xinstall -m 755 -d ${destroot}${prefix}/libexec/apache \
- ${destroot}${prefix}/etc/apache/extras-conf
+ ${destroot}${prefix}/etc/apache/extra
xinstall -m 755 ${worksrcpath}/libs/libphp5.so ${destroot}${prefix}/libexec/apache/
- xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}$prefix/etc/apache/extras-conf
+ xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}$prefix/etc/apache/extra
}
# Copy the Apache 2.2 module.
if { [variant_isset apache2] } {
xinstall -m 755 -d ${destroot}${prefix}/apache2/modules \
- ${destroot}${prefix}/apache2/conf/extras-conf
+ ${destroot}${prefix}/apache2/conf/extra
xinstall -m 755 ${worksrcpath}/libs/libphp5.so ${destroot}${prefix}/apache2/modules/
- xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache2/conf/extras-conf
+ xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache2/conf/extra
}
if { [variant_isset fastcgi] } {
Added: trunk/dports/lang/php5/files/patch-main-fopen_wrappers.c.diff
===================================================================
--- trunk/dports/lang/php5/files/patch-main-fopen_wrappers.c.diff (rev 0)
+++ trunk/dports/lang/php5/files/patch-main-fopen_wrappers.c.diff 2009-10-01 12:57:22 UTC (rev 58589)
@@ -0,0 +1,13 @@
+Fix http://bugs.php.net/bug.php?id=48880
+Remove this patch when updating to php 5.3.1
+--- a/main/fopen_wrappers.c (revision 286601)
++++ b/main/fopen_wrappers.c (revision 286602)
+@@ -93,7 +93,7 @@
+
+ p = (char **) (base + (size_t) mh_arg1);
+
+- if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN) {
++ if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN || stage == PHP_INI_STAGE_ACTIVATE || stage == PHP_INI_STAGE_DEACTIVATE) {
+ /* We're in a PHP_INI_SYSTEM context, no restrictions */
+ *p = new_value;
+ return SUCCESS;
Added: trunk/dports/lang/php5/files/patch-scripts-php-config.in.diff
===================================================================
--- trunk/dports/lang/php5/files/patch-scripts-php-config.in.diff (rev 0)
+++ trunk/dports/lang/php5/files/patch-scripts-php-config.in.diff 2009-10-01 12:57:22 UTC (rev 58589)
@@ -0,0 +1,11 @@
+--- a/scripts/php-config.in.orig 2007-08-24 06:44:10.000000000 -0500
++++ b/scripts/php-config.in 2009-08-10 16:33:49.000000000 -0500
+@@ -6,7 +6,7 @@
+ version="@PHP_VERSION@"
+ vernum="@PHP_VERSION_ID@"
+ include_dir="@includedir@/php"
+-includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
++includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib -I at prefix@/include"
+ ldflags="@PHP_LDFLAGS@"
+ libs="@EXTRA_LIBS@"
+ extension_dir='@EXTENSION_DIR@'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091001/bd35d2fc/attachment-0001.html>
More information about the macports-changes
mailing list