summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chat/finch/Makefile3
-rw-r--r--chat/finch/PLIST5
-rw-r--r--chat/libpurple/Makefile4
-rw-r--r--chat/libpurple/Makefile.common5
-rw-r--r--chat/libpurple/PLIST33
-rw-r--r--chat/libpurple/distinfo10
-rw-r--r--chat/libpurple/options.mk20
-rw-r--r--chat/libpurple/patches/patch-aa2
-rw-r--r--chat/pidgin-sametime/Makefile3
-rw-r--r--chat/pidgin-silc/Makefile3
-rw-r--r--chat/pidgin-silc/distinfo8
-rw-r--r--chat/pidgin/Makefile7
-rw-r--r--chat/pidgin/PLIST60
-rw-r--r--chat/pidgin/options.mk11
14 files changed, 143 insertions, 31 deletions
diff --git a/chat/finch/Makefile b/chat/finch/Makefile
index 5693e84f971..481c68e1c4e 100644
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/02/04 16:16:41 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2009/09/06 21:06:44 abs Exp $
#
PKGNAME= finch-${PIDGIN_VERSION}
@@ -49,6 +49,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 "../../devel/ncursesw/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/finch/PLIST b/chat/finch/PLIST
index c375fc3d955..7b8d871dc42 100644
--- a/chat/finch/PLIST
+++ b/chat/finch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:37:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/09/06 21:06:44 abs Exp $
bin/finch
include/finch/finch.h
include/finch/gntaccount.h
@@ -10,6 +10,7 @@ include/finch/gntdebug.h
include/finch/gntft.h
include/finch/gntidle.h
include/finch/gntlog.h
+include/finch/gntmedia.h
include/finch/gntnotify.h
include/finch/gntplugin.h
include/finch/gntpounce.h
@@ -36,6 +37,7 @@ include/gnt/gntmarshal.h
include/gnt/gntmenu.h
include/gnt/gntmenuitem.h
include/gnt/gntmenuitemcheck.h
+include/gnt/gntprogressbar.h
include/gnt/gntslider.h
include/gnt/gntstyle.h
include/gnt/gnttextview.h
@@ -49,6 +51,7 @@ lib/finch/gntclipboard.la
lib/finch/gntgf.la
lib/finch/gnthistory.la
lib/finch/gntlastlog.la
+lib/finch/gnttinyurl.la
lib/finch/grouping.la
lib/gnt/irssi.la
lib/gnt/s.la
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 @@
diff --git a/chat/pidgin-sametime/Makefile b/chat/pidgin-sametime/Makefile
index 11439b61034..10e5c9b7b32 100644
--- a/chat/pidgin-sametime/Makefile
+++ b/chat/pidgin-sametime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/02/09 18:36:11 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2009/09/06 21:06:45 abs Exp $
#
PKGNAME= pidgin-sametime-${PIDGIN_VERSION}
@@ -20,5 +20,6 @@ BUILDLINK_API_DEPENDS.libpurple+= libpurple-${PIDGIN_VERSION}{,nb*}
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/pidgin-silc/Makefile b/chat/pidgin-silc/Makefile
index 5eed15879f4..b15cc6a5d03 100644
--- a/chat/pidgin-silc/Makefile
+++ b/chat/pidgin-silc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/02/09 18:36:11 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/09/06 21:06:45 abs Exp $
#
PKGNAME= pidgin-silc-${PIDGIN_VERSION}
@@ -47,6 +47,7 @@ BUILDLINK_API_DEPENDS.libpurple+= libpurple-${PIDGIN_VERSION}{,nb*}
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
#.include "../../devel/silc-toolkit/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/pidgin-silc/distinfo b/chat/pidgin-silc/distinfo
index 47304c40573..f71364802ac 100644
--- a/chat/pidgin-silc/distinfo
+++ b/chat/pidgin-silc/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2009/08/13 18:58:31 snj Exp $
+$NetBSD: distinfo,v 1.20 2009/09/06 21:06:45 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 (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 (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
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"