Update to 2.4.0. See http://developer.pidgin.im/wiki/ChangeLog for a list

of changes.

7 files changed, 43 insertions, 25 deletions

diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index 50288419ee12..07b4a2fc774a 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.3:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.4:${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 59408970584f..f187e5fdc2e6 100644
--- a/net-im/finch/pkg-plist
+++ b/net-im/finch/pkg-plist
@@ -8,11 +8,13 @@ include/finch/gntconv.h
 include/finch/gntdebug.h
 include/finch/gntft.h
 include/finch/gntidle.h
+include/finch/gntlog.h
 include/finch/gntnotify.h
 include/finch/gntplugin.h
 include/finch/gntpounce.h
 include/finch/gntprefs.h
 include/finch/gntrequest.h
+include/finch/gntroomlist.h
 include/finch/gntstatus.h
 include/finch/gntsound.h
 include/finch/gntui.h
@@ -50,6 +52,8 @@ lib/finch/gnthistory.la
 lib/finch/gnthistory.so
 lib/finch/gntlastlog.la
 lib/finch/gntlastlog.so
+lib/finch/grouping.la
+lib/finch/grouping.so
 lib/gnt/irssi.la
 lib/gnt/irssi.so
 lib/gnt/s.la
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 0b184c280759..33f860c62ba4 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.3.1
-PORTREVISION?=	1
+PORTVERSION=	2.4.0
+PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pidgin
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index 588237d337d7..de3cd768c721 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,3 +1,3 @@
-MD5 (pidgin-2.3.1.tar.bz2) = 0a593c2c343d5b854bd2cd2be7542f40
-SHA256 (pidgin-2.3.1.tar.bz2) = 2d083687734b232c18b9d4500a314cff5ba1a2584350832c9688ecec668eb79e
-SIZE (pidgin-2.3.1.tar.bz2) = 9358563
+MD5 (pidgin-2.4.0.tar.bz2) = d03ac2695d5b5304f86812ffd6ba0053
+SHA256 (pidgin-2.4.0.tar.bz2) = 6e35ee6abaa2a57fb8a347ca29c9213cd2c23768d819a7d1615ca7578b6b1ec1
+SIZE (pidgin-2.4.0.tar.bz2) = 9515789
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index 1efa1c71b167..319282c1ae86 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -131,23 +131,12 @@ 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.3
+%%DBUS%%lib/libpurple-client.so.4
 lib/libpurple.la
 lib/libpurple.so
-lib/libpurple.so.3
+lib/libpurple.so.4
 libdata/pkgconfig/purple.pc
 share/aclocal/purple.m4
-share/applications/pidgin.desktop
-share/purple/ca-certs/Equifax_Secure_CA.pem
-share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
-share/purple/ca-certs/Microsoft_Secure_Server_Authority.pem
-share/purple/ca-certs/Verisign_Class3_Primary_CA.pem
-share/purple/ca-certs/Verisign_RSA_Secure_Server_CA.pem
-share/sounds/purple/alert.wav
-share/sounds/purple/login.wav
-share/sounds/purple/logout.wav
-share/sounds/purple/receive.wav
-share/sounds/purple/send.wav
 share/locale/af/LC_MESSAGES/pidgin.mo
 share/locale/am/LC_MESSAGES/pidgin.mo
 share/locale/ar/LC_MESSAGES/pidgin.mo
@@ -200,6 +189,7 @@ share/locale/pt/LC_MESSAGES/pidgin.mo
 share/locale/pt_BR/LC_MESSAGES/pidgin.mo
 share/locale/ro/LC_MESSAGES/pidgin.mo
 share/locale/ru/LC_MESSAGES/pidgin.mo
+share/locale/si/LC_MESSAGES/pidgin.mo
 share/locale/sk/LC_MESSAGES/pidgin.mo
 share/locale/sl/LC_MESSAGES/pidgin.mo
 share/locale/sq/LC_MESSAGES/pidgin.mo
@@ -217,6 +207,21 @@ share/locale/xh/LC_MESSAGES/pidgin.mo
 share/locale/zh_CN/LC_MESSAGES/pidgin.mo
 share/locale/zh_HK/LC_MESSAGES/pidgin.mo
 share/locale/zh_TW/LC_MESSAGES/pidgin.mo
+share/purple/ca-certs/Equifax_Secure_CA.pem
+share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
+share/purple/ca-certs/Microsoft_Secure_Server_Authority.pem
+share/purple/ca-certs/StartCom_Free_SSL_CA.pem
+share/purple/ca-certs/Verisign_Class3_Primary_CA.pem
+share/purple/ca-certs/Verisign_RSA_Secure_Server_CA.pem
+share/sounds/purple/alert.wav
+share/sounds/purple/login.wav
+share/sounds/purple/logout.wav
+share/sounds/purple/receive.wav
+share/sounds/purple/send.wav
+@dirrm share/sounds/purple
+@dirrm share/purple/ca-certs
+@dirrm share/purple
+%%PERL:%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Purple
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -227,6 +232,8 @@ share/locale/zh_TW/LC_MESSAGES/pidgin.mo
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
 @dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/ps/LC_MESSAGES
 @dirrmtry share/locale/ps
 @dirrmtry share/locale/my_MM/LC_MESSAGES
@@ -241,10 +248,5 @@ share/locale/zh_TW/LC_MESSAGES/pidgin.mo
 @dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrm share/purple/ca-certs
-@dirrm share/purple
-@dirrm share/sounds/purple
-%%PERL:%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Purple
 @dirrm lib/purple-2
 @dirrm include/libpurple
-@dirrmtry share/applications
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index 8ddb86ef7c53..4904c722aecd 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.3:${PORTSDIR}/net-im/libpurple
+		purple.4:${PORTSDIR}/net-im/libpurple
 
 MASTERDIR=	${.CURDIR}/../libpurple
 BUILD_WRKSRC=	${WRKSRC}/pidgin
@@ -30,4 +30,13 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gtk20
 WANT_GNOME=	yes
 CONFIGURE_ARGS=	--disable-consoleui
 
+post-build:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+	    	Makefile ${MAKE_ARGS} pidgin.desktop
+
+post-install:
+	${MKDIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/pidgin.desktop \
+	    	${PREFIX}/share/applications/pidgin.desktop
+
 .include "${MASTERDIR}/Makefile"
diff --git a/net-im/pidgin/pkg-plist b/net-im/pidgin/pkg-plist
index 70bdca39164e..597b53bcbeb6 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -48,6 +48,7 @@ include/pidgin/gtkutils.h
 include/pidgin/gtkwhiteboard.h
 include/pidgin/minidialog.h
 include/pidgin/pidgin.h
+include/pidgin/pidgintooltip.h
 %%CAP%%lib/pidgin/cap.la
 %%CAP%%lib/pidgin/cap.so
 lib/pidgin/convcolors.la
@@ -85,6 +86,7 @@ lib/pidgin/timestamp_format.so
 lib/pidgin/xmppconsole.la
 lib/pidgin/xmppconsole.so
 libdata/pkgconfig/pidgin.pc
+share/applications/pidgin.desktop
 share/pixmaps/pidgin/animations/16/connect0.png
 share/pixmaps/pidgin/animations/16/connect1.png
 share/pixmaps/pidgin/animations/16/connect2.png
@@ -633,5 +635,6 @@ share/icons/hicolor/48x48/apps/pidgin.png
 @dirrm share/pixmaps/pidgin/animations/16
 @dirrm share/pixmaps/pidgin/animations
 @dirrm share/pixmaps/pidgin
+@dirrmtry share/applications
 @dirrm lib/pidgin
 @dirrm include/pidgin