Ticket #30174: centerim.ryandesign.cleanervariants.diff

Portfile

@@ -4 +4 @@
 PortSystem          1.0
 
 name                centerim
-version             4.22.9
-revision            3
+version             4.22.10
 categories          net
 platforms           darwin
 maintainers         freebsd.org:miwi
@@ -13 +12 @@
 
 description         Console multi-IM client.
 long_description    Console client for AIM/ICQ/Yahoo/MSN/IRC/LiveJournal.
-checksums           md5     c43911508205e0277529230c8316a298 \
-                    sha1    ebe9f4ee2064a2fa10f1084ce26083ccd295673e \
-                    rmd160  253007e466a211ec740f7843538e4f686ab95cad
+
+checksums           sha1    46fbac7a55f33b0d4f42568cca21ed83770650e5 \
+                    rmd160  2514c871388edb98b4a8957f965ccee3450b968f
+
 homepage            http://www.centerim.org/
 master_sites        ${homepage}download/releases/
 depends_lib         port:libiconv port:gettext port:ncurses port:openssl \
@@ -31 +31 @@
                     --without-libcurl
 build.type          gnu
 
-variant msn description {Enable MSN support (requires curl+ssl)} {
-    depends_build-append port:pkgconfig
-    depends_lib-append port:curl
-    configure.args-delete --disable-msn --without-libcurl
-    configure.args-append --with-libcurl=${prefix}
-    pre-fetch {
-        set fd [open "|pkg-config --variable=supported_features libcurl"]
-        eval set features [gets $fd]
-        close $fd
-        if {[lsearch -exact $features SSL] == -1} {
-            return -code error "curl must be installed with +ssl to enable MSN support."
-        }
-    }
+variant msn description {Enable Microsoft Messenger support} {
+    configure.args-delete --disable-msn
 }
-variant allproto description {Enable support for all protocols (requires curl+ssl)} {
+
+variant yahoo description {Enable Yahoo! Messenger support} {
+    configure.args-delete --disable-yahoo
+}
+
+# Legacy compatibility variant; can be removed once most users have upgraded.
+variant allproto requires msn yahoo description {Enable support for all protocols} {}
+
+if {[variant_isset msn] || [variant_isset yahoo]} {
     depends_build-append port:pkgconfig
     depends_lib-append port:curl
-    configure.args-delete --disable-msn --disable-yahoo --without-libcurl
+    configure.args-delete --without-libcurl
     configure.args-append --with-libcurl=${prefix}
-    pre-fetch {
+    pre-configure {
         set fd [open "|pkg-config --variable=supported_features libcurl"]
         eval set features [gets $fd]
         close $fd
         if {[lsearch -exact $features SSL] == -1} {
-            return -code error "curl must be installed with +ssl to enable MSN and Yahoo support."
+            ui_error "curl must be installed with the +ssl variant"
+            return -code error "incompatible curl installation"
         }
     }
 }