[121811] trunk/dports/net/mcabber

[devans at macports.org]

Revision: 121811
          https://trac.macports.org/changeset/121811
Author:   devans at macports.org
Date:     2014-07-08 11:00:32 -0700 (Tue, 08 Jul 2014)
Log Message:
-----------
mcabber: update to version 0.10.3 to fix build with libotr 4.0.0 (#40756, maintainer timeout).

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

Removed Paths:
-------------
    trunk/dports/net/mcabber/files/patch-automake-1.13.diff

Modified: trunk/dports/net/mcabber/Portfile
===================================================================
--- trunk/dports/net/mcabber/Portfile	2014-07-08 17:59:06 UTC (rev 121810)
+++ trunk/dports/net/mcabber/Portfile	2014-07-08 18:00:32 UTC (rev 121811)
@@ -4,8 +4,8 @@
 PortSystem          1.0
 
 name                mcabber
-version             0.9.10
-revision            1
+version             0.10.3
+license             GPL-2+
 categories          net
 maintainers         hitzemann.org:simon
 description         Console Jabber client
@@ -16,8 +16,8 @@
 platforms           darwin
 master_sites        http://mcabber.com/files/
 use_bzip2           yes
-checksums           rmd160  656818b304b9088097ad2a0fe485f38cd0e704fc \
-                    sha256  431e47ba3095c1cc6c11931bab9034c42ba0911dfadcc137ba765803e4460cb5
+checksums           rmd160  d94e7b2e340cfd83a5b55276cdb0383a8555b347 \
+                    sha256  77466138496cc26db125145cc28dc4fc0df79827143b922dfb9f02eb0dc7fa6d
 
 depends_lib         port:libiconv \
                     port:ncurses \
@@ -25,25 +25,26 @@
                     port:gettext \
                     port:libotr \
                     port:gpgme \
-                    port:libgcrypt
+                    port:libgcrypt \
+                    port:loudmouth
 
 depends_build       port:autoconf \
                     port:automake \
                     port:coreutils \
                     bin:gawk:gawk \
                     port:libtool \
-                    port:pkgconfig
+                    port:pkgconfig \
+                    port:cctools \
+                    port:grep \
+                    port:gsed
 
 configure.args      --enable-otr \
                     --with-libotr-prefix=${prefix}/lib \
-                    --with-libotr-inc-prefix=${prefix}/include \
-                    --without-ssl \
-                    --without-openssl
+                    --with-libotr-inc-prefix=${prefix}/include
 
 configure.env       LIBTOOL=glibtool
 
-patchfiles          patch-autogen.sh.diff \
-                    patch-automake-1.13.diff
+patchfiles          patch-autogen.sh.diff
 
 pre-configure {
     system -W ${worksrcpath} "./autogen.sh"
@@ -51,28 +52,13 @@
 
 # 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 for SSL connections} {
-    configure.args-delete   --without-ssl
-    configure.args-delete   --without-openssl
-    configure.args-append   --with-ssl
-    configure.args-append   --with-openssl=${prefix}
-    depends_lib-append      port:openssl
-}
-
 variant aspell description {Use aspell spell checking - remember to install a dictionary, too} {
     configure.args-append   --enable-aspell
     depends_lib-append      port:aspell
 }
 
 post-configure {
-    reinplace "s|#define HAVE_LOCALCHARSET_H 1|\/\* #undef HAVE_LOCALCHARSET_H \*\/|g" ${worksrcpath}/config.h
+    reinplace "s|#define HAVE_LOCALCHARSET_H 1|\/\* #undef HAVE_LOCALCHARSET_H \*\/|g" ${worksrcpath}/${name}/config.h
 }
 
 livecheck.type      regex

Modified: trunk/dports/net/mcabber/files/patch-autogen.sh.diff
===================================================================
--- trunk/dports/net/mcabber/files/patch-autogen.sh.diff	2014-07-08 17:59:06 UTC (rev 121810)
+++ trunk/dports/net/mcabber/files/patch-autogen.sh.diff	2014-07-08 18:00:32 UTC (rev 121811)
@@ -1,12 +1,11 @@
---- 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 @@
+--- autogen.sh.orig
++++ autogen.sh
+@@ -1,6 +1,6 @@
  #! /bin/sh
  
 -libtoolize --force --automake --copy
--aclocal -I macros/
 +glibtoolize --force --automake --copy
-+aclocal -I macros/ -I macros/missing/
+ aclocal -I macros/
  autoheader
  autoconf
  automake -a --copy

Deleted: trunk/dports/net/mcabber/files/patch-automake-1.13.diff
===================================================================
--- trunk/dports/net/mcabber/files/patch-automake-1.13.diff	2014-07-08 17:59:06 UTC (rev 121810)
+++ trunk/dports/net/mcabber/files/patch-automake-1.13.diff	2014-07-08 18:00:32 UTC (rev 121811)
@@ -1,11 +0,0 @@
---- configure.ac.orig	2009-10-06 14:34:18.000000000 -0500
-+++ configure.ac	2013-03-22 03:05:28.000000000 -0500
-@@ -5,7 +5,7 @@
- AC_INIT([mcabber],[0.9.10],[mcabber at lilotux.net])
- AM_INIT_AUTOMAKE
- AC_CONFIG_SRCDIR([src])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS([config.h])
- 
- #AC_PROG_LIBTOOL
- AC_PROG_RANLIB
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140708/4befc288/attachment.html>