<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1d125caf4bfa66e7d129e250825d24cdb3e4c0da">https://github.com/macports/macports-ports/commit/1d125caf4bfa66e7d129e250825d24cdb3e4c0da</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1d125ca php4: Fix breakage due to incomplete Apache variant changes
</span>1d125ca is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1d125caf4bfa66e7d129e250825d24cdb3e4c0da
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Nov 1 16:44:36 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> php4: Fix breakage due to incomplete Apache variant changes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Previous commits to remove the apache and apache20 variants were
</span><span style='display:block; white-space:pre;color:#404040;'> incomplete; this completes the work.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Change the default variant to apache22 since the apache2 variant does
</span><span style='display:block; white-space:pre;color:#404040;'> not build.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use require_active_variants instead of a manual implementation.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Don't set the execute bit on conf files and shared libraries.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update notes and checksum types.
</span>---
lang/php4/Portfile | 129 ++++++++++++++++++++---------------------------------
1 file changed, 48 insertions(+), 81 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php4/Portfile b/lang/php4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ede4f14..d837b2d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,17 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
name php4
version 4.4.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 19
</span> set major [lindex [split ${version} .] 0]
set my_name php${major}
dist_subdir ${my_name}
categories lang www
license PHP-3.01
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign}
</span> homepage http://www.php.net/
distname php-${version}
use_bzip2 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,11 +27,10 @@ long_description \
</span> that is especially suited for Web development \
and can be embedded into HTML.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 2e3b2a0e27f10cb84fd00e5ecd7a1880 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 ab3d2205d756ddf93452b57bd6ce6a2014b1c374 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0d77092efaccd8fe6efc16635be98c5d4ccfec66
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 0d77092efaccd8fe6efc16635be98c5d4ccfec66 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2ac502d56ba3360fa4ea2e5c53ea6e35b6367a5654161f9aeec86a549b1656c2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4545009
</span>
depends_build \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,18 +116,11 @@ platform macosx {
</span> --with-iodbc=/usr
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_web conflicts apache apache2 apache22 fastcgi description {Don't include any web server support} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant no_web conflicts apache2 apache22 fastcgi description {Don't include any web server support} {}
</span>
variant apache2 conflicts apache22 no_web description {Add Apache 2.4 web server module} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Checking for mod_cgi.so is a convenient way to verify apache2 is using its
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # +preforkmpm variant. (+eventmpm and +workermpm instead provide mod_cgid.so.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${prefix}/lib/apache2/modules/mod_cgi.so]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "To use ${name} with the +apache2 variant, apache2 must be installed with the +preforkmpm variant."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible apache2 installation"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.violate_mtree yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants apache2 preforkmpm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.violate_mtree yes
</span> depends_lib-append \
port:apache2
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,14 +128,7 @@ variant apache2 conflicts apache22 no_web description {Add Apache 2.4 web server
</span> }
variant apache22 conflicts apache2 no_web description {Add Apache 2.2 web server module} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Checking for mod_cgi.so is a convenient way to verify apache22 is using its
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # +preforkmpm variant. (+workermpm instead provides mod_cgid.so.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${prefix}/apache22/modules/mod_cgi.so]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "To use ${name} with the +apache22 variant, apache22 must be installed with the +preforkmpm variant."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible apache22 installation"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants apache22 preforkmpm
</span> destroot.violate_mtree yes
depends_lib-append \
port:apache22
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,7 +137,7 @@ variant apache22 conflicts apache2 no_web description {Add Apache 2.2 web server
</span> }
variant fastcgi conflicts no_web description {Add FastCGI web server binary} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![variant_isset apache] && ![variant_isset apache2] && ![variant_isset apache20] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset apache2] && ![variant_isset apache22]} {
</span> configure.args-append \
--enable-fastcgi \
--enable-force-cgi-redirect
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -250,8 +235,8 @@ variant xslt description {Add XSLT support using Sablotron} {
</span> --with-iconv-dir=${prefix}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset apache2] && ![variant_isset apache20] && ![variant_isset fastcgi] && ![variant_isset no_web]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +apache2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset apache2] && ![variant_isset apache22] && ![variant_isset fastcgi] && ![variant_isset no_web]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +apache22
</span> }
variant readline description {Add GNU readline functions} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -275,8 +260,9 @@ variant pdflib description {Add PDFlib support} {
</span> extract.only ${distfiles}
distfiles-append ${pdflib_distfile}:pdflib
checksums-append ${pdflib_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 5d0b01dc6fe81a39e7832a4c719983ebd06f6174 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a74d2bba8985bd85fbd61589450c591665663906
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a74d2bba8985bd85fbd61589450c591665663906 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 410f8b1a9691705e4e70a03eb6468e735232f3871c3e63a4cf164250bd25b5bc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 55797
</span> post-extract {
delete ${worksrcpath}/ext/pdf
system -W ${workpath} "gnutar --no-same-owner -xzf ${distpath}/${pdflib_distfile}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -296,13 +282,12 @@ variant suhosin description {Add Suhosin patch} {
</span> }
set suhosin_patch_version ${version}-0.9.6
set suhosin_patch suhosin-patch-${suhosin_patch_version}.patch.gz
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch_sites-append http://download.suhosin.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch_sites-append https://download.suhosin.org/
</span> patchfiles-append ${suhosin_patch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${suhosin_patch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 c4e88782b1572e0aee26e6b2124e6257 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 b2b5121dc1f2bb5ffed968efb978a4a1ac9fcca6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 39d2e74cc879187b348f2e0dd22755680fafb49d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append ${suhosin_patch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 39d2e74cc879187b348f2e0dd22755680fafb49d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 163dc01b0ce2412fec6dcd63f1b4d474c82657672f8d4ca1b40979722c46ca3f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22248
</span> }
destroot.args \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -313,53 +298,37 @@ destroot.target \
</span>
post-destroot {
#copy module
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset apache] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/libexec/apache \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/apache/extra
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/libs/libphp4.so ${destroot}${prefix}/libexec/apache/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}$prefix/etc/apache/extra/mod_php.conf.sample
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset apache2] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/apache2/modules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/apache2/conf/extra
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/libs/libphp4.so ${destroot}${prefix}/apache2/modules/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache2/conf/extra/mod_php.conf.sample
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset apache2]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/lib/apache2/modules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/apache2/extra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/libs/libphp4.so ${destroot}${prefix}/lib/apache2/modules/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -c ${filespath}/mod_php.conf ${destroot}${prefix}/etc/apache2/extra/mod_php.conf.sample
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset apache20] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/apache20/modules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/apache20/conf/extra
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/libs/libphp4.so ${destroot}${prefix}/apache20/modules/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache20/conf/extra/mod_php.conf.sample
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset apache22]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/apache22/modules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/apache22/conf/extra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/libs/libphp4.so ${destroot}${prefix}/apache22/modules/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache22/conf/extra/mod_php.conf.sample
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset fastcgi] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset fastcgi]} {
</span> # If we've built an Apache module (any version) then the FastCGI binary
# will not have been built, so we need to run through the whole process
# again and build just the FastCGI binary. Keep the options here in sync
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # with the options specified in the apache, apache2 and apache20 variants.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset apache] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} ne "macosx") } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-apxs=${prefix}/sbin/apxs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-apxs=/usr/sbin/apxs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset apache2] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # with the options specified in the apache2 and apache22 variants.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset apache2]} {
</span> configure.args-delete \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-apxs2=${prefix}/apache2/bin/apxs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-apxs2=${prefix}/bin/apxs
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset apache20] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset apache22]} {
</span> configure.args-delete \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-apxs2=${prefix}/apache20/bin/apxs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-apxs2=${prefix}/apache22/bin/apxs
</span> }
# Run the build again to get the FastCGI binary. Keep the options here
# in sync with those in the fastcgi variant.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset apache] || [variant_isset apache2] || [variant_isset apache20] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset apache2] || [variant_isset apache22]} {
</span> configure.args-append \
--enable-fastcgi \
--enable-force-cgi-redirect
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -406,8 +375,10 @@ pre-activate {
</span> }
notes "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PHP 4 is obsolete. Please update to PHP 5 (the php5 port).\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-For information on how to update your code, please see\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PHP 4 has reached end-of-life. Please upgrade to a newer version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To learn how to update your code, please read the following guide:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> http://www.php.net/manual/en/migration5.php
"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -433,17 +404,13 @@ post-activate {
</span> ui_msg ""
ui_msg "If this is your first install, you need to activate PHP in your web server."
if {![variant_isset fastcgi]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset apache]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set moduledir ${prefix}/libexec/modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set apxs ${prefix}/apache/bin/apxs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> if {[variant_isset apache2]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set moduledir ${prefix}/apache2/modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set apxs ${prefix}/apache2/bin/apxs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set moduledir ${prefix}/lib/apache2/modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set apxs ${prefix}/bin/apxs
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset apache20]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set moduledir ${prefix}/apache20/modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set apxs ${prefix}/apache20/bin/apxs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset apache22]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set moduledir ${prefix}/apache22/modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set apxs ${prefix}/apache22/bin/apxs
</span> }
ui_msg ""
ui_msg "To enable PHP in Apache, run"
</pre><pre style='margin:0'>
</pre>