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

of changes in this release.

7 files changed, 16 insertions, 21 deletions

diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index af1a6f4385cd..ccd15218d5fe 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.4:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.5:${PORTSDIR}/net-im/libpurple
 
 MASTERDIR=	${.CURDIR}/../libpurple
 BUILD_WRKSRC=	${WRKSRC}/finch
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index 7d481ec5949d..a995523a733c 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.4.3
+PORTVERSION=	2.5.0
 PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index 3e90e7496357..d41c32df456a 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,3 +1,3 @@
-MD5 (pidgin-2.4.3.tar.bz2) = 9e4a5f4ebda16a51fe91ec610286810a
-SHA256 (pidgin-2.4.3.tar.bz2) = 8bb5d452fa3239c703647cf2dc28a5dfb849d7df7b89da0018271a337af053a6
-SIZE (pidgin-2.4.3.tar.bz2) = 9382967
+MD5 (pidgin-2.5.0.tar.bz2) = 71df6633794de30e57827848cfb61996
+SHA256 (pidgin-2.5.0.tar.bz2) = 978b956c4d411433a5844f4cbd15176cf8e55bc7e71fe950415b2adb0e8f4ddb
+SIZE (pidgin-2.5.0.tar.bz2) = 9316876
diff --git a/net-im/libpurple/files/patch-configure b/net-im/libpurple/files/patch-configure
deleted file mode 100644
index 314e51fcfc0c..000000000000
--- a/net-im/libpurple/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2008-06-09 16:04:38.000000000 -0400
-+++ configure	2008-06-09 16:05:14.000000000 -0400
-@@ -36922,7 +36922,7 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--
-+		#include <sys/types.h>
- 		#ifdef HAVE_PARAM_H
- 		# include <sys/param.h>
- 		#endif
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index 6d6cf75d75bd..efc1783692d9 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -49,6 +49,7 @@ include/libpurple/roomlist.h
 include/libpurple/savedstatuses.h
 include/libpurple/server.h
 include/libpurple/signals.h
+include/libpurple/smiley.h
 include/libpurple/sound.h
 include/libpurple/sslconn.h
 include/libpurple/status.h
@@ -131,10 +132,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.4
+%%DBUS%%lib/libpurple-client.so.5
 lib/libpurple.la
 lib/libpurple.so
-lib/libpurple.so.4
+lib/libpurple.so.5
 libdata/pkgconfig/purple.pc
 share/aclocal/purple.m4
 share/locale/af/LC_MESSAGES/pidgin.mo
@@ -208,6 +209,8 @@ 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/CAcert_Class3.pem
+share/purple/ca-certs/CAcert_Root.pem
 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
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index be102c697c53..ee9ba8064fcf 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.4:${PORTSDIR}/net-im/libpurple
+		purple.5:${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 0cf7b99ff1eb..305efef6c03f 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -38,6 +38,7 @@ include/pidgin/gtkroomlist.h
 include/pidgin/gtksavedstatuses.h
 include/pidgin/gtkscrollbook.h
 include/pidgin/gtksession.h
+include/pidgin/gtksmiley.h
 include/pidgin/gtksound.h
 include/pidgin/gtksourceiter.h
 include/pidgin/gtksourceundomanager.h
@@ -164,6 +165,7 @@ share/pixmaps/pidgin/emotes/default/bowl.png
 share/pixmaps/pidgin/emotes/default/boy.png
 share/pixmaps/pidgin/emotes/default/brb.png
 share/pixmaps/pidgin/emotes/default/bulgy-eyes.png
+share/pixmaps/pidgin/emotes/default/bunny.png
 share/pixmaps/pidgin/emotes/default/bye.png
 share/pixmaps/pidgin/emotes/default/cake.png
 share/pixmaps/pidgin/emotes/default/call-me.png
@@ -172,6 +174,7 @@ share/pixmaps/pidgin/emotes/default/can.png
 share/pixmaps/pidgin/emotes/default/car.png
 share/pixmaps/pidgin/emotes/default/cat.png
 share/pixmaps/pidgin/emotes/default/chicken.png
+share/pixmaps/pidgin/emotes/default/cigarette.png
 share/pixmaps/pidgin/emotes/default/clap.png
 share/pixmaps/pidgin/emotes/default/clock.png
 share/pixmaps/pidgin/emotes/default/cloudy.png
@@ -193,7 +196,7 @@ share/pixmaps/pidgin/emotes/default/dance.png
 share/pixmaps/pidgin/emotes/default/dazed.png
 share/pixmaps/pidgin/emotes/default/desire.png
 share/pixmaps/pidgin/emotes/default/devil.png
-share/pixmaps/pidgin/emotes/default/disapointed.png
+share/pixmaps/pidgin/emotes/default/disappointed.png
 share/pixmaps/pidgin/emotes/default/disdain.png
 share/pixmaps/pidgin/emotes/default/doctor.png
 share/pixmaps/pidgin/emotes/default/dog.png
@@ -294,7 +297,6 @@ share/pixmaps/pidgin/emotes/default/shout.png
 share/pixmaps/pidgin/emotes/default/shut-mouth.png
 share/pixmaps/pidgin/emotes/default/sick.png
 share/pixmaps/pidgin/emotes/default/sidefrown.png
-share/pixmaps/pidgin/emotes/default/sigarette.png
 share/pixmaps/pidgin/emotes/default/silly.png
 share/pixmaps/pidgin/emotes/default/sinister.png
 share/pixmaps/pidgin/emotes/default/skeleton.png
@@ -460,6 +462,7 @@ share/pixmaps/pidgin/toolbar/16/insert.png
 share/pixmaps/pidgin/toolbar/16/message-new.png
 share/pixmaps/pidgin/toolbar/16/plugins.png
 share/pixmaps/pidgin/toolbar/16/send-file.png
+share/pixmaps/pidgin/toolbar/16/transfer.png
 share/pixmaps/pidgin/toolbar/16/unblock.png
 share/pixmaps/pidgin/toolbar/22/select-avatar.png
 share/pixmaps/pidgin/tray/16/tray-away.png