Revision: 133471 https://trac.macports.org/changeset/133471 Author: larryv@macports.org Date: 2015-03-02 16:25:49 -0800 (Mon, 02 Mar 2015) Log Message: ----------- alpine: Build default variants differently Instead of incrementally constructing the set of default (positive) variants based on which deprecated (negative) variants are selected, start with the new default set and remove variants as necessary. This better isolates the deprecation code and will make its future removal less disruptive to the rest of the portfile. Modified Paths: -------------- trunk/dports/mail/alpine/Portfile Modified: trunk/dports/mail/alpine/Portfile =================================================================== --- trunk/dports/mail/alpine/Portfile 2015-03-03 00:25:47 UTC (rev 133470) +++ trunk/dports/mail/alpine/Portfile 2015-03-03 00:25:49 UTC (rev 133471) @@ -76,8 +76,10 @@ configure.args-delete --without-tcl } +default_variants +kerberos +ldap +ssl + # TODO: Remove legacy variants after 2016-02-20. variant without_krb5 conflicts kerberos description {Legacy variant} {} @@ -85,17 +87,14 @@ variant without_ssl conflicts ssl description {Legacy variant} {} variant without_tcl conflicts tcl description {Legacy variant} {} -# TODO: Replace this morass after 2016-02-20. -#default_variants +kerberos +ldap +ssl - -if {![variant_isset without_krb5]} { - default_variants +kerberos +if {[variant_isset without_krb5]} { + default_variants -kerberos } -if {![variant_isset without_ldap]} { - default_variants +ldap +if {[variant_isset without_ldap]} { + default_variants -ldap } -if {![variant_isset without_ssl]} { - default_variants +ssl +if {[variant_isset without_ssl]} { + default_variants -ssl } if {![variant_isset tcl]} { default_variants +without_tcl