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)

3 files changed, 70 insertions, 8 deletions

diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index 78feb46dfe7..330bea83050 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/08/26 19:57:16 sno Exp $
+# $NetBSD: Makefile,v 1.19 2009/09/06 21:06:45 abs Exp $
 #
 # XXX appease pkglint
 #PKGNAME=		pidgin-${PIDGIN_VERSION}
@@ -8,8 +8,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include		"../../chat/libpurple/Makefile.common"
 
-PKGREVISION=		1
-
 USE_TOOLS+=		msgfmt intltool
 
 PKGCONFIG_OVERRIDE+=	gaim.pc.in
@@ -19,6 +17,7 @@ PKGCONFIG_OVERRIDE+=	pidgin/pidgin.pc.in
 CONFIGURE_ARGS+=	--enable-gtkui
 
 BUILD_DIRS=		pidgin
+INSTALLATION_DIRS=	share/applications
 
 # includes "Arguments to configure" as string
 CHECK_WRKREF_SKIP=	bin/pidgin
@@ -32,7 +31,6 @@ pre-build:
 	cd ${WRKSRC} && ${BUILD_MAKE_CMD} pidgin.desktop
 
 post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/pidgin.desktop \
 	  ${DESTDIR}${PREFIX}/share/applications
 
@@ -42,6 +40,7 @@ BUILDLINK_API_DEPENDS.libpurple+=	libpurple-${PIDGIN_VERSION}{,nb*}
 .include "../../chat/libpurple/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/chat/pidgin/PLIST b/chat/pidgin/PLIST
index 05a744fa5aa..667f531cece 100644
--- a/chat/pidgin/PLIST
+++ b/chat/pidgin/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 17:37:48 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2009/09/06 21:06:45 abs Exp $
 bin/pidgin
 include/pidgin/eggtrayicon.h
 include/pidgin/gtkaccount.h
+include/pidgin/gtkblist-theme-loader.h
+include/pidgin/gtkblist-theme.h
 include/pidgin/gtkblist.h
 include/pidgin/gtkcelllayout.h
 include/pidgin/gtkcellrendererexpander.h
@@ -20,10 +22,13 @@ include/pidgin/gtkeventloop.h
 include/pidgin/gtkexpander.h
 include/pidgin/gtkft.h
 include/pidgin/gtkgaim-compat.h
+include/pidgin/gtkicon-theme-loader.h
+include/pidgin/gtkicon-theme.h
 include/pidgin/gtkidle.h
 include/pidgin/gtkimhtml.h
 include/pidgin/gtkimhtmltoolbar.h
 include/pidgin/gtklog.h
+include/pidgin/gtkmedia.h
 include/pidgin/gtkmenutray.h
 include/pidgin/gtknickcolors.h
 include/pidgin/gtknotify.h
@@ -42,6 +47,7 @@ include/pidgin/gtksound.h
 include/pidgin/gtksourceiter.h
 include/pidgin/gtksourceundomanager.h
 include/pidgin/gtksourceview-marshal.h
+include/pidgin/gtkstatus-icon-theme.h
 include/pidgin/gtkstatusbox.h
 include/pidgin/gtkthemes.h
 include/pidgin/gtkutils.h
@@ -64,10 +70,12 @@ lib/pidgin/pidginrc.la
 lib/pidgin/relnot.la
 lib/pidgin/sendbutton.la
 lib/pidgin/spellchk.la
+lib/pidgin/themeedit.la
 lib/pidgin/ticker.la
 lib/pidgin/timestamp.la
 lib/pidgin/timestamp_format.la
 lib/pidgin/xmppconsole.la
+lib/pidgin/xmppdisco.la
 lib/pkgconfig/pidgin.pc
 share/applications/pidgin.desktop
 share/icons/hicolor/16x16/apps/pidgin.png
@@ -75,6 +83,7 @@ share/icons/hicolor/22x22/apps/pidgin.png
 share/icons/hicolor/24x24/apps/pidgin.png
 share/icons/hicolor/32x32/apps/pidgin.png
 share/icons/hicolor/48x48/apps/pidgin.png
+share/icons/hicolor/scalable/apps/pidgin.svg
 share/pixmaps/pidgin/animations/16/connect0.png
 share/pixmaps/pidgin/animations/16/connect1.png
 share/pixmaps/pidgin/animations/16/connect2.png
@@ -142,6 +151,13 @@ share/pixmaps/pidgin/dialogs/64/info.png
 share/pixmaps/pidgin/dialogs/64/mail.png
 share/pixmaps/pidgin/dialogs/64/question.png
 share/pixmaps/pidgin/dialogs/64/warning.png
+share/pixmaps/pidgin/dialogs/scalable/auth.svg
+share/pixmaps/pidgin/dialogs/scalable/cool.svg
+share/pixmaps/pidgin/dialogs/scalable/dialog.svg
+share/pixmaps/pidgin/dialogs/scalable/error.svg
+share/pixmaps/pidgin/dialogs/scalable/info.svg
+share/pixmaps/pidgin/dialogs/scalable/question.svg
+share/pixmaps/pidgin/dialogs/scalable/warning.svg
 share/pixmaps/pidgin/emblems/16/aol-client.png
 share/pixmaps/pidgin/emblems/16/birthday.png
 share/pixmaps/pidgin/emblems/16/blocked.png
@@ -163,6 +179,22 @@ share/pixmaps/pidgin/emblems/16/secure.png
 share/pixmaps/pidgin/emblems/16/unavailable.png
 share/pixmaps/pidgin/emblems/16/video.png
 share/pixmaps/pidgin/emblems/16/voice.png
+share/pixmaps/pidgin/emblems/scalable/aol-client.svg
+share/pixmaps/pidgin/emblems/scalable/blocked.svg
+share/pixmaps/pidgin/emblems/scalable/bot.svg
+share/pixmaps/pidgin/emblems/scalable/external.svg
+share/pixmaps/pidgin/emblems/scalable/female.svg
+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/mobile.svg
+share/pixmaps/pidgin/emblems/scalable/music.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
+share/pixmaps/pidgin/emblems/scalable/voice.svg
 share/pixmaps/pidgin/emotes/default/act-up.png
 share/pixmaps/pidgin/emotes/default/airplane.png
 share/pixmaps/pidgin/emotes/default/alien.png
@@ -445,6 +477,21 @@ share/pixmaps/pidgin/protocols/48/silc.png
 share/pixmaps/pidgin/protocols/48/simple.png
 share/pixmaps/pidgin/protocols/48/yahoo.png
 share/pixmaps/pidgin/protocols/48/zephyr.png
+share/pixmaps/pidgin/protocols/scalable/aim.svg
+share/pixmaps/pidgin/protocols/scalable/bonjour.svg
+share/pixmaps/pidgin/protocols/scalable/gadu-gadu.svg
+share/pixmaps/pidgin/protocols/scalable/google-talk.svg
+share/pixmaps/pidgin/protocols/scalable/icq.svg
+share/pixmaps/pidgin/protocols/scalable/irc.svg
+share/pixmaps/pidgin/protocols/scalable/jabber.svg
+share/pixmaps/pidgin/protocols/scalable/meanwhile.svg
+share/pixmaps/pidgin/protocols/scalable/msn.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
+share/pixmaps/pidgin/protocols/scalable/zephyr.svg
 share/pixmaps/pidgin/status/11/available.png
 share/pixmaps/pidgin/status/11/away.png
 share/pixmaps/pidgin/status/11/busy.png
@@ -510,6 +557,8 @@ share/pixmaps/pidgin/status/48/person.png
 share/pixmaps/pidgin/status/48/rtl/extended-away.png
 share/pixmaps/pidgin/status/48/rtl/log-in.png
 share/pixmaps/pidgin/status/48/rtl/log-out.png
+share/pixmaps/pidgin/toolbar/11/message-new.png
+share/pixmaps/pidgin/toolbar/16/audio-call.png
 share/pixmaps/pidgin/toolbar/16/change-bgcolor.png
 share/pixmaps/pidgin/toolbar/16/change-fgcolor.png
 share/pixmaps/pidgin/toolbar/16/emote-select.png
@@ -524,7 +573,14 @@ share/pixmaps/pidgin/toolbar/16/plugins.png
 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/select-avatar.png
+share/pixmaps/pidgin/toolbar/22/video-call.png
+share/pixmaps/pidgin/toolbar/22/voice-call.png
+share/pixmaps/pidgin/toolbar/32/video-call.png
+share/pixmaps/pidgin/toolbar/32/voice-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
@@ -556,6 +612,7 @@ share/pixmaps/pidgin/tray/32/tray-busy.png
 share/pixmaps/pidgin/tray/32/tray-connecting.png
 share/pixmaps/pidgin/tray/32/tray-extended-away.png
 share/pixmaps/pidgin/tray/32/tray-invisible.png
+share/pixmaps/pidgin/tray/32/tray-message.png
 share/pixmaps/pidgin/tray/32/tray-new-im.png
 share/pixmaps/pidgin/tray/32/tray-offline.png
 share/pixmaps/pidgin/tray/32/tray-online.png
@@ -564,6 +621,7 @@ share/pixmaps/pidgin/tray/48/tray-busy.png
 share/pixmaps/pidgin/tray/48/tray-connecting.png
 share/pixmaps/pidgin/tray/48/tray-extended-away.png
 share/pixmaps/pidgin/tray/48/tray-invisible.png
+share/pixmaps/pidgin/tray/48/tray-message.png
 share/pixmaps/pidgin/tray/48/tray-new-im.png
 share/pixmaps/pidgin/tray/48/tray-offline.png
 share/pixmaps/pidgin/tray/48/tray-online.png
diff --git a/chat/pidgin/options.mk b/chat/pidgin/options.mk
index 20c45be51a4..51c33767ee4 100644
--- a/chat/pidgin/options.mk
+++ b/chat/pidgin/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.6 2008/12/21 14:08:39 ahoka Exp $
+# $NetBSD: options.mk,v 1.7 2009/09/06 21:06:45 abs Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.pidgin
-PKG_SUPPORTED_OPTIONS+=		dbus debug gstreamer gtkspell
-PKG_SUGGESTED_OPTIONS+=		gtkspell dbus gstreamer
+PKG_SUPPORTED_OPTIONS+=		dbus debug farsight gstreamer gtkspell
+PKG_SUGGESTED_OPTIONS+=		gtkspell dbus farsight gstreamer
 
 .include "../../mk/bsd.options.mk"
 
@@ -15,6 +15,11 @@ PLIST.dbus=		yes
 .  include "../../sysutils/dbus-glib/buildlink3.mk"
 .endif
 
+.if !empty(PKG_OPTIONS:Mfarsight)
+CONFIGURE_ARGS+=	--enable-farsight
+.  include "../../multimedia/farsight2/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mgtkspell)
 CONFIGURE_ARGS+=	--enable-gtkspell
 .  include "../../textproc/gtkspell/buildlink3.mk"