3 files changed, 11 insertions, 47 deletions

diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index ed55c4d14900..cab6c335699b 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	libpurple
-PORTVERSION=	2.11.0
-PORTREVISION?=	2
+PORTVERSION=	2.12.0
+PORTREVISION?=	0
 CATEGORIES?=	net-im
 MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
 DISTNAME=	pidgin-${PORTVERSION}
@@ -43,10 +43,10 @@ CPE_VENDOR=	pidgin
 
 OPTIONS_DEFINE=	BONJOUR DBUS GNUTLS NSS SASL GSTREAMER VV IDN PERL TCLTK
 OPTIONS_GROUP=		PROTOCOLS
-OPTIONS_GROUP_PROTOCOLS=GG SAMETIME SILC IRC JABBER MSN MYSPACE \
-			NOVELL OSCAR QQ SIMPLE YAHOO ZEPHYR
-OPTIONS_DEFAULT=	BONJOUR DBUS NSS GSTREAMER VV IDN GG IRC JABBER MSN \
-			MYSPACE NOVELL OSCAR QQ SIMPLE YAHOO ZEPHYR
+OPTIONS_GROUP_PROTOCOLS=GG SAMETIME SILC IRC JABBER \
+			NOVELL OSCAR QQ SIMPLE ZEPHYR
+OPTIONS_DEFAULT=	BONJOUR DBUS NSS GSTREAMER VV IDN GG IRC JABBER \
+			NOVELL OSCAR QQ SIMPLE ZEPHYR
 BONJOUR_DESC=	mDNS support
 GNUTLS_DESC=	Use GNUTLS for encryption support
 NSS_DESC=	Use Mozilla NSS for encryption support
@@ -58,13 +58,10 @@ SILC_DESC=	The Secure Internet Live Conferencing protocol
 GG_DESC=	The Gadu-Gadu chat protocol
 IRC_DESC=	The Internet Relay Chat protocol
 JABBER_DESC=	The Jabber/XMPP/Google Talk protocol
-MSN_DESC=	The MSN Messenger protocol
-MYSPACE_DESC=	The MySpaceIM protocol
 NOVELL_DESC=	The Novell GroupWise chat protocol
 OSCAR_DESC=	The AIM/ICQ/Oscar protocol
 QQ_DESC=	The Tercent QQ chat protocol
 SIMPLE_DESC=	The SIMPLE chat protocol
-YAHOO_DESC=	The Yahoo! Messenger protocol
 ZEPHYR_DESC=	The Zephyr chat protocol
 
 .if defined(WITH_GTKUI)
@@ -260,20 +257,6 @@ PRPL_MODULES:=		jabber,${PRPL_MODULES}
 PLIST_SUB+=		JABBER="@comment not installed: "
 .endif
 
-.if ${PORT_OPTIONS:MMSN}
-PLIST_SUB+=		MSN=""
-PRPL_MODULES:=		msn,${PRPL_MODULES}
-.else
-PLIST_SUB+=		MSN="@comment not installed: "
-.endif
-
-.if ${PORT_OPTIONS:MMYSPACE}
-PLIST_SUB+=		MYSPACE=""
-PRPL_MODULES:=		myspace,${PRPL_MODULES}
-.else
-PLIST_SUB+=		MYSPACE="@comment not installed: "
-.endif
-
 .if ${PORT_OPTIONS:MNOVELL}
 PLIST_SUB+=		NOVELL=""
 PRPL_MODULES:=		novell,${PRPL_MODULES}
@@ -302,13 +285,6 @@ PRPL_MODULES:=		simple,${PRPL_MODULES}
 PLIST_SUB+=		SIMPLE="@comment not installed: "
 .endif
 
-.if ${PORT_OPTIONS:MYAHOO}
-PLIST_SUB+=		YAHOO=""
-PRPL_MODULES:=		yahoo,${PRPL_MODULES}
-.else
-PLIST_SUB+=		YAHOO="@comment not installed: "
-.endif
-
 .if ${PORT_OPTIONS:MZEPHYR}
 PLIST_SUB+=		ZEPHYR=""
 PRPL_MODULES:=		zephyr,${PRPL_MODULES}
diff --git a/net-im/libpurple/distinfo b/net-im/libpurple/distinfo
index 12bf2e786475..da5129b3234c 100644
--- a/net-im/libpurple/distinfo
+++ b/net-im/libpurple/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466610376
-SHA256 (pidgin-2.11.0.tar.bz2) = f72613440586da3bdba6d58e718dce1b2c310adf8946de66d8077823e57b3333
-SIZE (pidgin-2.11.0.tar.bz2) = 10037480
+TIMESTAMP = 1489472185
+SHA256 (pidgin-2.12.0.tar.bz2) = 8c3d3536d6d3c971bd433ff9946678af70a0f6aa4e6969cc2a83bb357015b7f8
+SIZE (pidgin-2.12.0.tar.bz2) = 9270704
diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist
index 36046b5448f3..c157bea4c313 100644
--- a/net-im/libpurple/pkg-plist
+++ b/net-im/libpurple/pkg-plist
@@ -98,10 +98,6 @@ lib/purple-2/joinpart.so
 %%JABBER%%lib/purple-2/libjabber.so
 %%JABBER%%lib/purple-2/libjabber.so.0
 %%JABBER%%lib/purple-2/libjabber.so.0.0.0
-%%MSN%%lib/purple-2/libmsn.a
-%%MSN%%lib/purple-2/libmsn.so
-%%MYSPACE%%lib/purple-2/libmyspace.a
-%%MYSPACE%%lib/purple-2/libmyspace.so
 %%NOVELL%%lib/purple-2/libnovell.a
 %%NOVELL%%lib/purple-2/libnovell.so
 %%OSCAR%%lib/purple-2/liboscar.a
@@ -116,14 +112,6 @@ lib/purple-2/joinpart.so
 %%SIMPLE%%lib/purple-2/libsimple.so
 %%JABBER%%lib/purple-2/libxmpp.a
 %%JABBER%%lib/purple-2/libxmpp.so
-%%YAHOO%%lib/purple-2/libyahoo.a
-%%YAHOO%%lib/purple-2/libyahoo.so
-%%YAHOO%%lib/purple-2/libyahoojp.a
-%%YAHOO%%lib/purple-2/libyahoojp.so
-%%YAHOO%%lib/purple-2/libymsg.a
-%%YAHOO%%lib/purple-2/libymsg.so
-%%YAHOO%%lib/purple-2/libymsg.so.0
-%%YAHOO%%lib/purple-2/libymsg.so.0.0.0
 %%ZEPHYR%%lib/purple-2/libzephyr.a
 %%ZEPHYR%%lib/purple-2/libzephyr.so
 lib/purple-2/log_reader.a
@@ -155,11 +143,11 @@ lib/purple-2/statenotify.so
 %%DBUS%%lib/libpurple-client.a
 %%DBUS%%lib/libpurple-client.so
 %%DBUS%%lib/libpurple-client.so.0
-%%DBUS%%lib/libpurple-client.so.0.11.0
+%%DBUS%%lib/libpurple-client.so.0.12.0
 lib/libpurple.a
 lib/libpurple.so
 lib/libpurple.so.0
-lib/libpurple.so.0.11.0
+lib/libpurple.so.0.12.0
 libdata/pkgconfig/purple.pc
 %%CONSOLEUI%%man/man1/finch.1.gz
 %%GTKUI%%man/man1/pidgin.1.gz