Update to 2.2.0. See http://pidgin.im/ChangeLog for the list of changes

in this release.

7 files changed, 27 insertions, 9 deletions

diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index d31afd5e8fa2..fffc1a7cbf7e 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.1:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.2:${PORTSDIR}/net-im/libpurple
 
 MASTERDIR=	${.CURDIR}/../libpurple
 BUILD_WRKSRC=	${WRKSRC}/finch
diff --git a/net-im/finch/pkg-plist b/net-im/finch/pkg-plist
index db6c59d256f5..9bfd0db9e7a9 100644
--- a/net-im/finch/pkg-plist
+++ b/net-im/finch/pkg-plist
@@ -2,6 +2,7 @@ bin/finch
 include/finch/finch.h
 include/finch/gntaccount.h
 include/finch/gntblist.h
+include/finch/gntcertmgr.h
 include/finch/gntconn.h
 include/finch/gntconv.h
 include/finch/gntdebug.h
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index ddfa5a597735..d401177265ad 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2.0
 PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index e7904967f3e9..023e5c89f242 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,3 +1,3 @@
-MD5 (pidgin-2.1.1.tar.bz2) = eb29fecb2f3a6d4790f47ce8e658c07c
-SHA256 (pidgin-2.1.1.tar.bz2) = cfeb66d224acc574d9545eb52af685c43e0627db5abc2df04089245d181440de
-SIZE (pidgin-2.1.1.tar.bz2) = 7829592
+MD5 (pidgin-2.2.0.tar.bz2) = d71cd4de6ef1459ba9b504d0c06d8d04
+SHA256 (pidgin-2.2.0.tar.bz2) = 4cb6c1b1b4d3e3b792ef5c4770df4a70585a4c593171e1b0a7e66a21598b3aba
+SIZE (pidgin-2.2.0.tar.bz2) = 8101465
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index bbb8b8d9aac8..3848fa99385c 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -20,6 +20,7 @@ include/libpurple/dbus-maybe.h
 %%DBUS%%include/libpurple/dbus-server.h
 %%DBUS%%include/libpurple/dbus-types.h
 %%DBUS%%include/libpurple/dbus-useful.h
+include/libpurple/certificate.h
 include/libpurple/debug.h
 include/libpurple/desktopitem.h
 include/libpurple/dnsquery.h
@@ -129,13 +130,17 @@ lib/purple-2/statenotify.so
 %%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/Purple.pm
 %%DBUS%%lib/libpurple-client.la
 %%DBUS%%lib/libpurple-client.so
-%%DBUS%%lib/libpurple-client.so.1
+%%DBUS%%lib/libpurple-client.so.2
 lib/libpurple.la
 lib/libpurple.so
-lib/libpurple.so.1
+lib/libpurple.so.2
 libdata/pkgconfig/purple.pc
 share/aclocal/purple.m4
 share/gnome/applications/pidgin.desktop
+share/gnome/purple/ca-certs/Equifax_Secure_CA.pem
+share/gnome/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
+share/gnome/purple/ca-certs/Verisign_Class3_Primary_CA.pem
+share/gnome/purple/ca-certs/Verisign_RSA_Secure_Server_CA.pem
 share/gnome/sounds/purple/alert.wav
 share/gnome/sounds/purple/login.wav
 share/gnome/sounds/purple/logout.wav
@@ -145,6 +150,7 @@ share/locale/af/LC_MESSAGES/pidgin.mo
 share/locale/am/LC_MESSAGES/pidgin.mo
 share/locale/ar/LC_MESSAGES/pidgin.mo
 share/locale/az/LC_MESSAGES/pidgin.mo
+share/locale/be@latin/LC_MESSAGES/pidgin.mo
 share/locale/bg/LC_MESSAGES/pidgin.mo
 share/locale/bn/LC_MESSAGES/pidgin.mo
 share/locale/bs/LC_MESSAGES/pidgin.mo
@@ -257,7 +263,11 @@ share/locale/zh_TW/LC_MESSAGES/pidgin.mo
 @dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
 @dirrm share/gnome/sounds/purple
+@dirrm share/gnome/purple/ca-certs
+@dirrm share/gnome/purple
 %%PERL:%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Purple
 @dirrm lib/purple-2
 @dirrm include/libpurple
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index 5d4815cf3e21..3c530dec2338 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Pidgin multi-protocol messaging client (GTK+ UI)
 
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
-    		purple.1:${PORTSDIR}/net-im/libpurple
+    		purple.2:${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 d611729c693b..0cf5638491f4 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -9,6 +9,7 @@ include/pidgin/gtkcellrendererexpander.h
 include/pidgin/gtkcellrendererprogress.h
 include/pidgin/gtkcellview.h
 include/pidgin/gtkcellviewmenuitem.h
+include/pidgin/gtkcertmgr.h
 include/pidgin/gtkconn.h
 include/pidgin/gtkconv.h
 include/pidgin/gtkconvwin.h
@@ -103,6 +104,7 @@ share/gnome/pixmaps/pidgin/arrow-left.xpm
 share/gnome/pixmaps/pidgin/arrow-right.xpm
 share/gnome/pixmaps/pidgin/arrow-up.xpm
 share/gnome/pixmaps/pidgin/buttons/edit.png
+share/gnome/pixmaps/pidgin/buttons/info.png
 share/gnome/pixmaps/pidgin/buttons/music.png
 share/gnome/pixmaps/pidgin/buttons/pause.png
 share/gnome/pixmaps/pidgin/dialogs/16/auth.png
@@ -232,7 +234,7 @@ share/gnome/pixmaps/pidgin/emotes/default/loser.png
 share/gnome/pixmaps/pidgin/emotes/default/love-over.png
 share/gnome/pixmaps/pidgin/emotes/default/love.png
 share/gnome/pixmaps/pidgin/emotes/default/lying.png
-share/gnome/pixmaps/pidgin/emotes/default/madtongue.png
+share/gnome/pixmaps/pidgin/emotes/default/mad-tongue.png
 share/gnome/pixmaps/pidgin/emotes/default/mail.png
 share/gnome/pixmaps/pidgin/emotes/default/male-fighter1.png
 share/gnome/pixmaps/pidgin/emotes/default/male-fighter2.png
@@ -339,6 +341,7 @@ share/gnome/pixmaps/pidgin/protocols/16/irc.png
 share/gnome/pixmaps/pidgin/protocols/16/jabber.png
 share/gnome/pixmaps/pidgin/protocols/16/meanwhile.png
 share/gnome/pixmaps/pidgin/protocols/16/msn.png
+share/gnome/pixmaps/pidgin/protocols/16/myspace.png
 share/gnome/pixmaps/pidgin/protocols/16/novell.png
 share/gnome/pixmaps/pidgin/protocols/16/qq.png
 share/gnome/pixmaps/pidgin/protocols/16/silc.png
@@ -354,6 +357,7 @@ share/gnome/pixmaps/pidgin/protocols/22/irc.png
 share/gnome/pixmaps/pidgin/protocols/22/jabber.png
 share/gnome/pixmaps/pidgin/protocols/22/meanwhile.png
 share/gnome/pixmaps/pidgin/protocols/22/msn.png
+share/gnome/pixmaps/pidgin/protocols/22/myspace.png
 share/gnome/pixmaps/pidgin/protocols/22/novell.png
 share/gnome/pixmaps/pidgin/protocols/22/qq.png
 share/gnome/pixmaps/pidgin/protocols/22/silc.png
@@ -368,6 +372,7 @@ share/gnome/pixmaps/pidgin/protocols/48/irc.png
 share/gnome/pixmaps/pidgin/protocols/48/jabber.png
 share/gnome/pixmaps/pidgin/protocols/48/meanwhile.png
 share/gnome/pixmaps/pidgin/protocols/48/msn.png
+share/gnome/pixmaps/pidgin/protocols/48/myspace.png
 share/gnome/pixmaps/pidgin/protocols/48/novell.png
 share/gnome/pixmaps/pidgin/protocols/48/qq.png
 share/gnome/pixmaps/pidgin/protocols/48/silc.png
@@ -382,6 +387,7 @@ share/gnome/pixmaps/pidgin/status/11/extended-away.png
 share/gnome/pixmaps/pidgin/status/11/invisible.png
 share/gnome/pixmaps/pidgin/status/11/offline.png
 share/gnome/pixmaps/pidgin/status/11/person.png
+share/gnome/pixmaps/pidgin/status/11/rtl/extended-away.png
 share/gnome/pixmaps/pidgin/status/16/available.png
 share/gnome/pixmaps/pidgin/status/16/away.png
 share/gnome/pixmaps/pidgin/status/16/busy.png
@@ -604,6 +610,7 @@ share/icons/hicolor/scalable/apps/pidgin.svg
 @dirrm share/gnome/pixmaps/pidgin/status/22
 @dirrm share/gnome/pixmaps/pidgin/status/16/rtl
 @dirrm share/gnome/pixmaps/pidgin/status/16
+@dirrm share/gnome/pixmaps/pidgin/status/11/rtl
 @dirrm share/gnome/pixmaps/pidgin/status/11
 @dirrm share/gnome/pixmaps/pidgin/status
 @dirrm share/gnome/pixmaps/pidgin/protocols/48