<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/67a64434883211e05d2580de03fbad897046bca5">https://github.com/macports/macports-ports/commit/67a64434883211e05d2580de03fbad897046bca5</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 67a6443 webalizer: Always enable bz2 and geoip support
</span>67a6443 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 67a64434883211e05d2580de03fbad897046bca5
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jan 19 19:20:55 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> webalizer: Always enable bz2 and geoip support
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The bzip2 and libgeoip dependencies are small so this should not be an
</span><span style='display:block; white-space:pre;color:#404040;'> inconvenience. Remove the with_bz2 and with_geoip variants.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Ensure that if the user had selected the old no_dns or no_largefile
</span><span style='display:block; white-space:pre;color:#404040;'> variants, the new dns and largefile variants are explicitly disabled.
</span>---
www/webalizer/Portfile | 39 ++++++++++++++++++---------------------
1 file changed, 18 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webalizer/Portfile b/www/webalizer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ef300b..c4fd8f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webalizer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webalizer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name webalizer
version 2.23-08
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories www
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,11 +27,15 @@ checksums rmd160 6f1d2ca90d9a891c878e5edb220684869f9fd32c \
</span> sha256 b37524fbd98e97052a80d59f75e69f857468752cf74cc0eb0972e5fab02eb6f7 \
size 308090
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gd2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gd2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgeoip \
</span> port:libpng \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-dns \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --enable-bz2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-geoip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-dns \
</span> --disable-largefile \
--mandir=${prefix}/share/man \
--with-etcdir=${prefix}/etc \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,39 +66,31 @@ variant debug description {Compile with debugging code} {
</span> configure.args-append --enable-debug
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_largefile description {Legacy variant} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Delete after 1/17/2019
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant largefile conflicts no_largefile description {Add support for large files} {
configure.args-delete --disable-largefile
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_dns conflicts dns description {Legacy variant} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Delete after 1/17/2019
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant dns description {Enable DNS/GeoDB lookup code} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant dns conflicts no_dns description {Enable DNS/GeoDB lookup code} {
</span> configure.args-delete --disable-dns
configure.args-append --with-db=${prefix}/include/db60 \
--with-dblib=${prefix}/lib/db60
depends_lib-append port:db60
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant with_bz2 description {Enable BZip2 decompression code} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-bz2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:bzip2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Delete the below after 1/17/2019
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant with_geoip conflicts no_dns description {Enable GeoIP geolocation code} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-geoip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libgeoip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant no_dns conflicts dns description {Legacy variant} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset no_dns]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset no_dns]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants -dns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> default_variants +dns
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset no_largefile]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant no_largefile conflicts largefile description {Legacy variant} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset no_largefile]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants -largefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> default_variants +largefile
}
</pre><pre style='margin:0'>
</pre>