alpine: remove obsolete negative variants

macports · Feb 4, 2017 · fc2617d · fc2617d
1 parent 687d066
commit fc2617d
Showing 1 changed file with 0 additions and 37 deletions.
diff --git a/mail/alpine/Portfile b/mail/alpine/Portfile
@@ -77,40 +77,3 @@ variant tcl description {Tcl support (required by Alpine Web)} requires ssl {
 }
 
 default_variants +kerberos +ldap +ssl
-
-
-# ###############################################
-# TODO: Remove 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
-}
-if {[variant_isset without_ldap]} {
-    default_variants -ldap
-}
-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
-}
-
-# ###############################################