[56369] trunk/dports/net

[jmr at macports.org]

Revision: 56369
          http://trac.macports.org/changeset/56369
Author:   jmr at macports.org
Date:     2009-08-26 12:02:36 -0700 (Wed, 26 Aug 2009)
Log Message:
-----------
centerim, centerim-devel: add variant for msn support

Modified Paths:
--------------
    trunk/dports/net/centerim/Portfile
    trunk/dports/net/centerim-devel/Portfile

Modified: trunk/dports/net/centerim/Portfile
===================================================================
--- trunk/dports/net/centerim/Portfile	2009-08-26 18:59:25 UTC (rev 56368)
+++ trunk/dports/net/centerim/Portfile	2009-08-26 19:02:36 UTC (rev 56369)
@@ -18,7 +18,7 @@
 			port:jpeg port:gpgme
 patchfiles		patch-configure.diff \
 			patch-kkconsui_include_conscommon.h.diff
-# Would enable MSN support but it needs curl +ssl and we can't do that yet
+
 configure.args		--disable-msn \
 			--with-libiconv-prefix=${prefix} \
 			--with-libintl-prefix=${prefix} \
@@ -27,3 +27,17 @@
 			--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."
+        }
+    }
+}

Modified: trunk/dports/net/centerim-devel/Portfile
===================================================================
--- trunk/dports/net/centerim-devel/Portfile	2009-08-26 18:59:25 UTC (rev 56368)
+++ trunk/dports/net/centerim-devel/Portfile	2009-08-26 19:02:36 UTC (rev 56369)
@@ -18,13 +18,27 @@
 master_sites        ${homepage}download/mobshots/
 depends_lib         port:libiconv port:gettext port:ncurses port:openssl \
       port:jpeg port:gpgme
-# Would enable MSN support but it needs curl +ssl and we can't do that yet
-# because of limitations with the port system not handling dependancies on variants
+
 configure.args \
     --disable-msn \
+    --disable-yahoo \
     --with-libiconv-prefix=${prefix} \
     --with-libintl-prefix=${prefix} \
-#    --with-ssl --with-openssl=${prefix}/include \
+    --with-ssl --with-openssl=${prefix}/include \
     --with-libjpeg --with-gpgme-prefix=${prefix} \
     --without-libcurl
 
+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."
+        }
+    }
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090826/340d7d78/attachment.html>