PR 41978 from Joachim Kuebart

Update:
    chat/finch to 2.6.1
    chat/libpurple to 2.6.1
    chat/pidgin to 2.6.1
    chat/pidgin-sametime to 2.6.1
    chat/pidgin-silc to 2.6.1

major changes:
 o addition of farsight support for voice/video chats (untested, new option on by default)
 o addition of dependency on devel/libidn
 o addition of gstreamer option for libpurple (on by default)

6 files changed, 59 insertions, 15 deletions

diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index 55ebe95e22f..bbbe4b6c3e5 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:58:43 sno Exp $
+# $NetBSD: Makefile,v 1.16 2009/09/06 21:06:44 abs Exp $
 #
 
 PKGNAME=	libpurple-${PIDGIN_VERSION}
-PKGREVISION=	1
 COMMENT=	Multi-protocol Instant Messaging client backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -30,5 +29,6 @@ BUILD_DIRS=	m4macros libpurple po share/ca-certs share/sounds
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
+.include "../../devel/libidn/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index a9af5a8a435..00cb95e372a 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2009/08/13 18:58:31 snj Exp $
+# $NetBSD: Makefile.common,v 1.29 2009/09/06 21:06:44 abs 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.5.8
+PIDGIN_VERSION=	2.6.1
 DISTNAME=	pidgin-${PIDGIN_VERSION}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
@@ -27,6 +27,7 @@ CONFIGURE_ARGS+=	--disable-gevolution
 CONFIGURE_ARGS+=	--disable-gtkui
 CONFIGURE_ARGS+=	--disable-consoleui
 CONFIGURE_ARGS+=	--disable-meanwhile
+CONFIGURE_ARGS+=	--disable-farsight
 CONFIGURE_ARGS+=	--disable-gstreamer
 CONFIGURE_ARGS+=	--disable-avahi
 CONFIGURE_ARGS+=	--disable-perl
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index 9482160b8ea..fcf31405d23 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2009/06/14 17:37:47 joerg Exp $
+@comment $NetBSD: PLIST,v 1.19 2009/09/06 21:06:44 abs Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
@@ -21,6 +21,10 @@ include/libpurple/gaim-compat.h
 include/libpurple/idle.h
 include/libpurple/imgstore.h
 include/libpurple/log.h
+include/libpurple/marshallers.h
+include/libpurple/media-gst.h
+include/libpurple/media.h
+include/libpurple/mediamanager.h
 include/libpurple/mime.h
 include/libpurple/nat-pmp.h
 include/libpurple/network.h
@@ -40,13 +44,19 @@ include/libpurple/savedstatuses.h
 include/libpurple/server.h
 include/libpurple/signals.h
 include/libpurple/smiley.h
+include/libpurple/sound-theme-loader.h
+include/libpurple/sound-theme.h
 include/libpurple/sound.h
 include/libpurple/sslconn.h
 include/libpurple/status.h
 include/libpurple/stringref.h
 include/libpurple/stun.h
+include/libpurple/theme-loader.h
+include/libpurple/theme-manager.h
+include/libpurple/theme.h
 include/libpurple/upnp.h
 include/libpurple/util.h
+include/libpurple/valgrind.h
 include/libpurple/value.h
 include/libpurple/version.h
 include/libpurple/whiteboard.h
@@ -71,12 +81,15 @@ lib/purple-2/libqq.la
 lib/purple-2/libsimple.la
 lib/purple-2/libxmpp.la
 lib/purple-2/libyahoo.la
+lib/purple-2/libyahoojp.la
+lib/purple-2/libymsg.la
 lib/purple-2/libzephyr.la
 lib/purple-2/log_reader.la
 lib/purple-2/newline.la
 lib/purple-2/offlinemsg.la
 lib/purple-2/psychic.la
-lib/purple-2/ssl-gnutls.la
+${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
 share/aclocal/purple.m4
@@ -112,6 +125,7 @@ share/locale/gu/LC_MESSAGES/pidgin.mo
 share/locale/he/LC_MESSAGES/pidgin.mo
 share/locale/hi/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
 share/locale/it/LC_MESSAGES/pidgin.mo
 share/locale/ja/LC_MESSAGES/pidgin.mo
@@ -144,6 +158,7 @@ share/locale/sq/LC_MESSAGES/pidgin.mo
 share/locale/sr/LC_MESSAGES/pidgin.mo
 share/locale/sr@latin/LC_MESSAGES/pidgin.mo
 share/locale/sv/LC_MESSAGES/pidgin.mo
+share/locale/sw/LC_MESSAGES/pidgin.mo
 share/locale/ta/LC_MESSAGES/pidgin.mo
 share/locale/te/LC_MESSAGES/pidgin.mo
 share/locale/th/LC_MESSAGES/pidgin.mo
@@ -160,13 +175,18 @@ 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/Equifax_Secure_CA.pem
+share/purple/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem
 share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
 share/purple/ca-certs/Microsoft_Internet_Authority.pem
 share/purple/ca-certs/Microsoft_Secure_Server_Authority.pem
+share/purple/ca-certs/StartCom_Certification_Authority.pem
 share/purple/ca-certs/StartCom_Free_SSL_CA.pem
+share/purple/ca-certs/Thawte_Premium_Server_CA.pem
+share/purple/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem
 share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
-share/purple/ca-certs/Verisign_Class3_Primary_CA.pem
+share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
 share/purple/ca-certs/VeriSign_International_Server_Class_3_CA.pem
+share/purple/ca-certs/Verisign_Class3_Primary_CA.pem
 share/purple/ca-certs/Verisign_RSA_Secure_Server_CA.pem
 share/sounds/purple/alert.wav
 share/sounds/purple/login.wav
@@ -186,3 +206,10 @@ ${PLIST.dbus}include/libpurple/dbus-types.h
 ${PLIST.dbus}include/libpurple/dbus-useful.h
 ${PLIST.dbus}lib/libpurple-client.la
 ${PLIST.dbus}lib/purple-2/dbus-example.la
+${PLIST.perl}lib/purple-2/perl.la
+${PLIST.perl}lib/purple-2/perl/Purple.pm
+${PLIST.perl}lib/purple-2/perl/auto/Purple/.packlist
+${PLIST.perl}lib/purple-2/perl/auto/Purple/Purple.bs
+${PLIST.perl}lib/purple-2/perl/auto/Purple/Purple.so
+${PLIST.perl}lib/purple-2/perl/auto/Purple/autosplit.ix
+${PLIST.perl}man/man3/Purple.3
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index 8a46caaeb5c..711feecf136 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.23 2009/08/13 18:58:31 snj Exp $
+$NetBSD: distinfo,v 1.24 2009/09/06 21:06:44 abs Exp $
 
-SHA1 (pidgin-2.5.8.tar.bz2) = 672f7e16c429c210f33f2499520c436db4e2384c
-RMD160 (pidgin-2.5.8.tar.bz2) = b13108331a3da1639f30a76984c3c09529b7d5aa
-Size (pidgin-2.5.8.tar.bz2) = 8246538 bytes
-SHA1 (patch-aa) = 1b1e34c7ecf91fb2ac8ddca3376b7803975420c0
+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
diff --git a/chat/libpurple/options.mk b/chat/libpurple/options.mk
index 754ecd8075f..786df1002d5 100644
--- a/chat/libpurple/options.mk
+++ b/chat/libpurple/options.mk
@@ -1,12 +1,13 @@
-# $NetBSD: options.mk,v 1.10 2008/12/21 14:08:39 ahoka Exp $
+# $NetBSD: options.mk,v 1.11 2009/09/06 21:06:44 abs Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.libpurple
 PKG_SUPPORTED_OPTIONS+=		gnutls perl tcl debug dbus sasl avahi
-PKG_SUGGESTED_OPTIONS+=		gnutls dbus avahi
+PKG_SUPPORTED_OPTIONS+=		farsight gstreamer
+PKG_SUGGESTED_OPTIONS+=		gnutls dbus avahi farsight gstreamer
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		dbus avahi
+PLIST_VARS+=		avahi dbus gnutls nss perl
 
 .if !empty(PKG_OPTIONS:Mavahi)
 PLIST.avahi=            yes
@@ -14,12 +15,14 @@ PLIST.avahi=            yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mgnutls)
+PLIST.gnutls=		yes
 CONFIGURE_ARGS+=	--enable-gnutls
 CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
 CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
 
 .  include "../../security/gnutls/buildlink3.mk"
 .else
+PLIST.nss=		yes
 CONFIGURE_ARGS+=	--enable-nss
 CONFIGURE_ARGS+= --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr
 CONFIGURE_ARGS+= --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib/nspr
@@ -30,6 +33,7 @@ CONFIGURE_ARGS+= --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib/nss
 .endif
 
 .if !empty(PKG_OPTIONS:Mperl)
+PLIST.perl=		yes
 CONFIGURE_ARGS+=	--enable-perl
 USE_TOOLS+=		perl:run
 .  include "../../lang/perl5/buildlink3.mk"
@@ -62,3 +66,13 @@ CONFIGURE_ARGS+=	--enable-debug
 CONFIGURE_ARGS+=	--enable-cyrus-sasl
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 .endif
+
+.if !empty(PKG_OPTIONS:Mfarsight)
+CONFIGURE_ARGS+=	--enable-farsight
+.  include "../../multimedia/farsight2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgstreamer)
+CONFIGURE_ARGS+=	--enable-gstreamer
+.  include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.endif
diff --git a/chat/libpurple/patches/patch-aa b/chat/libpurple/patches/patch-aa
index febb49df6ca..67fb246eb48 100644
--- a/chat/libpurple/patches/patch-aa
+++ b/chat/libpurple/patches/patch-aa
@@ -1,3 +1,5 @@
+$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 @@