<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/c1d67881a648ef3b4039d16ec0045d396759ac2d">https://github.com/macports/macports-ports/commit/c1d67881a648ef3b4039d16ec0045d396759ac2d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c1d67881a648ef3b4039d16ec0045d396759ac2d
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun Oct 15 12:45:52 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> mapserver: add apache22 and postgresql96 variants
</span>---
gis/mapserver/Portfile | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 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 c06009b..6cc8167 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name mapserver
version 6.2.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> maintainers hbaspecto.com:jea openmaintainer
categories gis
license permissive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ if {[variant_isset postgis]} {
</span> set HAVE_PGCONFIG [llength [glob -nocomplain -d ${prefix}/lib postgresql*/bin/pg_config]]
# if not found, intall the postgresql port
if {$HAVE_PGCONFIG == 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql96
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,24 +117,30 @@ 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 description {Use MacPorts Apache 2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant apache2 conflicts apache_apple apache22 description {Use MacPorts Apache 2} {
</span> depends_run-append port:apache2
global cgi_path
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cgi_path "${prefix}/www/apache2/cgi-bin/"
</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 conflicts apache_apple apache2 description {Use MacPorts Apache 2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:apache22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global cgi_path
</span> set cgi_path "${prefix}/apache2/cgi-bin/"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.violate_mtree yes
</span> }
variant apache_apple conflicts apache2 description {Use Apple Apache} {
global cgi_path
set cgi_path "/Library/WebServer/CGI-Executables/"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.violate_mtree yes
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset apache2] && ![variant_isset apache_apple]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset apache2] && ![variant_isset apache22] && ![variant_isset apache_apple]} {
</span> # default to the apple apache version if none specified
default_variants +apache_apple
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.violate_mtree yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
file mkdir ${destroot}${cgi_path}
# There's no good reason to keep the executable in ${prefix}/bin.
</pre><pre style='margin:0'>
</pre>