Update Pidgin and friends to 2.10.0. See

http://developer.pidgin.im/wiki/ChangeLog for a list of changes in this
release.

16 files changed, 28 insertions, 38 deletions

diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index 9aa8a05d4158..154d7ad65d9f 100644
--- a/net-im/finch/Makefile
+++ b/net-im/finch/Makefile
@@ -12,7 +12,7 @@ PORTREVISION=	0
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Finch multi-protocol messaging client (Console UI)
 
-LIB_DEPENDS=	purple.9:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple
 
 MASTERDIR=	${.CURDIR}/../libpurple
 BUILD_WRKSRC=	${WRKSRC}/finch
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 96935de72095..fa1e16b69f88 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.9.0
-PORTREVISION?=	2
+PORTVERSION=	2.10.0
+PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
 DISTNAME=	pidgin-${PORTVERSION}
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index fac66f72ab8b..ab3122a16987 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pidgin-2.9.0.tar.bz2) = 28ee8ece47d94ee1b708a78d613832ea88b56d879a93fa934d532d76ae52cfd7
-SIZE (pidgin-2.9.0.tar.bz2) = 9925589
+SHA256 (pidgin-2.10.0.tar.bz2) = f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd
+SIZE (pidgin-2.10.0.tar.bz2) = 9941288
diff --git a/net-im/libpurple/files/patch-libpurple-conversation.c b/net-im/libpurple/files/patch-libpurple-conversation.c
index 992769c8bfcd..e69de29bb2d1 100644
--- a/net-im/libpurple/files/patch-libpurple-conversation.c
+++ b/net-im/libpurple/files/patch-libpurple-conversation.c
@@ -1,10 +0,0 @@
---- libpurple/conversation.c.orig	2011-07-11 14:28:20.000000000 +0200
-+++ libpurple/conversation.c	2011-07-11 14:28:47.000000000 +0200
-@@ -1978,7 +1978,6 @@
- 	}
- 
- 	g_hash_table_remove_all(chat->users);
--	chat->users = NULL;
- 
- 	g_list_free(users);
- 	chat->in_room = NULL;
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index fdfe49d35c61..ce995e1486aa 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -70,7 +70,6 @@ include/libpurple/theme-manager.h
 include/libpurple/theme.h
 include/libpurple/upnp.h
 include/libpurple/util.h
-include/libpurple/valgrind.h
 include/libpurple/value.h
 include/libpurple/version.h
 include/libpurple/whiteboard.h
@@ -185,11 +184,11 @@ lib/purple-2/statenotify.so
 %%DBUS%%lib/libpurple-client.a
 %%DBUS%%lib/libpurple-client.la
 %%DBUS%%lib/libpurple-client.so
-%%DBUS%%lib/libpurple-client.so.9
+%%DBUS%%lib/libpurple-client.so.10
 lib/libpurple.a
 lib/libpurple.la
 lib/libpurple.so
-lib/libpurple.so.9
+lib/libpurple.so.10
 libdata/pkgconfig/purple.pc
 share/aclocal/purple.m4
 share/locale/af/LC_MESSAGES/pidgin.mo
diff --git a/net-im/pidgin-birthday-reminder/Makefile b/net-im/pidgin-birthday-reminder/Makefile
index e009d6a8f5e3..5b3252132795 100644
--- a/net-im/pidgin-birthday-reminder/Makefile
+++ b/net-im/pidgin-birthday-reminder/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	pidgin-birthday-reminder
 PORTVERSION=	1.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	http://launchpadlibrarian.net/56075754/
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	The birthday reminder for Pidgin
 
-LIB_DEPENDS=	purple.9:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple
 BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
diff --git a/net-im/pidgin-bs/Makefile b/net-im/pidgin-bs/Makefile
index 1dfc4035dc2d..89514017d6fb 100644
--- a/net-im/pidgin-bs/Makefile
+++ b/net-im/pidgin-bs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pidgin-bs
 PORTVERSION=	1.3.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im
 MASTER_SITES=	SF/${PORTNAME}/bot-sentry/${PORTVERSION}
 DISTNAME=	bot-sentry-${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME=	bot-sentry-${PORTVERSION}
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Pidgin plugin to prevent instant message spam
 
-LIB_DEPENDS=	purple.9:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
 GNU_CONFIGURE=	yes
diff --git a/net-im/pidgin-fetion/Makefile b/net-im/pidgin-fetion/Makefile
index ec465aea4f67..731861daa150 100644
--- a/net-im/pidgin-fetion/Makefile
+++ b/net-im/pidgin-fetion/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fetion
 PORTVERSION=	0.98.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.logvinov.ru/files/dist/fetion/ \
 		LOCAL/avl
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	pidgin-
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	Fetion protocol plugin for libpurple
 
-LIB_DEPENDS=	purple.9:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple
 
 MAKE_JOBS_SAFE=	yes
 
diff --git a/net-im/pidgin-hotkeys/Makefile b/net-im/pidgin-hotkeys/Makefile
index 16481bdf679b..436dc893d0ab 100644
--- a/net-im/pidgin-hotkeys/Makefile
+++ b/net-im/pidgin-hotkeys/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	pidgin-hotkeys
 PORTVERSION=	0.2.4
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	net-im
 MASTER_SITES=	SF
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	A pidgin plugin that allows user to assign global hotkeys
 
-LIB_DEPENDS=	purple.9:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple
 BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
diff --git a/net-im/pidgin-libnotify/Makefile b/net-im/pidgin-libnotify/Makefile
index 822202e4d3a6..60ca66dbe6ab 100644
--- a/net-im/pidgin-libnotify/Makefile
+++ b/net-im/pidgin-libnotify/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libnotify
 PORTVERSION=	0.14
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net-im
 MASTER_SITES=	SF/gaim-${PORTNAME}/pidgin-${PORTNAME}/pidgin-${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	pidgin-
@@ -19,7 +19,7 @@ COMMENT=	This plugin adds a libnotify interface to Pidgin
 BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin \
     		${LOCALBASE}/libdata/pkgconfig/libnotify.pc:${PORTSDIR}/devel/libnotify
 LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify \
-		purple.9:${PORTSDIR}/net-im/libpurple
+		purple.10:${PORTSDIR}/net-im/libpurple
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/net-im/pidgin-msn-pecan/Makefile b/net-im/pidgin-msn-pecan/Makefile
index c2528779173f..c5ddb1c53147 100644
--- a/net-im/pidgin-msn-pecan/Makefile
+++ b/net-im/pidgin-msn-pecan/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	msn-pecan
 PORTVERSION=	0.1.0.r1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	pidgin-
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
 MAINTAINER=	hrkfdn@gmail.com
 COMMENT=	Alternative MSN protocol plugin for libpurple
 
-LIB_DEPENDS=	purple.9:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple
 
 PROJECTHOST=	msn-pecan
 USE_BZIP2=	yes
diff --git a/net-im/pidgin-pidgimpd/Makefile b/net-im/pidgin-pidgimpd/Makefile
index b6300d3c0118..898049a45eb5 100644
--- a/net-im/pidgin-pidgimpd/Makefile
+++ b/net-im/pidgin-pidgimpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pidgimpd
 PORTVERSION=	1.1.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-im audio
 MASTER_SITES=	http://ayeon.org/projects/pidgimpd/
 PKGNAMEPREFIX=	pidgin-
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	pidgin-
 MAINTAINER=	hrkfdn@gmail.com
 COMMENT=	PidgiMPD is a Pidgin plugin for monitoring/controlling MPD
 
-LIB_DEPENDS=	purple.9:${PORTSDIR}/net-im/libpurple \
+LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple \
 		mpd.3:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
diff --git a/net-im/pidgin-sipe/Makefile b/net-im/pidgin-sipe/Makefile
index e70a6f63c798..c96c94e8a0cc 100644
--- a/net-im/pidgin-sipe/Makefile
+++ b/net-im/pidgin-sipe/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	pidgin-sipe
 PORTVERSION=	1.11.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	SF/sipe/sipe/${DISTNAME}
 
 MAINTAINER=	john.c.prather@gmail.com
 COMMENT=	A plugin for Pidgin to provide LCS/OCS connectivity
 
-LIB_DEPENDS=	purple.9:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
 GNU_CONFIGURE=	yes
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index ed5d7e46b499..e51dc0834c09 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -7,13 +7,13 @@
 #
 
 PORTNAME=	pidgin
-PORTREVISION=	1
+PORTREVISION=	0
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Pidgin multi-protocol messaging client (GTK+ UI)
 
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
-		purple.9:${PORTSDIR}/net-im/libpurple
+		purple.10:${PORTSDIR}/net-im/libpurple
 
 MASTERDIR=	${.CURDIR}/../libpurple
 BUILD_WRKSRC=	${WRKSRC}/pidgin
diff --git a/net-im/pidgin/pkg-plist b/net-im/pidgin/pkg-plist
index 04e7da9f0489..3452082cf4f8 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -510,6 +510,7 @@ share/pixmaps/pidgin/protocols/22/irc.png
 share/pixmaps/pidgin/protocols/22/jabber.png
 share/pixmaps/pidgin/protocols/22/meanwhile.png
 share/pixmaps/pidgin/protocols/22/msn.png
+share/pixmaps/pidgin/protocols/22/mxit.png
 share/pixmaps/pidgin/protocols/22/myspace.png
 share/pixmaps/pidgin/protocols/22/novell.png
 share/pixmaps/pidgin/protocols/22/silc.png
diff --git a/net-im/telepathy-haze/Makefile b/net-im/telepathy-haze/Makefile
index 87befeaf850a..c7cc430bc0c3 100644
--- a/net-im/telepathy-haze/Makefile
+++ b/net-im/telepathy-haze/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	haze
 PORTVERSION=	0.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-haze/
 PKGNAMEPREFIX=	telepathy-
@@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Libpurple connection manager for telepathy
 
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	purple.9:${PORTSDIR}/net-im/libpurple \
+LIB_DEPENDS=	purple.10:${PORTSDIR}/net-im/libpurple \
 		idn.17:${PORTSDIR}/dns/libidn \
 		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib