Index: Portfile
===================================================================
--- Portfile	(revision 142334)
+++ Portfile	(working copy)
@@ -4,6 +4,7 @@
 
 name                    webalizer
 version                 2.23-08
+revision                1
 categories              www
 platforms               darwin
 license                 GPL-2
@@ -26,11 +27,15 @@
                         sha256  b37524fbd98e97052a80d59f75e69f857468752cf74cc0eb0972e5fab02eb6f7 \
                         size    308090
 
-depends_lib             port:gd2 \
+depends_lib             port:bzip2 \
+                        port:gd2 \
+                        port:libgeoip \
                         port:libpng \
                         port:zlib
 
-configure.args          --disable-dns \
+configure.args          --enable-bz2 \
+                        --enable-geoip \
+                        --disable-dns \
                         --disable-largefile \
                         --mandir=${prefix}/share/man \
                         --with-etcdir=${prefix}/etc \
@@ -61,19 +66,11 @@
     configure.args-append   --enable-debug
 }
 
-variant no_largefile description {Legacy variant} {
-    # Delete after 1/17/2019
-}
-
 variant largefile conflicts no_largefile description {Add support for large files} {
     configure.args-delete   --disable-largefile
 }
 
-variant no_dns conflicts dns description {Legacy variant} {
-    # Delete after 1/17/2019
-}
-
-variant dns description {Enable DNS/GeoDB lookup code} {
+variant dns conflicts no_dns description {Enable DNS/GeoDB lookup code} {
     configure.args-delete   --disable-dns
     configure.args-append   --with-db=${prefix}/include/db60 \
                             --with-dblib=${prefix}/lib/db60
@@ -80,20 +77,20 @@
     depends_lib-append      port:db60
 }
 
-variant with_bz2 description {Enable BZip2 decompression code} {
-    configure.args-append   --enable-bz2
-    depends_lib-append      port:bzip2
-}
+# Delete the below after 1/17/2019
 
-variant with_geoip conflicts no_dns description {Enable GeoIP geolocation code} {
-    configure.args-append   --enable-geoip
-    depends_lib-append      port:libgeoip
-}
+variant no_dns conflicts dns description {Legacy variant} {}
 
-if {![variant_isset no_dns]} {
+if {[variant_isset no_dns]} {
+    default_variants        -dns
+} else {
     default_variants        +dns
 }
 
-if {![variant_isset no_largefile]} {
+variant no_largefile conflicts largefile description {Legacy variant} {}
+
+if {[variant_isset no_largefile]} {
+    default_variants        -largefile
+} else {
     default_variants        +largefile
 }