<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/ac42b7c5a6fa1aba5c38429b6b4da56bcbd25781">https://github.com/macports/macports-ports/commit/ac42b7c5a6fa1aba5c38429b6b4da56bcbd25781</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ac42b7c5a6fa1aba5c38429b6b4da56bcbd25781
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun Oct 15 12:49:43 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> mod_dnssd: add apache22 variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> add mode line
</span>---
www/mod_dnssd/Portfile | 30 ++++++++++++++++++++++++------
1 file changed, 24 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/mod_dnssd/Portfile b/www/mod_dnssd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b2c80e..48a35ea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/mod_dnssd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/mod_dnssd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
name mod_dnssd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,14 +25,31 @@ depends_lib port:apache2 port:avahi
</span> patchfiles patch-src_Makefile.in.diff
configure.args --disable-lynx
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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 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 httpd_conf ${prefix}/apache22/conf/httpd.conf
</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 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 httpd_conf ${prefix}/etc/apache2/httpd.conf
</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:#e0ffe0;'>+
</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:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Set APXS APACHECTL since configure appears to ignore --with-apxs and
# --with-apachectl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env APXS=${prefix}/apache2/bin/apxs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- APACHECTL=${prefix}/apache2/bin/apachectl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env APXS=${apxs} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ APACHECTL=${apachectl}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.violate_mtree yes
</span> pre-destroot {
<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:#e0ffe0;'>+ xinstall -m 755 -d ${mdir}
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,9 +61,8 @@ post-destroot {
</span> post-activate {
ui_msg "To enable ${name}, add"
ui_msg " LoadModule dnssd_module modules/mod_dnssd.so"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "to your ${prefix}/apache2/conf/httpd.conf file."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "to your ${httpd_conf} file."
</span> ui_msg "Please read the documentation at"
ui_msg " http://0pointer.de/lennart/projects/mod_dnssd/"
ui_msg " for further details on configuration of this module"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
</pre><pre style='margin:0'>
</pre>