- use telepathy-logger, so the logs are telepathy-wide, instead of confined

to empathy
- zap a patch by using FAKE_FLAGS

x11/gnome/empathy/Makefile

@@ -1,12 +1,14 @@
-# $OpenBSD: Makefile,v 1.32 2010/04/23 13:03:28 jasper Exp $
+# $OpenBSD: Makefile,v 1.33 2010/04/23 18:26:13 jasper Exp $
 
 # XXX
 # (empathy:10245): Gtk-WARNING **: could not load image: Icon 'im-xmpp' not present in theme
+# make a symlink from im-jabber to im-xmpp if needed?
 
 COMMENT= 		telepathy based messenger for GNOME
 
 GNOME_PROJECT=		empathy
 GNOME_VERSION=		2.30.0.2
+PKGNAME=		${DISTNAME}p0
 
 CATEGORIES=		net
 
@@ -69,11 +71,13 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--enable-map=Yes\
 			--enable-webkit=no \
 			--enable-nautilus-sendto=no \
-			--enable-control-center-embedding=no
-#CONFIGURE_ARGS+=	--enable-tpl # Needs telepathy-logger
+			--enable-control-center-embedding=no \
+			--enable-tpl
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
+FAKE_FLAGS+=		pkgdatadir=${PREFIX}/share/
+
 pre-configure:
 	@ln -s ${LOCALBASE}/bin/python${MODPY_VERSION}-config \
 		${WRKDIR}/bin/python-config

x11/gnome/empathy/patches/patch-data_icons_Makefile_in

@@ -1,15 +0,0 @@
-$OpenBSD: patch-data_icons_Makefile_in,v 1.2 2010/04/23 13:03:28 jasper Exp $
-
-Make sure icons are installed in the correct directory.
-
---- data/icons/Makefile.in.orig	Thu Dec 24 13:57:21 2009
-+++ data/icons/Makefile.in	Thu Dec 24 13:57:32 2009
-@@ -15,7 +15,7 @@
- 
- @SET_MAKE@
- VPATH = @srcdir@
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/
- pkgincludedir = $(includedir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkglibexecdir = $(libexecdir)/@PACKAGE@

x11/gnome/empathy/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.10 2010/04/23 13:03:28 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.11 2010/04/23 18:26:13 jasper Exp $
 @bin bin/empathy
 @bin bin/empathy-accounts
 @bin bin/empathy-debugger
@@ -34,7 +34,6 @@ share/empathy/empathy-contact-widget.ui
 share/empathy/empathy-ft-manager.ui
 share/empathy/empathy-import-dialog.ui
 share/empathy/empathy-irc-networks.dtd
-share/empathy/empathy-log-manager.xsl
 share/empathy/empathy-log-window.ui
 share/empathy/empathy-main-window.ui
 share/empathy/empathy-map-view.ui