Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	glusterfs
-PORTVERSION=	3.11.1
-PORTREVISION=	2
+PORTVERSION=	3.12.2
 CATEGORIES=	net
 MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/
 
@@ -12,7 +11,7 @@
 LICENSE=	GPLv2 LGPL3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libargp.so:devel/argp-standalone liburcu-bp.so:sysutils/liburcu
+LIB_DEPENDS=	libargp.so:devel/argp-standalone liburcu-bp.so:sysutils/liburcu libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		bison gettext libtool pkgconfig python readline shebangfix \
 		sqlite ssl
@@ -27,6 +26,7 @@
 		tools/glusterfind/src/changelog.py \
 		tools/glusterfind/glusterfind.in \
 		tools/gfind_missing_files/gfid_to_path.py \
+		tools/glusterfind/S57glusterfind-delete-post.py \
 		extras/pre-upgrade-script-for-quota.sh \
 		events/tools/eventsdash.py \
 		extras/post-upgrade-script-for-quota.sh \
@@ -34,8 +34,20 @@
 		extras/snap_scheduler/snap_scheduler.py \
 		events/src/peer_eventsapi.py \
 		events/src/glustereventsd.py \
-		tools/glusterfind/S57glusterfind-delete-post.py
+		extras/hook-scripts/delete/pre/S10selinux-del-fcontext.sh \
+		extras/hook-scripts/create/post/S10selinux-label-brick.sh \
+		extras/hook-scripts/stop/pre/S29CTDB-teardown.sh \
+		extras/hook-scripts/stop/pre/S30samba-stop.sh \
+		extras/hook-scripts/add-brick/pre/S28Quota-enable-root-xattr-heal.sh \
+		extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh \
+		extras/hook-scripts/start/post/S30samba-start.sh \
+		extras/hook-scripts/start/post/S29CTDBsetup.sh \
+		extras/hook-scripts/S56glusterd-geo-rep-create-post.sh \
+		extras/hook-scripts/set/post/S30samba-set.sh \
+		extras/hook-scripts/set/post/S32gluster_enable_shared_storage.sh
 
+USE_GCC=	yes
+
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	glusterd
@@ -55,10 +67,4 @@
 PLIST_SUB=	GLUSTERLIBDIR="lib/${PORTNAME}/${PORTVERSION}"
 KMODDIR?=	/boot/modules
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101001
-USE_GCC=	yes
-.endif
-
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo
+++ distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499632037
-SHA256 (glusterfs-3.11.1.tar.gz) = c7e0502631c9bc9da05795b666b74ef40a30a0344f5a2e205e65bd2faefe1442
-SIZE (glusterfs-3.11.1.tar.gz) = 9155001
+TIMESTAMP = 1510185080
+SHA256 (glusterfs-3.12.2.tar.gz) = 6f9fbf8183df9e012a2c95f3ac3fad303443218beef4fd060f4af57c0bdbc069
+SIZE (glusterfs-3.12.2.tar.gz) = 9404275
Index: files/patch-configure
===================================================================
--- files/patch-configure
+++ files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2017-06-27 15:25:15 UTC
+--- configure.orig	2017-10-12 20:59:04 UTC
 +++ configure
-@@ -13475,6 +13475,9 @@ case $host_os in
+@@ -13523,6 +13523,9 @@ case $host_os in
       linux*)
  #do nothing
         ;;
Index: files/patch-contrib_fuse-lib_mount.c
===================================================================
--- files/patch-contrib_fuse-lib_mount.c
+++ files/patch-contrib_fuse-lib_mount.c
@@ -1,4 +1,4 @@
---- contrib/fuse-lib/mount.c.orig	2017-06-27 15:25:12 UTC
+--- contrib/fuse-lib/mount.c.orig	2017-10-12 20:59:00 UTC
 +++ contrib/fuse-lib/mount.c
 @@ -382,6 +382,7 @@ fuse_mount_sys (const char *mountpoint, 
          build_iovec (&iov, &iovlen, "from", "/dev/fuse", -1);
Index: files/patch-extras_Makefile.in
===================================================================
--- files/patch-extras_Makefile.in
+++ files/patch-extras_Makefile.in
@@ -1,6 +1,6 @@
---- extras/Makefile.in.orig	2017-06-27 15:25:17 UTC
+--- extras/Makefile.in.orig	2017-10-12 20:59:06 UTC
 +++ extras/Makefile.in
-@@ -637,8 +637,8 @@ install-volDATA: $(vol_DATA)
+@@ -639,8 +639,8 @@ install-volDATA: $(vol_DATA)
  	  echo "$$d$$p"; \
  	done | $(am__base_list) | \
  	while read files; do \
@@ -11,7 +11,7 @@
  	done
  
  uninstall-volDATA:
-@@ -937,7 +937,7 @@ install-data-local:
+@@ -939,7 +939,7 @@ install-data-local:
  	fi
  	$(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/groups
  	$(INSTALL_DATA) $(top_srcdir)/extras/group-virt.example \
Index: pkg-plist
===================================================================
--- pkg-plist
+++ pkg-plist
@@ -62,6 +62,7 @@
 include/glusterfs/mem-types.h
 include/glusterfs/options.h
 include/glusterfs/parse-utils.h
+include/glusterfs/protocol-common.h
 include/glusterfs/quota-common-utils.h
 include/glusterfs/rbthash.h
 include/glusterfs/refcount.h
@@ -274,6 +275,7 @@
 libexec/glusterfs/glusterfind/utils.%%PYTHON_PYOEXTENSION%%
 libexec/glusterfs/peer_add_secret_pub
 libexec/glusterfs/peer_eventsapi.py
+man/man8/gluster-setgfid2path.8.gz
 man/man8/gluster.8.gz
 man/man8/glusterd.8.gz
 man/man8/glusterfs.8.gz
@@ -286,6 +288,7 @@
 sbin/glfsheal
 sbin/gluster
 sbin/gluster-eventsapi
+sbin/gluster-setgfid2path
 sbin/glusterd
 sbin/glustereventsd
 sbin/glusterfs