<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/0414d1430d14df32a76472855e31ea95024b1439">https://github.com/macports/macports-ports/commit/0414d1430d14df32a76472855e31ea95024b1439</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 0414d14 mapserver: remove obsolete apache22 variant
</span>0414d14 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0414d1430d14df32a76472855e31ea95024b1439
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu Apr 30 09:46:33 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> mapserver: remove obsolete apache22 variant
</span>---
gis/mapserver/Portfile | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mapserver/Portfile b/gis/mapserver/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8790aee..650d874 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/mapserver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/mapserver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,25 +117,19 @@ variant geos description {Add GEOS operations support} {
</span> configure.args-append --with-geos
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant apache2 conflicts apache_apple apache22 description {Use MacPorts Apache 2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant apache2 conflicts apache_apple description {Use MacPorts Apache 2} {
</span> depends_run-append port:apache2
global cgi_path
set cgi_path "${prefix}/www/apache2/cgi-bin/"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant apache22 conflicts apache_apple apache2 description {Use MacPorts Apache 2} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove after 2020-04-30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Please do not install this variant since Apache 2.2 is obsolete."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant apache_apple conflicts apache2 description {Use Apple Apache} {
global cgi_path
set cgi_path "/Library/WebServer/CGI-Executables/"
destroot.violate_mtree yes
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset apache2] && ![variant_isset apache22] && ![variant_isset apache_apple]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset apache2] && ![variant_isset apache_apple]} {
</span> # default to the apple apache version if none specified
default_variants +apache_apple
}
</pre><pre style='margin:0'>
</pre>