php-apache2handler: fix confdir path, no longer violate mtree

See: https://trac.macports.org/ticket/50965
macports · Oct 16, 2017 · 3668d21 · 3668d21
1 parent 1e70102
commit 3668d21
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/lang/php/Portfile b/lang/php/Portfile
@@ -423,14 +423,14 @@ subport ${php}-apache2handler {
     PortGroup               active_variants 1.1
 
     switch -- ${version} {
-        5.2.17              {revision 1}
-        5.3.29              {revision 1}
-        5.4.45              {revision 1}
-        5.5.38              {revision 1}
-        5.6.31              {revision 1}
-        7.0.24              {revision 1}
-        7.1.10              {revision 1}
-        7.2.0RC4            {revision 1}
+        5.2.17              {revision 2}
+        5.3.29              {revision 2}
+        5.4.45              {revision 2}
+        5.5.38              {revision 2}
+        5.6.31              {revision 2}
+        7.0.24              {revision 2}
+        7.1.10              {revision 2}
+        7.2.0RC4            {revision 2}
     }
 
     description             ${php} Apache 2 Handler SAPI
@@ -444,15 +444,13 @@ subport ${php}-apache2handler {
     require_active_variants apache2 preforkmpm
 
     set apxs ${prefix}/bin/apxs
-    set confdir ${prefix}/etc/apache
+    set confdir ${prefix}/etc/apache2
     set moduledir ${prefix}/lib/apache2/modules
 
     configure.args-append   --with-apxs2=${apxs}
 
     build.target            libs/libphp${major}.bundle
 
-    destroot.violate_mtree  yes
-
     destroot {
         xinstall -m 755 -d ${destroot}${moduledir} ${destroot}${confdir}/extra
         xinstall -m 644 ${worksrcpath}/libs/libphp${major}.so ${destroot}${moduledir}/mod_${php}.so