Modified: trunk/dports/mail/alpine/Portfile (133471 => 133472)

--- trunk/dports/mail/alpine/Portfile	2015-03-03 00:25:49 UTC (rev 133471)
+++ trunk/dports/mail/alpine/Portfile	2015-03-03 00:25:51 UTC (rev 133472)
@@ -72,21 +72,24 @@
 }
 
 variant tcl description {Tcl support (required by Alpine Web} {
-    # Should we force MacPorts' Tcl?
+    # Should we force use of MacPorts' `tcl` port?
     configure.args-delete   --without-tcl
 }
 
 default_variants +kerberos +ldap +ssl
 
 
+# ###############################################
+# TODO: Remove after 2016-02-20.
+#
 
-# TODO: Remove legacy variants after 2016-02-20.
-
+# Deprecate negative variants.
 variant without_krb5 conflicts kerberos description {Legacy variant} {}
 variant without_ldap conflicts ldap description {Legacy variant} {}
 variant without_ssl conflicts ssl description {Legacy variant} {}
 variant without_tcl conflicts tcl description {Legacy variant} {}
 
+# Remove default variants if user has explicitly enabled their inverses.
 if {[variant_isset without_krb5]} {
     default_variants -kerberos
 }
@@ -96,9 +99,18 @@
 if {[variant_isset without_ssl]} {
     default_variants -ssl
 }
+
+# Since +without_tcl used to be set by default, we need to test whether
+# the user set -without_tcl and set +tcl if so. However, if we just
+# checked for -without_tcl, new installs would get +tcl by default,
+# which we don't want. So we should continue setting +without_tcl by
+# default until we remove it.
+
 if {![variant_isset tcl]} {
     default_variants +without_tcl
 }
 if {![variant_isset without_tcl]} {
     default_variants +tcl
 }
+
+# ###############################################