[133173] trunk/dports/mail/alpine/Portfile

[larryv at macports.org]

Revision: 133173
          https://trac.macports.org/changeset/133173
Author:   larryv at macports.org
Date:     2015-02-22 17:40:47 -0800 (Sun, 22 Feb 2015)
Log Message:
-----------
alpine: Swap negative variants for positive ones

Modified Paths:
--------------
    trunk/dports/mail/alpine/Portfile

Modified: trunk/dports/mail/alpine/Portfile
===================================================================
--- trunk/dports/mail/alpine/Portfile	2015-02-23 01:40:44 UTC (rev 133172)
+++ trunk/dports/mail/alpine/Portfile	2015-02-23 01:40:47 UTC (rev 133173)
@@ -34,14 +34,9 @@
     reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/imap/Makefile
 }
 
-default_variants    +without_tcl
-
-depends_lib         port:openssl \
+depends_lib         port:gettext \
                     port:libiconv \
-                    port:gettext \
-                    port:openldap \
-                    port:ncurses \
-                    port:cyrus-sasl2
+                    port:ncurses
 
 configure.env       SSLDIR=${prefix}
 configure.args      -with-lib-dir=${prefix}/lib \
@@ -53,37 +48,69 @@
                     --with-ssl-include-dir=${prefix}/include/openssl \
                     --with-ssl-lib-dir=${prefix}/lib \
                     --with-local-password-cache-method \
-                    --with-debug-level=0
+                    --with-debug-level=0 \
+                    --without-krb5 \
+                    --without-ldap \
+                    --without-ssl \
+                    --without-tcl
 
 variant universal {}
 
 use_parallel_build  no
+build.env           SSLTYPE=none
 build.args          CC=${configure.cc} \
                     EXTRACFLAGS="[get_canonical_archflags cc]" \
                     EXTRALDFLAGS="[get_canonical_archflags ld]" \
                     SPECIALS="GSSDIR=${prefix} SSLDIR=${prefix}"
 
-variant without_krb5 description {Disable Kerberos5 support} {
-    depends_lib-delete      port:cyrus-sasl2
-    configure.args-append   --without-krb5
-}
+# TODO: Remove legacy variants after 2016-02-20.
 
-variant without_ldap description {Disable LDAP support} {
-    depends_lib-delete      port:openldap
-    configure.args-append   --without-ldap
-}
+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} {}
 
-variant without_ssl description {Disable SSL support} {
-    depends_lib-delete      port:openssl
-    configure.args-append   --without-ssl
-    build.env-append        SSLTYPE=none
-}
+# TODO: Replace this morass after 2016-02-20.
+#default_variants    +kerberos +ldap +ssl
 
-variant without_tcl description {Disable TCL support (disables Alpine Web)} {
-    configure.args-append   --without-tcl
+if {![variant_isset without_krb5]} {
+    default_variants +kerberos
 }
+if {![variant_isset without_ldap]} {
+    default_variants +ldap
+}
+if {![variant_isset without_ssl]} {
+    default_variants +ssl
+}
+if {![variant_isset tcl]} {
+    default_variants +without_tcl
+}
+if {![variant_isset without_tcl]} {
+    default_variants +tcl
+}
 
 variant passfile description {Enable password files support} {
     configure.args-delete   --with-local-password-cache-method
     configure.args-append   --with-passfile=".pine.pwd"
 }
+
+variant kerberos description {Kerberos support} {
+    depends_lib-append      port:cyrus-sasl2
+    configure.args-delete   --without-krb5
+}
+
+variant ldap description {LDAP support} {
+    depends_lib-append      port:openldap
+    configure.args-delete   --without-ldap
+}
+
+variant ssl description {OpenSSL support} {
+    depends_lib-append      port:openssl
+    configure.args-delete   --without-ssl
+    build.env-delete        SSLTYPE=none
+}
+
+variant tcl description {Tcl support (required by Alpine Web} {
+    # Should we force MacPorts' Tcl?
+    configure.args-delete   --without-tcl
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150222/00c43152/attachment.html>