<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/da25318a59465d6a8e5728082d1b870ab37cb39a">https://github.com/macports/macports-ports/commit/da25318a59465d6a8e5728082d1b870ab37cb39a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit da25318a59465d6a8e5728082d1b870ab37cb39a
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun Oct 15 12:58:30 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> mod_perl2: add apache22 variant
</span>---
www/mod_perl2/Portfile | 37 +++++++++++++++++++++++++------------
1 file changed, 25 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/mod_perl2/Portfile b/www/mod_perl2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 832cd4a..795d791 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/mod_perl2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/mod_perl2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,22 +44,35 @@ if {[string match *clang* ${configure.compiler}]} {
</span> patchfiles-append clang-compatibility_src-modules-perl-modperl_common_util.h.patch
}
<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;'>+if {[variant_isset apache22]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set apache_name apache22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set apachectl ${prefix}/apache2/bin/apachectl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set apxs ${prefix}/apache22/bin/apxs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mdir ${destroot}${prefix}/apache22/modules/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set apache_name apache2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set apachectl ${prefix}/sbin/apachectl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set apxs ${prefix}/bin/apxs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mdir ${destroot}${prefix}/lib/apache2/modules/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "${perl5.bin} Makefile.PL MP_APXS=${APXS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant apache22 description "use apache22 instead of apache2" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace port:apache2 port:apache22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.violate_mtree yes
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.violate_mtree yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${perl5.bin} Makefile.PL MP_APXS=${apxs}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/apache2/include/modules/perl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/apache2/libexec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 {*}[glob ${worksrcpath}/src/modules/perl/*.h] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/apache2/include/modules/perl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/include/${apache_name}/modules/perl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/libexec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 {*}[glob ${worksrcpath}/src/modules/perl/*.h] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/include/${apache_name}/modules/perl
</span>
xinstall -m 755 ${worksrcpath}/src/modules/perl/mod_perl.so \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/apache2/libexec/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${mdir}
</span>
fs-traverse f ${destroot}${prefix} {
if {[file isfile ${f}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,12 +89,12 @@ post-destroot {
</span> notes "
If this your first install, you might want to enable mod_perl in apache:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cd ${prefix}/apache2/libexec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${APXS} -a -e -n \"perl\" mod_perl.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd ${mdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${apxs} -a -e -n \"perl\" mod_perl.so
</span>
And then relaunch apache:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/apache2/bin/apachectl restart
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${apachectl} restart
</span> "
livecheck.url http://perl.apache.org/download/index.html
</pre><pre style='margin:0'>
</pre>