- finally update empathy to 2.30.0.2

x11/gnome/empathy/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2009/12/21 18:03:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.32 2010/04/23 13:03:28 jasper Exp $
 
 # XXX
 # (empathy:10245): Gtk-WARNING **: could not load image: Icon 'im-xmpp' not present in theme
@@ -6,11 +6,8 @@
 COMMENT= 		telepathy based messenger for GNOME
 
 GNOME_PROJECT=		empathy
-GNOME_VERSION=		2.24.1
+GNOME_VERSION=		2.30.0.2
-PKGNAME=		${DISTNAME}p18
 
-SHARED_LIBS +=	empathy              1.0      # .16.4
-SHARED_LIBS +=	empathy-gtk          1.0      # .15.6
 CATEGORIES=		net
 
 HOMEPAGE=		http://live.gnome.org/Empathy
@@ -21,35 +18,44 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite
-WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
-WANTLIB += Xrender art_lgpl_2 asn1 atk-1.0 avahi-client avahi-common
-WANTLIB += avahi-glib bonobo-2 bonobo-activation bonoboui-2 c
-WANTLIB += cairo com_err crypto dbus-1 dbus-glib-1 expat ffi fontconfig
-WANTLIB += freetype gailutil gcrypt gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-2
-WANTLIB += gnomecanvas-2 gnomevfs-2 gnutls gobject-2.0 gpg-error
-WANTLIB += gssapi gthread-2.0 gtk-x11-2.0 krb5 m nspr4 nss3 pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 plc4 plds4 png
-WANTLIB += popt pthread pthread-stubs smime3 softokn3 soup-2.4 sqlite3
-WANTLIB +=  ssl ssl3 stdc++ tasn1 telepathy telepathy-glib util xcb xml2 z
-
 MODULES=		devel/gconf2 \
 			devel/gettext \
 			lang/python \
 			x11/gnome
 
+WANTLIB += GL ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm asn1
+WANTLIB += atk-1.0 c cairo clutter-glx-1.0 com_err crypto dbus-1
+WANTLIB += dbus-glib-1 drm eggdbus-1 expat fontconfig freetype
+WANTLIB += gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += glitz gmodule-2.0 gnome-keyring gnutls gobject-2.0
+WANTLIB += gpg-error gssapi gstbase-0.10 gstfarsight-0.10 gstinterfaces-0.10
+WANTLIB += gstreamer-0.10 gthread-2.0 gtk-x11-2.0 krb5 m nspr4
+WANTLIB += nss3 ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
+WANTLIB += pixman-1 plc4 plds4 png proxy pthread pthread-stubs
+WANTLIB += smime3 soup-2.4 soup-gnome-2.4 sqlite3 ssl3 stdc++
+WANTLIB += tasn1 telepathy-glib vorbis vorbisfile xcb xcb-render
+WANTLIB += xcb-render-util xml2 z
+
 BUILD_DEPENDS=		::devel/iso-codes \
 			::x11/py-gtk2
-LIB_DEPENDS=		camel-1.2,ebook-1.2,edataserver-1.2::databases/evolution-data-server \
+LIB_DEPENDS=		canberra,canberra-gtk::audio/libcanberra \
-			missioncontrol-client::net/telepathy/telepathy-mission-control \
+			camel-1.2,ebook-1.2,edataserver-1.2::databases/evolution-data-server \
-			panel-applet-2::x11/gnome/panel \
+			json-glib-1.0::devel/json-glib \
-			enchant.>=5::textproc/enchant
+			notify::devel/libnotify \
+			ltdl::devel/libtool,-ltdl \
+			unique-1.0::devel/libunique \
+			geoclue::geo/geoclue \
+			champlain-0.4,champlain-gtk-0.4::geo/libchamplain/core \
+			clutter-gtk-0.10::graphics/clutter/clutter-gtk \
+			telepathy-farsight::net/telepathy/telepathy-farsight \
+			mcclient::net/telepathy/telepathy-mission-control \
+			enchant::textproc/enchant
+
 RUN_DEPENDS=		::net/telepathy/telepathy-gabble \
 			::net/telepathy/telepathy-haze \
 			::net/telepathy/telepathy-idle \
-			::x11/hicolor-icon-theme \
+			::x11/hicolor-icon-theme
-			::x11/py-gtk2
 
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
@@ -58,16 +64,18 @@ MODGCONF2_SCHEMAS_DIR=	empathy
 
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--disable-scrollkeeper \
-			--disable-aspell \
+			--enable-spell=Yes \
-			--disable-voip \
+			--enable-location=Yes \
-			--enable-nothere \
+			--enable-map=Yes\
-			--enable-megaphone \
+			--enable-webkit=no \
-			--enable-python=Yes \
+			--enable-nautilus-sendto=no \
-			--enable-tests=no
+			--enable-control-center-embedding=no
+#CONFIGURE_ARGS+=	--enable-tpl # Needs telepathy-logger
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
 pre-configure:
-	@ln -s ${LOCALBASE}/bin/python${MODPY_VERSION}-config ${WRKDIR}/bin/python-config
+	@ln -s ${LOCALBASE}/bin/python${MODPY_VERSION}-config \
+		${WRKDIR}/bin/python-config
 
 .include <bsd.port.mk>

x11/gnome/empathy/distinfo

@@ -1,5 +1,5 @@
-MD5 (gnome/empathy-2.24.1.tar.bz2) = mNHvSFsjp1qaEVVHyi2mag==
+MD5 (gnome/empathy-2.30.0.2.tar.bz2) = CgFQU6TAf5qxGHNJEeX8nA==
-RMD160 (gnome/empathy-2.24.1.tar.bz2) = l+WGZMHPOXeAaITMQB1nnsypE2U=
+RMD160 (gnome/empathy-2.30.0.2.tar.bz2) = DfJWlNXwIFklRYCwlp9faa5+6Sk=
-SHA1 (gnome/empathy-2.24.1.tar.bz2) = fCtkNNX9hV6Ifm7ycwBgFglwbqU=
+SHA1 (gnome/empathy-2.30.0.2.tar.bz2) = Gsq8URdZ35JfGLXGJDPW7n+qDbM=
-SHA256 (gnome/empathy-2.24.1.tar.bz2) = JLZ144n7kYmL0pJPizXbfnrvTEC7tpQS5EUEjdnhgSM=
+SHA256 (gnome/empathy-2.30.0.2.tar.bz2) = jdnDGWhndmHly98IAivryq3yzc3NCP7kxAqqzFUjPIY=
-SIZE (gnome/empathy-2.24.1.tar.bz2) = 1761446
+SIZE (gnome/empathy-2.30.0.2.tar.bz2) = 2623258

x11/gnome/empathy/patches/patch-data_icons_Makefile_in

@@ -1,15 +1,15 @@
-$OpenBSD: patch-data_icons_Makefile_in,v 1.1 2008/11/21 17:23:43 jasper Exp $
+$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 Oct 30 20:47:38 2008
+--- data/icons/Makefile.in.orig	Thu Dec 24 13:57:21 2009
-+++ data/icons/Makefile.in	Thu Oct 30 20:49:31 2008
++++ data/icons/Makefile.in	Thu Dec 24 13:57:32 2009
-@@ -14,7 +14,7 @@
+@@ -15,7 +15,7 @@
  
  @SET_MAKE@
  VPATH = @srcdir@
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/
- pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@

x11/gnome/empathy/patches/patch-libempathy-gtk_libempathy-gtk_pc_in

@@ -1,11 +0,0 @@
-$OpenBSD: patch-libempathy-gtk_libempathy-gtk_pc_in,v 1.1 2008/11/21 17:23:43 jasper Exp $
---- libempathy-gtk/libempathy-gtk.pc.in.orig	Tue Nov 18 19:18:49 2008
-+++ libempathy-gtk/libempathy-gtk.pc.in	Tue Nov 18 19:19:24 2008
-@@ -5,7 +5,6 @@ includedir=@includedir@
- 
- Name: libempathy-gtk
- Description:  Empathy interface library
--Requires: pkg-config >= 0.21
- Requires.private: glib-2.0, gobject-2.0, gtk+-2.0, libglade-2.0, libmissioncontrol, libempathy
- Version: @VERSION@
- Libs: -L${libdir} -lempathy-gtk

x11/gnome/empathy/patches/patch-libempathy_empathy-tp-file_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-libempathy_empathy-tp-file_c,v 1.1 2010/04/23 13:03:28 jasper Exp $
+--- libempathy/empathy-tp-file.c.orig	Thu Dec 24 14:37:56 2009
++++ libempathy/empathy-tp-file.c	Thu Dec 24 14:38:32 2009
+@@ -30,6 +30,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
++#include <netinet/in.h>
+ 
+ #include <glib/gi18n-lib.h>
+ 

x11/gnome/empathy/patches/patch-libempathy_libempathy_pc_in

@@ -1,11 +0,0 @@
-$OpenBSD: patch-libempathy_libempathy_pc_in,v 1.1 2008/11/21 17:23:43 jasper Exp $
---- libempathy/libempathy.pc.in.orig	Tue Nov 18 19:19:39 2008
-+++ libempathy/libempathy.pc.in	Tue Nov 18 19:19:43 2008
-@@ -5,7 +5,6 @@ includedir=@includedir@
- 
- Name: libempathy
- Description:  Empathy base library
--Requires: pkg-config >= 0.21
- Requires.private: glib-2.0, gobject-2.0, libxml-2.0, libmissioncontrol
- Version: @VERSION@
- Libs: -L${libdir} -lempathy