<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/c67081f382254acb1dc02dcbc57b322e9cbac37c">https://github.com/macports/macports-ports/commit/c67081f382254acb1dc02dcbc57b322e9cbac37c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c67081f382254acb1dc02dcbc57b322e9cbac37c
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun Oct 15 13:00:26 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> mod_python: add apache22 variant, remove python25 subport
</span>---
www/mod_python/Portfile | 50 +++++++++++++++++++++++++++----------------------
1 file changed, 28 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/mod_python/Portfile b/www/mod_python/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c3c155..1398f2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/mod_python/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/mod_python/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,9 @@
</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_python
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.5.0
</span> categories www python
platforms darwin
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,27 +17,39 @@ long_description \
</span> connections and other data between hits and access to Apache internals.
homepage http://www.modpython.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites apache:httpd/modpython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://dist.modpython.org/dist/
</span> extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 e538170fd78e09408b6d8593da980b126a0fef93 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f78f93172963317f4318f8f2455419743c8fb4f5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 03315af0843892059a11758209f350c82164acc3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0ef09058ed98b41c18d899d8b710a0cce2df2b53c44d877401133b3f28bdca90
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {$subport ne $name && $subport ne "mod_python25"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$subport ne $name} {
</span> depends_build port:flex
depends_lib port:apache2
patchfiles patch-dist-Makefile.in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-connobject.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-dist-version.sh.diff
</span><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 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 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:#ffe0e0;'>- configure.args --with-apxs=${prefix}/apache2/bin/apxs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-flex=${prefix}/bin/flex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-so
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args --with-apxs=${apxs} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-flex=${prefix}/bin/flex
</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 -d -m 755 ${destroot}${prefix}/apache2/modules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 755 ${mdir} \
</span> ${destroot}${prefix}/share/doc
file copy ${worksrcpath}/doc-html ${destroot}${prefix}/share/doc/${subport}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,8 +57,8 @@ if {$subport ne $name && $subport ne "mod_python25"} {
</span> notes "To enable ${subport}, add
LoadModule python_module modules/mod_python.so
to your apache2 config file:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/apache2/conf/httpd.conf"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {$subport eq $name} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${httpd_conf}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> # mod_python used to be for python 2.4
replaced_by mod_python27
depends_lib port:mod_python27
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,10 +89,3 @@ subport mod_python26 {
</span> configure.args-append --with-python=${prefix}/bin/python2.6
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport mod_python25 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by mod_python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "This port is only a stub and is replaced by $replaced_by"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span></pre><pre style='margin:0'>
</pre>