The FreeBSD GNOME team proudly presents GNOME 3.18 for FreeBSD.

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

This update doesn't contain the glib/gtk c++ bindings which will
be done in a another update due to the requirement on c++11 and the
amount of fallout this probably will give.

GDM is still at version 3.16 due to some issues.

Bump mate-themes to use the gtk 3.18 version of the themes.

Thanks to Antoine Brodin for running the exp-runs.

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

PR:	207006

25 files changed, 99 insertions, 64 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 8ca15b581389..658c28ba8c91 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-desktop
-PORTVERSION=	3.16.2
+PORTVERSION=	3.18.2
 PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
@@ -13,9 +13,7 @@ COMMENT=	Additional UI API for GNOME 3
 
 USES=		tar:xz
 
-.if defined(REFERENCE_PORT)
-PORTSCOUT=	ignore:1
-.else
+.if !defined(REFERENCE_PORT)
 PORTSCOUT=	limitw:1,even
 
 BUILD_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
@@ -28,7 +26,7 @@ RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
 		xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
 		libxkbfile>=0:${PORTSDIR}/x11/libxkbfile
 
-USES+=		bison gettext gmake libtool pathfix pkgconfig python:3
+USES+=		bison gettext gmake gnome libtool pathfix pkgconfig python:3
 USE_GNOME=	gtk30 intlhack introspection:build referencehack
 USE_XORG=	x11 xrandr xext
 USE_LDCONFIG=	yes
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index d43ee077a089..fb2cff555234 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-desktop-3.16.2.tar.xz) = 3a8f196b46eb9dbd3ba2afb8fb5fef6a8825539d449a02181311242e22227bd0
-SIZE (gnome3/gnome-desktop-3.16.2.tar.xz) = 1078328
+SHA256 (gnome3/gnome-desktop-3.18.2.tar.xz) = ddd46d022de137543a71f50c7392b32f9b98d5d3f2b53040b35f5802de2e7b56
+SIZE (gnome3/gnome-desktop-3.18.2.tar.xz) = 1091568
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 011b6f956249..12df042647f3 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -11,8 +11,8 @@ include/gnome-desktop-3.0/libgnome-desktop/gnome-wall-clock.h
 include/gnome-desktop-3.0/libgnome-desktop/gnome-xkb-info.h
 lib/girepository-1.0/GnomeDesktop-3.0.typelib
 lib/libgnome-desktop-3.so
-lib/libgnome-desktop-3.so.10
-lib/libgnome-desktop-3.so.10.0.0
+lib/libgnome-desktop-3.so.12
+lib/libgnome-desktop-3.so.12.0.0
 libdata/pkgconfig/gnome-desktop-3.0.pc
 libexec/gnome-rr-debug
 share/gir-1.0/GnomeDesktop-3.0.gir
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 6e911d7160ad..ca9d01ad53ce 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-session
-PORTVERSION=	3.16.0
+PORTVERSION=	3.18.1.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consoleki
 
 PORTSCOUT=	limitw:1,even
 
-USES=		execinfo gettext gmake pathfix pkgconfig tar:xz
+USES=		execinfo gettext gmake gnome pathfix pkgconfig tar:xz
 USE_GNOME=	gnomedesktop3 gtk30 intlhack intlhack libxslt:build
 USE_XORG=	ice sm xau xext xtst xrender xtrans xcomposite
 USE_GL=		gl
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 36145f8a61ee..480f61145a78 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-session-3.16.0.tar.xz) = 9b546d455edd9d681070a61c98a4164557f89ebbd66367a2aa528d807dfea99d
-SIZE (gnome3/gnome-session-3.16.0.tar.xz) = 764808
+SHA256 (gnome3/gnome-session-3.18.1.2.tar.xz) = b37d823d57ff2e3057401a426279954699cfe1e44e59a4cbdd941687ff928a45
+SIZE (gnome3/gnome-session-3.18.1.2.tar.xz) = 758552
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 9f2e202a9203..67125a764943 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -1,6 +1,7 @@
 bin/gnome-session
 bin/gnome-session-inhibit
 bin/gnome-session-quit
+libexec/gnome-session-binary
 libexec/gnome-session-check-accelerated
 libexec/gnome-session-check-accelerated-helper
 libexec/gnome-session-failed
@@ -19,6 +20,7 @@ share/icons/hicolor/24x24/apps/session-properties.png
 share/icons/hicolor/32x32/apps/session-properties.png
 share/icons/hicolor/48x48/apps/session-properties.png
 share/icons/hicolor/scalable/apps/session-properties.svg
+share/icons/hicolor/symbolic/apps/session-properties-symbolic.svg
 share/locale/af/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/an/LC_MESSAGES/gnome-session-3.0.mo
 share/locale/am/LC_MESSAGES/gnome-session-3.0.mo
diff --git a/x11/gnome-shell-extensions/Makefile b/x11/gnome-shell-extensions/Makefile
index 8adeb70c8828..24d48e2572d5 100644
--- a/x11/gnome-shell-extensions/Makefile
+++ b/x11/gnome-shell-extensions/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-shell-extensions
-PORTVERSION=	3.16.2
+PORTVERSION=	3.18.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -15,7 +15,7 @@ RUN_DEPENDS=	gnome-shell>=3.12.0:${PORTSDIR}/x11/gnome-shell
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake pathfix pkgconfig tar:xz
+USES=		gettext gmake gnome pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 gnomedesktop3 intlhack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/gnome-shell-extensions/distinfo b/x11/gnome-shell-extensions/distinfo
index b9011181e2a2..1cea848fac35 100644
--- a/x11/gnome-shell-extensions/distinfo
+++ b/x11/gnome-shell-extensions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-shell-extensions-3.16.2.tar.xz) = 0dca1677ec9401dd7c1a7261164b7f4cc94d52207637cf9e8e350bb9f6d0e9bf
-SIZE (gnome3/gnome-shell-extensions-3.16.2.tar.xz) = 231292
+SHA256 (gnome3/gnome-shell-extensions-3.18.3.tar.xz) = 2bb3726decf14a31ae35755c049d8f03425231857c42ed27f01854af755ec035
+SIZE (gnome3/gnome-shell-extensions-3.18.3.tar.xz) = 233480
diff --git a/x11/gnome-shell-extensions/pkg-plist b/x11/gnome-shell-extensions/pkg-plist
index c8ed50850d3c..88fa907a6039 100644
--- a/x11/gnome-shell-extensions/pkg-plist
+++ b/x11/gnome-shell-extensions/pkg-plist
@@ -59,6 +59,7 @@ share/gnome-shell/extensions/workspace-indicator@gnome-shell-extensions.gcampax.
 share/gnome-shell/extensions/workspace-indicator@gnome-shell-extensions.gcampax.github.com/prefs.js
 share/gnome-shell/extensions/workspace-indicator@gnome-shell-extensions.gcampax.github.com/stylesheet.css
 share/gnome-shell/modes/classic.json
+share/gnome-shell/theme/calendar-today.svg
 share/gnome-shell/theme/classic-process-working.svg
 share/gnome-shell/theme/classic-toggle-off-intl.svg
 share/gnome-shell/theme/classic-toggle-off-us.svg
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 844dda8c4f7f..7fc16db2bff3 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-shell
-PORTVERSION=	3.16.4
+PORTVERSION=	3.18.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -32,8 +32,8 @@ RUN_DEPENDS=	py*-dbus>=0:${PORTSDIR}/devel/py-dbus \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		compiler:c11 cpe gettext gmake libtool pathfix pkgconfig \
-		tar:xz webplugin:native
+USES=		compiler:c11 cpe gettext gmake gnome libtool pathfix \
+		pkgconfig tar:xz webplugin:native
 USE_GNOME=	evolutiondataserver3 gnomedesktop3 gtk30 intlhack \
 		introspection
 USE_XORG=	x11 xfixes sm
diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo
index 78f6144eb4ca..9968fa75be90 100644
--- a/x11/gnome-shell/distinfo
+++ b/x11/gnome-shell/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-shell-3.16.4.tar.xz) = 37bc440a2c5bed6cbd095ddb95a488cb67ef0e1d17153bc87635ce4120d917a9
-SIZE (gnome3/gnome-shell-3.16.4.tar.xz) = 1579292
+SHA256 (gnome3/gnome-shell-3.18.3.tar.xz) = 8517baf8606f970ebf38222411eb7563cab2ae5efbfb088954ce23705b67519b
+SIZE (gnome3/gnome-shell-3.18.3.tar.xz) = 1590348
diff --git a/x11/gnome-shell/files/patch-src_data-to-c.pl b/x11/gnome-shell/files/patch-src_data-to-c.pl
deleted file mode 100644
index 79542797db5b..000000000000
--- a/x11/gnome-shell/files/patch-src_data-to-c.pl
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/data-to-c.pl.orig	2014-03-22 16:28:35.000000000 +0100
-+++ src/data-to-c.pl	2014-03-22 16:28:44.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/bin/env perl
- 
- # Copyright © 2011 Red Hat, Inc
- #
diff --git a/x11/gnome-shell/pkg-message b/x11/gnome-shell/pkg-message
index 902ac7d70cbe..a169c16947cd 100644
--- a/x11/gnome-shell/pkg-message
+++ b/x11/gnome-shell/pkg-message
@@ -6,7 +6,12 @@ driver the user needs to have read/write permissions on
 /dev/dri/cardN (usually N=0). If gnome-shell is launched from gdm, the
 gdm user also needs this access.
 
-Access can be granted by adding the user(s) to the wheel group or using
-a devfs.rules(5) to change the mode of the /dev/dri/card0 on creation. 
+Access can be granted by adding the user(s) to the video group.
+
+Additional for FreeBSD versions before FreeBSD 11.0-CURRENT revision
+286524. And any FreeBSD 10.x version and FreeBSD 9.3-Release.
+
+By using a devfs.rules(5) to change the mode of the /dev/dri/card0 on creation.
+
+	add path 'dri/*' mode 0666 group video
 
-	add path 'dri/*' mode 0666 group operator
diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist
index 619b711f709e..406c994aa053 100644
--- a/x11/gnome-shell/pkg-plist
+++ b/x11/gnome-shell/pkg-plist
@@ -29,20 +29,9 @@ share/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
 share/gnome-control-center/keybindings/50-gnome-shell-system.xml
 %%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
@@ -62,9 +51,20 @@ 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-app-system.html
+share/gtk-doc/html/shell/shell-shell-app-usage.html
+share/gtk-doc/html/shell/shell-shell-app.html
+share/gtk-doc/html/shell/shell-shell-generic-container.html
+share/gtk-doc/html/shell/shell-shell-global.html
+share/gtk-doc/html/shell/shell-shell-mount-operation.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-stack.html
+share/gtk-doc/html/shell/shell-shell-tray-icon.html
+share/gtk-doc/html/shell/shell-shell-tray-manager.html
 share/gtk-doc/html/shell/shell-shell-util.html
+share/gtk-doc/html/shell/shell-shell-window-tracker.html
+share/gtk-doc/html/shell/shell-shell-wm.html
 share/gtk-doc/html/shell/shell.devhelp2
 share/gtk-doc/html/shell/style.css
 share/gtk-doc/html/shell/up-insensitive.png
@@ -78,7 +78,6 @@ 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
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 2eacf874281d..4c23cdbb806a 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-terminal
-PORTVERSION=	3.16.2
+PORTVERSION=	3.18.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -20,7 +20,7 @@ RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-sc
 
 PORTSCOUT=	limitw:1,even
 
-USES=		cpe gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		cpe gettext gmake gnome libtool pathfix pkgconfig tar:xz
 USE_GNOME=	dconf gtk30 intlhack nautilus3 vte3
 USE_XORG=	sm ice
 GNU_CONFIGURE=	yes
@@ -55,7 +55,7 @@ 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
+.for i in ca cs de el es fi fr gl hu pt_BR ru
 	@${RMDIR} ${STAGEDIR}${PREFIX}/share/help/${i}/gnome-terminal/figures
 .endfor
 
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index d076e587b6ff..1daaaaf04cf7 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-terminal-3.16.2.tar.xz) = 9df7bab7bfd15ca9a3c60612e425baaf5c8b32ba181619f740b7129a0768f4e0
-SIZE (gnome3/gnome-terminal-3.16.2.tar.xz) = 1798620
+SHA256 (gnome3/gnome-terminal-3.18.1.tar.xz) = 6eecc81f38c8019d9f49b8950cd814da88d84a8d98c9da98a57be06a1b9f4119
+SIZE (gnome3/gnome-terminal-3.18.1.tar.xz) = 1830748
diff --git a/x11/gnome-terminal/pkg-descr b/x11/gnome-terminal/pkg-descr
index 1193c30f736a..39b967d38710 100644
--- a/x11/gnome-terminal/pkg-descr
+++ b/x11/gnome-terminal/pkg-descr
@@ -1,3 +1,3 @@
-Default terminal emulator for the GNOME 2.0 Desktop.
+Default terminal emulator for the GNOME 3 Desktop.
 
 WWW: http://www.gnome.org/
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 9f8bed743115..b6e5917b0e5c 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -41,6 +41,38 @@ share/help/C/gnome-terminal/txt-copy-paste.page
 share/help/C/gnome-terminal/txt-links.page
 share/help/C/gnome-terminal/txt-search.page
 share/help/C/gnome-terminal/txt-select-text.page
+share/help/ca/gnome-terminal/adv-keyboard-shortcuts.page
+share/help/ca/gnome-terminal/app-colors.page
+share/help/ca/gnome-terminal/app-cursor.page
+share/help/ca/gnome-terminal/app-fonts.page
+share/help/ca/gnome-terminal/app-fullscreen.page
+share/help/ca/gnome-terminal/app-terminal-sizes.page
+share/help/ca/gnome-terminal/app-zoom.page
+share/help/ca/gnome-terminal/gs-execute-commands.page
+share/help/ca/gnome-terminal/gs-tabs.page
+share/help/ca/gnome-terminal/index.page
+share/help/ca/gnome-terminal/introduction.page
+share/help/ca/gnome-terminal/legal.xml
+share/help/ca/gnome-terminal/overview.page
+share/help/ca/gnome-terminal/pref-bell.page
+share/help/ca/gnome-terminal/pref-custom-command.page
+share/help/ca/gnome-terminal/pref-custom-exit.page
+share/help/ca/gnome-terminal/pref-encoding.page
+share/help/ca/gnome-terminal/pref-keyboard-access.page
+share/help/ca/gnome-terminal/pref-menubar.page
+share/help/ca/gnome-terminal/pref-profile-char-width.page
+share/help/ca/gnome-terminal/pref-profile-encoding.page
+share/help/ca/gnome-terminal/pref-profiles.page
+share/help/ca/gnome-terminal/pref-scrolling.page
+share/help/ca/gnome-terminal/pref-tab-window.page
+share/help/ca/gnome-terminal/pref-user-input.page
+share/help/ca/gnome-terminal/pref.page
+share/help/ca/gnome-terminal/prob-reset.page
+share/help/ca/gnome-terminal/profile.page
+share/help/ca/gnome-terminal/txt-copy-paste.page
+share/help/ca/gnome-terminal/txt-links.page
+share/help/ca/gnome-terminal/txt-search.page
+share/help/ca/gnome-terminal/txt-select-text.page
 share/help/cs/gnome-terminal/adv-keyboard-shortcuts.page
 share/help/cs/gnome-terminal/app-colors.page
 share/help/cs/gnome-terminal/app-cursor.page
diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile
index 8abbb13efa3f..150713c7749f 100644
--- a/x11/gnome3/Makefile
+++ b/x11/gnome3/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnome3
-PORTVERSION=	3.16.2
+PORTVERSION=	3.18.0
 CATEGORIES?=	x11 gnome
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -71,9 +71,9 @@ RUN_DEPENDS+=	empathy>=3.0.0:${PORTSDIR}/net-im/empathy \
 		totem>=3.0.0:${PORTSDIR}/multimedia/totem \
 		gconf-editor>=3.0.0:${PORTSDIR}/sysutils/gconf-editor \
 		gdm>=3.0.0:${PORTSDIR}/x11/gdm \
+		gnome-color-manager>=0:${PORTSDIR}/graphics/gnome-color-manager \
 		evolution>=3.0.0:${PORTSDIR}/mail/evolution \
-		cheese>=3.0.0:${PORTSDIR}/multimedia/cheese \
-		alacarte>=3.0.0:${PORTSDIR}/deskutils/alacarte
+		cheese>=3.0.0:${PORTSDIR}/multimedia/cheese
 
 .endif # !gnome3-lite section
 
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index d1819a9eaf72..2510a793834f 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	yelp
-PORTVERSION=	3.16.1
+PORTVERSION=	3.18.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -15,12 +15,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	yelp-xsl>=0:${PORTSDIR}/textproc/yelp-xsl \
 		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+LIB_DEPENDS=	libwebkit2gtk-4.0.so:${PORTSDIR}/www/webkit2-gtk3
 RUN_DEPENDS=	yelp-xsl>=0:${PORTSDIR}/textproc/yelp-xsl
 
 PORTSCOUT=	limitw:1,even
 
-USES=		desktop-file-utils gettext gmake libtool pathfix \
+USES=		desktop-file-utils gettext gmake gnome libtool pathfix \
 		pkgconfig tar:xz
 USE_XORG=	x11 ice
 USE_GNOME=	gtk30 intlhack libxml2 libxslt
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index 38510337a750..25b201115059 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/yelp-3.16.1.tar.xz) = 60810b8ddf5d2bf525a70a80a982af5053db061e0d823ed883d3671d9a5267ca
-SIZE (gnome3/yelp-3.16.1.tar.xz) = 1416752
+SHA256 (gnome3/yelp-3.18.1.tar.xz) = ba3a4eb4717c0ecf4a2e40eff0963fcd12c700c4fb80b83ecaad8b7032256880
+SIZE (gnome3/yelp-3.18.1.tar.xz) = 1386044
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 1e1d82d881f7..c6579d1939f3 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -1,6 +1,7 @@
 bin/gnome-help
 bin/yelp
 include/libyelp/yelp-bookmarks.h
+include/libyelp/yelp-common-types.h
 include/libyelp/yelp-docbook-document.h
 include/libyelp/yelp-document.h
 include/libyelp/yelp-help-list.h
@@ -14,12 +15,17 @@ include/libyelp/yelp-sqlite-storage.h
 include/libyelp/yelp-storage.h
 include/libyelp/yelp-transform.h
 include/libyelp/yelp-types.h
+include/libyelp/yelp-uri-builder.h
 include/libyelp/yelp-uri.h
 include/libyelp/yelp-view.h
 lib/libyelp.a
 lib/libyelp.so
 lib/libyelp.so.0
 lib/libyelp.so.0.0.0
+lib/yelp/libyelpcommon.a
+lib/yelp/libyelpcommon.so
+lib/yelp/web-extensions/libyelpwebextension.a
+lib/yelp/web-extensions/libyelpwebextension.so
 share/applications/yelp.desktop
 share/gtk-doc/html/libyelp/YelpDocument.html
 share/gtk-doc/html/libyelp/YelpSettings.html
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 14c32937de9b..d1266e1d5f23 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,9 +1,8 @@
 # Created by: Franz Klammer <klammer@webonaut.com>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/zenity/Makefile 19968 2014-10-16 07:29:56Z gusi $
 
 PORTNAME=	zenity
-PORTVERSION=	3.16.3
+PORTVERSION=	3.18.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -17,7 +16,7 @@ BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 
 CONFLICTS=	gtkada-1.2.* zenity-2.*
 
-USES=		gettext gmake pathfix pkgconfig perl5 tar:xz
+USES=		gettext gmake gnome pathfix pkgconfig perl5 tar:xz
 USE_GNOME=	gnomeprefix gtk30 intlhack
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index a243c1060bc8..c11941ac22b2 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/zenity-3.16.3.tar.xz) = 7fe28016fbc5b1fc6d8f730d8eabd5ae2d8b7d67c8bfa0270811ff0c2bfb1eba
-SIZE (gnome3/zenity-3.16.3.tar.xz) = 3878596
+SHA256 (gnome3/zenity-3.18.0.tar.xz) = 0efafea95a830f3bf6eca805ff4a8008df760a6ad3e81181b9473dcf721c3a69
+SIZE (gnome3/zenity-3.18.0.tar.xz) = 3876564
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 97f81b3870a4..ebd99514e5cb 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -813,6 +813,7 @@ share/locale/is/LC_MESSAGES/zenity.mo
 share/locale/it/LC_MESSAGES/zenity.mo
 share/locale/ja/LC_MESSAGES/zenity.mo
 share/locale/ka/LC_MESSAGES/zenity.mo
+share/locale/kk/LC_MESSAGES/zenity.mo
 share/locale/kn/LC_MESSAGES/zenity.mo
 share/locale/ko/LC_MESSAGES/zenity.mo
 share/locale/ku/LC_MESSAGES/zenity.mo