* Update the glib to 2.34.3 and gtk20 to 2.24.17 and gtk30 to 3.6.4 which

  are the latest stable releases.
* Update vala to the newest stable release 0.18.1, also update a few ports
  in the gtk/gnome stack.
* The c++ bindings ports for glib, atk, gconf, etc, have now USE_GNOME toggles.
* Remove pkg-config run depends from glib20 and freetype2. This doesn't
  eliminate pkg-config run dependency completely, a second phase is needed
  and is planned.
* Support for .:run. and .:build. for USE_GNOME components was added.
  Currently only libxml2 and libxslt support this mechanism.
* Updates of the telepathy stack and empathy.
* Trim makefile headers, convert ports to new options, trim off library
  versions for some ports.
* Fix other ports so they build with the new glib version.

Thanks to miwi and crees for helping out with some exp-runs.
Approved by:	portmgr (miwi & bapt)
Obtained from:	gnome team repo

4 files changed, 61 insertions, 132 deletions

diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index fec8de126d2c..96abe0a587d6 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -1,14 +1,9 @@
-# New ports collection makefile for:	folks
-# Date created:				23 July 2010
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/net-im/folks/Makefile,v 1.8 2010/10/26 08:47:55 kwm Exp $
-#
+#   $MCom: ports/net-im/folks/Makefile,v 1.29 2012/08/17 19:06:45 kwm Exp $
 
 PORTNAME=	folks
-PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTVERSION=	0.7.0
 CATEGORIES=	net-im
 MASTER_SITES=	GNOME
 
@@ -17,17 +12,36 @@ COMMENT=	library to aggregates people from multiple sources
 
 BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala-vapigen \
 		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	gee.2:${PORTSDIR}/devel/libgee \
+LIB_DEPENDS=	gee:${PORTSDIR}/devel/libgee06 \
 		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
 
-USE_BZIP2=	yes
+CONFLICTS=	folks-0.4.[0-9]*
+
+USE_XZ=		yes
+USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehier gnomehack intlhack ltverhack evolutiondataserver3
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include 
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_SUB=	VERSION=16
+PLIST_SUB=	LIBVER=25 VERSION=33
+
+#OPTIONS=	SOCIALWEB "Enable social web backend" on
+
+#.include <bsd.port.options.mk>
+
+#.if defined(WITH_SOCIALWEB)
+#LIB_DEPENDS+=	socialweb.0:${PORTSDIR}/www/libsocialweb
+#CONFIGURE_ARGS+=--enable-libsocialweb-backend=yes
+#.else
+CONFIGURE_ARGS+=--enable-libsocialweb-backend=no
+#.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|^build_old_libs=yes|build_old_libs=no|g' \
+		${WRKDIR}/gnome-libtool
 
 .include <bsd.port.mk>
diff --git a/net-im/folks/distinfo b/net-im/folks/distinfo
index 2422467dd045..65e986124ef7 100644
--- a/net-im/folks/distinfo
+++ b/net-im/folks/distinfo
@@ -1,2 +1,2 @@
-SHA256 (folks-0.2.1.tar.bz2) = f8eeeb6a6974416d4db1ab6b18187173fb6ff4ec7830bece379dfba9b25f2a29
-SIZE (folks-0.2.1.tar.bz2) = 465522
+SHA256 (folks-0.7.0.tar.xz) = 861da1007e859e6bad43388a3bee56c31b3e9d003329086a5038fa6b19c6abf7
+SIZE (folks-0.7.0.tar.xz) = 1415856
diff --git a/net-im/folks/files/patch-backends_telepathy_lib_tpf-persona-store.vala b/net-im/folks/files/patch-backends_telepathy_lib_tpf-persona-store.vala
deleted file mode 100644
index 8e8e86cd2da2..000000000000
--- a/net-im/folks/files/patch-backends_telepathy_lib_tpf-persona-store.vala
+++ /dev/null
@@ -1,109 +0,0 @@
---- backends/telepathy/lib/tpf-persona-store.vala.orig	2011-07-22 14:19:09.000000000 +0200
-+++ backends/telepathy/lib/tpf-persona-store.vala	2011-07-22 14:30:40.000000000 +0200
-@@ -22,7 +22,6 @@
- using GLib;
- using Gee;
- using TelepathyGLib;
--using TelepathyGLib.ContactFeature;
- using Folks;
- 
- /**
-@@ -36,6 +35,15 @@ public class Tpf.PersonaStore : Folks.Pe
- {
-   private string[] undisplayed_groups = { "publish", "stored", "subscribe" };
- 
-+  private static ContactFeature[] _contact_features =
-+      {
-+        ContactFeature.ALIAS,
-+        ContactFeature.AVATAR_DATA,
-+        ContactFeature.AVATAR_TOKEN,
-+        ContactFeature.CAPABILITIES,
-+        ContactFeature.PRESENCE
-+      };
-+
-   private HashTable<string, Persona> _personas;
-   /* universal, contact owner handles (not channel-specific) */
-   private HashMap<uint, Persona> handle_persona_map;
-@@ -407,7 +415,7 @@ public class Tpf.PersonaStore : Folks.Pe
-       if (change_maps.size < 1)
-         return;
- 
--      foreach (var entry in change_maps)
-+      foreach (var entry in change_maps.entries)
-         {
-           var changes = entry.key;
- 
-@@ -640,7 +648,7 @@ public class Tpf.PersonaStore : Folks.Pe
-       /*
-        * remove all persona-keyed entries
-        */
--      foreach (var entry in this.channel_group_personas_map)
-+      foreach (var entry in this.channel_group_personas_map.entries)
-         {
-           var channel = (Channel) entry.key;
-           var members = this.channel_group_personas_map[channel];
-@@ -648,9 +656,8 @@ public class Tpf.PersonaStore : Folks.Pe
-             members.remove (persona);
-         }
- 
--      foreach (var entry in this.group_outgoing_adds)
-+      foreach (var name in this.group_outgoing_adds.keys)
-         {
--          var name = (string) entry.key;
-           var members = this.group_outgoing_adds[name];
-           if (members != null)
-             members.remove (persona);
-@@ -866,14 +873,6 @@ public class Tpf.PersonaStore : Folks.Pe
-       Channel channel,
-       Array<uint> channel_handles)
-     {
--      ContactFeature[] features =
--        {
--          ALIAS,
--          AVATAR_DATA,
--          AVATAR_TOKEN,
--          PRESENCE
--        };
--
-       uint[] contact_handles = {};
-       for (var i = 0; i < channel_handles.length; i++)
-         {
-@@ -891,7 +890,7 @@ public class Tpf.PersonaStore : Folks.Pe
- 
-           GLib.List<TelepathyGLib.Contact> contacts =
-               yield this.ll.connection_get_contacts_by_handle_async (
--                  this.conn, contact_handles, (uint[]) features);
-+                  this.conn, contact_handles, (uint[]) _contact_features);
- 
-           if (contacts == null || contacts.length () < 1)
-             return;
-@@ -918,19 +917,11 @@ public class Tpf.PersonaStore : Folks.Pe
-   private async GLib.List<Tpf.Persona>? create_personas_from_contact_ids (
-       string[] contact_ids) throws GLib.Error
-     {
--      ContactFeature[] features =
--        {
--          ALIAS,
--          AVATAR_DATA,
--          AVATAR_TOKEN,
--          PRESENCE
--        };
--
-       if (contact_ids.length > 0)
-         {
-           GLib.List<TelepathyGLib.Contact> contacts =
-               yield this.ll.connection_get_contacts_by_id_async (
--                  this.conn, contact_ids, (uint[]) features);
-+                  this.conn, contact_ids, (uint[]) _contact_features);
- 
-           GLib.List<Persona> personas = new GLib.List<Persona> ();
-           uint err_count = 0;
-@@ -1027,7 +1018,7 @@ public class Tpf.PersonaStore : Folks.Pe
- 
-   private void channel_groups_add_new_personas ()
-     {
--      foreach (var entry in this.channel_group_incoming_adds)
-+      foreach (var entry in this.channel_group_incoming_adds.entries)
-         {
-           var channel = (Channel) entry.key;
-           var members_added = new GLib.List<Persona> ();
diff --git a/net-im/folks/pkg-plist b/net-im/folks/pkg-plist
index a9cd7dbadde4..09989046be10 100644
--- a/net-im/folks/pkg-plist
+++ b/net-im/folks/pkg-plist
@@ -1,26 +1,50 @@
 bin/folks-import
+include/folks/folks-eds.h
 include/folks/folks-telepathy.h
 include/folks/folks.h
-lib/folks/%%VERSION%%/backends/key-file/libfolks-backend-key-file.la
-lib/folks/%%VERSION%%/backends/key-file/libfolks-backend-key-file.so
-lib/folks/%%VERSION%%/backends/telepathy/libfolks-backend-telepathy.la
-lib/folks/%%VERSION%%/backends/telepathy/libfolks-backend-telepathy.so
+lib/folks/%%VERSION%%/backends/eds/eds.la
+lib/folks/%%VERSION%%/backends/eds/eds.so
+lib/folks/%%VERSION%%/backends/key-file/key-file.la
+lib/folks/%%VERSION%%/backends/key-file/key-file.so
+lib/folks/%%VERSION%%/backends/telepathy/telepathy.la
+lib/folks/%%VERSION%%/backends/telepathy/telepathy.so
+lib/girepository-1.0/Folks-0.6.typelib
+lib/libfolks-eds.la
+lib/libfolks-eds.so
+lib/libfolks-eds.so.%%LIBVER%%
 lib/libfolks-telepathy.la
 lib/libfolks-telepathy.so
-lib/libfolks-telepathy.so.%%VERSION%%
+lib/libfolks-telepathy.so.%%LIBVER%%
 lib/libfolks.la
 lib/libfolks.so
-lib/libfolks.so.%%VERSION%%
+lib/libfolks.so.%%LIBVER%%
+libdata/pkgconfig/folks-eds.pc
 libdata/pkgconfig/folks-telepathy.pc
 libdata/pkgconfig/folks.pc
+share/gir-1.0/Folks-0.6.gir
+share/locale/cs/LC_MESSAGES/folks.mo
+share/locale/de/LC_MESSAGES/folks.mo
+share/locale/en_GB/LC_MESSAGES/folks.mo
+share/locale/eo/LC_MESSAGES/folks.mo
+share/locale/es/LC_MESSAGES/folks.mo
+share/locale/gl/LC_MESSAGES/folks.mo
+share/locale/it/LC_MESSAGES/folks.mo
+share/locale/nb/LC_MESSAGES/folks.mo
+share/locale/pl/LC_MESSAGES/folks.mo
+share/locale/pt_BR/LC_MESSAGES/folks.mo
+share/locale/sl/LC_MESSAGES/folks.mo
+share/locale/sv/LC_MESSAGES/folks.mo
+share/locale/uk/LC_MESSAGES/folks.mo
+share/locale/zh_CN/LC_MESSAGES/folks.mo
+share/vala/vapi/folks-eds.deps
+share/vala/vapi/folks-eds.vapi
 share/vala/vapi/folks-telepathy.deps
 share/vala/vapi/folks-telepathy.vapi
 share/vala/vapi/folks.deps
 share/vala/vapi/folks.vapi
-@dirrmtry share/vala/vapi
-@dirrmtry share/vala
 @dirrm lib/folks/%%VERSION%%/backends/telepathy
 @dirrm lib/folks/%%VERSION%%/backends/key-file
+@dirrm lib/folks/%%VERSION%%/backends/eds
 @dirrm lib/folks/%%VERSION%%/backends
 @dirrm lib/folks/%%VERSION%%
 @dirrm lib/folks