* 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

5 files changed, 75 insertions, 78 deletions

diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 4d93e890610b..0e06ee0bbfce 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -1,24 +1,23 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/gvfs/Makefile,v 1.70 2011/01/31 19:06:42 kwm Exp $
-#
+#   $MCom: ports/devel/gvfs/Makefile,v 1.85 2012/12/14 16:09:28 kwm Exp $
 
 PORTNAME=	gvfs
-PORTVERSION=	1.6.6
-PORTREVISION=	3
+PORTVERSION=	1.12.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME virtual file system
 
-LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus \
-		soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
+		soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome \
+		gcrypt:${PORTSDIR}/security/libgcrypt \
 		gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 
-USE_BZIP2=	yes
-USE_GNOME=	glib20 gnomehack gnomeprefix intlhack gconf2
+USE_XZ=		yes
+USE_GNOME=	glib20 gnomehack gnomeprefix intlhack intltool
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
@@ -27,16 +26,18 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-obexftp \
 		--disable-afc
-OPTIONS=	FUSE "Enable fuse" off \
-		AVAHI "Enable AVAHI" on \
-		SAMBA "Enable Samba" on \
-		GPHOTO2 "Enable Gphoto 2 camera support (required HAL)" on \
-		CDDA "Enable CDDA (required HAL)" on \
-		HAL "Enable HAL" on
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	AVAHI SAMBA GPHOTO2 CDDA HAL FUSE
+OPTIONS_DEFAULT=AVAHI SAMBA GPHOTO2 CDDA HAL
+CDDA_DESC=	CDDA (enables HAL)
+GPHOTO2_DESC=	Gphoto 2 camera support (enables HAL)
+SAMBA_DESC=	Samba support
 
-.if defined(WITH_FUSE)
+GLIB_SCHEMAS=	org.gnome.system.gvfs.enums.xml
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFUSE}
 USES+=		fuse
 PLIST_SUB+=	FUSE=""
 .else
@@ -44,40 +45,42 @@ CONFIGURE_ARGS+=	--disable-fuse
 PLIST_SUB+=	FUSE="@comment "
 .endif
 
-.if defined(WITH_SAMBA)
-LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+.if ${PORT_OPTIONS:MSAMBA}
+LIB_DEPENDS+=	smbclient:${PORTSDIR}/net/samba-libsmbclient
+GLIB_SCHEMAS+=	org.gnome.system.smb.gschema.xml
 PLIST_SUB+=	SMB=""
 .else
 CONFIGURE_ARGS+=	--disable-samba
 PLIST_SUB+=	SMB="@comment "
 .endif
 
-.if defined(WITH_CDDA) && !defined(WITHOUT_HAL)
-LIB_DEPENDS+=	cdio_paranoia.1:${PORTSDIR}/sysutils/libcdio
+.if ${PORT_OPTIONS:MCDDA}
+LIB_DEPENDS+=	cdio_paranoia:${PORTSDIR}/sysutils/libcdio
 PLIST_SUB+=	CDDA=""
 .else
 CONFIGURE_ARGS+=	--disable-cdda
 PLIST_SUB+=	CDDA="@comment "
 .endif
 
-.if defined(WITH_GPHOTO2) && !defined(WITHOUT_HAL)
-LIB_DEPENDS+=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
+.if ${PORT_OPTIONS:MGPHOTO2}
+LIB_DEPENDS+=	gphoto2:${PORTSDIR}/graphics/libgphoto2
 PLIST_SUB+=	GPHOTO2=""
 .else
 CONFIGURE_ARGS+=	--disable-gphoto2
 PLIST_SUB+=	GPHOTO2="@comment "
 .endif
 
-.if defined(WITH_AVAHI)
-LIB_DEPENDS+=	avahi-client.3:${PORTSDIR}/net/avahi-app
+.if ${PORT_OPTIONS:MAVAHI}
+LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi-app
+GLIB_SCHEMAS+=	org.gnome.system.dns_sd.gschema.xml
 PLIST_SUB+=	AVAHI=""
 .else
 CONFIGURE_ARGS+=--disable-avahi
 PLIST_SUB+=	AVAHI="@comment "
 .endif
 
-.if defined(WITH_HAL)
-LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+.if ${PORT_OPTIONS:MHAL} || ${PORT_OPTIONS:MGPHOTO2} || ${PORT_OPTIONS:MCDDA}
+LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
 RUN_DEPENDS+=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
 PLIST_SUB+=	HAL=""
 .else
@@ -85,8 +88,4 @@ CONFIGURE_ARGS+=--disable-hal
 PLIST_SUB+=	HAL="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
-		${WRKSRC}/gconf/Makefile.in
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index 5cd6abd7ebc4..b58710e7609a 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gvfs-1.6.6.tar.bz2) = 902890deb6a670f642180ea958406ebb02af1d5867a464c87e493d56f1dde7bd
-SIZE (gnome2/gvfs-1.6.6.tar.bz2) = 1387796
+SHA256 (gnome3/gvfs-1.12.3.tar.xz) = 38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2
+SIZE (gnome3/gvfs-1.12.3.tar.xz) = 1361968
diff --git a/devel/gvfs/files/patch-client_Makefile.in b/devel/gvfs/files/patch-client_Makefile.in
index ffbfd5878dc1..1470cbce0ef6 100644
--- a/devel/gvfs/files/patch-client_Makefile.in
+++ b/devel/gvfs/files/patch-client_Makefile.in
@@ -1,11 +1,11 @@
---- client/Makefile.in.orig	2008-02-11 20:05:14.000000000 -0500
-+++ client/Makefile.in	2008-02-11 20:05:42.000000000 -0500
-@@ -152,7 +152,7 @@ EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
+--- client/Makefile.in.orig	2010-12-26 18:25:46.000000000 +0100
++++ client/Makefile.in	2010-12-26 18:26:12.000000000 +0100
+@@ -196,7 +196,7 @@
+ EXPAT_LIBS = @EXPAT_LIBS@
+ FGREP = @FGREP@
  FUSE_CFLAGS = @FUSE_CFLAGS@
 -FUSE_LIBS = @FUSE_LIBS@
 +FUSE_LIBS = @FUSE_LIBS@ -lfuse
- GCONF_CFLAGS = @GCONF_CFLAGS@
- GCONF_LIBS = @GCONF_LIBS@
+ GDU_CFLAGS = @GDU_CFLAGS@
+ GDU_LIBS = @GDU_LIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
diff --git a/devel/gvfs/files/patch-client_gvfsfusedaemon.c b/devel/gvfs/files/patch-client_gvfsfusedaemon.c
index 2ea9b3330625..0d9c69189b48 100644
--- a/devel/gvfs/files/patch-client_gvfsfusedaemon.c
+++ b/devel/gvfs/files/patch-client_gvfsfusedaemon.c
@@ -1,17 +1,7 @@
---- client/gvfsfusedaemon.c.orig	2010-11-12 16:42:49.000000000 +0100
-+++ client/gvfsfusedaemon.c	2010-11-21 18:23:36.000000000 +0100
-@@ -26,7 +26,9 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
-+#ifdef __linux__
- #include <sys/vfs.h>
-+#endif
- #include <sys/time.h>
- #include <unistd.h>
- #include <stdlib.h>
-@@ -2340,7 +2342,9 @@
-   subthread = g_thread_create ((GThreadFunc) subthread_main, NULL, FALSE, NULL);
+--- client/gvfsfusedaemon.c.orig	2012-05-15 20:01:49.000000000 +0200
++++ client/gvfsfusedaemon.c	2012-05-31 14:00:26.000000000 +0200
+@@ -2361,7 +2361,9 @@
+   subthread = g_thread_new ("gvfs-fuse-sub", (GThreadFunc) subthread_main, NULL);
  
    /* Indicate O_TRUNC support for open() */
 +#ifdef FUSE_CAP_ATOMIC_O_TRUNC
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index bbc4ad1a7c89..5463953eabf4 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -3,6 +3,7 @@ bin/gvfs-copy
 bin/gvfs-info
 bin/gvfs-less
 bin/gvfs-ls
+bin/gvfs-mime
 bin/gvfs-mkdir
 bin/gvfs-monitor-dir
 bin/gvfs-monitor-file
@@ -18,8 +19,6 @@ bin/gvfs-tree
 etc/profile.d/gvfs-bash-completion.sh
 include/gvfs-client/gvfs/gvfsurimapper.h
 include/gvfs-client/gvfs/gvfsuriutils.h
-lib/gio/modules/libgiogconf.la
-lib/gio/modules/libgiogconf.so
 lib/gio/modules/libgioremote-volume-monitor.la
 lib/gio/modules/libgioremote-volume-monitor.so
 lib/gio/modules/libgvfsdbus.la
@@ -30,6 +29,8 @@ lib/gio/modules/libgvfsdbus.so
 lib/libgvfscommon.la
 lib/libgvfscommon.so
 lib/libgvfscommon.so.0
+libexec/gvfsd-afp
+libexec/gvfsd-afp-browse
 %%FUSE%%libexec/gvfs-fuse-daemon
 %%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor
 %%HAL%%libexec/gvfs-hal-volume-monitor
@@ -50,32 +51,37 @@ libexec/gvfsd-sftp
 %%SMB%%libexec/gvfsd-smb
 %%SMB%%libexec/gvfsd-smb-browse
 libexec/gvfsd-trash
+%%AVAHI%%share/GConf/gsettings/gvfs-dns-sd.convert
+%%SMB%%share/GConf/gsettings/gvfs-smb.convert
 share/dbus-1/services/gvfs-daemon.service
 share/dbus-1/services/gvfs-metadata.service
 %%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
 %%HAL%%share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
-share/gvfs/mounts/archive.mount
-share/gvfs/mounts/burn.mount
-%%CDDA%%share/gvfs/mounts/cdda.mount
-share/gvfs/mounts/computer.mount
-share/gvfs/mounts/dav.mount
-%%AVAHI%%share/gvfs/mounts/dav+sd.mount
-%%AVAHI%%share/gvfs/mounts/dns-sd.mount
-share/gvfs/mounts/ftp.mount
-%%GPHOTO2%%share/gvfs/mounts/gphoto2.mount
-share/gvfs/mounts/http.mount
-share/gvfs/mounts/localtest.mount
-share/gvfs/mounts/network.mount
-share/gvfs/mounts/sftp.mount
-%%SMB%%share/gvfs/mounts/smb-browse.mount
-%%SMB%%share/gvfs/mounts/smb.mount
-share/gvfs/mounts/trash.mount
-%%GPHOTO2%%share/gvfs/remote-volume-monitors/gphoto2.monitor
-%%HAL%%share/gvfs/remote-volume-monitors/hal.monitor
+share/gvfs/mounts/afp-browse.mount
+share/gvfs/mounts/afp.mount
+%%DATADIR%%/mounts/archive.mount
+%%DATADIR%%/mounts/burn.mount
+%%CDDA%%%%DATADIR%%/mounts/cdda.mount
+%%DATADIR%%/mounts/computer.mount
+%%DATADIR%%/mounts/dav.mount
+%%AVAHI%%%%DATADIR%%/mounts/dav+sd.mount
+%%AVAHI%%%%DATADIR%%/mounts/dns-sd.mount
+%%DATADIR%%/mounts/ftp.mount
+%%GPHOTO2%%%%DATADIR%%/mounts/gphoto2.mount
+%%DATADIR%%/mounts/http.mount
+%%DATADIR%%/mounts/localtest.mount
+%%DATADIR%%/mounts/network.mount
+%%DATADIR%%/mounts/sftp.mount
+%%SMB%%%%DATADIR%%/mounts/smb-browse.mount
+%%SMB%%%%DATADIR%%/mounts/smb.mount
+%%DATADIR%%/mounts/trash.mount
+%%GPHOTO2%%%%DATADIR%%/remote-volume-monitors/gphoto2.monitor
+%%HAL%%%%DATADIR%%/remote-volume-monitors/hal.monitor
 share/locale/af/LC_MESSAGES/gvfs.mo
 share/locale/ar/LC_MESSAGES/gvfs.mo
 share/locale/as/LC_MESSAGES/gvfs.mo
 share/locale/ast/LC_MESSAGES/gvfs.mo
+share/locale/be/LC_MESSAGES/gvfs.mo
 share/locale/be@latin/LC_MESSAGES/gvfs.mo
 share/locale/bg/LC_MESSAGES/gvfs.mo
 share/locale/bn/LC_MESSAGES/gvfs.mo
@@ -88,9 +94,11 @@ share/locale/de/LC_MESSAGES/gvfs.mo
 share/locale/el/LC_MESSAGES/gvfs.mo
 share/locale/en@shaw/LC_MESSAGES/gvfs.mo
 share/locale/en_GB/LC_MESSAGES/gvfs.mo
+share/locale/eo/LC_MESSAGES/gvfs.mo
 share/locale/es/LC_MESSAGES/gvfs.mo
 share/locale/et/LC_MESSAGES/gvfs.mo
 share/locale/eu/LC_MESSAGES/gvfs.mo
+share/locale/fa/LC_MESSAGES/gvfs.mo
 share/locale/fi/LC_MESSAGES/gvfs.mo
 share/locale/fr/LC_MESSAGES/gvfs.mo
 share/locale/ga/LC_MESSAGES/gvfs.mo
@@ -139,9 +147,9 @@ share/locale/vi/LC_MESSAGES/gvfs.mo
 share/locale/zh_CN/LC_MESSAGES/gvfs.mo
 share/locale/zh_HK/LC_MESSAGES/gvfs.mo
 share/locale/zh_TW/LC_MESSAGES/gvfs.mo
-@dirrm share/gvfs/remote-volume-monitors
-@dirrm share/gvfs/mounts
-@dirrm share/gvfs
+@dirrm %%DATADIR%%/remote-volume-monitors
+@dirrm %%DATADIR%%/mounts
+@dirrm %%DATADIR%%
 @dirrm include/gvfs-client/gvfs
 @dirrm include/gvfs-client
 @dirrmtry etc/profile.d