update to 0.11.10

This is a major update, too much to list here.

8 files changed, 17 insertions, 73 deletions

diff --git a/chat/telepathy-gabble/Makefile b/chat/telepathy-gabble/Makefile
index c681bf59384..e38c9d4d03c 100644
--- a/chat/telepathy-gabble/Makefile
+++ b/chat/telepathy-gabble/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2010/06/13 22:43:58 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2011/04/05 18:47:19 drochner Exp $
 #
 
-DISTNAME=	telepathy-gabble-0.9.2
-PKGREVISION=	4
+DISTNAME=	telepathy-gabble-0.11.10
 CATEGORIES=	chat
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-gabble/
 
@@ -17,6 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config
+CONFIGURE_ENV+=	UUID_CFLAGS=" " UUID_LIBS=" "
 
 pre-configure: wocky-pkg-config-hack
 wocky-pkg-config-hack:
@@ -29,6 +29,7 @@ BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.21.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../net/libsoup24/buildlink3.mk"
+.include "../../net/libnice/buildlink3.mk"
 BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.78
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.dbus+=		dbus>=1.1
diff --git a/chat/telepathy-gabble/PLIST b/chat/telepathy-gabble/PLIST
index 0066cf11b70..6d065ac86b9 100644
--- a/chat/telepathy-gabble/PLIST
+++ b/chat/telepathy-gabble/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:28:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/04/05 18:47:20 drochner Exp $
+lib/telepathy/gabble-0/gateways.la
 libexec/telepathy-gabble
 man/man8/telepathy-gabble.8
 share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.gabble.service
diff --git a/chat/telepathy-gabble/distinfo b/chat/telepathy-gabble/distinfo
index 5f98663aec0..fff3f42c520 100644
--- a/chat/telepathy-gabble/distinfo
+++ b/chat/telepathy-gabble/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.9 2009/12/09 10:06:55 drochner Exp $
+$NetBSD: distinfo,v 1.10 2011/04/05 18:47:20 drochner Exp $
 
-SHA1 (telepathy-gabble-0.9.2.tar.gz) = 615821d1f80aecd4cdefaf578b8755e8adbae6d6
-RMD160 (telepathy-gabble-0.9.2.tar.gz) = 2767db9ac8173649e302189440fd1f18446b00ad
-Size (telepathy-gabble-0.9.2.tar.gz) = 2274608 bytes
-SHA1 (patch-aa) = c6f579acd92f43bd327136b4ebabce8d3a54976c
-SHA1 (patch-ab) = b231ff2d99da0d4246134956a5cb0931358b28fd
-SHA1 (patch-ac) = 2d3c4fcb5490acbca969c11f168a1f80fe133d11
-SHA1 (patch-ad) = 9eab302f5b2a754b55bd9d0f4d6262fd04e1c444
-SHA1 (patch-ae) = a6830c047e494d28240c029b5eea8f2c7e0ced1b
+SHA1 (telepathy-gabble-0.11.10.tar.gz) = 26ca4e8a98b01b78007f88caea56b08ae5070fdd
+RMD160 (telepathy-gabble-0.11.10.tar.gz) = b4906a01b8cc6e6630e1707e97250bcdefeac9c4
+Size (telepathy-gabble-0.11.10.tar.gz) = 3443486 bytes
+SHA1 (patch-ab) = 984544201507c0a5f9d2bc24b0fbeab9c061a197
diff --git a/chat/telepathy-gabble/patches/patch-aa b/chat/telepathy-gabble/patches/patch-aa
deleted file mode 100644
index d05537801de..00000000000
--- a/chat/telepathy-gabble/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/11/14 23:00:42 wiz Exp $
-
---- src/tube-stream.c.orig	2008-11-06 09:40:19.000000000 +0000
-+++ src/tube-stream.c
-@@ -24,6 +24,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
-+#include <netinet/in.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <errno.h>
diff --git a/chat/telepathy-gabble/patches/patch-ab b/chat/telepathy-gabble/patches/patch-ab
index 1b337630258..a6b1bba14d6 100644
--- a/chat/telepathy-gabble/patches/patch-ab
+++ b/chat/telepathy-gabble/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2009/12/03 23:58:59 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2011/04/05 18:47:20 drochner Exp $
 
---- configure.orig	2009-10-27 17:12:34.000000000 +0000
+--- configure.orig	2010-06-14 16:12:31.000000000 +0000
 +++ configure
-@@ -12537,7 +12537,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
+@@ -12855,7 +12855,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
    $as_echo_n "(cached) " >&6
  else
  
--	for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
-+	for am_cv_pathless_PYTHON in python python2 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
+-	for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
++	for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
  	  test "$am_cv_pathless_PYTHON" = none && break
- 	  prog="import sys, string
+ 	  prog="import sys
  # split strings by '.' and convert to numeric.  Append some zeros
diff --git a/chat/telepathy-gabble/patches/patch-ac b/chat/telepathy-gabble/patches/patch-ac
deleted file mode 100644
index d1acaf26e14..00000000000
--- a/chat/telepathy-gabble/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2009/12/03 23:58:59 wiz Exp $
-
---- lib/gibber/asyncns.c.orig	2009-02-27 13:05:19.000000000 +0000
-+++ lib/gibber/asyncns.c
-@@ -35,6 +35,7 @@
- #include <errno.h>
- #include <sys/wait.h>
- #include <sys/types.h>
-+#include <sys/resource.h>
- #include <pwd.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
diff --git a/chat/telepathy-gabble/patches/patch-ad b/chat/telepathy-gabble/patches/patch-ad
deleted file mode 100644
index 4058069e701..00000000000
--- a/chat/telepathy-gabble/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/09/20 12:36:03 sno Exp $
-
-Apply patch from FreeBSD ports - FreeBSD's <net/if.h> doesn't include
-sys/socket.h ...
-
---- src/bytestream-socks5.c.orig	2009-09-20 14:18:46.000000000 +0200
-+++ src/bytestream-socks5.c	2009-09-20 14:24:08.000000000 +0200
-@@ -21,6 +21,10 @@
- #include "config.h"
- #include "bytestream-socks5.h"
- 
-+#ifdef __FreeBSD__
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#endif
- #include <arpa/inet.h>
- #include <errno.h>
- #include <fcntl.h>
diff --git a/chat/telepathy-gabble/patches/patch-ae b/chat/telepathy-gabble/patches/patch-ae
deleted file mode 100644
index 89e23910553..00000000000
--- a/chat/telepathy-gabble/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2009/12/09 10:06:55 drochner Exp $
-
---- tests/twisted/resolver-fake.c.orig	2009-02-27 14:05:19.000000000 +0100
-+++ tests/twisted/resolver-fake.c
-@@ -24,6 +24,7 @@
- #include <string.h>
- #include <sys/socket.h>
- #include <sys/types.h>
-+#include <netinet/in.h>
- 
- #define DEBUG(format, ...) \
-   g_debug ("%s: " format, G_STRFUNC, ##__VA_ARGS__)