Ticket #40756: mcabber-0.10.3.2.diff

Portfile

@@ -4 +4 @@
 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 +16 @@
 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 @@
                     port:gettext \
                     port:libotr \
                     port:gpgme \
-                    port:libgcrypt
+                    port:libgcrypt \
+                    port:loudmouth
 
 depends_build       port:autoconf \
                     port:automake \
@@ -32 +33 @@
                     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 +52 @@
 
 # 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
@@ -72 +58 @@
 }
 
 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

files/patch-autogen.sh.diff

@@ -1 @@
---- 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

files/patch-automake-1.13.diff

@@ -1 @@
---- 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@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