Update pidgin to 2.3.1, and chase the shared lib version bump. See

http://developer.pidgin.im/wiki/ChangeLog for the list of changes.

12 files changed, 22 insertions, 35 deletions

diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index fffc1a7cbf7e..50288419ee12 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.2:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.3:${PORTSDIR}/net-im/libpurple
 
 MASTERDIR=	${.CURDIR}/../libpurple
 BUILD_WRKSRC=	${WRKSRC}/finch
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 4cffb9ea7382..4e13dd9e8b94 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.2.2
+PORTVERSION=	2.3.1
 PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index bd22e15c35e3..588237d337d7 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,3 +1,3 @@
-MD5 (pidgin-2.2.2.tar.bz2) = 7c8fc5a55959b84c6e4c57a11bc0707a
-SHA256 (pidgin-2.2.2.tar.bz2) = 610efaefb869cb9b16ca0bb9b92779c41584f8965988a61a81e593d0510377ac
-SIZE (pidgin-2.2.2.tar.bz2) = 8901875
+MD5 (pidgin-2.3.1.tar.bz2) = 0a593c2c343d5b854bd2cd2be7542f40
+SHA256 (pidgin-2.3.1.tar.bz2) = 2d083687734b232c18b9d4500a314cff5ba1a2584350832c9688ecec668eb79e
+SIZE (pidgin-2.3.1.tar.bz2) = 9358563
diff --git a/net-im/libpurple/files/patch-finch_libgnt_gntmain.c b/net-im/libpurple/files/patch-finch_libgnt_gntmain.c
index aaabc974a22f..e69de29bb2d1 100644
--- a/net-im/libpurple/files/patch-finch_libgnt_gntmain.c
+++ b/net-im/libpurple/files/patch-finch_libgnt_gntmain.c
@@ -1,11 +0,0 @@
---- finch/libgnt/gntmain.c.orig	2007-08-16 02:18:26.000000000 -0400
-+++ finch/libgnt/gntmain.c	2007-08-16 02:18:42.000000000 -0400
-@@ -21,7 +21,7 @@
-  */
- 
- #define _GNU_SOURCE
--#if defined(__APPLE__) || defined(__unix__)
-+#if (defined(__APPLE__) || defined(__unix__)) && !defined(__FreeBSD__)
- #define _XOPEN_SOURCE_EXTENDED
- #endif
- 
diff --git a/net-im/libpurple/files/patch-finch_libgnt_gntwm.c b/net-im/libpurple/files/patch-finch_libgnt_gntwm.c
index 9788cf084bd1..e69de29bb2d1 100644
--- a/net-im/libpurple/files/patch-finch_libgnt_gntwm.c
+++ b/net-im/libpurple/files/patch-finch_libgnt_gntwm.c
@@ -1,11 +0,0 @@
---- finch/libgnt/gntwm.c.orig	2007-08-16 02:19:22.000000000 -0400
-+++ finch/libgnt/gntwm.c	2007-08-16 02:19:38.000000000 -0400
-@@ -21,7 +21,7 @@
-  */
- 
- #define _GNU_SOURCE
--#if defined(__APPLE__) || defined(__unix__)
-+#if (defined(__APPLE__) || defined(__unix__)) && !defined(__FreeBSD__)
- #define _XOPEN_SOURCE_EXTENDED
- #endif
- 
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index 8cdef4610603..1efa1c71b167 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -43,6 +43,7 @@ include/libpurple/prefs.h
 include/libpurple/privacy.h
 include/libpurple/proxy.h
 include/libpurple/prpl.h
+include/libpurple/purple.h
 include/libpurple/request.h
 include/libpurple/roomlist.h
 include/libpurple/savedstatuses.h
@@ -130,10 +131,10 @@ 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.2
+%%DBUS%%lib/libpurple-client.so.3
 lib/libpurple.la
 lib/libpurple.so
-lib/libpurple.so.2
+lib/libpurple.so.3
 libdata/pkgconfig/purple.pc
 share/aclocal/purple.m4
 share/applications/pidgin.desktop
@@ -210,6 +211,7 @@ share/locale/te/LC_MESSAGES/pidgin.mo
 share/locale/th/LC_MESSAGES/pidgin.mo
 share/locale/tr/LC_MESSAGES/pidgin.mo
 share/locale/uk/LC_MESSAGES/pidgin.mo
+share/locale/ur/LC_MESSAGES/pidgin.mo
 share/locale/vi/LC_MESSAGES/pidgin.mo
 share/locale/xh/LC_MESSAGES/pidgin.mo
 share/locale/zh_CN/LC_MESSAGES/pidgin.mo
@@ -219,6 +221,8 @@ share/locale/zh_TW/LC_MESSAGES/pidgin.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index 26b344de3c00..aa28a87d5b89 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pidgin-guifications
 PORTVERSION=	2.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	http://downloads.guifications.org/plugins/Guifications2/
 
diff --git a/net-im/pidgin-hotkeys/Makefile b/net-im/pidgin-hotkeys/Makefile
index 9c61f68b1e78..199cbaf6a180 100644
--- a/net-im/pidgin-hotkeys/Makefile
+++ b/net-im/pidgin-hotkeys/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pidgin-hotkeys
 PORTVERSION=	0.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	SF
 
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index 09c119a2ff4d..8ddb86ef7c53 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -13,11 +13,12 @@ MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Pidgin multi-protocol messaging client (GTK+ UI)
 
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
-    		purple.2:${PORTSDIR}/net-im/libpurple
+		purple.3:${PORTSDIR}/net-im/libpurple
 
 MASTERDIR=	${.CURDIR}/../libpurple
 BUILD_WRKSRC=	${WRKSRC}/pidgin
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
+INSTALLS_ICONS=	yes
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
diff --git a/net-im/pidgin/pkg-plist b/net-im/pidgin/pkg-plist
index 52a9cd9bc83f..70bdca39164e 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -46,6 +46,7 @@ include/pidgin/gtkstatusbox.h
 include/pidgin/gtkthemes.h
 include/pidgin/gtkutils.h
 include/pidgin/gtkwhiteboard.h
+include/pidgin/minidialog.h
 include/pidgin/pidgin.h
 %%CAP%%lib/pidgin/cap.la
 %%CAP%%lib/pidgin/cap.so
@@ -121,6 +122,7 @@ share/pixmaps/pidgin/dialogs/64/mail.png
 share/pixmaps/pidgin/dialogs/64/question.png
 share/pixmaps/pidgin/dialogs/64/warning.png
 share/pixmaps/pidgin/emblems/16/aol-client.png
+share/pixmaps/pidgin/emblems/16/birthday.png
 share/pixmaps/pidgin/emblems/16/blocked.png
 share/pixmaps/pidgin/emblems/16/bot.png
 share/pixmaps/pidgin/emblems/16/external.png
@@ -132,6 +134,7 @@ share/pixmaps/pidgin/emblems/16/half-operator.png
 share/pixmaps/pidgin/emblems/16/hiptop.png
 share/pixmaps/pidgin/emblems/16/male.png
 share/pixmaps/pidgin/emblems/16/mobile.png
+share/pixmaps/pidgin/emblems/16/music.png
 share/pixmaps/pidgin/emblems/16/not-authorized.png
 share/pixmaps/pidgin/emblems/16/operator.png
 share/pixmaps/pidgin/emblems/16/qq-member.png
@@ -385,6 +388,8 @@ share/pixmaps/pidgin/status/11/busy.png
 share/pixmaps/pidgin/status/11/chat.png
 share/pixmaps/pidgin/status/11/extended-away.png
 share/pixmaps/pidgin/status/11/invisible.png
+share/pixmaps/pidgin/status/11/log-in.png
+share/pixmaps/pidgin/status/11/log-out.png
 share/pixmaps/pidgin/status/11/offline.png
 share/pixmaps/pidgin/status/11/person.png
 share/pixmaps/pidgin/status/11/rtl/extended-away.png
@@ -590,7 +595,6 @@ share/icons/hicolor/22x22/apps/pidgin.png
 share/icons/hicolor/24x24/apps/pidgin.png
 share/icons/hicolor/32x32/apps/pidgin.png
 share/icons/hicolor/48x48/apps/pidgin.png
-share/icons/hicolor/scalable/apps/pidgin.svg
 @dirrm share/pixmaps/purple/buddy_icons/qq
 @dirrm share/pixmaps/purple/buddy_icons
 @dirrm share/pixmaps/purple
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 60a59469f24c..2f3f94bf900b 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pidgin
 PORTVERSION=	3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pidgin-encrypt
diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile
index f4fbd4158b44..98e053a49e92 100644
--- a/security/pidgin-otr/Makefile
+++ b/security/pidgin-otr/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	otr
 PORTVERSION=	3.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net
 MASTER_SITES=	http://www.cypherpunks.ca/otr/
 PKGNAMEPREFIX=	pidgin-