[56451] trunk/dports/net/mcabber

[blb at macports.org]

Revision: 56451
          http://trac.macports.org/changeset/56451
Author:   blb at macports.org
Date:     2009-08-27 17:02:50 -0700 (Thu, 27 Aug 2009)
Log Message:
-----------
net/mcabber - correct libgcrypt dependency, enable gnutls variant; ticket #18382

Modified Paths:
--------------
    trunk/dports/net/mcabber/Portfile

Added Paths:
-----------
    trunk/dports/net/mcabber/files/
    trunk/dports/net/mcabber/files/patch-autogen.sh.diff

Modified: trunk/dports/net/mcabber/Portfile
===================================================================
--- trunk/dports/net/mcabber/Portfile	2009-08-27 23:58:26 UTC (rev 56450)
+++ trunk/dports/net/mcabber/Portfile	2009-08-28 00:02:50 UTC (rev 56451)
@@ -4,6 +4,7 @@
 
 name                mcabber
 version             0.9.9
+revision            1
 categories          net
 maintainers         hitzemann.org:simon
 description         Console Jabber client
@@ -19,17 +20,16 @@
                     sha1    334f483f554098af3768d5746bc0395bfe663c91 \
                     rmd160  6babdbfff6c2b5ab4a1336de412dc726b7ca0e4a
 
-depends_lib          lib:libgpgme:gpgme \
-                     port:libiconv \
+depends_lib          port:libiconv \
                      port:ncursesw \
                      port:glib2 \
                      port:gettext \
-                     port:libotr
+                     port:libotr \
+                     bin:gpgme-config:gpgme \
+                     bin:gcrypt-config:libgcrypt
 
 depends_build        bin:gawk:gawk \
                      bin:pkg-config:pkgconfig \
-                     bin:gpgme-config:gpgme \
-                     bin:gcrypt-config:libgcrypt \
                      bin:gmkdir:coreutils
 
 configure.args      --enable-otr \
@@ -40,17 +40,24 @@
 
 configure.env       LIBTOOL=glibtool
 
-#TODO
-#Check why I get errors during linking, until then keep disabled
-#variant gnutls {
-#                    configure.args-delete --without-ssl
-#                    configure.args-append --with-ssl
-#                    configure.args-append --with-libgnutls-extra-prefix=${prefix}
-#                    depends_lib-append port:gnutls
-#               }
+patchfiles          patch-autogen.sh.diff
 
+pre-configure {
+                    system "cd ${worksrcpath} && ./autogen.sh"
+}
+
+# TODO
+# Bug #26 on mcabber - see pre-configure section for a workaround
+variant gnutls \
+description "Use GNUTLS for TLS connections" {
+                    configure.args-delete --without-ssl
+                    configure.args-append --with-ssl
+                    configure.args-append --with-libgnutls-extra-prefix=${prefix}
+                    depends_lib-append port:gnutls
+               }
+
 variant ssl \
-description "Use OpenSSL" {
+description "Use OpenSSL for SSL connections" {
                     configure.args-delete --without-ssl
                     configure.args-delete --without-openssl
                     configure.args-append --with-ssl
@@ -59,7 +66,7 @@
                }
 
 variant aspell \
-description "Use aspell spell checking" {
+description "Use aspell spell checking - remember to install a dictionary, too" {
                     configure.args-append --enable-aspell
                     depends_lib-append port:aspell
                }

Added: trunk/dports/net/mcabber/files/patch-autogen.sh.diff
===================================================================
--- trunk/dports/net/mcabber/files/patch-autogen.sh.diff	                        (rev 0)
+++ trunk/dports/net/mcabber/files/patch-autogen.sh.diff	2009-08-28 00:02:50 UTC (rev 56451)
@@ -0,0 +1,12 @@
+--- autogen.sh.orig	2009-02-05 10:54:06.000000000 +0100
++++ autogen.sh	2009-02-05 10:54:17.000000000 +0100
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ 
+-libtoolize --force --automake --copy
+-aclocal -I macros/
++glibtoolize --force --automake --copy
++aclocal -I macros/ -I macros/missing/
+ autoheader
+ autoconf
+ automake -a --copy
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090827/1a240258/attachment-0001.html>