diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-05-22 16:08:11 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-05-22 16:08:11 +0800 |
commit | e14b21f2d500954ccb794ea276214d92e1749b39 (patch) | |
tree | af169888df3df4becb1802ec4c21333c5e2fb576 | |
parent | a4e52ff7b00633947e912cb3bcf9f1675784f8df (diff) | |
download | marcuscom-ports-e14b21f2d500954ccb794ea276214d92e1749b39.tar marcuscom-ports-e14b21f2d500954ccb794ea276214d92e1749b39.tar.gz marcuscom-ports-e14b21f2d500954ccb794ea276214d92e1749b39.tar.bz2 marcuscom-ports-e14b21f2d500954ccb794ea276214d92e1749b39.tar.lz marcuscom-ports-e14b21f2d500954ccb794ea276214d92e1749b39.tar.xz marcuscom-ports-e14b21f2d500954ccb794ea276214d92e1749b39.tar.zst marcuscom-ports-e14b21f2d500954ccb794ea276214d92e1749b39.zip |
Fix build with new glib.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16772 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | net-im/loudmouth/Makefile | 53 | ||||
-rw-r--r-- | net-im/loudmouth/distinfo | 2 | ||||
-rw-r--r-- | net-im/loudmouth/files/patch-configure | 28 | ||||
-rw-r--r-- | net-im/loudmouth/files/patch-loudmouth_Makefile.in | 12 | ||||
-rw-r--r-- | net-im/loudmouth/files/patch-loudmouth_lm-error.c | 11 | ||||
-rw-r--r-- | net-im/loudmouth/files/patch-loudmouth_lm-ssl-gnutls.c | 28 | ||||
-rw-r--r-- | net-im/loudmouth/pkg-descr | 3 | ||||
-rw-r--r-- | net-im/loudmouth/pkg-plist | 37 |
8 files changed, 174 insertions, 0 deletions
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile new file mode 100644 index 000000000..d9cea4ef7 --- /dev/null +++ b/net-im/loudmouth/Makefile @@ -0,0 +1,53 @@ +# New ports collection makefile for: loudmouth +# Date created: 08 July 2003 +# Whom: Adam Weinberger <adamw@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= loudmouth +PORTVERSION= 1.4.3 +PORTREVISION= 6 +CATEGORIES= net-im gnome +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Lightweight Jabber client library + +LIB_DEPENDS= idn.17:${PORTSDIR}/dns/libidn + +USE_BZIP2= yes +USE_GMAKE= yes +USE_GETTEXT= yes +USE_AUTOTOOLS= libtool +USE_LDCONFIG= yes +USE_GNOME= gnomehack glib20 ltverhack +CONFIGURE_ARGS= --disable-gtk-doc +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -Wl,-Bsymbolic -L${LOCALBASE}/lib + +OPTIONS= GNUTLS "Enable SSL (via GnuTLS) support" on \ + OPENSSL "Enable SSL (via OpenSSL) support" off + +.include <bsd.port.pre.mk> + +.if defined(WITH_GNUTLS) +LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls +RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss +.endif + +.if defined(WITH_OPENSSL) +USE_OPENSSL= yes +CONFIGURE_ARGS+=--with-ssl=openssl +RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss +.endif + +.if !defined(WITH_GNUTLS) && !defined(WITH_OPENSSL) +CONFIGURE_ARGS+=--without-ssl +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/loudmouth/lm-ssl-gnutls.c + +.include <bsd.port.post.mk> diff --git a/net-im/loudmouth/distinfo b/net-im/loudmouth/distinfo new file mode 100644 index 000000000..703c9f195 --- /dev/null +++ b/net-im/loudmouth/distinfo @@ -0,0 +1,2 @@ +SHA256 (loudmouth-1.4.3.tar.bz2) = 95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3 +SIZE (loudmouth-1.4.3.tar.bz2) = 366818 diff --git a/net-im/loudmouth/files/patch-configure b/net-im/loudmouth/files/patch-configure new file mode 100644 index 000000000..2c37af283 --- /dev/null +++ b/net-im/loudmouth/files/patch-configure @@ -0,0 +1,28 @@ +--- configure.orig 2009-08-17 03:50:55.000000000 -0400 ++++ configure 2009-08-17 03:50:59.000000000 -0400 +@@ -21983,12 +21983,14 @@ fi + if test x$libgnutls_config_prefix != x ; then + libgnutls_config_args="$libgnutls_config_args --prefix=$libgnutls_config_prefix" + if test x${LIBGNUTLS_CONFIG+set} != xset ; then +- LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config ++ LIBGNUTLS_CONFIG=pkg-config + fi + fi + ++ libgnutls_config_args="$libgnutls_config_args gnutls" ++ + # Extract the first word of "libgnutls-config", so it can be a program name with args. +-set dummy libgnutls-config; ac_word=$2 ++set dummy pkg-config; ac_word=$2 + { echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then +@@ -22037,7 +22039,7 @@ echo $ECHO_N "checking for libgnutls - v + else + LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags` + LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` +- libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` ++ libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --modversion` + + + ac_save_CFLAGS="$CFLAGS" diff --git a/net-im/loudmouth/files/patch-loudmouth_Makefile.in b/net-im/loudmouth/files/patch-loudmouth_Makefile.in new file mode 100644 index 000000000..99c8782e6 --- /dev/null +++ b/net-im/loudmouth/files/patch-loudmouth_Makefile.in @@ -0,0 +1,12 @@ +--- loudmouth/Makefile.in.orig 2008-07-06 15:44:25.000000000 -0400 ++++ loudmouth/Makefile.in 2008-07-06 15:43:53.000000000 -0400 +@@ -306,8 +306,7 @@ libloudmouthinclude_HEADERS = \ + + libloudmouth_1_la_LIBADD = \ + $(LOUDMOUTH_LIBS) \ +- $(LIBIDN_LIBS) \ +- -lresolv ++ $(LIBIDN_LIBS) + + libloudmouth_1_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ diff --git a/net-im/loudmouth/files/patch-loudmouth_lm-error.c b/net-im/loudmouth/files/patch-loudmouth_lm-error.c new file mode 100644 index 000000000..61f65fce2 --- /dev/null +++ b/net-im/loudmouth/files/patch-loudmouth_lm-error.c @@ -0,0 +1,11 @@ +--- loudmouth/lm-error.c.orig 2012-05-22 10:05:29.000000000 +0200 ++++ loudmouth/lm-error.c 2012-05-22 10:05:41.000000000 +0200 +@@ -19,7 +19,7 @@ + */ + + #include <config.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include "lm-error.h" + + /** diff --git a/net-im/loudmouth/files/patch-loudmouth_lm-ssl-gnutls.c b/net-im/loudmouth/files/patch-loudmouth_lm-ssl-gnutls.c new file mode 100644 index 000000000..5a202430c --- /dev/null +++ b/net-im/loudmouth/files/patch-loudmouth_lm-ssl-gnutls.c @@ -0,0 +1,28 @@ +--- loudmouth/lm-ssl-gnutls.c.orig 2010-04-17 15:56:39.000000000 -0400 ++++ loudmouth/lm-ssl-gnutls.c 2010-04-17 15:56:43.000000000 -0400 +@@ -32,7 +32,7 @@ + + #include <gnutls/x509.h> + +-#define CA_PEM_FILE "/etc/ssl/certs/ca-certificates.crt" ++#define CA_PEM_FILE "%%LOCALBASE%%/share/certs/ca-root-nss.crt" + + struct _LmSSL { + LmSSLBase base; +@@ -200,6 +200,7 @@ _lm_ssl_begin (LmSSL *ssl, gint fd, cons + { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; + const int compression_priority[] = + { GNUTLS_COMP_DEFLATE, GNUTLS_COMP_NULL, 0 }; ++ gnutls_priority_t priorities_cache; + + gnutls_init (&ssl->gnutls_session, GNUTLS_CLIENT); + gnutls_set_default_priority (ssl->gnutls_session); +@@ -213,6 +214,8 @@ _lm_ssl_begin (LmSSL *ssl, gint fd, cons + + gnutls_transport_set_ptr (ssl->gnutls_session, + (gnutls_transport_ptr_t)(glong) fd); ++ gnutls_priority_init (&priorities_cache, "NONE:+VERS-TLS1.0:+AES-128-CBC:+RSA:+SHA1:+COMP-NULL:NORMAL:%COMPAT", NULL); ++ gnutls_priority_set (ssl->gnutls_session, priorities_cache); + + ret = gnutls_handshake (ssl->gnutls_session); + diff --git a/net-im/loudmouth/pkg-descr b/net-im/loudmouth/pkg-descr new file mode 100644 index 000000000..bd4242f0e --- /dev/null +++ b/net-im/loudmouth/pkg-descr @@ -0,0 +1,3 @@ +Loudmouth is a lightweight and easy-to-use C library for programming with the +Jabber protocol. It's designed to be easy to get started with and yet +extensible to let you do anything the Jabber protocol allows. diff --git a/net-im/loudmouth/pkg-plist b/net-im/loudmouth/pkg-plist new file mode 100644 index 000000000..540f79e05 --- /dev/null +++ b/net-im/loudmouth/pkg-plist @@ -0,0 +1,37 @@ +include/loudmouth-1.0/loudmouth/lm-connection.h +include/loudmouth-1.0/loudmouth/lm-error.h +include/loudmouth-1.0/loudmouth/lm-message-handler.h +include/loudmouth-1.0/loudmouth/lm-message-node.h +include/loudmouth-1.0/loudmouth/lm-message.h +include/loudmouth-1.0/loudmouth/lm-proxy.h +include/loudmouth-1.0/loudmouth/lm-ssl.h +include/loudmouth-1.0/loudmouth/lm-utils.h +include/loudmouth-1.0/loudmouth/loudmouth.h +lib/libloudmouth-1.a +lib/libloudmouth-1.la +lib/libloudmouth-1.so +lib/libloudmouth-1.so.0 +libdata/pkgconfig/loudmouth-1.0.pc +share/gtk-doc/html/loudmouth/ch01.html +share/gtk-doc/html/loudmouth/home.png +share/gtk-doc/html/loudmouth/index.html +share/gtk-doc/html/loudmouth/index.sgml +share/gtk-doc/html/loudmouth/left.png +share/gtk-doc/html/loudmouth/loudmouth-lm-connection.html +share/gtk-doc/html/loudmouth/loudmouth-lm-error.html +share/gtk-doc/html/loudmouth/loudmouth-lm-message-handler.html +share/gtk-doc/html/loudmouth/loudmouth-lm-message.html +share/gtk-doc/html/loudmouth/loudmouth-lm-message-node.html +share/gtk-doc/html/loudmouth/loudmouth-lm-proxy.html +share/gtk-doc/html/loudmouth/loudmouth-lm-ssl.html +share/gtk-doc/html/loudmouth/loudmouth-lm-utils.html +share/gtk-doc/html/loudmouth/loudmouth.devhelp +share/gtk-doc/html/loudmouth/loudmouth.devhelp2 +share/gtk-doc/html/loudmouth/right.png +share/gtk-doc/html/loudmouth/style.css +share/gtk-doc/html/loudmouth/up.png +@dirrm share/gtk-doc/html/loudmouth +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc +@dirrm include/loudmouth-1.0/loudmouth +@dirrm include/loudmouth-1.0 |