Update to 2.26.1. Set LICENSE. Convert to user-destdir.

NEW in 2.26.1
==============

Bugs fixed:
 - Fixed #566905, avatar button is too tiny (Xavier Claessens)
 - Fixed #568562, ghelp link broken in documentation (Paul Cutler)
 - Fixed #575817, empathy_tp_tube_new_stream_tube should allow NULL as parameters (Guillaume Desmottes)
 - Fixed #576375, empathy build fails due to missing file in documentation (Xavier Claessens)
 - Fixed #577825, empathy-tp-contact-factory: get_requestable_channel_classes_cb: fixed_prop is leaked (Xavier Claessens)
 - Fixed #577826, dispatcher_connection_ready_cb: capabilities is leaked (Xavier Claessens)
 - Fixed #577829, empathy_smiley_manager_parse: string leaked (Xavier Claessens)
 - Fixed #578356, Asserts when reconnecting to a chat room. (Will Thompson)

Translations:
 - Updated Spanish translation (jorgegonz).
 - Updated th translation (tkaroonb).
 - Updated Simplified Chinese translation (fwang).

NEW in 2.26.0.1
===============

Bugs fixed:
 - Fixed #556173, crash in Empathy Instant Messenger: Chatting using the MSN a... (Xavier Claessens)
 - Fixed #571745, crash in Empathy Instant Messenger: Nothing, empathy was in ... (Xavier Claessens)
 - Fixed #575681, UNIX socket address is supposed to be an 'ay' and not a 's' (Guillaume Desmottes)
 - Fixed #576386, No video received (Sjoerd Simons)

Translations:
 - Updated Oriya Translation (mgiri).
 - Updated French translation (Frédéric Peters, Claude Paroz).
 - Updated Dutch translation (Wouter Bolsterlee).
 - Updated assamese translations (amitakhya).
 - Updated Galician translation (Suso Baleato).
 - Updated Arabic translation (djihed).
 - Updated Spanish translation (jorgegonz).

NEW in 2.26.0
==============
 - Fix various VoIP bugs
 - Hook up audio mute button (Sjoerd Simons).
 - Set the camera button sensitive while connected and there is a video input (Sjoerd Simons).
 - Set empathy's media role to phone for so pulse can do policy on it.
   For more information see:
   http://pulseaudio.org/wiki/ApplicationProperties (Sjoerd Simons).
 - Updated Greek tramslation by Jennie Petoumenou (pkst).
 - Refactor log backend, it now make possible to implement other backends to
   read logs from other clients, and it logs messages sooner to avoid losing
   messages if empathy crash at any time (Jonny Lamb)

Translations:
 - Updated British English manual translation (pwithnall).
 - Updated Spanish translation (jorgegonz).
 - Updated Czech translation (Martin Picek).
 - Updated Marathi Translations (sandeeps).
 - Updated Lithuanian translation (Gintautas Miliauskas).
 - Updated French translation (Frédéric Peters, Bruno Brouard).
 - Updated Portuguese translation (Duarte Loreto).
 - Updated Russian translation (Nickolay V. Shmyrev).
 - Updated Danish translation (kennethn).
 - Updated assamese translations (amitakhya).
 - Updated Bulgarian translation (Alexander Shopov).
 - Updated Norwegian bokmål translation (Kjartan Maraas).
 - Updated Oriya Translation (mgiri).
 - Updated tamil translation (ifelix).
 - Updated German translation (Mario Blättermann).
 - Updated Telugu Translation (kkrothap).
 - Updated Italian translation (miloc).
 - Updated Slovenian translation (mateju).

NEW in 2.25.92
==============
 - Hardcode some a default codec preferences
 - Hook up the video input sidebar item (Sjoerd Simons).
 - Hook up audio input panel (Sjoerd Simons).
 - Use undrafted file transfer spec. (Jonny Lamb).

Bugs fixed:
 - Fixed #572875, Missing translator comments (fpeters)

Translations:
 - Added British English documentation. (Philip Withnall).
 - Updated Czech translation (Lucas Lommer).
 - Updated Slovenian translation (mateju).
 - Updated Kannada translations (sprasad).
 - Updated Polish translation (Tomasz Dominikowski).
 - Updated German translation (joskulj).
 - Updated Italian translation (Milo Casagrande).
 - Updated Spanish translation (jorgegonz).
 - Updated British English translation. (Philip Withnall).
 - Updated th translation. (tkaroonb).
 - Updated Malayalam translation (apravi).
 - Updated German documentation (mariobl).
 - Updated ja translation  (Takeshi AIHANA).
 - Updated Swedish translation (dnylande).
 - Updated Catalan translation (gforcada).
 - Updated Brazilian Portuguese translation. (ogmaciel).
 - updated latvian translation (Raivis Dejus).
 - Updated sv translation  (Daniel Nylander).
 - Updated Basque translation. (Inaki Larranaga Murgoitio).
 - Updated Finnish translation (ituohela).
 - Updated ko translation. (cwryu).
 - Updated French translation (Laurent Coudeur, Claude Paroz).
 - Updated ro translation  (Adi Roiban).
 - Updated Hungarian translation (kelemeng).
 - Updated ca translation  (Gil Forcada).

NEW in 2.25.91
==============
 - Set the intial volume button level to a more correct one (Sjoerd Simons).
 - Set the camera button insensitive after a call (Sjoerd Simons).
 - Hook up the volume button (Sjoerd Simons).
 - Hook up DTFM support (Sjoerd Simons).
 - Notify when receiving an invitation to join a MUC (Guillaume Desmottes).
 - Save status message on NetworkManager disconnect and restore on reconnect (Davyd Madeley).

Bugs fixed:
 - Fixed #525559, Ignore muc invitations (Guillaume Desmottes)
 - Fixed #562109, Spacing in contact information dialog (Frédéric Peters)
 - Fixed #570357, make install fails on master (tkaroonb)
 - Fixed #570397, Menu icon for 'Hang Up' is too large in call UI window (Jonathon Jongsma)
 - Fixed #571184, Event toolip displayes (null) if no message was provided (Guillaume Desmottes)
 - Fixed #571635, Minor string fixes (Bruce Cowan)

Translations:
 - Updated Bulgarian translation (Alexander Shopov)
 - Updated ro translation (Alexandru Szasz, Mișu Moldovan).
 - Updated ja translation  (Takeshi AIHANA).
 - Updated Danish translation (Knneth Nielsen).
 - Updated Polish translation (Tomasz Dominikowski).
 - Updated sv translation  (Daniel Nylander).
 - Updated es translation  (Jorge Gonzalez).
 - Updated Vietnamese translation (Clytie Siddall).
 - Updated Hungarian translation (kelemeng).
 - Updated Basque translation  (Inaki Larranaga Murgoitio).
 - Updated Swedish translation  (Daniel Nylander).
 - Updated pt_BR translation  (Andre Gondim).
 - Updated Norwegian bokmål translation. (kmaraas).

NEW in 2.25.90
==============
 - Rewrite Voice/Video call UI, and use farsight2 instead of stream-engine. (Sjoerd Simons).
 - Add libnotify support (Jonny Lamb, Elliot Fairweather).
 - Add EmpathyContactSelector (Jonny Lamb, Elliot Fairweather).
 - Renamed G_STR_EMPTY to EMP_STR_EMPTY (Jonny Lamb).
 - Update the user documentation  (Milo Casagrande).
 - Rename _new -> _dup_singleton. (Cosimo Cecchi).
 - Remove usage of EmpathyTpGroup from EmpathyTpCall. (Xavier Claessens).
 - Remove some usage of EmpathyTpGroup from EmpathyTpChat (Xavier Claessens).
 - Rework internal dispatcher (Sjoerd Simons).

Bugs fixed:
 - Fixed #548768, You can open several avatar file pickers for the same account (Frederic Peters)
 - Fixed #562554, "Chat -> View Previous Conversations" should be disabled if no account (fpeters)
 - Fixed #566549, Please remove trailing space (Leonardo Ferreira Fontenelle)
 - Fixed #566676, There should not be any "gtk-ok", "gtk-cancel" etc. string in .pot (Lucas Lommer)
 - Fixed #569884, no --version command-line option (Bruce Cowan)
 - Fixed #569901, i18n problems in main() (Cosimo Cecchi)
 - Fixed #570066, Missing file from POTFILES.in (Gabor Kelemen )
 - Fixed #570080, empathy fails to build outside source tree (Theppitak Karoonboonyanan)

Translations:
 - Updated pt_BR translation  (Michel Recondo).
 - Updated Hungarian translation (kelemeng).
 - Updated es translation  (Jorge Gonzalez).
 - Updated ca translation  (Gil Forcada).
 - Updated Greek translation  (Marios Zindilis).
 - Updated Spanish translation (jorgegonz).
 - Updated ko translation. (cwryu).
 - updated hebrew translation (yairhr).
 - Updated gr translation  (Marios Zindilis).
 - Updated Slovenian translation (mateju).
 - Updated Norwegian bokmål translation. (kmaraas).
 - Updated th translation  (Theppitak Karoonboonyanan).
 - Updated sv translation  (Daniel Nylander).

NEW in 2.25.4
==============
 - Add sound notifications using libcanberra-gtk (Cosimo Cecchi)

Bugs fixed:

Translations:
 - Updated Norwegian bokmål translation. (kmaraas).
 - Updated pt_BR translation  (Taylon Silmer).

NEW in 2.25.3
==============
 - Refactor EmpathyChatView to make possible to use other backends than
   GtkTextView. Required to use Webkit and adium themes.
 - Use gi18n-lib.h instead of gi18n.h for libraries. (Xavier Claessens).
 - Add empathy_init(), empathy_gtk_init(). They have to be called by any process
   using libempathy and libempathy-gtk. (Xavier Claessens).
 - Do not make allow to add a contact to accounts that do not have contact list,
   like IRC or SIP. (Guillaume Desmottes)
 - Improve URI regex. (Xavier Claessens).
 - Drop libgnomeui dependency  (Cosimo Cecchi).
 - Use GTK+ 2.14.0 and gtk_show_uri  (Cosimo Cecchi).

Bugs fixed:
 - Fixed #552296, Autocompletion on contact names for "new message" dialog box (Emmanuel Bretelle, Xavier Claessens)
 - Fixed #562873, doesn't build with werror on x86_64 (Xavier Claessens)
 - Fixed #563713, linkifies "@name", and captures the next word (Xavier Claessens)

Translations:
 - Updated it translation  (Milo Casagrande).
 - Updated ca translation  (Joan Duran).
 - Added Catalan translation (Joan Duran).

NEW in 2.25.2
==============
 - Use GRegex instead of custom code and use a new regex to detect URIs (Xavier Claessens).
 - Replace Q_() with C_() for translation context. (Xavier Claessens).
 - Add file transfer support (Xavier Claessens, Guillaume Desmottes, Jonny Lamb, Marco Barisione).
 - Use markup for chat-window tooltips (hasselmm).
 - Convert avatar to fit the resolution and size requirements (Xavier Claessens, Will Thompson).

Bugs fixed:
 - Fixed #554938, Misspelled word in docs, help/C/empathy.xml:114 (fpeters)
 - Fixed #496100, Invites to Chat Rooms unimplemented (Guillaume Desmottes)
 - Fixed #541060, import accounts from Pidgin when first run (Xavier Claessens, Jonny Lamb)
 - Fixed #542176, EmpathyChatroomManager doesn't contain active chat rooms (Guillaume Desmottes)
 - Fixed #544029, empathy's configure.ac doesn't detect python 2.6 (fpeters)
 - Fixed #553066, Some strings are not translatable in megaphone-applet (kelemeng)
 - Fixed #554284, Bad email link (fpeters)
 - Fixed #558370, empathy do not link on os x 10.5 (Michael Scherer)
 - Fixed #560387, Crash when joining a chatroom (Guillaume Desmottes)
 - Fixed #560611, Cannot distinguish IRC chats: They all have the label "Conversation". (Xavier Claessens)
 - Fixed #560622, Show account name in conversation label. (hasselmm)
 - Fixed #562071, Empathy logview crashes if no accout exitsts. (Xavier Claessens)
 - Fixed #562588, Bugfix for the compile time libempathy/empathy-dispatcher.c (Stephane Wirtel)

Translations:
 - Updated Turkish translation  (Baris Cicek).
 - Updated es translation  (Jorge Gonzalez).
 - Updated ps translation  (Zabeeh Khan).
 - Updated German translation. (Hendrik Richter).
 - Updated Lithuanian translation  (Gintautas Miliauskas).
 - Updated ku translation (eronahi).
 - Added Russian translation (Nikita Belobrov, aprokoudine).
 - Updated Greek translation  (Nick Agianniotis).
 - Updated th translation  (Theppitak Karoonboonyanan).
 - Updated el translation (frolix68).
 - Updated Danish translation  (Kenneth Nielsen).
 - Updated sv translation  (Daniel Nylander).
 - Updated cs translation (Martin Picek and Lucas Lommer).
 - Updated Hungarian translation (kelemeng).
 - Updated Galician Translation. (icq).
 - Updated Finnish translation (ituohela).
 - Updated Brazilian Portuguese translation. (ogmaciel).
 - Updated Bulgarian translation (Alexander Shopov).
 - Updated zh_CN translation. (fwang, zyang).
 - Updated Arabic Translation (Anas Afif Emad).
 - Updated sr translation (grakic).

1 files changed, 11 insertions, 4 deletions

diff --git a/chat/empathy/Makefile b/chat/empathy/Makefile
index 5092727a704..94a725afca7 100644
--- a/chat/empathy/Makefile
+++ b/chat/empathy/Makefile
@@ -1,31 +1,37 @@
-# $NetBSD: Makefile,v 1.6 2009/07/22 09:01:20 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/08/21 15:29:26 wiz Exp $
 
-DISTNAME=	empathy-2.24.1
-PKGREVISION=	1
+DISTNAME=	empathy-2.26.1
 CATEGORIES=	chat gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/empathy/2.24/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/empathy/2.26/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://live.gnome.org/Empathy
 COMMENT=	Gnome instant messenger client
+LICENSE=	gnu-gpl-v2
 
 # not strictly needed, but without any plugins, empathy is useless
 DEPENDS+=	telepathy-gabble-[0-9]*:../../chat/telepathy-gabble
 DEPENDS+=	telepathy-idle-[0-9]*:../../chat/telepathy-idle
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gawk gmake intltool msgfmt pkg-config
 USE_TOOLS+=		autoconf
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
+BUILDLINK_TRANSFORM+=	rm:-Werror
+
 GCONF_SCHEMAS+=	GNOME_Megaphone_Applet.schemas
 GCONF_SCHEMAS+=	empathy.schemas
 
 pre-configure:
 	cd ${WRKSRC} && autoconf -f
 
+.include "../../audio/libcanberra/buildlink3.mk"
 .include "../../chat/telepathy-mission-control/buildlink3.mk"
+.include "../../chat/telepathy-farsight/buildlink3.mk"
 .include "../../chat/telepathy-glib/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/libglade/buildlink3.mk"
@@ -37,6 +43,7 @@ BUILDLINK_API_DEPENDS.enchant+=		enchant>=1.2.0
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/enchant/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/gtk-doc/buildlink3.mk"