[58833] trunk/dports/lang/php52

[ryandesign at macports.org]

Revision: 58833
          http://trac.macports.org/changeset/58833
Author:   ryandesign at macports.org
Date:     2009-10-05 22:03:58 -0700 (Mon, 05 Oct 2009)
Log Message:
-----------
php52: merge r58589 from php5: update to 5.2.11_1:

 * 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)

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

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

Added Paths:
-----------
    trunk/dports/lang/php52/files/patch-scripts-php-config.in.diff

Property Changed:
----------------
    trunk/dports/lang/php52/


Property changes on: trunk/dports/lang/php52
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/lang/php5:53631,54310,54581-55557,56403
/trunk/dports/www/php5-devel:41985
   + /trunk/dports/lang/php5:53631,54310,54581-55557,56403,58589
/trunk/dports/www/php5-devel:41985

Modified: trunk/dports/lang/php52/Portfile
===================================================================
--- trunk/dports/lang/php52/Portfile	2009-10-06 04:54:01 UTC (rev 58832)
+++ trunk/dports/lang/php52/Portfile	2009-10-06 05:03:58 UTC (rev 58833)
@@ -5,6 +5,7 @@
 name                    php52
 conflicts               php5 php5-devel
 version                 5.2.11
+revision                1
 set major               [lindex [split ${version} .] 0]
 set my_name             php${major}
 dist_subdir             ${my_name}
@@ -58,6 +59,7 @@
 # Use -p1 to accommodate the Suhosin patch
 patch.pre_args          -p1
 patchfiles \
+    patch-scripts-php-config.in.diff \
     patch-bind.diff
 
 use_autoconf            yes
@@ -139,6 +141,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
@@ -371,17 +381,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] } {

Copied: trunk/dports/lang/php52/files/patch-scripts-php-config.in.diff (from rev 58831, trunk/dports/lang/php5/files/patch-scripts-php-config.in.diff)
===================================================================
--- trunk/dports/lang/php52/files/patch-scripts-php-config.in.diff	                        (rev 0)
+++ trunk/dports/lang/php52/files/patch-scripts-php-config.in.diff	2009-10-06 05:03:58 UTC (rev 58833)
@@ -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/20091005/5ac5abf7/attachment.html>