The FreeBSD GNOME team proudly presents GNOME 3.16 for FreeBSD.

The offical GNOME 3.16 release notes can be found at https://help.gnome.org/misc/release-notes/3.16/

Upgrade instructions for port users:

Delete the old tracker package with:
# pkg delete -f tracker
And user port upgrade tool of choice to upgrade.

Thanks to Antoine Brodin for running the exp-runs.

This release was made possible by the following people:
  Gustau Perez
  Ting-Wei_Lan

PR:		201980

30 files changed, 277 insertions, 341 deletions

diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile
index 96b4b11025f2..a7f7b3d59eb1 100644
--- a/x11/cinnamon-desktop/Makefile
+++ b/x11/cinnamon-desktop/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
 		libxkbfile>=0:${PORTSDIR}/x11/libxkbfile
 
 USE_XORG=	x11 xrandr xext
-USES=		autoreconf:build gettext gmake libtool pathfix pkgconfig \
+USES=		autoreconf gettext gmake libtool pathfix pkgconfig \
 		shebangfix tar:xz
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
@@ -61,7 +61,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|find -min|find . -|g' \
 		${WRKSRC}/files/Makefile.am
 
-pre-configure:
-	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
-
 .include <bsd.port.mk>
diff --git a/x11/cinnamon-menus/Makefile b/x11/cinnamon-menus/Makefile
index 262c7bb3a339..1862d1be0cca 100644
--- a/x11/cinnamon-menus/Makefile
+++ b/x11/cinnamon-menus/Makefile
@@ -15,10 +15,9 @@ BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
 RUN_DEPENDS=	xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
 		libxkbfile>=0:${PORTSDIR}/x11/libxkbfile
 
-USES=		autoreconf:build gettext gmake libtool pathfix pkgconfig \
+USES=		autoreconf gettext gmake libtool pathfix pkgconfig \
 		python:2 tar:xz
-USE_GNOME=	gnomemenus3 gnomeprefix gtk30 intlhack \
-		introspection:build
+USE_GNOME=	gnomemenus3 gnomeprefix gtk30 introspection:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 USE_LDCONFIG=	yes
@@ -28,7 +27,4 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
-pre-configure:
-	cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh
-
 .include <bsd.port.mk>
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 9e00517c0202..b1d692c4025e 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -37,7 +37,7 @@ RUN_DEPENDS=	py*-dbus>=0:${PORTSDIR}/devel/py-dbus \
 
 WRKSRC=		${WRKDIR}/Cinnamon-${PORTVERSION}
 
-USES=		autoreconf:build compiler:c11 gettext gmake libtool \
+USES=		autoreconf compiler:c11 gettext gmake libtool \
 		pathfix pkgconfig python shebangfix
 USE_GNOME=	evolutiondataserver3 gconf2 gnomedesktop3 \
 		gnomeprefix gtk30 intlhack introspection:build
@@ -62,6 +62,8 @@ OPTIONS_DEFINE=	NLS
 NLS_RUN_DEPENDS=	cinnamon-translations>=0:${PORTSDIR}/misc/cinnamon-translations
 
 post-patch:
+# we need this for intltoolize otherwise it can't copy the m4 file ...
+	@${MKDIR} ${WRKSRC}/m4
 	@${MKDIR} ${WRKSRC}/files${PREFIX}
 .for d in bin lib share
 	@${MV} ${WRKSRC}/files/usr/${d} ${WRKSRC}/files${PREFIX}
@@ -140,9 +142,6 @@ post-patch:
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
-pre-configure:
-	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
-
 post-install:
 	@${PYTHON_CMD} ${WRKSRC}/files/generate_desktop_files
 
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index db83b6e976a4..4e9c4d9ef468 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,9 +1,8 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/gdm/Makefile 20031 2014-11-02 21:47:55Z kwm $
 
 PORTNAME=	gdm
-PORTVERSION=	3.14.2
+PORTVERSION=	3.16.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -22,6 +21,7 @@ LIB_DEPENDS=	libck-connector.so:${PORTSDIR}/sysutils/consolekit \
 		libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice \
 		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
 RUN_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity \
+		gnome-shell>=3.15.92:${PORTSDIR}/x11/gnome-shell \
 		gnome-settings-daemon>=3.0.0:${PORTSDIR}/sysutils/gnome-settings-daemon \
 		gnome-keyring-3:${PORTSDIR}/security/gnome-keyring \
 		gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \
@@ -38,8 +38,10 @@ RUN_DEPENDS+=	xrdb:${PORTSDIR}/x11/xrdb \
 USERS=		gdm
 GROUPS=		gdm
 
+PORTSCOUT=	limitw:1,even
+
 USES=		execinfo gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME=	dconf gnomeprefix intlhack introspection librsvg2
+USE_GNOME=	dconf intlhack introspection librsvg2
 USE_LDCONFIG=	yes
 USE_XORG=	dmx dmxproto
 INSTALLS_ICONS=	yes
@@ -54,15 +56,19 @@ CONFIGURE_ARGS=	--disable-static \
 		--with-custom-conf=${PREFIX}/etc/gdm/custom.conf \
 		--with-dbus-sys=${PREFIX}/etc/dbus-1/system.d \
 		--with-log-dir=/var/log/gdm \
+		--localstatedir=/var \
+		--with-console-kit \
 		--with-working-directory=${PREFIX}/etc/gdm/home \
 		--with-sysconfsubdir=gdm \
 		--with-pid-file=/var/run/gdm.pid \
 		--with-dmconfdir=${LOCALBASE}/share/xsessions \
 		--with-screenshot-dir=/var/run/gdm/greeter \
 		--enable-authentication-scheme=pam \
+		--without-plymouth \
 		--with-user=gdm \
 		--with-group=gdm \
  		--with-initial-vt=09 \
+		--disable-wayland-support \
 		--with-systemd=no
 
 # this is a hack until we can get our own pam dir and dir in order.
@@ -125,7 +131,13 @@ post-patch:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \
-		${STAGEDIR}${PREFIX}/etc/gdm/custom.conf.default
+		${STAGEDIR}${PREFIX}/etc/gdm/custom.conf.sample
+	@${RM} ${STAGEDIR}${PREFIX}/etc/gdm/custom.conf
+	${MV} ${STAGEDIR}${PREFIX}/etc/gdm/PostSession/Default \
+		${STAGEDIR}${PREFIX}/etc/gdm/PostSession/Default.sample
+	${MV} ${STAGEDIR}${PREFIX}/etc/gdm/PreSession/Default \
+		${STAGEDIR}${PREFIX}/etc/gdm/PreSession/Default.sample
+
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/Sessions
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/dm/Sessions
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 9c4d640bf07a..c701954add2d 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gdm-3.14.2.tar.xz) = e20eb61496161ad95b1058dbf8aea9b7b004df4d0ea6b0fab4401397d9db5930
-SIZE (gnome3/gdm-3.14.2.tar.xz) = 1490544
+SHA256 (gnome3/gdm-3.16.2.tar.xz) = c32ee80745424da10b94b7216efc2ef1257e2ca63d7f003edc1801f1111e1b56
+SIZE (gnome3/gdm-3.16.2.tar.xz) = 1526872
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index e0b13582b940..05fd987a8e3b 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -65,11 +65,11 @@ gdm_start()
 
 gdm_stop()
 {
-	/bin/kill -9 $(/bin/cat "${pidfile}")
-	pkill -9 -u gdm
-	pkill -9 X
-	pkill -9 gdm-session-worker
-
+    echo "Stopping ${name}."
+    /bin/kill -9 $(/bin/cat "${pidfile}")
+    pkill -9 -u gdm
+    pkill -9 X
+    pkill -9 gdm-session-worker
 }
 
 load_rc_config ${name}
diff --git a/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop b/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop
index e1183761c946..8a72f4aa949e 100644
--- a/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop
+++ b/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop
@@ -1,10 +1,10 @@
---- data/applications/mime-dummy-handler.desktop.orig	2013-08-26 10:09:17.171162980 +0000
-+++ data/applications/mime-dummy-handler.desktop	2013-08-26 10:09:28.342160146 +0000
+--- data/applications/mime-dummy-handler.desktop.orig	2015-06-18 15:47:40.000000000 +0200
++++ data/applications/mime-dummy-handler.desktop	2015-07-03 09:30:57.146642000 +0200
 @@ -1,6 +1,6 @@
  [Desktop Entry]
  Type=Application
  Name=Dummy URI Handler
--Exec=/bin/true %U
+-Exec=true %U
 +Exec=/usr/bin/true %U
  Terminal=false
  StartupNotify=false
diff --git a/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings b/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings
index 0000c8b0d06f..7ca2158505d8 100644
--- a/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings
+++ b/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings
@@ -1,10 +1,10 @@
---- data/dconf/defaults/00-upstream-settings.orig	2014-03-21 08:45:14.698486081 +0000
-+++ data/dconf/defaults/00-upstream-settings	2014-03-21 08:45:23.489485407 +0000
+--- data/dconf/defaults/00-upstream-settings.orig	2015-06-18 15:47:40.000000000 +0200
++++ data/dconf/defaults/00-upstream-settings	2015-07-03 09:32:09.925298000 +0200
 @@ -13,7 +13,7 @@
  show-desktop-icons=false
  
  [org/gnome/desktop/default-applications/terminal]
--exec='/bin/true'
+-exec='true'
 +exec='/usr/bin/true'
  
  [org/gnome/desktop/interface]
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 5e4ce4da52c8..4c85d41bf4a1 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -1,15 +1,14 @@
 bin/gdm-screenshot
 bin/gdmflexiserver
 etc/dbus-1/system.d/gdm.conf
-etc/gdm/Xsession
-etc/gdm/custom.conf
-etc/gdm/custom.conf.default
-etc/gdm/locale.conf
-etc/gdm/Init/Default
-etc/gdm/PostLogin/Default.sample
-etc/gdm/PostSession/Default
-etc/gdm/PreSession/Default
-etc/gdm/home/.pulse/client.conf
+%%ETCDIR%%/Init/Default
+@sample %%ETCDIR%%/PostLogin/Default.sample
+@sample %%ETCDIR%%/PostSession/Default.sample
+@sample %%ETCDIR%%/PreSession/Default.sample
+%%ETCDIR%%/Xsession
+@sample %%ETCDIR%%/custom.conf.sample
+%%ETCDIR%%/home/.pulse/client.conf
+%%ETCDIR%%/locale.conf
 etc/pam.d/gdm-autologin
 etc/pam.d/gdm-launch-environment
 etc/pam.d/gdm-password
@@ -17,31 +16,34 @@ include/gdm/gdm-client-glue.h
 include/gdm/gdm-client.h
 include/gdm/gdm-sessions.h
 include/gdm/gdm-user-switching.h
+lib/girepository-1.0/Gdm-1.0.typelib
 lib/libgdm.so
 lib/libgdm.so.1
 lib/libgdm.so.1.0.0
-lib/girepository-1.0/Gdm-1.0.typelib
 libdata/pkgconfig/gdm.pc
 libexec/gdm-host-chooser
 libexec/gdm-session-worker
 libexec/gdm-simple-chooser
+libexec/gdm-wayland-session
+libexec/gdm-x-session
 sbin/gdm
 share/dconf/profile/gdm
-share/gir-1.0/Gdm-1.0.gir
 %%DATADIR%%/gdb-cmd
 %%DATADIR%%/gdm.schemas
-%%DATADIR%%/greeter/autostart/caribou-autostart.desktop
 %%DATADIR%%/greeter-dconf-defaults
+%%DATADIR%%/greeter/applications/gnome-shell-wayland.desktop
 %%DATADIR%%/greeter/applications/gnome-shell.desktop
 %%DATADIR%%/greeter/applications/mime-dummy-handler.desktop
 %%DATADIR%%/greeter/applications/mimeapps.list
 %%DATADIR%%/greeter/autostart/orca-autostart.desktop
 %%DATADIR%%/locale.alias
-share/gnome-session/sessions/gdm-shell.session
+share/gir-1.0/Gdm-1.0.gir
 share/help/C/gdm/index.docbook
 share/help/C/gdm/legal.xml
 share/help/ca/gdm/index.docbook
 share/help/ca/gdm/legal.xml
+share/help/cs/gdm/index.docbook
+share/help/cs/gdm/legal.xml
 share/help/de/gdm/index.docbook
 share/help/de/gdm/legal.xml
 share/help/el/gdm/index.docbook
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 39546f96db56..566a99da4956 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,10 +1,8 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/gnome-desktop/Makefile 20072 2014-11-12 19:12:47Z gusi $
 
 PORTNAME=	gnome-desktop
-PORTVERSION=	3.14.2
-PORTREVISION=	1
+PORTVERSION=	3.16.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -14,24 +12,23 @@ COMMENT=	Additional UI API for GNOME 3
 
 USES=		tar:xz
 
+.if defined(REFERENCE_PORT)
+PORTSCOUT=	ignore:1
+.else
 PORTSCOUT=	limitw:1,even
 
-.if !defined(REFERENCE_PORT)
-
 BUILD_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
 		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
 		libxkbfile>=0:${PORTSDIR}/x11/libxkbfile \
 		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
 		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
 		libxkbfile>=0:${PORTSDIR}/x11/libxkbfile
 
 USES+=		bison gettext gmake libtool pathfix pkgconfig python:3
-USE_GNOME=	gnomeprefix gtk30 intlhack introspection:build \
-		referencehack
+USE_GNOME=	gtk30 intlhack introspection:build referencehack
 USE_XORG=	x11 xrandr xext
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index a3ff0c334709..d43ee077a089 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-desktop-3.14.2.tar.xz) = 3c284378fd4d5c9aba1ef98b8bab78d0f7fe514964f9dfcfc3b1591328d6b873
-SIZE (gnome3/gnome-desktop-3.14.2.tar.xz) = 1105916
+SHA256 (gnome3/gnome-desktop-3.16.2.tar.xz) = 3a8f196b46eb9dbd3ba2afb8fb5fef6a8825539d449a02181311242e22227bd0
+SIZE (gnome3/gnome-desktop-3.16.2.tar.xz) = 1078328
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 6c8eff429c8f..011b6f956249 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -1,6 +1,6 @@
 include/gnome-desktop-3.0/libgnome-desktop/gnome-bg-crossfade.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-bg.h
 include/gnome-desktop-3.0/libgnome-desktop/gnome-bg-slide-show.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-bg.h
 include/gnome-desktop-3.0/libgnome-desktop/gnome-desktop-thumbnail.h
 include/gnome-desktop-3.0/libgnome-desktop/gnome-idle-monitor.h
 include/gnome-desktop-3.0/libgnome-desktop/gnome-languages.h
@@ -15,35 +15,37 @@ lib/libgnome-desktop-3.so.10
 lib/libgnome-desktop-3.so.10.0.0
 libdata/pkgconfig/gnome-desktop-3.0.pc
 libexec/gnome-rr-debug
-share/doc/gnome-desktop3/GnomeDesktopThumbnailFactory.html
-share/doc/gnome-desktop3/GnomeIdleMonitor.html
-share/doc/gnome-desktop3/GnomeWallClock.html
-share/doc/gnome-desktop3/GnomeXkbInfo.html
-share/doc/gnome-desktop3/background.html
-share/doc/gnome-desktop3/idle-monitor.html
-share/doc/gnome-desktop3/gnome-desktop3-Language-Utilities.html
-share/doc/gnome-desktop3/gnome-desktop3-gnome-bg.html
-share/doc/gnome-desktop3/gnome-desktop3-gnome-pnp-ids.html
-share/doc/gnome-desktop3/gnome-desktop3-gnome-rr-config.html
-share/doc/gnome-desktop3/gnome-desktop3.devhelp2
-share/doc/gnome-desktop3/home.png
-share/doc/gnome-desktop3/index.html
-share/doc/gnome-desktop3/index.sgml
-share/doc/gnome-desktop3/intro.html
-share/doc/gnome-desktop3/languages.html
-share/doc/gnome-desktop3/left-insensitive.png
-share/doc/gnome-desktop3/left.png
-share/doc/gnome-desktop3/randr.html
-share/doc/gnome-desktop3/right-insensitive.png
-share/doc/gnome-desktop3/right.png
-share/doc/gnome-desktop3/gnome-desktop3-gnome-rr.html
-share/doc/gnome-desktop3/style.css
-share/doc/gnome-desktop3/thumbnail.html
-share/doc/gnome-desktop3/up-insensitive.png
-share/doc/gnome-desktop3/up.png
-share/doc/gnome-desktop3/wall-clock.html
-share/doc/gnome-desktop3/xkb-info.html
+share/gir-1.0/GnomeDesktop-3.0.gir
 share/gnome/gnome-version.xml
+share/gtk-doc/html/gnome-desktop3/GnomeDesktopThumbnailFactory.html
+share/gtk-doc/html/gnome-desktop3/GnomeIdleMonitor.html
+share/gtk-doc/html/gnome-desktop3/GnomeWallClock.html
+share/gtk-doc/html/gnome-desktop3/GnomeXkbInfo.html
+share/gtk-doc/html/gnome-desktop3/annotation-glossary.html
+share/gtk-doc/html/gnome-desktop3/background.html
+share/gtk-doc/html/gnome-desktop3/gnome-desktop3-Language-Utilities.html
+share/gtk-doc/html/gnome-desktop3/gnome-desktop3-gnome-bg.html
+share/gtk-doc/html/gnome-desktop3/gnome-desktop3-gnome-pnp-ids.html
+share/gtk-doc/html/gnome-desktop3/gnome-desktop3-gnome-rr-config.html
+share/gtk-doc/html/gnome-desktop3/gnome-desktop3-gnome-rr.html
+share/gtk-doc/html/gnome-desktop3/gnome-desktop3.devhelp2
+share/gtk-doc/html/gnome-desktop3/home.png
+share/gtk-doc/html/gnome-desktop3/idle-monitor.html
+share/gtk-doc/html/gnome-desktop3/index.html
+share/gtk-doc/html/gnome-desktop3/index.sgml
+share/gtk-doc/html/gnome-desktop3/intro.html
+share/gtk-doc/html/gnome-desktop3/languages.html
+share/gtk-doc/html/gnome-desktop3/left-insensitive.png
+share/gtk-doc/html/gnome-desktop3/left.png
+share/gtk-doc/html/gnome-desktop3/randr.html
+share/gtk-doc/html/gnome-desktop3/right-insensitive.png
+share/gtk-doc/html/gnome-desktop3/right.png
+share/gtk-doc/html/gnome-desktop3/style.css
+share/gtk-doc/html/gnome-desktop3/thumbnail.html
+share/gtk-doc/html/gnome-desktop3/up-insensitive.png
+share/gtk-doc/html/gnome-desktop3/up.png
+share/gtk-doc/html/gnome-desktop3/wall-clock.html
+share/gtk-doc/html/gnome-desktop3/xkb-info.html
 share/help/C/fdl/index.docbook
 share/help/C/gpl/index.docbook
 share/help/C/lgpl/index.docbook
@@ -106,7 +108,6 @@ share/help/vi/lgpl/index.docbook
 share/help/zh_CN/fdl/index.docbook
 share/help/zh_CN/gpl/index.docbook
 share/help/zh_CN/lgpl/index.docbook
-share/gir-1.0/GnomeDesktop-3.0.gir
 share/libgnome-desktop-3.0/pnp.ids
 share/locale/af/LC_MESSAGES/gnome-desktop-3.0.mo
 share/locale/am/LC_MESSAGES/gnome-desktop-3.0.mo
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 22c85814b049..6e911d7160ad 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,10 +1,8 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/gnome-session/Makefile 19960 2014-10-15 14:24:24Z gusi $
 
 PORTNAME=	gnome-session
-PORTVERSION=	3.14.0
-PORTREVISION=	1
+PORTVERSION=	3.16.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -21,13 +19,13 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consoleki
 PORTSCOUT=	limitw:1,even
 
 USES=		execinfo gettext gmake pathfix pkgconfig tar:xz
-USE_GNOME=	gnomedesktop3 gnomeprefix gtk30 intlhack intlhack \
-		libxslt:build
+USE_GNOME=	gnomedesktop3 gtk30 intlhack intlhack libxslt:build
 USE_XORG=	ice sm xau xext xtst xrender xtrans xcomposite
 USE_GL=		gl
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docbook-docs \
+		--enable-consolekit \
 		--enable-gconf=no
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 945dcb450bf6..36145f8a61ee 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-session-3.14.0.tar.xz) = b1e6e805478b863eda58e61ecd0e13961f63dd76e2d49692affc5a1d00f2c184
-SIZE (gnome3/gnome-session-3.14.0.tar.xz) = 736128
+SHA256 (gnome3/gnome-session-3.16.0.tar.xz) = 9b546d455edd9d681070a61c98a4164557f89ebbd66367a2aa528d807dfea99d
+SIZE (gnome3/gnome-session-3.16.0.tar.xz) = 764808
diff --git a/x11/gnome-shell-extensions/Makefile b/x11/gnome-shell-extensions/Makefile
index faf69d59e3ba..19436548b17d 100644
--- a/x11/gnome-shell-extensions/Makefile
+++ b/x11/gnome-shell-extensions/Makefile
@@ -1,9 +1,8 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/trunk/x11/gnome-shell-extensions/Makefile 20075 2014-11-13 06:53:37Z gusi $
 
 PORTNAME=	gnome-shell-extensions
-PORTVERSION=	3.14.4
+PORTVERSION=	3.16.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/x11/gnome-shell-extensions/distinfo b/x11/gnome-shell-extensions/distinfo
index 55b8e8380f17..881e9e98c9a9 100644
--- a/x11/gnome-shell-extensions/distinfo
+++ b/x11/gnome-shell-extensions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-shell-extensions-3.14.4.tar.xz) = 05a1d5ecf3ebbf8215b46d91da25f9f6e66e917e79a59d609dd8b65cadf976e0
-SIZE (gnome3/gnome-shell-extensions-3.14.4.tar.xz) = 229176
+SHA256 (gnome3/gnome-shell-extensions-3.16.1.tar.xz) = 88cd3d2df1f0419066a7f01f28ee4fc8f8c4b361dbf44a93067166c8a796a741
+SIZE (gnome3/gnome-shell-extensions-3.16.1.tar.xz) = 229704
diff --git a/x11/gnome-shell-extensions/pkg-plist b/x11/gnome-shell-extensions/pkg-plist
index 245472976a84..6f713c8f82cb 100644
--- a/x11/gnome-shell-extensions/pkg-plist
+++ b/x11/gnome-shell-extensions/pkg-plist
@@ -1,4 +1,3 @@
-share/applications/gnome-shell-classic.desktop
 share/gnome-session/sessions/gnome-classic.session
 share/gnome-shell/extensions/alternate-tab@gnome-shell-extensions.gcampax.github.com/convenience.js
 share/gnome-shell/extensions/alternate-tab@gnome-shell-extensions.gcampax.github.com/extension.js
@@ -40,10 +39,6 @@ share/gnome-shell/extensions/screenshot-window-sizer@gnome-shell-extensions.gcam
 share/gnome-shell/extensions/screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com/extension.js
 share/gnome-shell/extensions/screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com/metadata.json
 share/gnome-shell/extensions/screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com/stylesheet.css
-share/gnome-shell/extensions/systemMonitor@gnome-shell-extensions.gcampax.github.com/convenience.js
-share/gnome-shell/extensions/systemMonitor@gnome-shell-extensions.gcampax.github.com/extension.js
-share/gnome-shell/extensions/systemMonitor@gnome-shell-extensions.gcampax.github.com/metadata.json
-share/gnome-shell/extensions/systemMonitor@gnome-shell-extensions.gcampax.github.com/stylesheet.css
 share/gnome-shell/extensions/user-theme@gnome-shell-extensions.gcampax.github.com/convenience.js
 share/gnome-shell/extensions/user-theme@gnome-shell-extensions.gcampax.github.com/extension.js
 share/gnome-shell/extensions/user-theme@gnome-shell-extensions.gcampax.github.com/metadata.json
@@ -69,6 +64,7 @@ share/gnome-shell/theme/classic-toggle-off-intl.svg
 share/gnome-shell/theme/classic-toggle-off-us.svg
 share/gnome-shell/theme/classic-toggle-on-intl.svg
 share/gnome-shell/theme/classic-toggle-on-us.svg
+share/gnome-shell/theme/gnome-classic-high-contrast.css
 share/gnome-shell/theme/gnome-classic.css
 share/locale/af/LC_MESSAGES/gnome-shell-extensions.mo
 share/locale/an/LC_MESSAGES/gnome-shell-extensions.mo
@@ -98,6 +94,7 @@ share/locale/he/LC_MESSAGES/gnome-shell-extensions.mo
 share/locale/hi/LC_MESSAGES/gnome-shell-extensions.mo
 share/locale/hu/LC_MESSAGES/gnome-shell-extensions.mo
 share/locale/id/LC_MESSAGES/gnome-shell-extensions.mo
+share/locale/is/LC_MESSAGES/gnome-shell-extensions.mo
 share/locale/it/LC_MESSAGES/gnome-shell-extensions.mo
 share/locale/ja/LC_MESSAGES/gnome-shell-extensions.mo
 share/locale/kk/LC_MESSAGES/gnome-shell-extensions.mo
@@ -117,6 +114,7 @@ share/locale/pa/LC_MESSAGES/gnome-shell-extensions.mo
 share/locale/pl/LC_MESSAGES/gnome-shell-extensions.mo
 share/locale/pt/LC_MESSAGES/gnome-shell-extensions.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-shell-extensions.mo
+share/locale/ro/LC_MESSAGES/gnome-shell-extensions.mo
 share/locale/ru/LC_MESSAGES/gnome-shell-extensions.mo
 share/locale/sk/LC_MESSAGES/gnome-shell-extensions.mo
 share/locale/sl/LC_MESSAGES/gnome-shell-extensions.mo
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 5186e5334bfa..a2b74d6d81c4 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -1,9 +1,8 @@
 # Created by: Pawel Worach <pawel.worach@gmail.com>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/gnome-shell/Makefile 20036 2014-11-03 08:23:27Z kwm $
 
 PORTNAME=	gnome-shell
-PORTVERSION=	3.14.4
+PORTVERSION=	3.16.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -28,7 +27,6 @@ LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libclutter-1.0.so:${PORTSDIR}/graphics/clutter \
 		libgjs.so:${PORTSDIR}/lang/gjs
 RUN_DEPENDS=	py*-dbus>=0:${PORTSDIR}/devel/py-dbus \
-		gdm>=0:${PORTSDIR}/x11/gdm \
 		gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
 		ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss
 
@@ -36,17 +34,17 @@ PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 cpe gettext gmake libtool pathfix pkgconfig \
 		tar:xz webplugin:native
-USE_GNOME=	evolutiondataserver3 gnomedesktop3 gnomeprefix \
-		gtk30 intlhack introspection
+USE_GNOME=	evolutiondataserver3 gnomedesktop3 gtk30 intlhack \
+		introspection
 USE_XORG=	x11 xfixes sm
 USE_GSTREAMER1=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-WEBPLUGIN_DIR=	${PREFIX}/lib/
+WEBPLUGIN_NAME=	libgnome-shell-browser-plugin.so
+WEBPLUGIN_DIR=	${PREFIX}/lib/mozilla/plugins/
 WEBPLUGIN_FILES=libgnome-shell-browser-plugin.so
 CONFIGURE_ARGS+=--enable-compile-warnings=no \
 		--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
-CONFIGURE_ENV+=	BROWSER_PLUGIN_DIR=${PREFIX}/lib/
 CPPFLAGS+=	-I${LOCALASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo
index 3171f85f7352..f7bc31a16203 100644
--- a/x11/gnome-shell/distinfo
+++ b/x11/gnome-shell/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-shell-3.14.4.tar.xz) = 43336da7edece72bf298f1749510abb8470b625585e551c8b45258981435fd80
-SIZE (gnome3/gnome-shell-3.14.4.tar.xz) = 1597744
+SHA256 (gnome3/gnome-shell-3.16.3.tar.xz) = 227eff19fdf50fd7ac605e8068454a6a6bc6d1bd73281b28305c3cd8a91190cb
+SIZE (gnome3/gnome-shell-3.16.3.tar.xz) = 1593148
diff --git a/x11/gnome-shell/files/patch-src_shell-global.c b/x11/gnome-shell/files/patch-src_shell-global.c
deleted file mode 100644
index d770f8b45ec4..000000000000
--- a/x11/gnome-shell/files/patch-src_shell-global.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/shell-global.c.orig	2014-10-13 22:57:06.000000000 +0200
-+++ src/shell-global.c	2014-10-20 15:37:28.727759860 +0200
-@@ -1240,13 +1240,13 @@
- {
-   GPtrArray *arr;
-   gsize len;
--
--#if defined __linux__
-   char *buf;
-   char *buf_p;
-   char *buf_end;
-   GError *error = NULL;
- 
-+#if defined __linux__
-+
-   if (!g_file_get_contents ("/proc/self/cmdline", &buf, &len, &error))
-     {
-       g_warning ("failed to get /proc/self/cmdline: %s", error->message);
-@@ -1281,6 +1281,12 @@
-   }
- 
-   g_ptr_array_add (arr, NULL);
-+#elif defined __FreeBSD__
-+  if (!g_file_get_contents ("/proc/curproc/cmdline", &buf, &len, &error))
-+    {
-+      g_warning ("failed to get /proc/curproc/cmdline: %s", error->message);
-+      return;
-+    }
- #else
-   return;
- #endif
diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist
index 1ef1d900b4f8..80e1ff0136b4 100644
--- a/x11/gnome-shell/pkg-plist
+++ b/x11/gnome-shell/pkg-plist
@@ -5,12 +5,12 @@ bin/gnome-shell-perf-tool
 lib/gnome-shell/Gvc-1.0.typelib
 lib/gnome-shell/Shell-0.1.typelib
 lib/gnome-shell/ShellJS-0.1.typelib
-%%WEBPLUGIN_DIR%%gnome-shell/ShellMenu-0.1.typelib
+lib/gnome-shell/ShellMenu-0.1.typelib
 lib/gnome-shell/St-1.0.typelib
 lib/gnome-shell/libgnome-shell-js.so
-%%WEBPLUGIN_DIR%%gnome-shell/libgnome-shell-menu.so
+lib/gnome-shell/libgnome-shell-menu.so
 lib/gnome-shell/libgnome-shell.so
-lib/libgnome-shell-browser-plugin.so
+%%WEBPLUGIN_DIR%%libgnome-shell-browser-plugin.so
 libexec/gnome-shell-calendar-server
 libexec/gnome-shell-hotplug-sniffer
 libexec/gnome-shell-perf-helper
@@ -26,123 +26,87 @@ share/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml
 share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml
 share/dbus-1/services/org.gnome.Shell.CalendarServer.service
 share/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
-share/doc/shell/ShellApp.html
-share/doc/shell/ShellAppSystem.html
-share/doc/shell/ShellAppUsage.html
-share/doc/shell/ShellEmbeddedWindow.html
-share/doc/shell/ShellGenericContainer.html
-share/doc/shell/ShellGlobal.html
-share/doc/shell/ShellGtkEmbed.html
-share/doc/shell/ShellMountOperation.html
-share/doc/shell/ShellSlicer.html
-share/doc/shell/ShellStack.html
-share/doc/shell/ShellTpClient.html
-share/doc/shell/ShellTrayIcon.html
-share/doc/shell/ShellTrayManager.html
-share/doc/shell/ShellWM.html
-share/doc/shell/ShellWindowTracker.html
-share/doc/shell/annotation-glossary.html
-share/doc/shell/api-index-full.html
-share/doc/shell/ch01.html
-share/doc/shell/ch02.html
-share/doc/shell/ch03.html
-share/doc/shell/ch04.html
-share/doc/shell/ch05.html
-share/doc/shell/ch06.html
-share/doc/shell/deprecated-api-index.html
-share/doc/shell/gdbus-org.gnome.Shell.SearchProvider.html
-share/doc/shell/gdbus-org.gnome.Shell.SearchProvider2.html
-share/doc/shell/home.png
-share/doc/shell/index.html
-share/doc/shell/index.sgml
-share/doc/shell/left-insensitive.png
-share/doc/shell/left.png
-share/doc/shell/object-tree.html
-share/doc/shell/right-insensitive.png
-share/doc/shell/right.png
-share/doc/shell/shell-shell-keybinding-modes.html
-share/doc/shell/shell-shell-polkit-authentication-agent.html
-share/doc/shell/shell-shell-recorder.html
-share/doc/shell/shell-shell-util.html
-share/doc/shell/shell.devhelp2
-share/doc/shell/style.css
-share/doc/shell/up-insensitive.png
-share/doc/shell/up.png
-share/doc/st/StBin.html
-share/doc/st/StBoxLayout.html
-share/doc/st/StButton.html
-share/doc/st/StDrawingArea.html
-share/doc/st/StEntry.html
-share/doc/st/StIcon.html
-share/doc/st/StLabel.html
-share/doc/st/StScrollView.html
-share/doc/st/StScrollable.html
-share/doc/st/StTable.html
-share/doc/st/StTextureCache.html
-share/doc/st/StThemeNodeTransition.html
-share/doc/st/StWidget.html
-share/doc/st/StWidgetAccessible.html
-share/doc/st/annotation-glossary.html
-share/doc/st/api-index-full.html
-share/doc/st/base.html
-share/doc/st/containers.html
-share/doc/st/deprecated-api-index.html
-share/doc/st/home.png
-share/doc/st/index.html
-share/doc/st/index.sgml
-share/doc/st/left-insensitive.png
-share/doc/st/left.png
-share/doc/st/object-tree.html
-share/doc/st/pt01.html
-share/doc/st/right-insensitive.png
-share/doc/st/right.png
-share/doc/st/st-st-theme-context.html
-share/doc/st/st-st-theme-node.html
-share/doc/st/st-st-theme.html
-share/doc/st/st.devhelp2
-share/doc/st/style.css
-share/doc/st/styling.html
-share/doc/st/up-insensitive.png
-share/doc/st/up.png
-share/doc/st/widgets.html
 share/gnome-control-center/keybindings/50-gnome-shell-system.xml
-share/gnome-shell/perf-background.xml
-share/gnome-shell/theme/calendar-arrow-left.svg
-share/gnome-shell/theme/calendar-arrow-right.svg
-share/gnome-shell/theme/calendar-today.svg
-share/gnome-shell/theme/checkbox-focused.svg
-share/gnome-shell/theme/checkbox-off-focused.svg
-share/gnome-shell/theme/checkbox-off.svg
-share/gnome-shell/theme/checkbox.svg
-share/gnome-shell/theme/close-window.svg
-share/gnome-shell/theme/close.svg
-share/gnome-shell/theme/corner-ripple-ltr.png
-share/gnome-shell/theme/corner-ripple-rtl.png
-share/gnome-shell/theme/dash-placeholder.svg
-share/gnome-shell/theme/filter-selected-ltr.svg
-share/gnome-shell/theme/filter-selected-rtl.svg
-share/gnome-shell/theme/gnome-shell.css
-share/gnome-shell/theme/logged-in-indicator.svg
-share/gnome-shell/theme/message-tray-background.png
-share/gnome-shell/theme/more-results.svg
-share/gnome-shell/theme/noise-texture.png
-share/gnome-shell/theme/page-indicator-active.svg
-share/gnome-shell/theme/page-indicator-checked.svg
-share/gnome-shell/theme/page-indicator-hover.svg
-share/gnome-shell/theme/page-indicator-inactive.svg
-share/gnome-shell/theme/panel-button-border.svg
-share/gnome-shell/theme/panel-button-highlight-narrow.svg
-share/gnome-shell/theme/panel-button-highlight-wide.svg
-share/gnome-shell/theme/process-working.svg
-share/gnome-shell/theme/running-indicator.svg
-share/gnome-shell/theme/source-button-border.svg
-share/gnome-shell/theme/summary-counter.svg
-share/gnome-shell/theme/toggle-off-intl.svg
-share/gnome-shell/theme/toggle-off-us.svg
-share/gnome-shell/theme/toggle-on-intl.svg
-share/gnome-shell/theme/toggle-on-us.svg
-share/gnome-shell/theme/ws-switch-arrow-down.png
-share/gnome-shell/theme/ws-switch-arrow-up.png
+%%DATADIR%%/gnome-shell-theme.gresource
+%%DATADIR%%/perf-background.xml
+share/gtk-doc/html/shell/ShellApp.html
+share/gtk-doc/html/shell/ShellAppSystem.html
+share/gtk-doc/html/shell/ShellAppUsage.html
+share/gtk-doc/html/shell/ShellEmbeddedWindow.html
+share/gtk-doc/html/shell/ShellGenericContainer.html
+share/gtk-doc/html/shell/ShellGlobal.html
+share/gtk-doc/html/shell/ShellGtkEmbed.html
+share/gtk-doc/html/shell/ShellMountOperation.html
+share/gtk-doc/html/shell/ShellStack.html
+share/gtk-doc/html/shell/ShellTpClient.html
+share/gtk-doc/html/shell/ShellTrayIcon.html
+share/gtk-doc/html/shell/ShellTrayManager.html
+share/gtk-doc/html/shell/ShellWM.html
+share/gtk-doc/html/shell/ShellWindowTracker.html
+share/gtk-doc/html/shell/annotation-glossary.html
+share/gtk-doc/html/shell/api-index-full.html
+share/gtk-doc/html/shell/ch01.html
+share/gtk-doc/html/shell/ch02.html
+share/gtk-doc/html/shell/ch03.html
+share/gtk-doc/html/shell/ch04.html
+share/gtk-doc/html/shell/ch05.html
+share/gtk-doc/html/shell/ch06.html
+share/gtk-doc/html/shell/deprecated-api-index.html
+share/gtk-doc/html/shell/gdbus-org.gnome.Shell.SearchProvider.html
+share/gtk-doc/html/shell/gdbus-org.gnome.Shell.SearchProvider2.html
+share/gtk-doc/html/shell/home.png
+share/gtk-doc/html/shell/index.html
+share/gtk-doc/html/shell/index.sgml
+share/gtk-doc/html/shell/left-insensitive.png
+share/gtk-doc/html/shell/left.png
+share/gtk-doc/html/shell/object-tree.html
+share/gtk-doc/html/shell/right-insensitive.png
+share/gtk-doc/html/shell/right.png
+share/gtk-doc/html/shell/shell-shell-action-modes.html
+share/gtk-doc/html/shell/shell-shell-polkit-authentication-agent.html
+share/gtk-doc/html/shell/shell-shell-recorder.html
+share/gtk-doc/html/shell/shell-shell-util.html
+share/gtk-doc/html/shell/shell.devhelp2
+share/gtk-doc/html/shell/style.css
+share/gtk-doc/html/shell/up-insensitive.png
+share/gtk-doc/html/shell/up.png
+share/gtk-doc/html/st/StBin.html
+share/gtk-doc/html/st/StBoxLayout.html
+share/gtk-doc/html/st/StButton.html
+share/gtk-doc/html/st/StDrawingArea.html
+share/gtk-doc/html/st/StEntry.html
+share/gtk-doc/html/st/StIcon.html
+share/gtk-doc/html/st/StLabel.html
+share/gtk-doc/html/st/StScrollView.html
+share/gtk-doc/html/st/StScrollable.html
+share/gtk-doc/html/st/StTable.html
+share/gtk-doc/html/st/StTextureCache.html
+share/gtk-doc/html/st/StThemeNodeTransition.html
+share/gtk-doc/html/st/StWidget.html
+share/gtk-doc/html/st/StWidgetAccessible.html
+share/gtk-doc/html/st/annotation-glossary.html
+share/gtk-doc/html/st/api-index-full.html
+share/gtk-doc/html/st/base.html
+share/gtk-doc/html/st/containers.html
+share/gtk-doc/html/st/deprecated-api-index.html
+share/gtk-doc/html/st/home.png
+share/gtk-doc/html/st/index.html
+share/gtk-doc/html/st/index.sgml
+share/gtk-doc/html/st/left-insensitive.png
+share/gtk-doc/html/st/left.png
+share/gtk-doc/html/st/object-tree.html
+share/gtk-doc/html/st/pt01.html
+share/gtk-doc/html/st/right-insensitive.png
+share/gtk-doc/html/st/right.png
+share/gtk-doc/html/st/st-st-theme-context.html
+share/gtk-doc/html/st/st-st-theme-node.html
+share/gtk-doc/html/st/st-st-theme.html
+share/gtk-doc/html/st/st.devhelp2
+share/gtk-doc/html/st/style.css
+share/gtk-doc/html/st/styling.html
+share/gtk-doc/html/st/up-insensitive.png
+share/gtk-doc/html/st/up.png
+share/gtk-doc/html/st/widgets.html
 share/locale/af/LC_MESSAGES/gnome-shell.mo
 share/locale/an/LC_MESSAGES/gnome-shell.mo
 share/locale/ar/LC_MESSAGES/gnome-shell.mo
@@ -176,6 +140,7 @@ share/locale/hi/LC_MESSAGES/gnome-shell.mo
 share/locale/hu/LC_MESSAGES/gnome-shell.mo
 share/locale/ia/LC_MESSAGES/gnome-shell.mo
 share/locale/id/LC_MESSAGES/gnome-shell.mo
+share/locale/is/LC_MESSAGES/gnome-shell.mo
 share/locale/it/LC_MESSAGES/gnome-shell.mo
 share/locale/ja/LC_MESSAGES/gnome-shell.mo
 share/locale/kk/LC_MESSAGES/gnome-shell.mo
@@ -194,6 +159,7 @@ share/locale/nb/LC_MESSAGES/gnome-shell.mo
 share/locale/ne/LC_MESSAGES/gnome-shell.mo
 share/locale/nl/LC_MESSAGES/gnome-shell.mo
 share/locale/nn/LC_MESSAGES/gnome-shell.mo
+share/locale/oc/LC_MESSAGES/gnome-shell.mo
 share/locale/or/LC_MESSAGES/gnome-shell.mo
 share/locale/pa/LC_MESSAGES/gnome-shell.mo
 share/locale/pl/LC_MESSAGES/gnome-shell.mo
@@ -214,6 +180,7 @@ share/locale/th/LC_MESSAGES/gnome-shell.mo
 share/locale/tr/LC_MESSAGES/gnome-shell.mo
 share/locale/ug/LC_MESSAGES/gnome-shell.mo
 share/locale/uk/LC_MESSAGES/gnome-shell.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-shell.mo
 share/locale/vi/LC_MESSAGES/gnome-shell.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-shell.mo
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 21baaceb1f6d..d1b33ec2de5d 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,9 +1,8 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/gnome-terminal/Makefile 20059 2014-11-10 21:24:07Z gusi $
 
 PORTNAME=	gnome-terminal
-PORTVERSION=	3.14.3
+PORTVERSION=	3.16.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -13,17 +12,18 @@ COMMENT=	Terminal component for the GNOME 3 Desktop
 
 BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		itstool:${PORTSDIR}/textproc/itstool \
-		appdata-tools>=0:${PORTSDIR}/devel/appdata-tools \
+		appdata-validate:${PORTSDIR}/devel/appstream-glib \
 		vala:${PORTSDIR}/lang/vala
 LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
 RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
+PORTSCOUT=	limitw:1,even
+
 USES=		cpe gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME=	dconf gnomeprefix gtk30 intlhack nautilus3 vte3
+USE_GNOME=	dconf gtk30 intlhack nautilus3 vte3
 USE_XORG=	sm ice
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-search-provider
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
@@ -31,12 +31,16 @@ CPE_VENDOR=	gnome
 
 GLIB_SCHEMAS=	org.gnome.Terminal.gschema.xml
 
-OPTIONS_SUB=			yes
-OPTIONS_DEFINE=			MIGRATION
-OPTIONS_DEFAULT=		MIGRATION
+OPTIONS_SUB=		yes
+OPTIONS_DEFINE=		MIGRATION SEARCHPROVIDER
+OPTIONS_DEFAULT=	SEARCHPROVIDER
+SEARCHPROVIDER_DESC=	Gnome-shell search provider
+SEARCHPROVIDER_CONFIGURE_ENABLE=	search-provider
+SEARCHPROVIDER_BUILD_DEPENDS=	gnome-shell:${PORTSDIR}/x11/gnome-shell
+SEARCHPROVIDER_RUN_DEPENDS=	gnome-shell:${PORTSDIR}/x11/gnome-shell
 MIGRATION_CONFIGURE_ENABLE=	migration
-MIGRATION_USE=			GNOME=gconf2
-MIGRATION_DESC=			Profile migration to gsettings (pulls in gconf2)
+MIGRATION_USE=		GNOME=gconf2
+MIGRATION_DESC=		Profile migration to gsettings (pulls in gconf2)
 
 .include <bsd.port.options.mk>
 
@@ -50,4 +54,9 @@ post-patch:
 EXTRA_PATCHES+=	${FILESDIR}/extra-src_terminal-screen.c
 .endif
 
+post-install:
+.for i in cs de el es fi fr gl hu pt_BR ru
+	@${RMDIR} ${STAGEDIR}${PREFIX}/share/help/${i}/gnome-terminal/figures
+.endfor
+
 .include <bsd.port.mk>
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 9d1a2590d890..d076e587b6ff 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-terminal-3.14.3.tar.xz) = db9b7bb8b24f657ea00bdfa0e1de1792a6a3fb0369edbf66496924d63cc37fd3
-SIZE (gnome3/gnome-terminal-3.14.3.tar.xz) = 1781712
+SHA256 (gnome3/gnome-terminal-3.16.2.tar.xz) = 9df7bab7bfd15ca9a3c60612e425baaf5c8b32ba181619f740b7129a0768f4e0
+SIZE (gnome3/gnome-terminal-3.16.2.tar.xz) = 1798620
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 2246fd26e737..9f8bed743115 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -6,6 +6,7 @@ libexec/gnome-terminal-server
 share/appdata/gnome-terminal.appdata.xml
 share/applications/gnome-terminal.desktop
 share/dbus-1/services/org.gnome.Terminal.service
+%%SEARCHPROVIDER%%share/gnome-shell/search-providers/gnome-terminal-search-provider.ini
 share/help/C/gnome-terminal/adv-keyboard-shortcuts.page
 share/help/C/gnome-terminal/app-colors.page
 share/help/C/gnome-terminal/app-cursor.page
@@ -32,7 +33,7 @@ share/help/C/gnome-terminal/pref-profile-encoding.page
 share/help/C/gnome-terminal/pref-profiles.page
 share/help/C/gnome-terminal/pref-scrolling.page
 share/help/C/gnome-terminal/pref-tab-window.page
-share/help/C/gnome-terminal/pref-theme.page
+share/help/C/gnome-terminal/pref-user-input.page
 share/help/C/gnome-terminal/pref.page
 share/help/C/gnome-terminal/prob-reset.page
 share/help/C/gnome-terminal/profile.page
@@ -64,7 +65,7 @@ share/help/cs/gnome-terminal/pref-profile-encoding.page
 share/help/cs/gnome-terminal/pref-profiles.page
 share/help/cs/gnome-terminal/pref-scrolling.page
 share/help/cs/gnome-terminal/pref-tab-window.page
-share/help/cs/gnome-terminal/pref-theme.page
+share/help/cs/gnome-terminal/pref-user-input.page
 share/help/cs/gnome-terminal/pref.page
 share/help/cs/gnome-terminal/prob-reset.page
 share/help/cs/gnome-terminal/profile.page
@@ -96,7 +97,7 @@ share/help/de/gnome-terminal/pref-profile-encoding.page
 share/help/de/gnome-terminal/pref-profiles.page
 share/help/de/gnome-terminal/pref-scrolling.page
 share/help/de/gnome-terminal/pref-tab-window.page
-share/help/de/gnome-terminal/pref-theme.page
+share/help/de/gnome-terminal/pref-user-input.page
 share/help/de/gnome-terminal/pref.page
 share/help/de/gnome-terminal/prob-reset.page
 share/help/de/gnome-terminal/profile.page
@@ -128,7 +129,7 @@ share/help/el/gnome-terminal/pref-profile-encoding.page
 share/help/el/gnome-terminal/pref-profiles.page
 share/help/el/gnome-terminal/pref-scrolling.page
 share/help/el/gnome-terminal/pref-tab-window.page
-share/help/el/gnome-terminal/pref-theme.page
+share/help/el/gnome-terminal/pref-user-input.page
 share/help/el/gnome-terminal/pref.page
 share/help/el/gnome-terminal/prob-reset.page
 share/help/el/gnome-terminal/profile.page
@@ -160,7 +161,7 @@ share/help/es/gnome-terminal/pref-profile-encoding.page
 share/help/es/gnome-terminal/pref-profiles.page
 share/help/es/gnome-terminal/pref-scrolling.page
 share/help/es/gnome-terminal/pref-tab-window.page
-share/help/es/gnome-terminal/pref-theme.page
+share/help/es/gnome-terminal/pref-user-input.page
 share/help/es/gnome-terminal/pref.page
 share/help/es/gnome-terminal/prob-reset.page
 share/help/es/gnome-terminal/profile.page
@@ -192,7 +193,7 @@ share/help/fi/gnome-terminal/pref-profile-encoding.page
 share/help/fi/gnome-terminal/pref-profiles.page
 share/help/fi/gnome-terminal/pref-scrolling.page
 share/help/fi/gnome-terminal/pref-tab-window.page
-share/help/fi/gnome-terminal/pref-theme.page
+share/help/fi/gnome-terminal/pref-user-input.page
 share/help/fi/gnome-terminal/pref.page
 share/help/fi/gnome-terminal/prob-reset.page
 share/help/fi/gnome-terminal/profile.page
@@ -224,7 +225,7 @@ share/help/fr/gnome-terminal/pref-profile-encoding.page
 share/help/fr/gnome-terminal/pref-profiles.page
 share/help/fr/gnome-terminal/pref-scrolling.page
 share/help/fr/gnome-terminal/pref-tab-window.page
-share/help/fr/gnome-terminal/pref-theme.page
+share/help/fr/gnome-terminal/pref-user-input.page
 share/help/fr/gnome-terminal/pref.page
 share/help/fr/gnome-terminal/prob-reset.page
 share/help/fr/gnome-terminal/profile.page
@@ -256,7 +257,7 @@ share/help/gl/gnome-terminal/pref-profile-encoding.page
 share/help/gl/gnome-terminal/pref-profiles.page
 share/help/gl/gnome-terminal/pref-scrolling.page
 share/help/gl/gnome-terminal/pref-tab-window.page
-share/help/gl/gnome-terminal/pref-theme.page
+share/help/gl/gnome-terminal/pref-user-input.page
 share/help/gl/gnome-terminal/pref.page
 share/help/gl/gnome-terminal/prob-reset.page
 share/help/gl/gnome-terminal/profile.page
@@ -288,7 +289,7 @@ share/help/hu/gnome-terminal/pref-profile-encoding.page
 share/help/hu/gnome-terminal/pref-profiles.page
 share/help/hu/gnome-terminal/pref-scrolling.page
 share/help/hu/gnome-terminal/pref-tab-window.page
-share/help/hu/gnome-terminal/pref-theme.page
+share/help/hu/gnome-terminal/pref-user-input.page
 share/help/hu/gnome-terminal/pref.page
 share/help/hu/gnome-terminal/prob-reset.page
 share/help/hu/gnome-terminal/profile.page
@@ -320,7 +321,7 @@ share/help/pt_BR/gnome-terminal/pref-profile-encoding.page
 share/help/pt_BR/gnome-terminal/pref-profiles.page
 share/help/pt_BR/gnome-terminal/pref-scrolling.page
 share/help/pt_BR/gnome-terminal/pref-tab-window.page
-share/help/pt_BR/gnome-terminal/pref-theme.page
+share/help/pt_BR/gnome-terminal/pref-user-input.page
 share/help/pt_BR/gnome-terminal/pref.page
 share/help/pt_BR/gnome-terminal/prob-reset.page
 share/help/pt_BR/gnome-terminal/profile.page
@@ -352,7 +353,7 @@ share/help/ru/gnome-terminal/pref-profile-encoding.page
 share/help/ru/gnome-terminal/pref-profiles.page
 share/help/ru/gnome-terminal/pref-scrolling.page
 share/help/ru/gnome-terminal/pref-tab-window.page
-share/help/ru/gnome-terminal/pref-theme.page
+share/help/ru/gnome-terminal/pref-user-input.page
 share/help/ru/gnome-terminal/pref.page
 share/help/ru/gnome-terminal/prob-reset.page
 share/help/ru/gnome-terminal/profile.page
@@ -454,13 +455,3 @@ share/locale/xh/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
-@dir share/help/cs/gnome-terminal/figures
-@dir share/help/de/gnome-terminal/figures
-@dir share/help/el/gnome-terminal/figures
-@dir share/help/es/gnome-terminal/figures
-@dir share/help/fi/gnome-terminal/figures
-@dir share/help/fr/gnome-terminal/figures
-@dir share/help/gl/gnome-terminal/figures
-@dir share/help/hu/gnome-terminal/figures
-@dir share/help/pt_BR/gnome-terminal/figures
-@dir share/help/ru/gnome-terminal/figures
diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile
index 80c1718e4ed2..9d082fbbae53 100644
--- a/x11/gnome3/Makefile
+++ b/x11/gnome3/Makefile
@@ -1,15 +1,12 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/gnome3/Makefile 19831 2014-08-26 15:33:17Z kwm $
 
 PORTNAME=	gnome3
-PORTVERSION=	3.14.2
+PORTVERSION=	3.16.2
 CATEGORIES?=	x11 gnome
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT?=	The "meta-port" for the GNOME 3 integrated X11 desktop
-
-CONFLICTS?=	gnome3-lite-[0-9]*
+COMMENT?=	"meta-port" for the GNOME 3 integrated X11 desktop
 
 RUN_DEPENDS?=	dconf-editor:${PORTSDIR}/devel/dconf-editor \
 		gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \
@@ -33,15 +30,19 @@ RUN_DEPENDS?=	dconf-editor:${PORTSDIR}/devel/dconf-editor \
 		gnome-control-center>=3.0.0:${PORTSDIR}/sysutils/gnome-control-center \
 		${LOCALBASE}/share/gnome-background-properties/gnome-backgrounds.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
 		caribou>=0:${PORTSDIR}/accessibility/caribou \
-		${LOCALBASE}/share/help/C/gnome-help/index.page:${PORTSDIR}/misc/gnome-user-docs \
 		${LOCALBASE}/share/sounds/freedesktop/index.theme:${PORTSDIR}/audio/freedesktop-sound-theme \
 		ekiga:${PORTSDIR}/net-im/ekiga
 
+CONFLICTS?=	gnome3-lite-[0-9]*
+
 USES=		metaport
 
 .if ${.CURDIR:T}!="gnome3-lite"
 OPTIONS_DEFINE+=MAPI
 MAPI_DESC=	Depend on evolution-mapi (pulls in samba4)
+
+DOCS_RUN_DEPENDS=	gnome-user-docs>=0:${PORTSDIR}/misc/gnome-user-docs
+MAPS_RUN_DEPENDS=	evolution-mapi>=3.0.0:${PORTSDIR}/mail/evolution-mapi
 .endif
 
 .include <bsd.port.options.mk>
@@ -50,6 +51,8 @@ MAPI_DESC=	Depend on evolution-mapi (pulls in samba4)
 RUN_DEPENDS+=	empathy>=3.0.0:${PORTSDIR}/net-im/empathy \
 		epiphany>=3.0.0:${PORTSDIR}/www/epiphany \
 		gucharmap>=3.0.0:${PORTSDIR}/deskutils/gucharmap \
+		gnome-characters>=3.0.0:${PORTSDIR}/deskutils/gnome-characters \
+		gnome-calendar>=3.0:${PORTSDIR}/deskutils/gnome-calendar \
 		eog>=3.0.0:${PORTSDIR}/graphics/eog \
 		eog-plugins>=3.0.0:${PORTSDIR}/graphics/eog-plugins \
 		gedit>=3.0.0:${PORTSDIR}/editors/gedit \
@@ -72,9 +75,6 @@ RUN_DEPENDS+=	empathy>=3.0.0:${PORTSDIR}/net-im/empathy \
 		cheese>=3.0.0:${PORTSDIR}/multimedia/cheese \
 		alacarte>=3.0.0:${PORTSDIR}/deskutils/alacarte
 
-.if ${PORT_OPTIONS:MMAPI}
-RUN_DEPENDS+=	evolution-mapi>=3.0.0:${PORTSDIR}/mail/evolution-mapi
-.endif
 .endif # !gnome3-lite section
 
 .include <bsd.port.mk>
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index a1ae4bc2ddc6..d1819a9eaf72 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -1,9 +1,8 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/yelp/Makefile 19967 2014-10-16 06:45:29Z gusi $
 
 PORTNAME=	yelp
-PORTVERSION=	3.14.1
+PORTVERSION=	3.16.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -19,19 +18,25 @@ BUILD_DEPENDS=	yelp-xsl>=0:${PORTSDIR}/textproc/yelp-xsl \
 LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
 RUN_DEPENDS=	yelp-xsl>=0:${PORTSDIR}/textproc/yelp-xsl
 
+PORTSCOUT=	limitw:1,even
+
 USES=		desktop-file-utils gettext gmake libtool pathfix \
 		pkgconfig tar:xz
 USE_XORG=	x11 ice
-USE_GNOME=	gnomeprefix gtk30 intlhack libxml2 libxslt
+USE_GNOME=	gtk30 intlhack libxml2 libxslt
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -fstack-protector
+LDFLAGS+=	-L${LOCALBASE}/lib
 GLIB_SCHEMAS=	org.gnome.yelp.gschema.xml
 INSTALL_TARGET=	install-strip
 
+.include <bsd.port.options.mk>
+
+.if !exists(/usr/libdata/pkgconfig/liblzma.pc)
 CONFIGURE_ENV+=	YELP_LZMA_CFLAGS="-I/usr/include" \
 		YELP_LZMA_LIBS="-L/usr/lib -llzma"
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index 422aa861e61f..38510337a750 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/yelp-3.14.1.tar.xz) = 1df24b0afa000fd7b003b43448be5227d72757e95e678a7be1832ebea685f072
-SIZE (gnome3/yelp-3.14.1.tar.xz) = 1401680
+SHA256 (gnome3/yelp-3.16.1.tar.xz) = 60810b8ddf5d2bf525a70a80a982af5053db061e0d823ed883d3671d9a5267ca
+SIZE (gnome3/yelp-3.16.1.tar.xz) = 1416752
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 50f076b09c24..1e1d82d881f7 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -21,27 +21,27 @@ lib/libyelp.so
 lib/libyelp.so.0
 lib/libyelp.so.0.0.0
 share/applications/yelp.desktop
-share/doc/libyelp/YelpDocument.html
-share/doc/libyelp/YelpSettings.html
-share/doc/libyelp/YelpSimpleDocument.html
-share/doc/libyelp/YelpUri.html
-share/doc/libyelp/YelpView.html
-share/doc/libyelp/api-index-full.html
-share/doc/libyelp/ch01.html
-share/doc/libyelp/ch01s02.html
-share/doc/libyelp/home.png
-share/doc/libyelp/index.html
-share/doc/libyelp/index.sgml
-share/doc/libyelp/left-insensitive.png
-share/doc/libyelp/left.png
-share/doc/libyelp/libyelp-yelp-error.html
-share/doc/libyelp/libyelp.devhelp2
-share/doc/libyelp/object-tree.html
-share/doc/libyelp/right-insensitive.png
-share/doc/libyelp/right.png
-share/doc/libyelp/style.css
-share/doc/libyelp/up-insensitive.png
-share/doc/libyelp/up.png
+share/gtk-doc/html/libyelp/YelpDocument.html
+share/gtk-doc/html/libyelp/YelpSettings.html
+share/gtk-doc/html/libyelp/YelpSimpleDocument.html
+share/gtk-doc/html/libyelp/YelpUri.html
+share/gtk-doc/html/libyelp/YelpView.html
+share/gtk-doc/html/libyelp/api-index-full.html
+share/gtk-doc/html/libyelp/ch01.html
+share/gtk-doc/html/libyelp/ch01s02.html
+share/gtk-doc/html/libyelp/home.png
+share/gtk-doc/html/libyelp/index.html
+share/gtk-doc/html/libyelp/index.sgml
+share/gtk-doc/html/libyelp/left-insensitive.png
+share/gtk-doc/html/libyelp/left.png
+share/gtk-doc/html/libyelp/libyelp-yelp-error.html
+share/gtk-doc/html/libyelp/libyelp.devhelp2
+share/gtk-doc/html/libyelp/object-tree.html
+share/gtk-doc/html/libyelp/right-insensitive.png
+share/gtk-doc/html/libyelp/right.png
+share/gtk-doc/html/libyelp/style.css
+share/gtk-doc/html/libyelp/up-insensitive.png
+share/gtk-doc/html/libyelp/up.png
 share/locale/af/LC_MESSAGES/yelp.mo
 share/locale/am/LC_MESSAGES/yelp.mo
 share/locale/ar/LC_MESSAGES/yelp.mo
@@ -78,7 +78,6 @@ share/locale/ga/LC_MESSAGES/yelp.mo
 share/locale/gd/LC_MESSAGES/yelp.mo
 share/locale/gl/LC_MESSAGES/yelp.mo
 share/locale/gu/LC_MESSAGES/yelp.mo
-share/locale/km/LC_MESSAGES/yelp.mo
 share/locale/he/LC_MESSAGES/yelp.mo
 share/locale/hi/LC_MESSAGES/yelp.mo
 share/locale/hr/LC_MESSAGES/yelp.mo
@@ -89,6 +88,7 @@ share/locale/it/LC_MESSAGES/yelp.mo
 share/locale/ja/LC_MESSAGES/yelp.mo
 share/locale/ka/LC_MESSAGES/yelp.mo
 share/locale/kk/LC_MESSAGES/yelp.mo
+share/locale/km/LC_MESSAGES/yelp.mo
 share/locale/kn/LC_MESSAGES/yelp.mo
 share/locale/ko/LC_MESSAGES/yelp.mo
 share/locale/ks/LC_MESSAGES/yelp.mo
@@ -144,6 +144,7 @@ share/locale/zh_CN/LC_MESSAGES/yelp.mo
 share/locale/zh_HK/LC_MESSAGES/yelp.mo
 share/locale/zh_TW/LC_MESSAGES/yelp.mo
 share/locale/zu/LC_MESSAGES/yelp.mo
+%%DATADIR%%-xsl/xslt/common/domains/yelp.xml
 %%DATADIR%%/dtd/catalog
 %%DATADIR%%/dtd/docbookx.dtd
 %%DATADIR%%/dtd/isoamsa.ent
@@ -170,8 +171,6 @@ share/locale/zu/LC_MESSAGES/yelp.mo
 %%DATADIR%%/icons/hicolor/16x16/status/yelp-page-tip.png
 %%DATADIR%%/icons/hicolor/16x16/status/yelp-page-ui.png
 %%DATADIR%%/icons/hicolor/16x16/status/yelp-page-video.png
-%%DATADIR%%/icons/hicolor/scalable/actions/yelp-bookmark-add-symbolic.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/yelp-bookmark-remove-symbolic.svg
 %%DATADIR%%/icons/hicolor/scalable/status/yelp-page-problem-symbolic.svg
 %%DATADIR%%/icons/hicolor/scalable/status/yelp-page-search-symbolic.svg
 %%DATADIR%%/icons/hicolor/scalable/status/yelp-page-symbolic.svg
@@ -182,11 +181,11 @@ share/locale/zu/LC_MESSAGES/yelp.mo
 %%DATADIR%%/mathjax/MathJax.js
 %%DATADIR%%/mathjax/config/MMLorHTML.js
 %%DATADIR%%/mathjax/config/yelp.js
+%%DATADIR%%/mathjax/extensions/HTML-CSS/handle-floats.js
 %%DATADIR%%/mathjax/extensions/MathEvents.js
 %%DATADIR%%/mathjax/extensions/MathMenu.js
 %%DATADIR%%/mathjax/extensions/MathZoom.js
 %%DATADIR%%/mathjax/extensions/mml2jax.js
-%%DATADIR%%/mathjax/extensions/HTML-CSS/handle-floats.js
 %%DATADIR%%/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_AMS-Regular.woff
 %%DATADIR%%/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Bold.woff
 %%DATADIR%%/mathjax/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Regular.woff
@@ -229,7 +228,6 @@ share/locale/zu/LC_MESSAGES/yelp.mo
 %%DATADIR%%/mathjax/jax/element/mml/optable/SupplementalArrowsA.js
 %%DATADIR%%/mathjax/jax/element/mml/optable/SupplementalArrowsB.js
 %%DATADIR%%/mathjax/jax/input/MathML/config.js
-%%DATADIR%%/mathjax/jax/input/MathML/jax.js
 %%DATADIR%%/mathjax/jax/input/MathML/entities/a.js
 %%DATADIR%%/mathjax/jax/input/MathML/entities/b.js
 %%DATADIR%%/mathjax/jax/input/MathML/entities/c.js
@@ -259,8 +257,7 @@ share/locale/zu/LC_MESSAGES/yelp.mo
 %%DATADIR%%/mathjax/jax/input/MathML/entities/x.js
 %%DATADIR%%/mathjax/jax/input/MathML/entities/y.js
 %%DATADIR%%/mathjax/jax/input/MathML/entities/z.js
-%%DATADIR%%/mathjax/jax/output/HTML-CSS/config.js
-%%DATADIR%%/mathjax/jax/output/HTML-CSS/jax.js
+%%DATADIR%%/mathjax/jax/input/MathML/jax.js
 %%DATADIR%%/mathjax/jax/output/HTML-CSS/autoload/Makefile.am
 %%DATADIR%%/mathjax/jax/output/HTML-CSS/autoload/annotation-xml.js
 %%DATADIR%%/mathjax/jax/output/HTML-CSS/autoload/maction.js
@@ -270,8 +267,7 @@ share/locale/zu/LC_MESSAGES/yelp.mo
 %%DATADIR%%/mathjax/jax/output/HTML-CSS/autoload/ms.js
 %%DATADIR%%/mathjax/jax/output/HTML-CSS/autoload/mtable.js
 %%DATADIR%%/mathjax/jax/output/HTML-CSS/autoload/multiline.js
-%%DATADIR%%/mathjax/jax/output/HTML-CSS/fonts/TeX/fontdata-extra.js
-%%DATADIR%%/mathjax/jax/output/HTML-CSS/fonts/TeX/fontdata.js
+%%DATADIR%%/mathjax/jax/output/HTML-CSS/config.js
 %%DATADIR%%/mathjax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Arrows.js
 %%DATADIR%%/mathjax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/BBBold.js
 %%DATADIR%%/mathjax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/BoxDrawing.js
@@ -358,6 +354,9 @@ share/locale/zu/LC_MESSAGES/yelp.mo
 %%DATADIR%%/mathjax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/CombDiacritMarks.js
 %%DATADIR%%/mathjax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Main.js
 %%DATADIR%%/mathjax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Other.js
+%%DATADIR%%/mathjax/jax/output/HTML-CSS/fonts/TeX/fontdata-extra.js
+%%DATADIR%%/mathjax/jax/output/HTML-CSS/fonts/TeX/fontdata.js
+%%DATADIR%%/mathjax/jax/output/HTML-CSS/jax.js
 %%DATADIR%%/mathjax/jax/output/NativeMML/config.js
 %%DATADIR%%/mathjax/jax/output/NativeMML/jax.js
 %%DATADIR%%/xslt/db2html.xsl
@@ -365,4 +364,3 @@ share/locale/zu/LC_MESSAGES/yelp.mo
 %%DATADIR%%/xslt/mal2html.xsl
 %%DATADIR%%/xslt/man2html.xsl
 %%DATADIR%%/xslt/yelp-common.xsl
-share/yelp-xsl/xslt/common/domains/yelp.xml
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 97da62f75198..14c32937de9b 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports/trunk/x11/zenity/Makefile 19968 2014-10-16 07:29:56Z gusi $
 
 PORTNAME=	zenity
-PORTVERSION=	3.14.0
+PORTVERSION=	3.16.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 190ffd3408dc..a243c1060bc8 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/zenity-3.14.0.tar.xz) = 6b57ec6c456af17714dc366e63dabb8bbe0577878b61907805f0186d4d2b892f
-SIZE (gnome3/zenity-3.14.0.tar.xz) = 3686756
+SHA256 (gnome3/zenity-3.16.3.tar.xz) = 7fe28016fbc5b1fc6d8f730d8eabd5ae2d8b7d67c8bfa0270811ff0c2bfb1eba
+SIZE (gnome3/zenity-3.16.3.tar.xz) = 3878596