Update to 2.6.2, based on patches provided by Joachim Kuebart in PR 42005.

Additional changes:
Fix farsight handling in libpurple.
Set LICENSE.

2.6.2 (09/05/2009):
	Mark: Woo boy it's been a busy two weeks.  There was a lot of new code
	in 2.6.0, and with new code comes new bugs.  The cadre of relentless
	developers responsible for Pidgin have been hard at work, and I believe
	they have fixed all the major bugs that cropped up.  My thanks to all
	those names listed as Current Developers in Pidgin's 'About' window.

	Elliott: Well now, just as Mark said, there was a lot of new stuff that
	probably came up with tons of bugs.  So I can't say I wrote anything
	super-awesome, but I definitely fixed quite a few of those itty-bitty
	why-didn't-this-work-this-way sort of bugs.

10 files changed, 46 insertions, 64 deletions

diff --git a/chat/finch/options.mk b/chat/finch/options.mk
index 4e9f32cbd75..b38502e4e8f 100644
--- a/chat/finch/options.mk
+++ b/chat/finch/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2008/05/18 00:06:46 tnn Exp $
+# $NetBSD: options.mk,v 1.4 2009/12/08 12:45:42 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.finch
 PKG_SUPPORTED_OPTIONS+=		gstreamer debug
-PKG_SUGGESTED_OPTIONS+=
+PKG_SUGGESTED_OPTIONS+=		gstreamer
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index 00cb95e372a..6d01614a33f 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2009/09/06 21:06:44 abs Exp $
+# $NetBSD: Makefile.common,v 1.30 2009/12/08 12:45:42 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.6.1
+PIDGIN_VERSION=	2.6.2
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
@@ -14,6 +14,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pidgin.im/
+LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
@@ -32,9 +33,11 @@ CONFIGURE_ARGS+=	--disable-gstreamer
 CONFIGURE_ARGS+=	--disable-avahi
 CONFIGURE_ARGS+=	--disable-perl
 CONFIGURE_ARGS+=	--disable-tcl
+CONFIGURE_ARGS+=	--disable-tk
 CONFIGURE_ARGS+=	--disable-gnutls
 CONFIGURE_ARGS+=	--disable-nss
 CONFIGURE_ARGS+=	--disable-dbus
 CONFIGURE_ARGS+=	--disable-cyrus-sasl
 CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--disable-nm
+CONFIGURE_ARGS+=	--disable-vv
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index fcf31405d23..aed21de3351 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2009/09/06 21:06:44 abs Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/12/08 12:45:42 wiz Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
@@ -92,6 +92,7 @@ ${PLIST.gnutls}lib/purple-2/ssl-gnutls.la
 ${PLIST.nss}lib/purple-2/ssl-nss.la
 lib/purple-2/ssl.la
 lib/purple-2/statenotify.la
+${PLIST.tcl}lib/purple-2/tcl.la
 share/aclocal/purple.m4
 share/gconf/schemas/purple.schemas
 share/locale/af/LC_MESSAGES/pidgin.mo
diff --git a/chat/libpurple/buildlink3.mk b/chat/libpurple/buildlink3.mk
index 7d875742db5..8f3395debb2 100644
--- a/chat/libpurple/buildlink3.mk
+++ b/chat/libpurple/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:01 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/12/08 12:45:42 wiz Exp $
 
 BUILDLINK_TREE+=	libpurple
 
@@ -16,6 +16,9 @@ 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"
+.endif
 .endif # LIBPURPLE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libpurple
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index 711feecf136..33bbc8aa583 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.24 2009/09/06 21:06:44 abs Exp $
+$NetBSD: distinfo,v 1.25 2009/12/08 12:45:42 wiz Exp $
 
-SHA1 (pidgin-2.6.1.tar.bz2) = f14b1a6d36f3fc168c0e0d5949046eedee56d724
-RMD160 (pidgin-2.6.1.tar.bz2) = f1682e2d37ca272bc10b0c7710e73fb4807749bf
-Size (pidgin-2.6.1.tar.bz2) = 8964827 bytes
-SHA1 (patch-aa) = 7a1ec6bc64226dff60eac4b4835fabf1daecb9b3
+SHA1 (pidgin-2.6.2.tar.bz2) = 730b9bfaf79045f13e5d8dd736b91726bb11d332
+RMD160 (pidgin-2.6.2.tar.bz2) = a070ebe07a40d650c173065e4c448034e096963b
+Size (pidgin-2.6.2.tar.bz2) = 9093010 bytes
diff --git a/chat/libpurple/options.mk b/chat/libpurple/options.mk
index 786df1002d5..7620cbc67e1 100644
--- a/chat/libpurple/options.mk
+++ b/chat/libpurple/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2009/09/06 21:06:44 abs Exp $
+# $NetBSD: options.mk,v 1.12 2009/12/08 12:45:42 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.libpurple
 PKG_SUPPORTED_OPTIONS+=		gnutls perl tcl debug dbus sasl avahi
@@ -7,10 +7,11 @@ PKG_SUGGESTED_OPTIONS+=		gnutls dbus avahi farsight gstreamer
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		avahi dbus gnutls nss perl
+PLIST_VARS+=		avahi dbus gnutls nss perl tcl
 
 .if !empty(PKG_OPTIONS:Mavahi)
 PLIST.avahi=            yes
+CONFIGURE_ARGS+=	--enable-avahi
 .  include "../../net/avahi/buildlink3.mk"
 .endif
 
@@ -40,6 +41,8 @@ USE_TOOLS+=		perl:run
 .endif
 
 .if !empty(PKG_OPTIONS:Mtcl)
+PLIST.tcl=		yes
+CONFIGURE_ARGS+=	--enable-tcl
 CONFIGURE_ARGS+=	--with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib
 .  include "../../lang/tcl/buildlink3.mk"
 .endif
@@ -67,6 +70,12 @@ 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)
+CONFIGURE_ARGS+=	--enable-vv
+PLIST.vv=		yes
+.endif
+
 .if !empty(PKG_OPTIONS:Mfarsight)
 CONFIGURE_ARGS+=	--enable-farsight
 .  include "../../multimedia/farsight2/buildlink3.mk"
@@ -75,4 +84,5 @@ CONFIGURE_ARGS+=	--enable-farsight
 .if !empty(PKG_OPTIONS:Mgstreamer)
 CONFIGURE_ARGS+=	--enable-gstreamer
 .  include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.  include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 .endif
diff --git a/chat/libpurple/patches/patch-aa b/chat/libpurple/patches/patch-aa
deleted file mode 100644
index 67fb246eb48..00000000000
--- a/chat/libpurple/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2009/09/06 21:06:45 abs Exp $
-
---- configure.orig	2009-06-21 01:35:46.000000000 +0300
-+++ configure	2009-06-24 10:40:13.000000000 +0300
-@@ -21565,7 +21565,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpanelw  $LIBS"
-+LIBS="-lpanelw -lncurses $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -21625,7 +21625,7 @@
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_panelw_update_panels" >&5
- $as_echo "$ac_cv_lib_panelw_update_panels" >&6; }
- if test "x$ac_cv_lib_panelw_update_panels" = x""yes; then
--  GNT_LIBS="$GNT_LIBS -lpanelw"
-+  GNT_LIBS="$GNT_LIBS -lpanelw -lncurses"
- else
-   enable_consoleui=no
- fi
-@@ -21934,7 +21934,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpanel  $LIBS"
-+LIBS="-lpanel -lncurses $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -21994,7 +21994,7 @@
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_panel_update_panels" >&5
- $as_echo "$ac_cv_lib_panel_update_panels" >&6; }
- if test "x$ac_cv_lib_panel_update_panels" = x""yes; then
--  GNT_LIBS="$GNT_LIBS -lpanel"
-+  GNT_LIBS="$GNT_LIBS -lpanel -lncurses"
- else
-   enable_consoleui=no
- fi
diff --git a/chat/pidgin-silc/distinfo b/chat/pidgin-silc/distinfo
index f65a72a4777..5c65221ebf7 100644
--- a/chat/pidgin-silc/distinfo
+++ b/chat/pidgin-silc/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.21 2009/09/19 09:35:37 tnn Exp $
+$NetBSD: distinfo,v 1.22 2009/12/08 12:45:42 wiz Exp $
 
-SHA1 (pidgin-2.6.1.tar.bz2) = f14b1a6d36f3fc168c0e0d5949046eedee56d724
-RMD160 (pidgin-2.6.1.tar.bz2) = f1682e2d37ca272bc10b0c7710e73fb4807749bf
-Size (pidgin-2.6.1.tar.bz2) = 8964827 bytes
+SHA1 (pidgin-2.6.2.tar.bz2) = 730b9bfaf79045f13e5d8dd736b91726bb11d332
+RMD160 (pidgin-2.6.2.tar.bz2) = a070ebe07a40d650c173065e4c448034e096963b
+Size (pidgin-2.6.2.tar.bz2) = 9093010 bytes
 SHA1 (silc-toolkit-1.1.7.tar.gz) = a25918e83d5070ff75b7d6f296698dada76a92ca
 RMD160 (silc-toolkit-1.1.7.tar.gz) = 783297f44d577d5ec7dcff7952996944e4b1d5c6
 Size (silc-toolkit-1.1.7.tar.gz) = 2678989 bytes
-SHA1 (patch-aa) = 7a1ec6bc64226dff60eac4b4835fabf1daecb9b3
diff --git a/chat/pidgin/PLIST b/chat/pidgin/PLIST
index 667f531cece..4e1f5fe239d 100644
--- a/chat/pidgin/PLIST
+++ b/chat/pidgin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/09/06 21:06:45 abs Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/12/08 12:45:42 wiz Exp $
 bin/pidgin
 include/pidgin/eggtrayicon.h
 include/pidgin/gtkaccount.h
@@ -74,6 +74,7 @@ lib/pidgin/themeedit.la
 lib/pidgin/ticker.la
 lib/pidgin/timestamp.la
 lib/pidgin/timestamp_format.la
+${PLIST.vv}lib/pidgin/vvconfig.la
 lib/pidgin/xmppconsole.la
 lib/pidgin/xmppdisco.la
 lib/pkgconfig/pidgin.pc
@@ -574,13 +575,13 @@ 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/16/video-call.png
+share/pixmaps/pidgin/toolbar/22/audio-call.png
 share/pixmaps/pidgin/toolbar/22/select-avatar.png
 share/pixmaps/pidgin/toolbar/22/video-call.png
-share/pixmaps/pidgin/toolbar/22/voice-call.png
+share/pixmaps/pidgin/toolbar/32/audio-call.png
 share/pixmaps/pidgin/toolbar/32/video-call.png
-share/pixmaps/pidgin/toolbar/32/voice-call.png
+share/pixmaps/pidgin/toolbar/48/audio-call.png
 share/pixmaps/pidgin/toolbar/48/video-call.png
-share/pixmaps/pidgin/toolbar/48/voice-call.png
 share/pixmaps/pidgin/tray/16/available_4bit.ico
 share/pixmaps/pidgin/tray/16/away_4bit.ico
 share/pixmaps/pidgin/tray/16/busy_4bit.ico
diff --git a/chat/pidgin/options.mk b/chat/pidgin/options.mk
index 51c33767ee4..1ae5581bc5c 100644
--- a/chat/pidgin/options.mk
+++ b/chat/pidgin/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2009/09/06 21:06:45 abs Exp $
+# $NetBSD: options.mk,v 1.8 2009/12/08 12:45:42 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.pidgin
 PKG_SUPPORTED_OPTIONS+=		dbus debug farsight gstreamer gtkspell
@@ -6,7 +6,7 @@ PKG_SUGGESTED_OPTIONS+=		gtkspell dbus farsight gstreamer
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		dbus
+PLIST_VARS+=		dbus vv
 
 .if !empty(PKG_OPTIONS:Mdbus)
 CONFIGURE_ARGS+=	--enable-dbus
@@ -15,6 +15,12 @@ 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)
+CONFIGURE_ARGS+=	--enable-vv
+PLIST.vv=		yes
+.endif
+
 .if !empty(PKG_OPTIONS:Mfarsight)
 CONFIGURE_ARGS+=	--enable-farsight
 .  include "../../multimedia/farsight2/buildlink3.mk"