<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/3668d218da11c67b03aa982bcabb1067a16ca563">https://github.com/macports/macports-ports/commit/3668d218da11c67b03aa982bcabb1067a16ca563</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 3668d21 php-apache2handler: fix confdir path, no longer violate mtree
</span>3668d21 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3668d218da11c67b03aa982bcabb1067a16ca563
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Mon Oct 16 10:11:10 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> php-apache2handler: fix confdir path, no longer violate mtree
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/50965
</span>---
lang/php/Portfile | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/Portfile b/lang/php/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0b37869..8898e37 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -423,14 +423,14 @@ subport ${php}-apache2handler {
</span> PortGroup active_variants 1.1
switch -- ${version} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.2.17 {revision 1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.3.29 {revision 1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.4.45 {revision 1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.5.38 {revision 1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5.6.31 {revision 1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.0.24 {revision 1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.1.10 {revision 1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.2.0RC4 {revision 1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.2.17 {revision 2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.3.29 {revision 2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.4.45 {revision 2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.5.38 {revision 2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5.6.31 {revision 2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.0.24 {revision 2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.1.10 {revision 2}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.2.0RC4 {revision 2}
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -444,15 +444,13 @@ subport ${php}-apache2handler {
</span> require_active_variants apache2 preforkmpm
set apxs ${prefix}/bin/apxs
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set confdir ${prefix}/etc/apache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set confdir ${prefix}/etc/apache2
</span> set moduledir ${prefix}/lib/apache2/modules
configure.args-append --with-apxs2=${apxs}
build.target libs/libphp${major}.bundle
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.violate_mtree yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> destroot {
xinstall -m 755 -d ${destroot}${moduledir} ${destroot}${confdir}/extra
xinstall -m 644 ${worksrcpath}/libs/libphp${major}.so ${destroot}${moduledir}/mod_${php}.so
</pre><pre style='margin:0'>
</pre>