summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chat/empathy/Makefile15
-rw-r--r--chat/empathy/PLIST71
-rw-r--r--chat/empathy/distinfo10
-rw-r--r--chat/empathy/patches/patch-aa16
4 files changed, 86 insertions, 26 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"
diff --git a/chat/empathy/PLIST b/chat/empathy/PLIST
index 3e6b84a56a9..62fd0b06562 100644
--- a/chat/empathy/PLIST
+++ b/chat/empathy/PLIST
@@ -1,15 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:37:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/08/21 15:29:26 wiz Exp $
bin/empathy
bin/empathy-logs
include/libempathy-gtk/empathy-account-chooser.h
include/libempathy-gtk/empathy-account-widget-irc.h
include/libempathy-gtk/empathy-account-widget-sip.h
include/libempathy-gtk/empathy-account-widget.h
+include/libempathy-gtk/empathy-audio-sink.h
+include/libempathy-gtk/empathy-audio-src.h
include/libempathy-gtk/empathy-avatar-chooser.h
include/libempathy-gtk/empathy-avatar-image.h
include/libempathy-gtk/empathy-cell-renderer-activatable.h
include/libempathy-gtk/empathy-cell-renderer-expander.h
include/libempathy-gtk/empathy-cell-renderer-text.h
+include/libempathy-gtk/empathy-chat-text-view.h
include/libempathy-gtk/empathy-chat-view.h
include/libempathy-gtk/empathy-chat.h
include/libempathy-gtk/empathy-conf.h
@@ -17,6 +20,7 @@ include/libempathy-gtk/empathy-contact-dialogs.h
include/libempathy-gtk/empathy-contact-list-store.h
include/libempathy-gtk/empathy-contact-list-view.h
include/libempathy-gtk/empathy-contact-menu.h
+include/libempathy-gtk/empathy-contact-selector.h
include/libempathy-gtk/empathy-contact-widget.h
include/libempathy-gtk/empathy-geometry.h
include/libempathy-gtk/empathy-gtk-enum-types.h
@@ -32,16 +36,22 @@ include/libempathy-gtk/empathy-spell.h
include/libempathy-gtk/empathy-theme-boxes.h
include/libempathy-gtk/empathy-theme-irc.h
include/libempathy-gtk/empathy-theme-manager.h
-include/libempathy-gtk/empathy-theme.h
include/libempathy-gtk/empathy-ui-utils.h
+include/libempathy-gtk/empathy-video-src.h
+include/libempathy-gtk/empathy-video-widget.h
+include/libempathy/empathy-account-manager.h
+include/libempathy/empathy-call-factory.h
+include/libempathy/empathy-call-handler.h
include/libempathy/empathy-chatroom-manager.h
include/libempathy/empathy-chatroom.h
include/libempathy/empathy-contact-factory.h
include/libempathy/empathy-contact-groups.h
include/libempathy/empathy-contact-list.h
include/libempathy/empathy-contact-manager.h
+include/libempathy/empathy-contact-monitor.h
include/libempathy/empathy-contact.h
include/libempathy/empathy-debug.h
+include/libempathy/empathy-dispatch-operation.h
include/libempathy/empathy-dispatcher.h
include/libempathy/empathy-enum-types.h
include/libempathy/empathy-idle.h
@@ -49,6 +59,8 @@ include/libempathy/empathy-irc-network-manager.h
include/libempathy/empathy-irc-network.h
include/libempathy/empathy-irc-server.h
include/libempathy/empathy-log-manager.h
+include/libempathy/empathy-log-store-empathy.h
+include/libempathy/empathy-log-store.h
include/libempathy/empathy-message.h
include/libempathy/empathy-status-presets.h
include/libempathy/empathy-time.h
@@ -56,10 +68,12 @@ include/libempathy/empathy-tp-call.h
include/libempathy/empathy-tp-chat.h
include/libempathy/empathy-tp-contact-factory.h
include/libempathy/empathy-tp-contact-list.h
+include/libempathy/empathy-tp-file.h
include/libempathy/empathy-tp-group.h
include/libempathy/empathy-tp-roomlist.h
include/libempathy/empathy-tp-tube.h
include/libempathy/empathy-tube-handler.h
+include/libempathy/empathy-types.h
include/libempathy/empathy-utils.h
lib/bonobo/servers/GNOME_Megaphone_Applet.server
lib/bonobo/servers/GNOME_NotHere_Applet.server
@@ -92,6 +106,8 @@ share/empathy/empathy-chatrooms-window.glade
share/empathy/empathy-contact-dialogs.glade
share/empathy/empathy-contact-groups.dtd
share/empathy/empathy-contact-widget.glade
+share/empathy/empathy-ft-manager.glade
+share/empathy/empathy-import-dialog.glade
share/empathy/empathy-irc-networks.dtd
share/empathy/empathy-log-manager.xsl
share/empathy/empathy-log-window.glade
@@ -209,26 +225,29 @@ share/gconf/schemas/GNOME_Megaphone_Applet.schemas
share/gconf/schemas/empathy.schemas
share/gnome/help/empathy/C/empathy.xml
share/gnome/help/empathy/C/figures/empathy-main-window.png
-share/gnome/help/empathy/C/figures/empathy-new-account.png
share/gnome/help/empathy/C/legal.xml
+share/gnome/help/empathy/ca/empathy.xml
+share/gnome/help/empathy/ca/figures/empathy-main-window.png
share/gnome/help/empathy/cs/empathy.xml
share/gnome/help/empathy/cs/figures/empathy-main-window.png
-share/gnome/help/empathy/cs/figures/empathy-new-account.png
share/gnome/help/empathy/de/empathy.xml
share/gnome/help/empathy/de/figures/empathy-main-window.png
-share/gnome/help/empathy/de/figures/empathy-new-account.png
+share/gnome/help/empathy/el/empathy.xml
+share/gnome/help/empathy/el/figures/empathy-main-window.png
+share/gnome/help/empathy/en_GB/empathy.xml
+share/gnome/help/empathy/en_GB/figures/empathy-main-window.png
share/gnome/help/empathy/es/empathy.xml
share/gnome/help/empathy/es/figures/empathy-main-window.png
-share/gnome/help/empathy/es/figures/empathy-new-account.png
+share/gnome/help/empathy/fi/empathy.xml
+share/gnome/help/empathy/fi/figures/empathy-main-window.png
share/gnome/help/empathy/fr/empathy.xml
share/gnome/help/empathy/fr/figures/empathy-main-window.png
-share/gnome/help/empathy/fr/figures/empathy-new-account.png
share/gnome/help/empathy/it/empathy.xml
share/gnome/help/empathy/it/figures/empathy-main-window.png
-share/gnome/help/empathy/it/figures/empathy-new-account.png
+share/gnome/help/empathy/ru/empathy.xml
+share/gnome/help/empathy/ru/figures/empathy-main-window.png
share/gnome/help/empathy/sv/empathy.xml
share/gnome/help/empathy/sv/figures/empathy-main-window.png
-share/gnome/help/empathy/sv/figures/empathy-new-account.png
share/gtk-doc/html/libempathy-gtk/EmpathyAccountChooser.html
share/gtk-doc/html/libempathy-gtk/EmpathyAvatarChooser.html
share/gtk-doc/html/libempathy-gtk/EmpathyAvatarImage.html
@@ -236,16 +255,20 @@ share/gtk-doc/html/libempathy-gtk/EmpathyCellRendererActivatable.html
share/gtk-doc/html/libempathy-gtk/EmpathyCellRendererExpander.html
share/gtk-doc/html/libempathy-gtk/EmpathyCellRendererText.html
share/gtk-doc/html/libempathy-gtk/EmpathyChat.html
-share/gtk-doc/html/libempathy-gtk/EmpathyChatView.html
+share/gtk-doc/html/libempathy-gtk/EmpathyChatTextView.html
share/gtk-doc/html/libempathy-gtk/EmpathyConf.html
share/gtk-doc/html/libempathy-gtk/EmpathyContactListStore.html
share/gtk-doc/html/libempathy-gtk/EmpathyContactListView.html
+share/gtk-doc/html/libempathy-gtk/EmpathyContactSelector.html
+share/gtk-doc/html/libempathy-gtk/EmpathyGstAudioSink.html
+share/gtk-doc/html/libempathy-gtk/EmpathyGstAudioSrc.html
+share/gtk-doc/html/libempathy-gtk/EmpathyGstVideoSrc.html
share/gtk-doc/html/libempathy-gtk/EmpathyPresenceChooser.html
share/gtk-doc/html/libempathy-gtk/EmpathySmileyManager.html
-share/gtk-doc/html/libempathy-gtk/EmpathyTheme.html
share/gtk-doc/html/libempathy-gtk/EmpathyThemeBoxes.html
share/gtk-doc/html/libempathy-gtk/EmpathyThemeIrc.html
share/gtk-doc/html/libempathy-gtk/EmpathyThemeManager.html
+share/gtk-doc/html/libempathy-gtk/EmpathyVideoWidget.html
share/gtk-doc/html/libempathy-gtk/home.png
share/gtk-doc/html/libempathy-gtk/index.html
share/gtk-doc/html/libempathy-gtk/index.sgml
@@ -254,6 +277,7 @@ share/gtk-doc/html/libempathy-gtk/left.png
share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-account-widget-irc.html
share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-account-widget-sip.html
share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-account-widget.html
+share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-chat-view.html
share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-contact-dialogs.html
share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-contact-menu.html
share/gtk-doc/html/libempathy-gtk/libempathy-gtk-empathy-contact-widget.html
@@ -275,22 +299,29 @@ share/gtk-doc/html/libempathy-gtk/pt02.html
share/gtk-doc/html/libempathy-gtk/right.png
share/gtk-doc/html/libempathy-gtk/style.css
share/gtk-doc/html/libempathy-gtk/up.png
+share/gtk-doc/html/libempathy/EmpathyAccountManager.html
+share/gtk-doc/html/libempathy/EmpathyCallFactory.html
+share/gtk-doc/html/libempathy/EmpathyCallHandler.html
share/gtk-doc/html/libempathy/EmpathyChatroom.html
share/gtk-doc/html/libempathy/EmpathyChatroomManager.html
share/gtk-doc/html/libempathy/EmpathyContact.html
share/gtk-doc/html/libempathy/EmpathyContactFactory.html
share/gtk-doc/html/libempathy/EmpathyContactManager.html
+share/gtk-doc/html/libempathy/EmpathyContactMonitor.html
+share/gtk-doc/html/libempathy/EmpathyDispatchOperation.html
share/gtk-doc/html/libempathy/EmpathyDispatcher.html
share/gtk-doc/html/libempathy/EmpathyIdle.html
share/gtk-doc/html/libempathy/EmpathyIrcNetwork.html
share/gtk-doc/html/libempathy/EmpathyIrcNetworkManager.html
share/gtk-doc/html/libempathy/EmpathyIrcServer.html
share/gtk-doc/html/libempathy/EmpathyLogManager.html
+share/gtk-doc/html/libempathy/EmpathyLogStoreEmpathy.html
share/gtk-doc/html/libempathy/EmpathyMessage.html
share/gtk-doc/html/libempathy/EmpathyTpCall.html
share/gtk-doc/html/libempathy/EmpathyTpChat.html
share/gtk-doc/html/libempathy/EmpathyTpContactFactory.html
share/gtk-doc/html/libempathy/EmpathyTpContactList.html
+share/gtk-doc/html/libempathy/EmpathyTpFile.html
share/gtk-doc/html/libempathy/EmpathyTpGroup.html
share/gtk-doc/html/libempathy/EmpathyTpRoomlist.html
share/gtk-doc/html/libempathy/EmpathyTpTube.html
@@ -302,8 +333,11 @@ share/gtk-doc/html/libempathy/ix01.html
share/gtk-doc/html/libempathy/left.png
share/gtk-doc/html/libempathy/libempathy-empathy-contact-groups.html
share/gtk-doc/html/libempathy/libempathy-empathy-contact-list.html
+share/gtk-doc/html/libempathy/libempathy-empathy-enum-types.html
+share/gtk-doc/html/libempathy/libempathy-empathy-log-store.html
share/gtk-doc/html/libempathy/libempathy-empathy-status-presets.html
share/gtk-doc/html/libempathy/libempathy-empathy-time.html
+share/gtk-doc/html/libempathy/libempathy-empathy-types.html
share/gtk-doc/html/libempathy/libempathy-empathy-utils.html
share/gtk-doc/html/libempathy/libempathy-hierarchy.html
share/gtk-doc/html/libempathy/libempathy.devhelp
@@ -321,7 +355,9 @@ share/icons/hicolor/32x32/apps/empathy.png
share/icons/hicolor/48x48/apps/empathy.png
share/icons/hicolor/scalable/apps/empathy.svg
share/locale/ar/LC_MESSAGES/empathy.mo
+share/locale/as/LC_MESSAGES/empathy.mo
share/locale/az/LC_MESSAGES/empathy.mo
+share/locale/be@latin/LC_MESSAGES/empathy.mo
share/locale/bg/LC_MESSAGES/empathy.mo
share/locale/bn_IN/LC_MESSAGES/empathy.mo
share/locale/ca/LC_MESSAGES/empathy.mo
@@ -349,7 +385,10 @@ share/locale/it/LC_MESSAGES/empathy.mo
share/locale/ja/LC_MESSAGES/empathy.mo
share/locale/kn/LC_MESSAGES/empathy.mo
share/locale/ko/LC_MESSAGES/empathy.mo
+share/locale/ku/LC_MESSAGES/empathy.mo
share/locale/lt/LC_MESSAGES/empathy.mo
+share/locale/lv/LC_MESSAGES/empathy.mo
+share/locale/mai/LC_MESSAGES/empathy.mo
share/locale/mk/LC_MESSAGES/empathy.mo
share/locale/ml/LC_MESSAGES/empathy.mo
share/locale/mr/LC_MESSAGES/empathy.mo
@@ -358,16 +397,21 @@ share/locale/nb/LC_MESSAGES/empathy.mo
share/locale/ne/LC_MESSAGES/empathy.mo
share/locale/nl/LC_MESSAGES/empathy.mo
share/locale/oc/LC_MESSAGES/empathy.mo
+share/locale/or/LC_MESSAGES/empathy.mo
share/locale/pa/LC_MESSAGES/empathy.mo
share/locale/pl/LC_MESSAGES/empathy.mo
+share/locale/ps/LC_MESSAGES/empathy.mo
share/locale/pt/LC_MESSAGES/empathy.mo
share/locale/pt_BR/LC_MESSAGES/empathy.mo
+share/locale/ro/LC_MESSAGES/empathy.mo
share/locale/ru/LC_MESSAGES/empathy.mo
share/locale/sl/LC_MESSAGES/empathy.mo
share/locale/sq/LC_MESSAGES/empathy.mo
share/locale/sr/LC_MESSAGES/empathy.mo
share/locale/sr@latin/LC_MESSAGES/empathy.mo
share/locale/sv/LC_MESSAGES/empathy.mo
+share/locale/ta/LC_MESSAGES/empathy.mo
+share/locale/te/LC_MESSAGES/empathy.mo
share/locale/th/LC_MESSAGES/empathy.mo
share/locale/tr/LC_MESSAGES/empathy.mo
share/locale/uk/LC_MESSAGES/empathy.mo
@@ -392,9 +436,14 @@ share/mission-control/profiles/sipphone.profile
share/mission-control/profiles/sofiasip.profile
share/mission-control/profiles/yahoo.profile
share/omf/empathy/empathy-C.omf
+share/omf/empathy/empathy-ca.omf
share/omf/empathy/empathy-cs.omf
share/omf/empathy/empathy-de.omf
+share/omf/empathy/empathy-el.omf
+share/omf/empathy/empathy-en_GB.omf
share/omf/empathy/empathy-es.omf
+share/omf/empathy/empathy-fi.omf
share/omf/empathy/empathy-fr.omf
share/omf/empathy/empathy-it.omf
+share/omf/empathy/empathy-ru.omf
share/omf/empathy/empathy-sv.omf
diff --git a/chat/empathy/distinfo b/chat/empathy/distinfo
index f39de0dddf0..5b0059a2fe0 100644
--- a/chat/empathy/distinfo
+++ b/chat/empathy/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2009/04/01 16:20:40 roy Exp $
+$NetBSD: distinfo,v 1.5 2009/08/21 15:29:26 wiz Exp $
-SHA1 (empathy-2.24.1.tar.gz) = c2962c01b12e946bca4f2ee4585e8a98a29689e4
-RMD160 (empathy-2.24.1.tar.gz) = 20e16355c7e9df02f7692d3ae7511d91f9f0c5e7
-Size (empathy-2.24.1.tar.gz) = 2475921 bytes
-SHA1 (patch-aa) = 764e4d75441e75de4053dcdf3e18628feebe05ac
+SHA1 (empathy-2.26.1.tar.gz) = a4132267b306eb8690c1700cc030e0e9fa3bede9
+RMD160 (empathy-2.26.1.tar.gz) = 2fc412427e2514c40fda27cde32c596ede73ba36
+Size (empathy-2.26.1.tar.gz) = 2996465 bytes
+SHA1 (patch-aa) = 37d3b728f8f6f7202d68be6fa84c79b5cf6a145c
diff --git a/chat/empathy/patches/patch-aa b/chat/empathy/patches/patch-aa
index 7898c639647..09f4d1c14cf 100644
--- a/chat/empathy/patches/patch-aa
+++ b/chat/empathy/patches/patch-aa
@@ -1,14 +1,17 @@
-$NetBSD: patch-aa,v 1.1 2008/12/24 12:39:59 jmcneill Exp $
+$NetBSD: patch-aa,v 1.2 2009/08/21 15:29:26 wiz Exp $
---- configure.ac.orig 2008-12-24 07:18:01.000000000 -0500
-+++ configure.ac 2008-12-24 07:19:12.000000000 -0500
-@@ -95,11 +95,23 @@
+--- configure.ac.orig 2009-04-13 15:19:21.000000000 +0000
++++ configure.ac
+@@ -106,7 +106,6 @@ PKG_CHECK_MODULES(EMPATHY,
telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
libmissioncontrol >= $MISSION_CONTROL_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
- x11
libglade-2.0 >= $LIBGLADE_REQUIRED
libebook-1.2
+ libcanberra-gtk >= 0.4
+@@ -115,6 +114,20 @@ PKG_CHECK_MODULES(EMPATHY,
+ telepathy-farsight
])
+PKG_CHECK_MODULES(X11, x11 >= $X11_REQUIRED_VERSION, [HAVE_X11=yes], [HAVE_X11=no])
@@ -24,6 +27,7 @@ $NetBSD: patch-aa,v 1.1 2008/12/24 12:39:59 jmcneill Exp $
+EMPATHY_CFLAGS="$EMPATHY_CFLAGS $X11_CFLAGS $XLIB_CFLAGS"
+EMPATHY_LIBS="$EMPATHY_LIBS $X11_LIBS $XLIB_LIBS"
+
- # -----------------------------------------------------------
- # Enable debug
++
+ PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
+
# -----------------------------------------------------------