Changeset 58844


Ignore:
Timestamp:
Oct 6, 2009, 7:13:33 AM (8 years ago)
Author:
ryandesign@…
Message:

php4: merge r58589 from php5: update to 4.4.9_8:

  • 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/+apache20 variant when apache2/apache20 is not built with the +preforkmpm variant (#21281)

Also fix mod_php.conf which appears to have been incorrect ever since the php5 port was created in r7758.

Location:
trunk/dports/lang/php4
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/dports/lang/php4

  • trunk/dports/lang/php4/Portfile

    r58839 r58844  
    55name                    php4
    66version                 4.4.9
    7 revision                7
     7revision                8
    88set major               [lindex [split ${version} .] 0]
    99set my_name             php${major}
     
    5353# Use -p1 to accommodate the Suhosin patch
    5454patch.pre_args          -p1
     55patchfiles \
     56    patch-scripts-php-config.in.diff
    5557
    5658set phpinidir           ${prefix}/etc/${my_name}
     
    127129
    128130variant apache2 conflicts apache apache20 no_web description {Add Apache 2.2 web server module} {
     131    pre-extract {
     132        # Checking for mod_cgi.so is a convenient way to verify apache2 is using its
     133        # +preforkmpm variant. (+eventmpm and +workermpm instead provide mod_cgid.so.)
     134        if {![file exists ${prefix}/apache2/modules/mod_cgi.so]} {
     135            ui_error "To use ${name} with the +apache2 variant, apache2 must be installed with the +preforkmpm variant."
     136            return -code error "incompatible apache2 installation"
     137        }
     138    }
    129139    destroot.violate_mtree yes
    130140    depends_lib-append \
     
    135145
    136146variant apache20 conflicts apache apache2 no_web description {Add Apache 2.0 web server module} {
     147    pre-extract {
     148        # Checking for mod_cgi.so is a convenient way to verify apache20 is using its
     149        # +preforkmpm variant. (+workermpm instead provides mod_cgid.so.)
     150        if {![file exists ${prefix}/apache20/modules/mod_cgi.so]} {
     151            ui_error "To use ${name} with the +apache20 variant, apache20 must be installed with the +preforkmpm variant."
     152            return -code error "incompatible apache20 installation"
     153        }
     154    }
    137155    destroot.violate_mtree yes
    138156    depends_lib-append \
     
    278296    if { [variant_isset apache] } {
    279297        xinstall -m 755 -d ${destroot}${prefix}/libexec/apache \
    280             ${destroot}${prefix}/etc/apache/extras-conf
     298            ${destroot}${prefix}/etc/apache/extra
    281299        xinstall -m 755 ${worksrcpath}/libs/libphp4.so ${destroot}${prefix}/libexec/apache/
    282         xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}$prefix/etc/apache/extras-conf/mod_php.conf.sample
     300        xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}$prefix/etc/apache/extra/mod_php.conf.sample
    283301    }
    284302   
    285303    if { [variant_isset apache2] } {
    286304        xinstall -m 755 -d ${destroot}${prefix}/apache2/modules \
    287             ${destroot}${prefix}/apache2/conf/extras-conf
     305            ${destroot}${prefix}/apache2/conf/extra
    288306        xinstall -m 755 ${worksrcpath}/libs/libphp4.so ${destroot}${prefix}/apache2/modules/
    289         xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache2/conf/extras-conf/mod_php.conf.sample
     307        xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache2/conf/extra/mod_php.conf.sample
    290308    }
    291309   
    292310    if { [variant_isset apache20] } {
    293311        xinstall -m 755 -d ${destroot}${prefix}/apache20/modules \
    294             ${destroot}${prefix}/apache20/conf/extras-conf
     312            ${destroot}${prefix}/apache20/conf/extra
    295313        xinstall -m 755 ${worksrcpath}/libs/libphp4.so ${destroot}${prefix}/apache20/modules/
    296         xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache20/conf/extras-conf/mod_php.conf.sample
     314        xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache20/conf/extra/mod_php.conf.sample
    297315    }
    298316   
  • trunk/dports/lang/php4/files/mod_php.conf

    r7758 r58844  
    1 <IfModule mod_php5.c>
     1<IfModule mod_php4.c>
    22
    33AddType  application/x-httpd-php         .php
  • trunk/dports/lang/php4/files/patch-scripts-php-config.in.diff

    r58840 r58844  
    1 --- a/scripts/php-config.in.orig        2007-08-24 06:44:10.000000000 -0500
    2 +++ b/scripts/php-config.in     2009-08-10 16:33:49.000000000 -0500
    3 @@ -6,7 +6,7 @@
     1--- a/scripts/php-config.in.orig        2005-03-16 00:37:03.000000000 -0600
     2+++ b/scripts/php-config.in     2009-10-06 01:58:17.000000000 -0500
     3@@ -3,7 +3,7 @@
     4 prefix="@prefix@"
    45 version="@PHP_VERSION@"
    5  vernum="@PHP_VERSION_ID@"
    6  include_dir="@includedir@/php"
    7 -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"
    8 +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@prefix@/include"
     6 includedir="@includedir@/php"
     7-includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend"
     8+includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I@prefix@/include"
    99 ldflags="@PHP_LDFLAGS@"
    1010 libs="@EXTRA_LIBS@"
Note: See TracChangeset for help on using the changeset viewer.