Update pidgin/finch/libpurple to 2.10.12.

gstreamer is not an option any longer.

 version 2.10.12 (MM/DD/YY):

Windows-Specific Changes:

* Updates to dependencies:

* Cyrus SASL 2.1.26

* libxml2 2.9.2

* NSS 3.17.3 and NSPR 4.10.7

* Perl 5.20.1

* SILC 1.1.12

* Remove support for Tcl plugins



Gadu-Gadu:

* Updated internal libgadu to version 1.12.1.

14 files changed, 165 insertions, 61 deletions

diff --git a/chat/finch/Makefile b/chat/finch/Makefile
index bc61c4e919a..88ea613716e 100644
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2015/08/17 17:11:20 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2016/01/13 22:25:38 wiz Exp $
 
 PKGNAME=	finch-${PIDGIN_VERSION}
-PKGREVISION=	3
 
 COMMENT=	Multi-protocol Instant Messaging client console frontend
 
@@ -10,6 +9,7 @@ COMMENT=	Multi-protocol Instant Messaging client console frontend
 USE_TOOLS+=	intltool msgfmt perl
 
 CONFIGURE_ARGS+=	--enable-consoleui
+CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ENV+=		ac_cv_path_pythonpath=
 
 #CONFIGURE_ARGS+=	--disable-plugins
@@ -35,6 +35,10 @@ pre-build:
 
 INSTALL_DIRS=		finch doc
 
+# this was an option, but doesn't seem to be one as of 2.10.12
+.  include "../../multimedia/gstreamer1/buildlink3.mk"
+.  include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+
 BUILDLINK_API_DEPENDS.libpurple+=	libpurple-${PIDGIN_VERSION}{,nb*}
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/chat/finch/options.mk b/chat/finch/options.mk
index c0d632279d2..562ca1ce512 100644
--- a/chat/finch/options.mk
+++ b/chat/finch/options.mk
@@ -1,14 +1,10 @@
-# $NetBSD: options.mk,v 1.5 2015/08/06 19:39:19 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2016/01/13 22:25:38 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.finch
-PKG_SUPPORTED_OPTIONS+=		gstreamer debug
+PKG_SUPPORTED_OPTIONS+=		debug
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mgstreamer)
-.  include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index b3a4e830151..24eacd14cc3 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2015/08/23 14:30:36 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2016/01/13 22:25:38 wiz Exp $
 
 PKGNAME=	libpurple-${PIDGIN_VERSION}
-PKGREVISION=	3
 
 COMMENT=	Multi-protocol Instant Messaging client backend
 
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index c3cb3af23d0..d8caa4e0cf8 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.45 2015/12/29 04:54:37 dholland Exp $
+# $NetBSD: Makefile.common,v 1.46 2016/01/13 22:25:38 wiz Exp $
 #
 # used by chat/finch/Makefile
 # used by chat/libpurple/Makefile
@@ -6,7 +6,7 @@
 # used by chat/pidgin-sametime/Makefile
 # used by chat/pidgin-silc/Makefile
 
-PIDGIN_VERSION=	2.10.11
+PIDGIN_VERSION=	2.10.12
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index 4743935d3d2..cbbcf7db4ea 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2014/12/07 08:45:59 obache Exp $
+@comment $NetBSD: PLIST,v 1.31 2016/01/13 22:25:38 wiz Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
@@ -102,12 +102,15 @@ ${PLIST.gnome}share/gconf/schemas/purple.schemas
 share/locale/af/LC_MESSAGES/pidgin.mo
 share/locale/am/LC_MESSAGES/pidgin.mo
 share/locale/ar/LC_MESSAGES/pidgin.mo
+share/locale/as/LC_MESSAGES/pidgin.mo
 share/locale/ast/LC_MESSAGES/pidgin.mo
 share/locale/az/LC_MESSAGES/pidgin.mo
 share/locale/be@latin/LC_MESSAGES/pidgin.mo
 share/locale/bg/LC_MESSAGES/pidgin.mo
 share/locale/bn/LC_MESSAGES/pidgin.mo
 share/locale/bn_IN/LC_MESSAGES/pidgin.mo
+share/locale/br/LC_MESSAGES/pidgin.mo
+share/locale/brx/LC_MESSAGES/pidgin.mo
 share/locale/bs/LC_MESSAGES/pidgin.mo
 share/locale/ca/LC_MESSAGES/pidgin.mo
 share/locale/ca@valencia/LC_MESSAGES/pidgin.mo
@@ -121,6 +124,7 @@ share/locale/en_CA/LC_MESSAGES/pidgin.mo
 share/locale/en_GB/LC_MESSAGES/pidgin.mo
 share/locale/eo/LC_MESSAGES/pidgin.mo
 share/locale/es/LC_MESSAGES/pidgin.mo
+share/locale/es_AR/LC_MESSAGES/pidgin.mo
 share/locale/et/LC_MESSAGES/pidgin.mo
 share/locale/eu/LC_MESSAGES/pidgin.mo
 share/locale/fa/LC_MESSAGES/pidgin.mo
@@ -141,6 +145,7 @@ share/locale/kk/LC_MESSAGES/pidgin.mo
 share/locale/km/LC_MESSAGES/pidgin.mo
 share/locale/kn/LC_MESSAGES/pidgin.mo
 share/locale/ko/LC_MESSAGES/pidgin.mo
+share/locale/ks/LC_MESSAGES/pidgin.mo
 share/locale/ku/LC_MESSAGES/pidgin.mo
 share/locale/ku_IQ/LC_MESSAGES/pidgin.mo
 share/locale/lt/LC_MESSAGES/pidgin.mo
@@ -148,8 +153,10 @@ share/locale/lv/LC_MESSAGES/pidgin.mo
 share/locale/mai/LC_MESSAGES/pidgin.mo
 share/locale/mhr/LC_MESSAGES/pidgin.mo
 share/locale/mk/LC_MESSAGES/pidgin.mo
+share/locale/ml/LC_MESSAGES/pidgin.mo
 share/locale/mn/LC_MESSAGES/pidgin.mo
 share/locale/mr/LC_MESSAGES/pidgin.mo
+share/locale/ms_MY/LC_MESSAGES/pidgin.mo
 share/locale/my_MM/LC_MESSAGES/pidgin.mo
 share/locale/nb/LC_MESSAGES/pidgin.mo
 share/locale/ne/LC_MESSAGES/pidgin.mo
@@ -164,6 +171,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/sd/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
@@ -179,6 +187,7 @@ share/locale/tr/LC_MESSAGES/pidgin.mo
 share/locale/tt/LC_MESSAGES/pidgin.mo
 share/locale/uk/LC_MESSAGES/pidgin.mo
 share/locale/ur/LC_MESSAGES/pidgin.mo
+share/locale/uz/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
@@ -190,6 +199,8 @@ share/purple/ca-certs/America_Online_Root_Certification_Authority_1.pem
 share/purple/ca-certs/Baltimore_CyberTrust_Root.pem
 share/purple/ca-certs/CAcert_Class3.pem
 share/purple/ca-certs/CAcert_Root.pem
+share/purple/ca-certs/Certum_Root_CA.pem
+share/purple/ca-certs/Certum_Trusted_Network_CA.pem
 share/purple/ca-certs/Deutsche_Telekom_Root_CA_2.pem
 share/purple/ca-certs/DigiCertHighAssuranceCA-3.pem
 share/purple/ca-certs/DigiCertHighAssuranceEVRootCA.pem
diff --git a/chat/libpurple/buildlink3.mk b/chat/libpurple/buildlink3.mk
index f2c6935e2d8..6e60918d4cb 100644
--- a/chat/libpurple/buildlink3.mk
+++ b/chat/libpurple/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.40 2013/05/11 20:48:55 riastradh Exp $
+# $NetBSD: buildlink3.mk,v 1.41 2016/01/13 22:25:38 wiz Exp $
 
 BUILDLINK_TREE+=	libpurple
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libpurple
 LIBPURPLE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libpurple+=	libpurple>=2.7.9
-BUILDLINK_ABI_DEPENDS.libpurple+=	libpurple>=2.10.6nb9
+BUILDLINK_ABI_DEPENDS.libpurple+=	libpurple>=2.10.12
 BUILDLINK_PKGSRCDIR.libpurple?=	../../chat/libpurple
 
 pkgbase := libpurple
@@ -17,8 +17,8 @@ pkgbase := libpurple
 .  include "../../sysutils/dbus-glib/buildlink3.mk"
 .  include "../../sysutils/py-dbus/buildlink3.mk"
 .endif
-.if !empty(PKG_BUILD_OPTIONS.libpurple:Mfarsight)
-.  include "../../multimedia/farsight2/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.libpurple:Mfarstream)
+.  include "../../chat/farstream/buildlink3.mk"
 .endif
 .if empty(PKG_BUILD_OPTIONS.libpurple:Mgnutls)
 .  include "../../devel/nss/buildlink3.mk"
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index e46f0535db6..db79be50e8c 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.43 2015/11/03 01:20:21 agc Exp $
+$NetBSD: distinfo,v 1.44 2016/01/13 22:25:38 wiz Exp $
 
-SHA1 (pidgin-2.10.11.tar.bz2) = 5e0062b81bdb01300804e12bc0b6a04a91984631
-RMD160 (pidgin-2.10.11.tar.bz2) = 93802d5884b5ffd0714cb91dbe31f4e311f17e6d
-SHA512 (pidgin-2.10.11.tar.bz2) = 774710ab087cb56e349dc1d5e45dbfcbe06b9a8f792abe5d201b0860620d502009f31563cfe5316f4c815345427b6c273b8f9694deb600848957c825fd967029
-Size (pidgin-2.10.11.tar.bz2) = 9458050 bytes
+SHA1 (pidgin-2.10.12.tar.bz2) = 4550a447f35b869554c2d7d7bc1c7d84a01ce238
+RMD160 (pidgin-2.10.12.tar.bz2) = 22b14ba35cef488cb25d89b59aeb6c9923a4d924
+SHA512 (pidgin-2.10.12.tar.bz2) = 4756bed3ae78b48bfeaa586def3c7a0014db76ce14ae8c6773c96bdca24b65e92b2805270af43960e2a11a600aeac35e030faa3f79dbe3301084ca9d970a5f03
+Size (pidgin-2.10.12.tar.bz2) = 9837598 bytes
+SHA1 (patch-configure) = 74d033d148d74d0233c7ad33411b9ebcfbab7851
 SHA1 (patch-libpurple_plugins_perl_common_Makefile.PL.in) = 40326826000ed42e7570486f89f3196b58093d48
-SHA1 (patch-libpurple_protocols_mxit_profile.c) = 8f6e74f3a04976743c433d8b4b3f7b0b117f8b69
+SHA1 (patch-libpurple_protocols_mxit_profile.c) = e14883061131da2a3d31479584c5b267e451b721
diff --git a/chat/libpurple/options.mk b/chat/libpurple/options.mk
index 37aae8655f9..3f716c1aebe 100644
--- a/chat/libpurple/options.mk
+++ b/chat/libpurple/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.29 2015/06/17 06:48:22 khorben Exp $
+# $NetBSD: options.mk,v 1.30 2016/01/13 22:25:38 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.libpurple
-PKG_SUPPORTED_OPTIONS+=		avahi dbus debug farsight gnome gnutls
+PKG_SUPPORTED_OPTIONS+=		avahi dbus debug farstream gnome gnutls
 PKG_SUPPORTED_OPTIONS+=		gstreamer perl sasl tcl
-PKG_SUGGESTED_OPTIONS+=		dbus farsight gnome gstreamer
+PKG_SUGGESTED_OPTIONS+=		dbus farstream gnome gstreamer
 
 .include "../../mk/bsd.options.mk"
 
@@ -81,19 +81,19 @@ CONFIGURE_ARGS+=	--enable-cyrus-sasl
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 .endif
 
-# voice/video support requires both farsight and gstreamer
-.if !empty(PKG_OPTIONS:Mfarsight) && !empty(PKG_OPTIONS:Mgstreamer)
+# voice/video support requires both farstream and gstreamer
+.if !empty(PKG_OPTIONS:Mfarstream) && !empty(PKG_OPTIONS:Mgstreamer)
 CONFIGURE_ARGS+=	--enable-vv
 PLIST.vv=		yes
 .endif
 
-.if !empty(PKG_OPTIONS:Mfarsight)
+.if !empty(PKG_OPTIONS:Mfarstream)
 CONFIGURE_ARGS+=	--enable-farstream
-.  include "../../multimedia/farsight2/buildlink3.mk"
+.  include "../../chat/farstream/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mgstreamer)
 CONFIGURE_ARGS+=	--enable-gstreamer
-.  include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.  include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+.  include "../../multimedia/gstreamer1/buildlink3.mk"
+.  include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .endif
diff --git a/chat/libpurple/patches/patch-configure b/chat/libpurple/patches/patch-configure
new file mode 100644
index 00000000000..abfdb66f96c
--- /dev/null
+++ b/chat/libpurple/patches/patch-configure
@@ -0,0 +1,101 @@
+$NetBSD: patch-configure,v 1.1 2016/01/13 22:25:38 wiz Exp $
+
+Fix unportable test(1) construct.
+
+--- configure.orig	2015-12-31 23:19:55.000000000 +0000
++++ configure
+@@ -17931,7 +17931,7 @@ else
+ fi
+ 
+ if test "x$enable_gst" != "xno"; then
+-	if test "x$with_gstreamer" == "xauto"; then
++	if test "x$with_gstreamer" = "xauto"; then
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
+@@ -18208,7 +18208,7 @@ $as_echo "#define USE_GSTREAMER 1" >>con
+ 
+ 
+ fi
+-	elif test "x$with_gstreamer" == "x1.0"; then
++	elif test "x$with_gstreamer" = "x1.0"; then
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
+@@ -18306,7 +18306,7 @@ $as_echo "#define USE_GSTREAMER 1" >>con
+ 
+ 
+ fi
+-	elif test "x$with_gstreamer" == "x0.10"; then
++	elif test "x$with_gstreamer" = "x0.10"; then
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
+@@ -18409,14 +18409,14 @@ fi
+ 	fi
+ fi
+ 
+-if test "x$with_gtk" == "x3" -a "x$with_gstreamer" == "x0.10"; then
++if test "x$with_gtk" = "x3" -a "x$with_gstreamer" = "x0.10"; then
+ 	as_fn_error $? "WebKitGTK+ 3.0 cannot be mixed with GStreamer 0.10.
+ Please switch to WebKitGTK+ 2.0 or GStreamer 1.0." "$LINENO" 5
+-elif test "x$with_gtk" == "x2" -a "x$with_gstreamer" == "x1.0"; then
++elif test "x$with_gtk" = "x2" -a "x$with_gstreamer" = "x1.0"; then
+ 	as_fn_error $? "WebKitGTK+ 2.0 cannot be mixed with GStreamer 1.0.
+ Please switch to WebKitGTK+ 3.0 or GStreamer 0.10." "$LINENO" 5
+ fi
+-if test "x$with_gstreamer" == "x0.10" -o "x$with_gstreamer" == "x1.0"; then
++if test "x$with_gstreamer" = "x0.10" -o "x$with_gstreamer" = "x1.0"; then
+ 	GSTREAMER_VER=$with_gstreamer
+ 
+ else
+@@ -18424,7 +18424,7 @@ else
+ 
+ fi
+ 
+-if test "x$enable_gst" != "xno" -a "x$with_gstreamer" == "x1.0"; then
++if test "x$enable_gst" != "xno" -a "x$with_gstreamer" = "x1.0"; then
+ 	# Check whether --enable-gstreamer-video was given.
+ if test "${enable_gstreamer_video+set}" = set; then :
+   enableval=$enable_gstreamer_video; enable_gstvideo="$enableval"
+@@ -18519,7 +18519,7 @@ else
+ 	enable_gstvideo="no"
+ fi
+ 
+-if test "x$enable_gst" != "xno" -a "x$with_gstreamer" == "x0.10"; then
++if test "x$enable_gst" != "xno" -a "x$with_gstreamer" = "x0.10"; then
+ 	# Check whether --enable-gstreamer-interfaces was given.
+ if test "${enable_gstreamer_interfaces+set}" = set; then :
+   enableval=$enable_gstreamer_interfaces; enable_gstinterfaces="$enableval"
+@@ -18622,7 +18622,7 @@ else
+ fi
+ 
+ if test "x$enable_farstream" != "xno"; then
+-	if test "x$with_gstreamer" == "x1.0"; then
++	if test "x$with_gstreamer" = "x1.0"; then
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FARSTREAM" >&5
+@@ -18953,11 +18953,11 @@ else
+ fi
+ 
+ if test "x$enable_vv" != "xno"; then
+-	if test "x$enable_gst" != "xno" -a "x$with_gstreamer" == "x1.0" -a "x$enable_gstvideo" != "xno" -a "x$enable_farstream" != "xno"; then
++	if test "x$enable_gst" != "xno" -a "x$with_gstreamer" = "x1.0" -a "x$enable_gstvideo" != "xno" -a "x$enable_farstream" != "xno"; then
+ 
+ $as_echo "#define USE_VV 1" >>confdefs.h
+ 
+-	elif test "x$enable_gst" != "xno" -a "x$with_gstreamer" == "x0.10" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then
++	elif test "x$enable_gst" != "xno" -a "x$with_gstreamer" = "x0.10" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then
+ 
+ $as_echo "#define USE_VV 1" >>confdefs.h
+ 
+@@ -18981,7 +18981,7 @@ else
+ fi
+ 
+ 
+-if test "x$enable_vv" != "xno" -a "x$with_gstreamer" == "x1.0"; then
++if test "x$enable_vv" != "xno" -a "x$with_gstreamer" = "x1.0"; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for raw data support in Farstream" >&5
+ $as_echo_n "checking for raw data support in Farstream... " >&6; }
+ 
diff --git a/chat/libpurple/patches/patch-libpurple_protocols_mxit_profile.c b/chat/libpurple/patches/patch-libpurple_protocols_mxit_profile.c
index dcfbf911ec3..f373de2a29a 100644
--- a/chat/libpurple/patches/patch-libpurple_protocols_mxit_profile.c
+++ b/chat/libpurple/patches/patch-libpurple_protocols_mxit_profile.c
@@ -1,18 +1,15 @@
-$NetBSD: patch-libpurple_protocols_mxit_profile.c,v 1.1 2014/12/07 08:45:59 obache Exp $
+$NetBSD: patch-libpurple_protocols_mxit_profile.c,v 1.2 2016/01/13 22:25:38 wiz Exp $
 
-* prevent to overwrite _XOPEN_SOURCE setting, and 500 is good enough for
-  localtime_r(3).
+* prevent overwriting _XOPEN_SOURCE setting
+  otherwise breaks build on NetBSD due to missing struct sockaddr_storage definition
 
---- libpurple/protocols/mxit/profile.c.orig	2014-11-23 16:41:26.000000000 +0000
+--- libpurple/protocols/mxit/profile.c.orig	2015-12-31 23:19:41.000000000 +0000
 +++ libpurple/protocols/mxit/profile.c
-@@ -23,7 +23,9 @@
+@@ -23,7 +23,6 @@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
   */
  
--#define		_XOPEN_SOURCE
-+#ifndef		_XOPEN_SOURCE
-+#define		_XOPEN_SOURCE 500
-+#endif
+-#define		_XOPEN_SOURCE	1
  #include	<time.h>
  
  #include	"internal.h"
diff --git a/chat/pidgin-sametime/Makefile b/chat/pidgin-sametime/Makefile
index e12df28b62e..ac6c47d577d 100644
--- a/chat/pidgin-sametime/Makefile
+++ b/chat/pidgin-sametime/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2015/06/12 10:48:28 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2016/01/13 22:25:38 wiz Exp $
 
 PKGNAME=	pidgin-sametime-${PIDGIN_VERSION}
-PKGREVISION=	1
 
 COMMENT=	Lotus Sametime plugin for the Pidgin instant messenger
 
diff --git a/chat/pidgin-silc/Makefile b/chat/pidgin-silc/Makefile
index 325d01b1dc4..dba83fffeef 100644
--- a/chat/pidgin-silc/Makefile
+++ b/chat/pidgin-silc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2015/06/12 10:48:29 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2016/01/13 22:25:38 wiz Exp $
 
 PKGNAME=	pidgin-silc-${PIDGIN_VERSION}
-PKGREVISION=	1
 
 COMMENT=	SILC plugin for the Pidgin instant messenger
 
diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index 7703d204340..ab3f5a0caea 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2015/04/25 14:20:28 tnn Exp $
+# $NetBSD: Makefile,v 1.65 2016/01/13 22:25:38 wiz Exp $
 
 COMMENT=		Multi-protocol Instant Messaging client GTK frontend
-PKGREVISION=		1
 
 .include		"../../chat/libpurple/Makefile.common"
 
@@ -18,12 +17,16 @@ CHECK_WRKREF_SKIP=	bin/pidgin
 .include "options.mk"
 
 pre-build:
-	# XXX Find a cleaner way.
+#	XXX Find a cleaner way.
 	${TEST} -r ${WRKSRC}/libpurple/libpurple.la || \
 	  ln -s ${BUILDLINK_DIR}/lib/libpurple.la ${WRKSRC}/libpurple/.
 
 INSTALL_DIRS=		pidgin doc
 
+# was an option, but is not as of 2.10.12
+.  include "../../multimedia/gstreamer1/buildlink3.mk"
+.  include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/chat/pidgin/options.mk b/chat/pidgin/options.mk
index f71cb1295b7..50a6c30ba6f 100644
--- a/chat/pidgin/options.mk
+++ b/chat/pidgin/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.13 2012/08/01 15:26:54 drochner Exp $
+# $NetBSD: options.mk,v 1.14 2016/01/13 22:25:38 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.pidgin
-PKG_SUPPORTED_OPTIONS+=		dbus debug gstreamer gtkspell farsight x11
-PKG_SUGGESTED_OPTIONS+=		dbus gstreamer gtkspell farsight x11
+PKG_SUPPORTED_OPTIONS+=		dbus debug gtkspell farstream x11
+#PKG_SUGGESTED_OPTIONS+=		dbus gtkspell farstream x11
 
 .include "../../mk/bsd.options.mk"
 
@@ -15,17 +15,17 @@ PLIST.dbus=		yes
 .  include "../../sysutils/dbus-glib/buildlink3.mk"
 .endif
 
-# voice/video support requires both farsight and gstreamer
-.if !empty(PKG_OPTIONS:Mfarsight) && !empty(PKG_OPTIONS:Mgstreamer)
+# voice/video support requires both farstream
+.if !empty(PKG_OPTIONS:Mfarstream)
 CONFIGURE_ARGS+=	--enable-vv
 PLIST.vv=		yes
 .else
 CONFIGURE_ARGS+=	--disable-vv
 .endif
 
-.if !empty(PKG_OPTIONS:Mfarsight)
+.if !empty(PKG_OPTIONS:Mfarstream)
 CONFIGURE_ARGS+=	--enable-farstream
-.  include "../../multimedia/farsight2/buildlink3.mk"
+.  include "../../multimedia/farstream/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mgtkspell)
@@ -35,12 +35,6 @@ CONFIGURE_ARGS+=	--enable-gtkspell
 CONFIGURE_ARGS+=	--disable-gtkspell
 .endif
 
-.if !empty(PKG_OPTIONS:Mgstreamer)
-CONFIGURE_ARGS+=	--enable-gstreamer
-.  include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.  include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=	--enable-debug
 .endif