<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/da8d170032678f284ab45e3a2c3a370363ee0620">https://github.com/macports/macports-ports/commit/da8d170032678f284ab45e3a2c3a370363ee0620</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit da8d170032678f284ab45e3a2c3a370363ee0620
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun Oct 15 13:09:34 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> php4: add apache22, remove apache20 variants
</span>---
lang/php4/Portfile | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 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 8b9eb3b..dbd4b61 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;'>@@ -116,13 +116,13 @@ platform macosx {
</span> --with-iodbc=/usr
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_web conflicts apache apache2 apache20 fastcgi description {Don't include any web server support} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#ffe0e0;'>-variant apache2 conflicts apache20 no_web description {Add Apache 2.2 web server module} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant apache2 conflicts apache22 no_web description {Add Apache 2.4 web server module} {
</span> pre-configure {
# 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.)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${prefix}/apache2/modules/mod_cgi.so]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/lib/apache2/modules/mod_cgi.so]} {
</span> ui_error "To use ${name} with the +apache2 variant, apache2 must be installed with the +preforkmpm variant."
return -code error "incompatible apache2 installation"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,23 +131,23 @@ variant apache2 conflicts apache20 no_web description {Add Apache 2.2 web server
</span> depends_lib-append \
port:apache2
configure.args-append \
<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;'>-variant apache20 conflicts apache2 no_web description {Add Apache 2.0 web server module} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant apache22 conflicts apache2 no_web description {Add Apache 2.2 web server module} {
</span> pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Checking for mod_cgi.so is a convenient way to verify apache20 is using its
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Checking for mod_cgi.so is a convenient way to verify apache22 is using its
</span> # +preforkmpm variant. (+workermpm instead provides mod_cgid.so.)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${prefix}/apache20/modules/mod_cgi.so]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "To use ${name} with the +apache20 variant, apache20 must be installed with the +preforkmpm variant."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible apache20 installation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/apache22/modules/mod_cgi.so]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:#e0ffe0;'>+ return -code error "incompatible apache22 installation"
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.violate_mtree yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.violate_mtree yes
</span> depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:apache20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:apache22
</span> configure.args-append \
<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> }
variant fastcgi conflicts no_web description {Add FastCGI web server binary} {
</pre><pre style='margin:0'>
</pre>