Index: head/devel/gvfs/Makefile
===================================================================
--- head/devel/gvfs/Makefile	(revision 411572)
+++ head/devel/gvfs/Makefile	(revision 411573)
@@ -1,103 +1,99 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gvfs
 PORTVERSION=	1.26.3
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME virtual file system
 
 BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
 LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libgcr-base-3.so:${PORTSDIR}/security/gcr \
-		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+		libsecret-1.so:${PORTSDIR}/security/libsecret
 
 PORTSCOUT=	limitw:1,even
 
 USES=		gettext gmake gnome libarchive libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 intlhack libxslt:build
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-bluray
 
 CONFIGURE_ARGS+=\
 		--disable-gudev \
 		--disable-libsystemd-login \
 		--disable-udisks2 \
 		--disable-gdu \
 		--disable-udev \
 		--disable-goa \
-		--disable-keyring \
 		--disable-libmtp \
 		--disable-gtk
 
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.system.gvfs.enums.xml
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	AVAHI SAMBA GPHOTO2 CDDA HAL FUSE AFC GOOGLE
 OPTIONS_DEFAULT=AVAHI SAMBA GPHOTO2 CDDA HAL FUSE GOOGLE
 CDDA_DESC=	CDDA (enables HAL)
 GPHOTO2_DESC=	Gphoto 2 camera support (enables HAL) for PTP support
 SAMBA_DESC=	Samba support
 AFC_DESC=	Apple device support
 GOOGLE_DESC=	Google backend
 
 FUSE_USES=	fuse
 FUSE_CONFIGURE_ENABLE=	fuse
 
 SAMBA_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
 SAMBA_CONFIGURE_ENABLE=	samba
 
 CDDA_LIB_DEPENDS=	libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
 CDDA_CONFIGURE_ENABLE=	cdda
 
 GPHOTO2_LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
 GPHOTO2_CONFIGURE_ENABLE=	gphoto2
 
 AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
 AVAHI_CONFIGURE_ENABLE=	avahi
 
 AFC_LIB_DEPENDS=	libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice \
 			libplist.so:${PORTSDIR}/devel/libplist
 AFC_CONFIGURE_ENABLE=	afc
 
 GOOGLE_CONFIGURE_ENABLE=	google
 GOOGLE_LIB_DEPENDS=	libgdata.so:${PORTSDIR}/devel/libgdata \
 			libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSAMBA}
 GLIB_SCHEMAS+=	org.gnome.system.smb.gschema.xml
 .endif
 
 .if ${PORT_OPTIONS:MAVAHI}
 GLIB_SCHEMAS+=	org.gnome.system.dns_sd.gschema.xml
 .endif
 
 .if ${PORT_OPTIONS:MHAL} || ${PORT_OPTIONS:MGPHOTO2} || ${PORT_OPTIONS:MCDDA}
 LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
 RUN_DEPENDS+=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
 PLIST_SUB+=	HAL=""
 .else
 CONFIGURE_ARGS+=--disable-hal
 PLIST_SUB+=	HAL="@comment "
 .endif
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=722411
-post-patch:
-	@${RM} ${WRKSRC}/monitor/hal/gvfsdbusutils.[ch]
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/remote-volume-monitors
 	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/systemd
 
 .include <bsd.port.mk>
Index: head/devel/gvfs/files/common_Makefile.am
===================================================================
--- head/devel/gvfs/files/common_Makefile.am	(revision 411572)
+++ head/devel/gvfs/files/common_Makefile.am	(nonexistent)
@@ -1,18 +0,0 @@
---- common/Makefile.am.orig	2015-02-13 07:19:44 UTC
-+++ common/Makefile.am
-@@ -43,6 +43,15 @@ libgvfscommon_la_LIBADD =	\
- 	$(GLIB_LIBS)		\
- 	$(BLURAY_LIBS)
- 
-+if USE_HAL
-+libgvfscommon_la_SOURCES += 	\
-+	gvfsdbusutils.c		gvfsdbusutils.h
-+libgvfscommon_la_CFLAGS +=	\
-+	$(DBUS_CFLAGS)
-+libgvfscommon_la_LIBADD =	\
-+	$(DBUS_LIBS)
-+endif
-+
- libgvfscommon_monitor_la_SOURCES = 	\
- 	gvfsmountinfo.h gvfsmountinfo.c \
- 	$(NULL)

Property changes on: head/devel/gvfs/files/common_Makefile.am
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-1
\ No newline at end of property
Index: head/devel/gvfs/files/monitor_hal_Makefile.am
===================================================================
--- head/devel/gvfs/files/monitor_hal_Makefile.am	(revision 411572)
+++ head/devel/gvfs/files/monitor_hal_Makefile.am	(nonexistent)
@@ -1,10 +0,0 @@
---- monitor/hal/Makefile.am.orig	2015-02-03 15:52:20 UTC
-+++ monitor/hal/Makefile.am
-@@ -23,7 +23,6 @@ gvfs_hal_volume_monitor_SOURCES =			\
- 	ghalvolume.c		ghalvolume.h		\
- 	ghalmount.c		ghalmount.h		\
- 	ghalvolumemonitor.c	ghalvolumemonitor.h	\
--	gvfsdbusutils.c		gvfsdbusutils.h		\
- 	$(NULL)
- 
- gvfs_hal_volume_monitor_CFLAGS =		\

Property changes on: head/devel/gvfs/files/monitor_hal_Makefile.am
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-1
\ No newline at end of property