* 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

9 files changed, 125 insertions, 109 deletions

diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 21df21c88cc6..d392d7ac9acc 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -1,41 +1,61 @@
-# New ports collection makefile for:	dconf
-# Date created:				28 May 2010
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/dconf/Makefile,v 1.9 2010/11/04 16:41:01 kwm Exp $
-#
+#   $MCom: ports/devel/dconf/Makefile,v 1.30 2012/10/03 17:57:17 kwm Exp $
 
-PORTNAME=	dconf
-PORTVERSION=	0.5.1
-PORTREVISION=	4
+PORTNAME?=	dconf
+PORTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
+DISTNAME=	dconf-${PORTVERSION}
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A configuration database system for GNOME
 
-BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
-		valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	gee.2:${PORTSDIR}/devel/libgee
+BUILD_DEPENDS=	vala>=0.11.7:${PORTSDIR}/lang/vala
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GMAKE=	yes
-#USE_GETTEXT=	yes
-USE_GNOME=	gnomehack gtk20
+USE_GNOME=	gnomehack glib20 gnomehier
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-
-MAKE_JOBS_SAFE=	yes
-
+MAKE_JOBS_UNSAFE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+DCONF_SLAVE?=	no
+
+.if ${DCONF_SLAVE} == "editor"
+USE_GNOME+=	gtk30
+INSTALLS_ICONS=	yes
+GLIB_SCHEMAS=	ca.desrt.dconf-editor.gschema.xml
+LIB_DEPENDS+=	dconf:${PORTSDIR}/devel/dconf
+.else
+CONFIGURE_ARGS+=--disable-editor
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
+		${WRKSRC}/engine/dconf-engine.c \
+		${WRKSRC}/bin/dconf-update.c
+	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \
+		${WRKSRC}/editor/dconf-model.c
+	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \
+		${WRKSRC}/editor/dconf-model.vala
+	@${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \
+		${WRKSRC}/bin/Makefile.in \
+		${WRKSRC}/client/Makefile.in \
+		${WRKSRC}/editor/Makefile.in
+
 pre-build:
-	${GMAKE} -C ${WRKSRC}/client dconf-client.c libdconf.so.0
+#	${GMAKE} -C ${WRKSRC}/client dconf-client.c libdconf.so.0
+#	${GMAKE} -C ${WRKSRC}/dbus-1 dconf-dbus-1.c libdconf-dbus-1.so.0
 
 post-install:
 	-${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gio/modules
+	@${MKDIR} ${PREFIX}/etc/dconf/db
+	@${MKDIR} ${PREFIX}/etc/dconf/profile
 
 .include <bsd.port.mk>
diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo
index 60e18dfbf33e..eccaa2835e51 100644
--- a/devel/dconf/distinfo
+++ b/devel/dconf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/dconf-0.5.1.tar.bz2) = 0083d70e1b5e540d8d4b3f04fa5d17dff4c574136682fe3bdd9b5ecc196ec4f6
-SIZE (gnome3/dconf-0.5.1.tar.bz2) = 251287
+SHA256 (gnome3/dconf-0.12.1.tar.xz) = 3cd32b78d88ed7be90dace5d45e2cf8a6abdb253d43dbfa5ef52103b329dc214
+SIZE (gnome3/dconf-0.12.1.tar.xz) = 202112
diff --git a/devel/dconf/files/patch-client_Makefile.in b/devel/dconf/files/patch-client_Makefile.in
index f0452b9173db..d97d83186173 100644
--- a/devel/dconf/files/patch-client_Makefile.in
+++ b/devel/dconf/files/patch-client_Makefile.in
@@ -1,5 +1,5 @@
---- client/Makefile.in.orig	2010-11-04 17:09:33.000000000 +0100
-+++ client/Makefile.in	2010-11-04 17:18:20.000000000 +0100
+--- client/Makefile.in.orig	2012-05-28 13:27:17.000000000 +0200
++++ client/Makefile.in	2012-05-28 13:31:25.000000000 +0200
 @@ -34,7 +34,7 @@
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
@@ -7,31 +7,27 @@
 -shlib_PROGRAMS = libdconf.so.0.0.0$(EXEEXT)
 +shlib_PROGRAMS = libdconf.so.0$(EXEEXT)
  subdir = client
- DIST_COMMON = $(am__dist_gir_DATA_DIST) $(dconfinclude_HEADERS) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ DIST_COMMON = $(dconfinclude_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/dconf.pc.in dconf-client.c \
 @@ -332,9 +332,10 @@
  
  clean-shlibPROGRAMS:
  	-test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
--libdconf.so.0.0.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) 
--	@rm -f libdconf.so.0.0.0$(EXEEXT)
-+libdconf.so.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) 
-+	@rm -f libdconf.so.0$(EXEEXT)
+-libdconf.so.0.0.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES) 
++libdconf.so.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES) 
+ 	@rm -f libdconf.so.0.0.0$(EXEEXT)
  	$(AM_V_CCLD)$(libdconf_so_0_0_0_LINK) $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_LDADD) $(LIBS)
 +	$(AM_V_GEN) ln -fs libdconf.so.0 libdconf.so
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -750,14 +751,10 @@
+@@ -695,12 +696,8 @@
+ 	uninstall-vapiDATA
  
- @HAVE_INTROSPECTION_TRUE@include $(INTROSPECTION_MAKEFILE)
  
--@HAVE_INTROSPECTION_TRUE@dconf-1.0.gir: libdconf.so.0 libdconf.so
--
 -libdconf.so.0 libdconf.so: libdconf.so.0.0.0
 -	$(AM_V_GEN) ln -fs libdconf.so.0.0.0 $@
-+@HAVE_INTROSPECTION_TRUE@dconf-1.0.gir: libdconf.so.0
- 
+-
  install-data-hook:
 -	ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.0
 -	ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
diff --git a/devel/dconf/files/patch-common_shmdir.c b/devel/dconf/files/patch-common_shmdir.c
deleted file mode 100644
index b8ed3eeb2080..000000000000
--- a/devel/dconf/files/patch-common_shmdir.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- common/dconf-shmdir.c.orig	2010-10-21 13:46:17.000000000 +0200
-+++ common/dconf-shmdir.c	2010-10-21 13:47:46.000000000 +0200
-@@ -21,8 +21,13 @@
- 
- #include "dconf-shmdir.h"
- 
-+#ifdef __linux__
- #include <sys/statfs.h>
- #include <sys/vfs.h>
-+#elif __FreeBSD__
-+#include <sys/param.h>
-+#include <sys/mount.h>
-+#endif
- #include <errno.h>
- 
- #ifndef NFS_SUPER_MAGIC
diff --git a/devel/dconf/files/patch-dbus-1_Makefile.in b/devel/dconf/files/patch-dbus-1_Makefile.in
new file mode 100644
index 000000000000..907188b52967
--- /dev/null
+++ b/devel/dconf/files/patch-dbus-1_Makefile.in
@@ -0,0 +1,47 @@
+--- dbus-1/Makefile.in.orig	2012-05-28 13:31:56.000000000 +0200
++++ dbus-1/Makefile.in	2012-05-28 13:35:25.000000000 +0200
+@@ -34,7 +34,7 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0$(EXEEXT)
++shlib_PROGRAMS = libdconf-dbus-1.so.0$(EXEEXT)
+ subdir = dbus-1
+ DIST_COMMON = $(dconf_dbus_1include_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/dconf-dbus-1.pc.in
+@@ -246,7 +246,7 @@
+ 	../gvdb/gvdb-reader.c		\
+ 	dconf-dbus-1.c
+ 
+-noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
++noinst_DATA = libdconf-dbus-1.so.0
+ CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
+ all: all-am
+ 
+@@ -321,9 +321,10 @@
+ 
+ clean-shlibPROGRAMS:
+ 	-test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
+-libdconf-dbus-1.so.0.0.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES) 
+-	@rm -f libdconf-dbus-1.so.0.0.0$(EXEEXT)
++libdconf-dbus-1.so.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES) 
++	@rm -f libdconf-dbus-1.so.0$(EXEEXT)
+ 	$(AM_V_CCLD)$(libdconf_dbus_1_so_0_0_0_LINK) $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_LDADD) $(LIBS)
++	$(AM_V_GEN) ln -fs libdconf-dbus-1.so.0 libdconf-dbus-1.so
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -640,12 +641,8 @@
+ 	uninstall-hook uninstall-pkgconfigDATA uninstall-shlibPROGRAMS
+ 
+ 
+-libdconf-dbus-1.so.0 libdconf-dbus-1.so: libdconf-dbus-1.so.0.0.0
+-	$(AM_V_GEN) ln -fs libdconf-dbus-1.so.0.0.0 $@
+-
+ install-data-hook:
+-	ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
+-	ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
++	ln -fs libdconf-dbus-1.so.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
+ 
+ uninstall-hook:
+ 	rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
diff --git a/devel/dconf/files/patch-editor_Makefile.in b/devel/dconf/files/patch-editor_Makefile.in
new file mode 100644
index 000000000000..8f158fced556
--- /dev/null
+++ b/devel/dconf/files/patch-editor_Makefile.in
@@ -0,0 +1,20 @@
+--- editor/Makefile.in.orig	2012-10-03 17:32:51.000000000 +0000
++++ editor/Makefile.in	2012-10-03 17:35:54.000000000 +0000
+@@ -55,7 +55,7 @@
+ 	dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT)
+ dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS)
+ am__DEPENDENCIES_1 =
+-dconf_editor_DEPENDENCIES = ../client/libdconf.so.0 \
++dconf_editor_DEPENDENCIES = -ldconf \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+@@ -232,7 +232,7 @@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = $(gtk_CFLAGS) $(gmodule_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client -DPKGDATADIR=\"@datadir@/dconf-editor\"
+ AM_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
+-dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
++dconf_editor_LDADD = -ldconf $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
+ dconf_editor_SOURCES = config.vapi dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala
+ desktopdir = $(datadir)/applications
+ desktop_in_files = dconf-editor.desktop.in.in
diff --git a/devel/dconf/files/patch-engine_dconf-engine.c b/devel/dconf/files/patch-engine_dconf-engine.c
deleted file mode 100644
index 328a8f53fe5f..000000000000
--- a/devel/dconf/files/patch-engine_dconf-engine.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- engine/dconf-engine.c.orig	2010-08-04 17:40:53.000000000 +0200
-+++ engine/dconf-engine.c	2010-11-03 00:23:07.000000000 +0100
-@@ -144,7 +144,7 @@ dconf_engine_setup_user (DConfEngine *en
- 
-           if (fd >= 0)
-             {
--              if (posix_fallocate (fd, 0, 1) == 0)
-+              if (ftruncate (fd, 1) == 0)
-                 {
-                   engine->shm = mmap (NULL, 1, PROT_READ, MAP_SHARED, fd, 0);
- 
diff --git a/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c b/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c
deleted file mode 100644
index 4fe175035d88..000000000000
--- a/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- gsettings/dconfsettingsbackend.c.orig	2010-11-03 00:18:46.000000000 +0100
-+++ gsettings/dconfsettingsbackend.c	2010-11-03 00:21:03.000000000 +0100
-@@ -155,6 +155,7 @@ dconf_settings_backend_remove_outstandin
-                                       g_dbus_message_get_sender (message),
-                                       g_dbus_message_get_body (message),
-                                       anti_expose, NULL);
-+        g_slice_free (Outstanding, tmp);
- 
-         found = TRUE;
-         break;
-@@ -457,6 +458,7 @@ dconf_settings_backend_write_tree (GSett
-                                    gpointer          origin_tag)
- {
-   DConfSettingsBackend *dcsb = (DConfSettingsBackend *) backend;
-+  gboolean success = FALSE;
-   volatile guint32 *serial;
-   DConfEngineMessage dcem;
-   GDBusConnection *bus;
-@@ -478,15 +480,11 @@ dconf_settings_backend_write_tree (GSett
- 
-           g_settings_backend_keys_changed (backend, prefix, keys, origin_tag);
- 
--          return TRUE;
-+          success = TRUE;
-         }
-     }
- 
--  g_free (prefix);
--  g_free (values);
--  g_free (keys);
--
--  return FALSE;
-+  return success;
- }
- 
- static void
diff --git a/devel/dconf/pkg-plist b/devel/dconf/pkg-plist
index 3f2a96fbe976..167169ca8e7c 100644
--- a/devel/dconf/pkg-plist
+++ b/devel/dconf/pkg-plist
@@ -1,26 +1,24 @@
 bin/dconf
-bin/dconf-editor
+etc/bash_completion.d/dconf-bash-completion.sh
 include/dconf/dconf-client.h
+include/dconf-dbus-1/dconf-dbus-1.h
 include/dconf/dconf-engine.h
 include/dconf/dconf-paths.h
-include/dconf/dconf-readtype.h
-include/dconf/dconf-resetlist.h
 include/dconf/dconf.h
 lib/gio/modules/libdconfsettings.so
-lib/girepository-1.0/dconf-1.0.typelib
 lib/libdconf.so
 lib/libdconf.so.0
+lib/libdconf-dbus-1.so
+lib/libdconf-dbus-1.so.0
 libdata/pkgconfig/dconf.pc
+libdata/pkgconfig/dconf-dbus-1.pc
 libexec/dconf-service
 share/dbus-1/services/ca.desrt.dconf.service
-share/dbus-1/system-services/ca.desrt.dconf.service
-share/gir-1.0/dconf-1.0.gir
 share/gtk-doc/html/dconf/DConfClient.html
 share/gtk-doc/html/dconf/dconf-DConf-Paths.html
 share/gtk-doc/html/dconf/annotation-glossary.html
 share/gtk-doc/html/dconf/api-index-full.html
 share/gtk-doc/html/dconf/ch01.html
-share/gtk-doc/html/dconf/dconf.devhelp
 share/gtk-doc/html/dconf/dconf.devhelp2
 share/gtk-doc/html/dconf/home.png
 share/gtk-doc/html/dconf/index.html
@@ -32,13 +30,11 @@ share/gtk-doc/html/dconf/style.css
 share/gtk-doc/html/dconf/up.png
 share/vala/vapi/dconf.deps
 share/vala/vapi/dconf.vapi
-@dirrmtry share/vala/vapi
 @dirrm share/gtk-doc/html/dconf
 @dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc
-@dirrmtry share/dbus-1/system-services
-@dirrmtry share/dbus-1/services
-@dirrmtry share/dbus-1
+@dirrm include/dconf-dbus-1
 @dirrm include/dconf
 @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
 @unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+@dirrmtry etc/bash_completion.d