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

of changes.

7 files changed, 16 insertions, 38 deletions

diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile
index 6eb6dda1f934..887fa99877fe 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.7:${PORTSDIR}/net-im/libpurple
+LIB_DEPENDS=	purple.8:${PORTSDIR}/net-im/libpurple
 
 MASTERDIR=	${.CURDIR}/../libpurple
 BUILD_WRKSRC=	${WRKSRC}/finch
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index a106450b904c..22330fb3f778 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.7.11
-PORTREVISION?=	2
+PORTVERSION=	2.8.0
+PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
 DISTNAME=	pidgin-${PORTVERSION}
@@ -275,12 +275,12 @@ PRPL_MODULES:=		oscar,${PRPL_MODULES}
 PLIST_SUB+=		OSCAR="@comment not installed: "
 .endif
 
-.if !defined(WITHOUT_QQ)
-PLIST_SUB+=		QQ=""
-PRPL_MODULES:=		qq,${PRPL_MODULES}
-.else
-PLIST_SUB+=		QQ="@comment not installed: "
-.endif
+#.if !defined(WITHOUT_QQ)
+#PLIST_SUB+=		QQ=""
+#PRPL_MODULES:=		qq,${PRPL_MODULES}
+#.else
+#PLIST_SUB+=		QQ="@comment not installed: "
+#.endif
 
 .if !defined(WITHOUT_SIMPLE)
 PLIST_SUB+=		SIMPLE=""
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index 3d35ff53326e..683ebbfbedad 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pidgin-2.7.11.tar.bz2) = a24e2c3118bd47983955d398c9cf5543c12e95527cdf7de9d273a6e92f9d160b
-SIZE (pidgin-2.7.11.tar.bz2) = 9978175
+SHA256 (pidgin-2.8.0.tar.bz2) = 71ced93efecd48a1114eaf6370adebf591ace31158457baf023d15892d663c78
+SIZE (pidgin-2.8.0.tar.bz2) = 9921362
diff --git a/net-im/libpurple/files/patch-finch_libgnt_gntwm.c b/net-im/libpurple/files/patch-finch_libgnt_gntwm.c
index b4cd06b4be13..e69de29bb2d1 100644
--- a/net-im/libpurple/files/patch-finch_libgnt_gntwm.c
+++ b/net-im/libpurple/files/patch-finch_libgnt_gntwm.c
@@ -1,15 +0,0 @@
---- finch/libgnt/gntwm.c.orig	2008-03-08 13:10:52.000000000 -0500
-+++ finch/libgnt/gntwm.c	2008-03-08 13:13:56.000000000 -0500
-@@ -24,6 +24,12 @@
- 
- #ifdef USE_PYTHON
- #include <Python.h>
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#if (__FreeBSD_version <= 700032 && __FreeBSD_version >= 700000) || __FreeBSD_version <= 602106
-+#undef _XOPEN_SOURCE_EXTENDED
-+#endif
-+#endif
- #else
- #define _GNU_SOURCE
- #if (defined(__APPLE__) || defined(__unix__)) && !defined(__FreeBSD__)
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index 414fe309ee79..05239b96c3cc 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -109,8 +109,6 @@ lib/purple-2/joinpart.so
 %%OSCAR%%lib/purple-2/liboscar.so.0
 %%SILC%%lib/purple-2/libsilcpurple.la
 %%SILC%%lib/purple-2/libsilcpurple.so
-%%QQ%%lib/purple-2/libqq.la
-%%QQ%%lib/purple-2/libqq.so
 %%SAMETIME%%lib/purple-2/libsametime.la
 %%SAMETIME%%lib/purple-2/libsametime.so
 %%SIMPLE%%lib/purple-2/libsimple.la
@@ -153,10 +151,10 @@ lib/purple-2/statenotify.so
 %%TCL:%%lib/purple-2/tcl.so
 %%DBUS%%lib/libpurple-client.la
 %%DBUS%%lib/libpurple-client.so
-%%DBUS%%lib/libpurple-client.so.7
+%%DBUS%%lib/libpurple-client.so.8
 lib/libpurple.la
 lib/libpurple.so
-lib/libpurple.so.7
+lib/libpurple.so.8
 libdata/pkgconfig/purple.pc
 share/aclocal/purple.m4
 share/locale/af/LC_MESSAGES/pidgin.mo
@@ -190,6 +188,7 @@ share/locale/gl/LC_MESSAGES/pidgin.mo
 share/locale/gu/LC_MESSAGES/pidgin.mo
 share/locale/he/LC_MESSAGES/pidgin.mo
 share/locale/hi/LC_MESSAGES/pidgin.mo
+share/locale/hr/LC_MESSAGES/pidgin.mo
 share/locale/hu/LC_MESSAGES/pidgin.mo
 share/locale/hy/LC_MESSAGES/pidgin.mo
 share/locale/id/LC_MESSAGES/pidgin.mo
@@ -247,6 +246,7 @@ share/purple/ca-certs/America_Online_Root_Certification_Authority_1.pem
 share/purple/ca-certs/CAcert_Class3.pem
 share/purple/ca-certs/CAcert_Root.pem
 share/purple/ca-certs/Deutsche_Telekom_Root_CA_2.pem
+share/purple/ca-certs/DigiCertHighAssuranceCA-3.pem
 share/purple/ca-certs/Entrust.net_Secure_Server_CA.pem
 share/purple/ca-certs/Equifax_Secure_CA.pem
 share/purple/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index 1c9139cfca40..6c874a75acd9 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.7:${PORTSDIR}/net-im/libpurple
+		purple.8:${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 c6074bec71ca..04e7da9f0489 100644
--- a/net-im/pidgin/pkg-plist
+++ b/net-im/pidgin/pkg-plist
@@ -189,7 +189,6 @@ share/pixmaps/pidgin/emblems/16/hiptop.png
 share/pixmaps/pidgin/emblems/16/male.png
 share/pixmaps/pidgin/emblems/16/not-authorized.png
 share/pixmaps/pidgin/emblems/16/operator.png
-share/pixmaps/pidgin/emblems/16/qq-member.png
 share/pixmaps/pidgin/emblems/16/secure.png
 share/pixmaps/pidgin/emblems/16/unavailable.png
 share/pixmaps/pidgin/emblems/16/video.png
@@ -203,7 +202,6 @@ share/pixmaps/pidgin/emblems/scalable/free-for-chat.svg
 share/pixmaps/pidgin/emblems/scalable/game.svg
 share/pixmaps/pidgin/emblems/scalable/male.svg
 share/pixmaps/pidgin/emblems/scalable/not-authorized.svg
-share/pixmaps/pidgin/emblems/scalable/qq-member.svg
 share/pixmaps/pidgin/emblems/scalable/secure.svg
 share/pixmaps/pidgin/emblems/scalable/unavailable.svg
 share/pixmaps/pidgin/emblems/scalable/video.svg
@@ -347,7 +345,6 @@ share/pixmaps/pidgin/emotes/default/poop.png
 share/pixmaps/pidgin/emotes/default/pray.png
 share/pixmaps/pidgin/emotes/default/present.png
 share/pixmaps/pidgin/emotes/default/pumpkin.png
-share/pixmaps/pidgin/emotes/default/qq.png
 share/pixmaps/pidgin/emotes/default/question.png
 share/pixmaps/pidgin/emotes/default/quiet.png
 share/pixmaps/pidgin/emotes/default/rain.png
@@ -499,7 +496,6 @@ share/pixmaps/pidgin/protocols/16/msn.png
 share/pixmaps/pidgin/protocols/16/mxit.png
 share/pixmaps/pidgin/protocols/16/myspace.png
 share/pixmaps/pidgin/protocols/16/novell.png
-share/pixmaps/pidgin/protocols/16/qq.png
 share/pixmaps/pidgin/protocols/16/silc.png
 share/pixmaps/pidgin/protocols/16/simple.png
 share/pixmaps/pidgin/protocols/16/yahoo.png
@@ -516,7 +512,6 @@ share/pixmaps/pidgin/protocols/22/meanwhile.png
 share/pixmaps/pidgin/protocols/22/msn.png
 share/pixmaps/pidgin/protocols/22/myspace.png
 share/pixmaps/pidgin/protocols/22/novell.png
-share/pixmaps/pidgin/protocols/22/qq.png
 share/pixmaps/pidgin/protocols/22/silc.png
 share/pixmaps/pidgin/protocols/22/simple.png
 share/pixmaps/pidgin/protocols/22/yahoo.png
@@ -533,7 +528,6 @@ share/pixmaps/pidgin/protocols/48/msn.png
 share/pixmaps/pidgin/protocols/48/mxit.png
 share/pixmaps/pidgin/protocols/48/myspace.png
 share/pixmaps/pidgin/protocols/48/novell.png
-share/pixmaps/pidgin/protocols/48/qq.png
 share/pixmaps/pidgin/protocols/48/silc.png
 share/pixmaps/pidgin/protocols/48/simple.png
 share/pixmaps/pidgin/protocols/48/yahoo.png
@@ -549,7 +543,6 @@ share/pixmaps/pidgin/protocols/scalable/meanwhile.svg
 share/pixmaps/pidgin/protocols/scalable/msn.svg
 share/pixmaps/pidgin/protocols/scalable/mxit.svg
 share/pixmaps/pidgin/protocols/scalable/novell.svg
-share/pixmaps/pidgin/protocols/scalable/qq.svg
 share/pixmaps/pidgin/protocols/scalable/silc.svg
 share/pixmaps/pidgin/protocols/scalable/simple.svg
 share/pixmaps/pidgin/protocols/scalable/yahoo.svg