Update the gtk+ stack [1]

Update gdk-pixbuf2 to 2.36.6
Update gtk30 to 3.22.12
Update cairomm to 1.12.2
Update gtkmm30 to 3.22.0

Update the following themes to be compatible with the new gtk+ version:
Update adwaita-icon-theme to 3.22.0
Update gnome-themes-standard to 3.22.3
Update gtk-E17-theme to 3.22.1 [2]
Update gtk-arc-themes to 20170302 [3]
Update mate-themes to 3.22.10

Bump xfce4-notifyd due to new gtk30 version, requested by olivierd@.
Mark LordsaWar broken, it doesn't build with cairomm 1.12.

PR:		210272 [1], 210696 [2], 218667 [3]
Submitted by:	Matthew Rezny [2]
Obtained from:	Unless otherwise stated obtained from GNOME devel repo
Exp-run by:	antoine@ [1]

11 files changed, 115 insertions, 61 deletions

diff --git a/x11-toolkits/gtk30-reference/Makefile b/x11-toolkits/gtk30-reference/Makefile
index b3fe5573a0f0..d8c8a63ce866 100644
--- a/x11-toolkits/gtk30-reference/Makefile
+++ b/x11-toolkits/gtk30-reference/Makefile
@@ -1,7 +1,7 @@
 # Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 
 BOOKS=		gdk gtk libgail-util
 
diff --git a/x11-toolkits/gtk30-reference/pkg-plist b/x11-toolkits/gtk30-reference/pkg-plist
index 3aaa44a4bfb0..bd4499c83266 100644
--- a/x11-toolkits/gtk30-reference/pkg-plist
+++ b/x11-toolkits/gtk30-reference/pkg-plist
@@ -1,25 +1,18 @@
 share/doc/gdk3/GdkDevice.html
 share/doc/gdk3/GdkDeviceManager.html
+share/doc/gdk3/GdkDevicePad.html
 share/doc/gdk3/GdkDisplay.html
 share/doc/gdk3/GdkDisplayManager.html
+share/doc/gdk3/GdkDrawingContext.html
 share/doc/gdk3/GdkFrameClock.html
 share/doc/gdk3/GdkGLContext.html
+share/doc/gdk3/GdkMonitor.html
 share/doc/gdk3/GdkScreen.html
+share/doc/gdk3/GdkSeat.html
 share/doc/gdk3/X_cursor.png
 share/doc/gdk3/alias_cursor.png
 share/doc/gdk3/all_scroll_cursor.png
 share/doc/gdk3/annotation-glossary.html
-share/doc/gdk3/api-index-3-0.html
-share/doc/gdk3/api-index-3-10.html
-share/doc/gdk3/api-index-3-12.html
-share/doc/gdk3/api-index-3-14.html
-share/doc/gdk3/api-index-3-16.html
-share/doc/gdk3/api-index-3-18.html
-share/doc/gdk3/api-index-3-2.html
-share/doc/gdk3/api-index-3-4.html
-share/doc/gdk3/api-index-3-6.html
-share/doc/gdk3/api-index-3-8.html
-share/doc/gdk3/api-index-deprecated.html
 share/doc/gdk3/api-index-full.html
 share/doc/gdk3/arrow.png
 share/doc/gdk3/based_arrow_down.png
@@ -37,6 +30,7 @@ share/doc/gdk3/circle.png
 share/doc/gdk3/clock.png
 share/doc/gdk3/coffee_mug.png
 share/doc/gdk3/col_resize_cursor.png
+share/doc/gdk3/context_menu_cursor.png
 share/doc/gdk3/copy_cursor.png
 share/doc/gdk3/cross.png
 share/doc/gdk3/cross_reverse.png
@@ -297,6 +291,7 @@ share/doc/gdk3/zoom_out_cursor.png
 %%PORTDOCS%%%%DOCSDIR%%3/GtkNumerableIcon.html
 %%PORTDOCS%%%%DOCSDIR%%3/GtkOffscreenWindow.html
 %%PORTDOCS%%%%DOCSDIR%%3/GtkOverlay.html
+%%PORTDOCS%%%%DOCSDIR%%3/GtkPadController.html
 %%PORTDOCS%%%%DOCSDIR%%3/GtkPageSetup.html
 %%PORTDOCS%%%%DOCSDIR%%3/GtkPageSetupUnixDialog.html
 %%PORTDOCS%%%%DOCSDIR%%3/GtkPaned.html
@@ -335,6 +330,10 @@ share/doc/gdk3/zoom_out_cursor.png
 %%PORTDOCS%%%%DOCSDIR%%3/GtkSeparatorMenuItem.html
 %%PORTDOCS%%%%DOCSDIR%%3/GtkSeparatorToolItem.html
 %%PORTDOCS%%%%DOCSDIR%%3/GtkSettings.html
+%%PORTDOCS%%%%DOCSDIR%%3/GtkShortcutsGroup.html
+%%PORTDOCS%%%%DOCSDIR%%3/GtkShortcutsSection.html
+%%PORTDOCS%%%%DOCSDIR%%3/GtkShortcutsShortcut.html
+%%PORTDOCS%%%%DOCSDIR%%3/GtkShortcutsWindow.html
 %%PORTDOCS%%%%DOCSDIR%%3/GtkSizeGroup.html
 %%PORTDOCS%%%%DOCSDIR%%3/GtkSocket.html
 %%PORTDOCS%%%%DOCSDIR%%3/GtkSpinButton.html
@@ -397,6 +396,7 @@ share/doc/gdk3/zoom_out_cursor.png
 %%PORTDOCS%%%%DOCSDIR%%3/RecentDocuments.html
 %%PORTDOCS%%%%DOCSDIR%%3/ScrollingWidgets.html
 %%PORTDOCS%%%%DOCSDIR%%3/SelectorWidgets.html
+%%PORTDOCS%%%%DOCSDIR%%3/ShortcutsOverview.html
 %%PORTDOCS%%%%DOCSDIR%%3/TextWidget.html
 %%PORTDOCS%%%%DOCSDIR%%3/TextWidgetObjects.html
 %%PORTDOCS%%%%DOCSDIR%%3/TreeWidget.html
@@ -406,17 +406,6 @@ share/doc/gdk3/zoom_out_cursor.png
 %%PORTDOCS%%%%DOCSDIR%%3/accel-label.png
 %%PORTDOCS%%%%DOCSDIR%%3/action-bar.png
 %%PORTDOCS%%%%DOCSDIR%%3/annotation-glossary.html
-%%PORTDOCS%%%%DOCSDIR%%3/api-index-3-0.html
-%%PORTDOCS%%%%DOCSDIR%%3/api-index-3-10.html
-%%PORTDOCS%%%%DOCSDIR%%3/api-index-3-12.html
-%%PORTDOCS%%%%DOCSDIR%%3/api-index-3-14.html
-%%PORTDOCS%%%%DOCSDIR%%3/api-index-3-16.html
-%%PORTDOCS%%%%DOCSDIR%%3/api-index-3-18.html
-%%PORTDOCS%%%%DOCSDIR%%3/api-index-3-2.html
-%%PORTDOCS%%%%DOCSDIR%%3/api-index-3-4.html
-%%PORTDOCS%%%%DOCSDIR%%3/api-index-3-6.html
-%%PORTDOCS%%%%DOCSDIR%%3/api-index-3-8.html
-%%PORTDOCS%%%%DOCSDIR%%3/api-index-deprecated.html
 %%PORTDOCS%%%%DOCSDIR%%3/api-index-full.html
 %%PORTDOCS%%%%DOCSDIR%%3/appchooserbutton.png
 %%PORTDOCS%%%%DOCSDIR%%3/appchooserdialog.png
@@ -432,6 +421,7 @@ share/doc/gdk3/zoom_out_cursor.png
 %%PORTDOCS%%%%DOCSDIR%%3/box-expand.png
 %%PORTDOCS%%%%DOCSDIR%%3/box-packing.png
 %%PORTDOCS%%%%DOCSDIR%%3/broadwayd.html
+%%PORTDOCS%%%%DOCSDIR%%3/builder-shortcuts.png
 %%PORTDOCS%%%%DOCSDIR%%3/button.png
 %%PORTDOCS%%%%DOCSDIR%%3/ch01s02.html
 %%PORTDOCS%%%%DOCSDIR%%3/ch01s03.html
@@ -439,10 +429,22 @@ share/doc/gdk3/zoom_out_cursor.png
 %%PORTDOCS%%%%DOCSDIR%%3/ch01s05.html
 %%PORTDOCS%%%%DOCSDIR%%3/ch02.html
 %%PORTDOCS%%%%DOCSDIR%%3/ch03.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch25s02.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch27s02.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch29s02.html
-%%PORTDOCS%%%%DOCSDIR%%3/ch29s03.html
+%%PORTDOCS%%%%DOCSDIR%%3/ch26s02.html
+%%PORTDOCS%%%%DOCSDIR%%3/ch28s02.html
+%%PORTDOCS%%%%DOCSDIR%%3/ch30s02.html
+%%PORTDOCS%%%%DOCSDIR%%3/ch30s03.html
+%%PORTDOCS%%%%DOCSDIR%%3/ch32s02.html
+%%PORTDOCS%%%%DOCSDIR%%3/ch32s03.html
+%%PORTDOCS%%%%DOCSDIR%%3/ch32s04.html
+%%PORTDOCS%%%%DOCSDIR%%3/ch32s05.html
+%%PORTDOCS%%%%DOCSDIR%%3/ch32s06.html
+%%PORTDOCS%%%%DOCSDIR%%3/ch32s07.html
+%%PORTDOCS%%%%DOCSDIR%%3/ch32s08.html
+%%PORTDOCS%%%%DOCSDIR%%3/ch32s09.html
+%%PORTDOCS%%%%DOCSDIR%%3/ch32s10.html
+%%PORTDOCS%%%%DOCSDIR%%3/ch32s11.html
+%%PORTDOCS%%%%DOCSDIR%%3/chap-css-overview.html
+%%PORTDOCS%%%%DOCSDIR%%3/chap-css-properties.html
 %%PORTDOCS%%%%DOCSDIR%%3/chap-drawing-model.html
 %%PORTDOCS%%%%DOCSDIR%%3/chap-input-handling.html
 %%PORTDOCS%%%%DOCSDIR%%3/check-button.png
@@ -450,6 +452,7 @@ share/doc/gdk3/zoom_out_cursor.png
 %%PORTDOCS%%%%DOCSDIR%%3/checklist-modifiers.html
 %%PORTDOCS%%%%DOCSDIR%%3/checklist-named-icons.html
 %%PORTDOCS%%%%DOCSDIR%%3/checks.png
+%%PORTDOCS%%%%DOCSDIR%%3/clocks-shortcuts.png
 %%PORTDOCS%%%%DOCSDIR%%3/color-button.png
 %%PORTDOCS%%%%DOCSDIR%%3/colorchooser.png
 %%PORTDOCS%%%%DOCSDIR%%3/combo-box-entry.png
@@ -478,6 +481,7 @@ share/doc/gdk3/zoom_out_cursor.png
 %%PORTDOCS%%%%DOCSDIR%%3/frame-gap.png
 %%PORTDOCS%%%%DOCSDIR%%3/frame.png
 %%PORTDOCS%%%%DOCSDIR%%3/frames.png
+%%PORTDOCS%%%%DOCSDIR%%3/gedit-shortcuts.png
 %%PORTDOCS%%%%DOCSDIR%%3/getting-started-app1.png
 %%PORTDOCS%%%%DOCSDIR%%3/getting-started-app10.png
 %%PORTDOCS%%%%DOCSDIR%%3/getting-started-app2.png
@@ -502,6 +506,7 @@ share/doc/gdk3/zoom_out_cursor.png
 %%PORTDOCS%%%%DOCSDIR%%3/gtk-getting-started.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk-launch.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-2-to-3.html
+%%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-3-x-to-y.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-GtkGrid.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-GtkStyleContext-bonus-points.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk-migrating-GtkStyleContext-checklist.html
@@ -516,6 +521,7 @@ share/doc/gdk3/zoom_out_cursor.png
 %%PORTDOCS%%%%DOCSDIR%%3/gtk-mir.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk-osx.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk-query-immodules-3.0.html
+%%PORTDOCS%%%%DOCSDIR%%3/gtk-query-settings.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk-question-index.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk-resources.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk-running.html
@@ -531,7 +537,9 @@ share/doc/gdk3/zoom_out_cursor.png
 %%PORTDOCS%%%%DOCSDIR%%3/gtk3-Feature-Test-Macros.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk3-Filesystem-utilities.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk3-General.html
+%%PORTDOCS%%%%DOCSDIR%%3/gtk3-GtkFileChooserNative.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk3-GtkGradient.html
+%%PORTDOCS%%%%DOCSDIR%%3/gtk3-GtkNativeDialog.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk3-GtkStyleProperties.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk3-GtkSymbolicColor.html
 %%PORTDOCS%%%%DOCSDIR%%3/gtk3-GtkTreeView-drag-and-drop.html
@@ -598,6 +606,9 @@ share/doc/gdk3/zoom_out_cursor.png
 %%PORTDOCS%%%%DOCSDIR%%3/panes.png
 %%PORTDOCS%%%%DOCSDIR%%3/placessidebar.png
 %%PORTDOCS%%%%DOCSDIR%%3/platform-support.html
+%%PORTDOCS%%%%DOCSDIR%%3/popup-anchors.png
+%%PORTDOCS%%%%DOCSDIR%%3/popup-flip.png
+%%PORTDOCS%%%%DOCSDIR%%3/popup-slide.png
 %%PORTDOCS%%%%DOCSDIR%%3/printdialog.png
 %%PORTDOCS%%%%DOCSDIR%%3/progressbar.png
 %%PORTDOCS%%%%DOCSDIR%%3/pt06.html
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index d2d89ba15bb0..ecd7cbca9423 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -4,8 +4,8 @@
 # adwaita-icon-theme, gnome-themes-standard and mate-themes
 
 PORTNAME=	gtk
-PORTVERSION=	3.18.8
-PORTREVISION?=	4
+PORTVERSION=	3.22.12
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMESUFFIX=	3
@@ -25,7 +25,10 @@ PORTSCOUT=	ignore:1
 PORTSCOUT=	limit:1,even
 
 BUILD_DEPENDS+=	at-spi2-atk>=0:accessibility/at-spi2-atk
-LIB_DEPENDS=	libepoxy.so:graphics/libepoxy
+LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS+=	hicolor-icon-theme>=0:misc/hicolor-icon-theme \
 		adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme \
 		at-spi2-atk>=0:accessibility/at-spi2-atk
@@ -33,20 +36,19 @@ RUN_DEPENDS+=	hicolor-icon-theme>=0:misc/hicolor-icon-theme \
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	atk gdkpixbuf2 introspection:build pango
+USE_GNOME=	atk cairo gdkpixbuf2 introspection:build pango
 #gtk-update-icon-cache
-USES+=		gettext gmake gnome libtool pathfix perl5 pkgconfig
+USES+=		gettext gmake gnome libtool localbase pathfix perl5 pkgconfig
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 CONFIGURE_ARGS=	--enable-x11-backend \
 		--disable-wayland-backend \
 		--enable-introspection
-CPPFLAGS+=	-I${LOCALBASE}/include -fno-omit-frame-pointer
-LIBS+=		-L${LOCALBASE}/lib
+CPPFLAGS+=	-fno-omit-frame-pointer
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 
-LIBVERSION=	0.1800.8
+LIBVERSION=	0.2200.12
 PLIST_SUB+=	LIBVERSION=${LIBVERSION}
 
 GLIB_SCHEMAS=	org.gtk.Demo.gschema.xml \
@@ -54,7 +56,7 @@ GLIB_SCHEMAS=	org.gtk.Demo.gschema.xml \
 		org.gtk.Settings.Debug.gschema.xml \
 		org.gtk.Settings.FileChooser.gschema.xml
 
-OPTIONS_DEFINE=	CUPS CLOUDPRINT COLORD DEBUG BROADWAY
+OPTIONS_DEFINE=	CUPS CLOUDPRINT COLORD BROADWAY
 OPTIONS_DEFAULT=CUPS COLORD BROADWAY
 OPTIONS_SUB=	yes
 
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 43cbf52bfefe..79404c8a50cb 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gtk+-3.18.8.tar.xz) = 1c53ef1bb55364698f7183ecd185b547f92f4a3a7abfafd531400232e2e052f8
-SIZE (gnome3/gtk+-3.18.8.tar.xz) = 16806532
+TIMESTAMP = 1491985486
+SHA256 (gnome3/gtk+-3.22.12.tar.xz) = 84fae0cefb6a11ee2b4e86b8ac42fe46a3d30b4ad16661d5fc51e8ae03e2a98c
+SIZE (gnome3/gtk+-3.22.12.tar.xz) = 18236348
diff --git a/x11-toolkits/gtk30/files/patch-configure b/x11-toolkits/gtk30/files/patch-configure
index 78cbf3ca2309..a98cb678afbe 100644
--- a/x11-toolkits/gtk30/files/patch-configure
+++ b/x11-toolkits/gtk30/files/patch-configure
@@ -1,15 +1,6 @@
---- configure.orig	2016-02-24 05:04:43 UTC
-+++ configure
-@@ -25758,7 +25758,7 @@ fi
-     CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
-     CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
- 
--    if test $CUPS_API_MAJOR -gt 1 -o \
-+    if test $CUPS_API_MAJOR -lt 1 -o \
-             $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
-       as_fn_error $? "CUPS >= 1.2 not found" "$LINENO" 5
-     fi
-@@ -26190,9 +26190,7 @@ fi
+--- configure.orig	2016-10-24 05:10:09.000000000 +0200
++++ configure	2016-11-15 07:54:17.741400000 +0100
+@@ -27913,9 +27913,7 @@ fi
  if test "$have_cups" = "yes"; then
    GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cups"
  fi
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 7fdf78843569..0e8cbac4dbf4 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -3,6 +3,7 @@ bin/gtk-builder-tool
 bin/gtk-encode-symbolic-svg
 bin/gtk-launch
 bin/gtk-query-immodules-3.0
+bin/gtk-query-settings
 @comment bin/gtk-update-icon-cache
 bin/gtk3-demo
 bin/gtk3-demo-application
@@ -14,8 +15,10 @@ include/gail-3.0/libgail-util/gailmisc.h
 include/gail-3.0/libgail-util/gailtextutil.h
 %%BROADWAY%%include/gtk-3.0/gdk/broadway/gdkbroadwaycursor.h
 %%BROADWAY%%include/gtk-3.0/gdk/broadway/gdkbroadwaydisplay.h
+%%BROADWAY%%include/gtk-3.0/gdk/broadway/gdkbroadwaymonitor.h
 %%BROADWAY%%include/gtk-3.0/gdk/broadway/gdkbroadwayvisual.h
 %%BROADWAY%%include/gtk-3.0/gdk/broadway/gdkbroadwaywindow.h
+include/gtk-3.0/gdk/deprecated/gdkcolor.h
 include/gtk-3.0/gdk/gdk-autocleanup.h
 include/gtk-3.0/gdk/gdk.h
 include/gtk-3.0/gdk/gdkapplaunchcontext.h
@@ -25,9 +28,12 @@ include/gtk-3.0/gdk/gdkconfig.h
 include/gtk-3.0/gdk/gdkcursor.h
 include/gtk-3.0/gdk/gdkdevice.h
 include/gtk-3.0/gdk/gdkdevicemanager.h
+include/gtk-3.0/gdk/gdkdevicepad.h
+include/gtk-3.0/gdk/gdkdevicetool.h
 include/gtk-3.0/gdk/gdkdisplay.h
 include/gtk-3.0/gdk/gdkdisplaymanager.h
 include/gtk-3.0/gdk/gdkdnd.h
+include/gtk-3.0/gdk/gdkdrawingcontext.h
 include/gtk-3.0/gdk/gdkenumtypes.h
 include/gtk-3.0/gdk/gdkevents.h
 include/gtk-3.0/gdk/gdkframeclock.h
@@ -37,6 +43,7 @@ include/gtk-3.0/gdk/gdkkeys.h
 include/gtk-3.0/gdk/gdkkeysyms-compat.h
 include/gtk-3.0/gdk/gdkkeysyms.h
 include/gtk-3.0/gdk/gdkmain.h
+include/gtk-3.0/gdk/gdkmonitor.h
 include/gtk-3.0/gdk/gdkpango.h
 include/gtk-3.0/gdk/gdkpixbuf.h
 include/gtk-3.0/gdk/gdkprivate.h
@@ -44,6 +51,7 @@ include/gtk-3.0/gdk/gdkproperty.h
 include/gtk-3.0/gdk/gdkrectangle.h
 include/gtk-3.0/gdk/gdkrgba.h
 include/gtk-3.0/gdk/gdkscreen.h
+include/gtk-3.0/gdk/gdkseat.h
 include/gtk-3.0/gdk/gdkselection.h
 include/gtk-3.0/gdk/gdktestutils.h
 include/gtk-3.0/gdk/gdkthreads.h
@@ -66,6 +74,7 @@ include/gtk-3.0/gdk/x11/gdkx11displaymanager.h
 include/gtk-3.0/gdk/x11/gdkx11dnd.h
 include/gtk-3.0/gdk/x11/gdkx11glcontext.h
 include/gtk-3.0/gdk/x11/gdkx11keys.h
+include/gtk-3.0/gdk/x11/gdkx11monitor.h
 include/gtk-3.0/gdk/x11/gdkx11property.h
 include/gtk-3.0/gdk/x11/gdkx11screen.h
 include/gtk-3.0/gdk/x11/gdkx11selection.h
@@ -114,6 +123,7 @@ include/gtk-3.0/gtk/a11y/gtkscalebuttonaccessible.h
 include/gtk-3.0/gtk/a11y/gtkscrolledwindowaccessible.h
 include/gtk-3.0/gtk/a11y/gtkspinbuttonaccessible.h
 include/gtk-3.0/gtk/a11y/gtkspinneraccessible.h
+include/gtk-3.0/gtk/a11y/gtkstackaccessible.h
 include/gtk-3.0/gtk/a11y/gtkstatusbaraccessible.h
 include/gtk-3.0/gtk/a11y/gtkswitchaccessible.h
 include/gtk-3.0/gtk/a11y/gtktextcellaccessible.h
@@ -123,7 +133,6 @@ include/gtk-3.0/gtk/a11y/gtktoplevelaccessible.h
 include/gtk-3.0/gtk/a11y/gtktreeviewaccessible.h
 include/gtk-3.0/gtk/a11y/gtkwidgetaccessible.h
 include/gtk-3.0/gtk/a11y/gtkwindowaccessible.h
-include/gtk-3.0/gdk/deprecated/gdkcolor.h
 include/gtk-3.0/gtk/deprecated/gtkaction.h
 include/gtk-3.0/gtk/deprecated/gtkactiongroup.h
 include/gtk-3.0/gtk/deprecated/gtkactivatable.h
@@ -148,10 +157,10 @@ include/gtk-3.0/gtk/deprecated/gtknumerableicon.h
 include/gtk-3.0/gtk/deprecated/gtkradioaction.h
 include/gtk-3.0/gtk/deprecated/gtkrc.h
 include/gtk-3.0/gtk/deprecated/gtkrecentaction.h
+include/gtk-3.0/gtk/deprecated/gtkstatusicon.h
 include/gtk-3.0/gtk/deprecated/gtkstock.h
 include/gtk-3.0/gtk/deprecated/gtkstyle.h
 include/gtk-3.0/gtk/deprecated/gtkstyleproperties.h
-include/gtk-3.0/gtk/deprecated/gtkstatusicon.h
 include/gtk-3.0/gtk/deprecated/gtksymboliccolor.h
 include/gtk-3.0/gtk/deprecated/gtktable.h
 include/gtk-3.0/gtk/deprecated/gtktearoffmenuitem.h
@@ -223,6 +232,8 @@ include/gtk-3.0/gtk/gtkcsssection.h
 include/gtk-3.0/gtk/gtkdebug.h
 include/gtk-3.0/gtk/gtkdialog.h
 include/gtk-3.0/gtk/gtkdnd.h
+include/gtk-3.0/gtk/gtkdragdest.h
+include/gtk-3.0/gtk/gtkdragsource.h
 include/gtk-3.0/gtk/gtkdrawingarea.h
 include/gtk-3.0/gtk/gtkeditable.h
 include/gtk-3.0/gtk/gtkentry.h
@@ -235,6 +246,7 @@ include/gtk-3.0/gtk/gtkexpander.h
 include/gtk-3.0/gtk/gtkfilechooser.h
 include/gtk-3.0/gtk/gtkfilechooserbutton.h
 include/gtk-3.0/gtk/gtkfilechooserdialog.h
+include/gtk-3.0/gtk/gtkfilechoosernative.h
 include/gtk-3.0/gtk/gtkfilechooserwidget.h
 include/gtk-3.0/gtk/gtkfilefilter.h
 include/gtk-3.0/gtk/gtkfixed.h
@@ -284,10 +296,12 @@ include/gtk-3.0/gtk/gtkmessagedialog.h
 include/gtk-3.0/gtk/gtkmodelbutton.h
 include/gtk-3.0/gtk/gtkmodules.h
 include/gtk-3.0/gtk/gtkmountoperation.h
+include/gtk-3.0/gtk/gtknativedialog.h
 include/gtk-3.0/gtk/gtknotebook.h
 include/gtk-3.0/gtk/gtkoffscreenwindow.h
 include/gtk-3.0/gtk/gtkorientable.h
 include/gtk-3.0/gtk/gtkoverlay.h
+include/gtk-3.0/gtk/gtkpadcontroller.h
 include/gtk-3.0/gtk/gtkpagesetup.h
 include/gtk-3.0/gtk/gtkpaned.h
 include/gtk-3.0/gtk/gtkpapersize.h
@@ -324,16 +338,21 @@ include/gtk-3.0/gtk/gtkseparator.h
 include/gtk-3.0/gtk/gtkseparatormenuitem.h
 include/gtk-3.0/gtk/gtkseparatortoolitem.h
 include/gtk-3.0/gtk/gtksettings.h
+include/gtk-3.0/gtk/gtkshortcutlabel.h
+include/gtk-3.0/gtk/gtkshortcutsgroup.h
+include/gtk-3.0/gtk/gtkshortcutssection.h
+include/gtk-3.0/gtk/gtkshortcutsshortcut.h
+include/gtk-3.0/gtk/gtkshortcutswindow.h
 include/gtk-3.0/gtk/gtkshow.h
 include/gtk-3.0/gtk/gtksizegroup.h
 include/gtk-3.0/gtk/gtksizerequest.h
 include/gtk-3.0/gtk/gtksocket.h
 include/gtk-3.0/gtk/gtkspinbutton.h
 include/gtk-3.0/gtk/gtkspinner.h
-include/gtk-3.0/gtk/gtkstatusbar.h
 include/gtk-3.0/gtk/gtkstack.h
 include/gtk-3.0/gtk/gtkstacksidebar.h
 include/gtk-3.0/gtk/gtkstackswitcher.h
+include/gtk-3.0/gtk/gtkstatusbar.h
 include/gtk-3.0/gtk/gtkstylecontext.h
 include/gtk-3.0/gtk/gtkstyleprovider.h
 include/gtk-3.0/gtk/gtkswitch.h
@@ -425,6 +444,8 @@ share/aclocal/gtk-3.0.m4
 share/applications/gtk3-demo.desktop
 share/applications/gtk3-icon-browser.desktop
 share/applications/gtk3-widget-factory.desktop
+share/gettext/its/gtkbuilder.its
+share/gettext/its/gtkbuilder.loc
 share/gir-1.0/Gdk-3.0.gir
 share/gir-1.0/GdkX11-3.0.gir
 share/gir-1.0/Gtk-3.0.gir
diff --git a/x11-toolkits/gtkmm30-reference/Makefile b/x11-toolkits/gtkmm30-reference/Makefile
index 2b495483fb69..518684efb0f5 100644
--- a/x11-toolkits/gtkmm30-reference/Makefile
+++ b/x11-toolkits/gtkmm30-reference/Makefile
@@ -1,7 +1,7 @@
 # Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtkmm-3.0.pc:x11-toolkits/gtkmm30 \
 		glibmm-reference>=0:devel/glibmm-reference
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 67a6419c51e1..3b8efad224de 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gtkmm
-PORTVERSION=	3.16.0
+PORTVERSION=	3.22.0
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
@@ -12,6 +12,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ wrapper for Gtk+3
 
+LICENSE=	LGPL21
+
 USES+=		tar:xz
 
 PORTSCOUT=	limitw:1,even
@@ -20,13 +22,12 @@ PORTSCOUT=	limitw:1,even
 
 BUILD_DEPENDS=	gm4:devel/m4
 
-USES+=		gettext gmake libtool pathfix pkgconfig compiler:c++11-lang
+USES+=		gettext gmake gnome libtool pathfix pkgconfig \
+		compiler:c++11-lang
 USE_CXXSTD=	c++11
-USE_GNOME=	gtk30 glibmm cairomm atkmm pangomm
+USE_GNOME=	gdkpixbuf2 gtk30 glibmm cairomm atkmm pangomm
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-documentation
 INSTALL_TARGET=	install-strip
 
diff --git a/x11-toolkits/gtkmm30/distinfo b/x11-toolkits/gtkmm30/distinfo
index 4663db246574..779caca1d1b3 100644
--- a/x11-toolkits/gtkmm30/distinfo
+++ b/x11-toolkits/gtkmm30/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gtkmm-3.16.0.tar.xz) = 9b8d4af5e1bb64e52b53bc8ef471ef43e1b9d11a829f16ef54c3a92985b0dd0c
-SIZE (gnome3/gtkmm-3.16.0.tar.xz) = 11468644
+TIMESTAMP = 1476914714
+SHA256 (gnome3/gtkmm-3.22.0.tar.xz) = 05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5
+SIZE (gnome3/gtkmm-3.22.0.tar.xz) = 12320816
diff --git a/x11-toolkits/gtkmm30/pkg-plist b/x11-toolkits/gtkmm30/pkg-plist
index 7f90afc7f86b..fe938c4db873 100644
--- a/x11-toolkits/gtkmm30/pkg-plist
+++ b/x11-toolkits/gtkmm30/pkg-plist
@@ -7,8 +7,11 @@ include/gdkmm-%%API_VERSION%%/gdkmm/devicemanager.h
 include/gdkmm-%%API_VERSION%%/gdkmm/display.h
 include/gdkmm-%%API_VERSION%%/gdkmm/displaymanager.h
 include/gdkmm-%%API_VERSION%%/gdkmm/dragcontext.h
+include/gdkmm-%%API_VERSION%%/gdkmm/drawingcontext.h
 include/gdkmm-%%API_VERSION%%/gdkmm/event.h
 include/gdkmm-%%API_VERSION%%/gdkmm/general.h
+include/gdkmm-%%API_VERSION%%/gdkmm/glcontext.h
+include/gdkmm-%%API_VERSION%%/gdkmm/monitor.h
 include/gdkmm-%%API_VERSION%%/gdkmm/pixbuf.h
 include/gdkmm-%%API_VERSION%%/gdkmm/pixbufanimation.h
 include/gdkmm-%%API_VERSION%%/gdkmm/pixbufanimationiter.h
@@ -22,7 +25,10 @@ include/gdkmm-%%API_VERSION%%/gdkmm/private/devicemanager_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/display_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/displaymanager_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/dragcontext_p.h
+include/gdkmm-%%API_VERSION%%/gdkmm/private/drawingcontext_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/event_p.h
+include/gdkmm-%%API_VERSION%%/gdkmm/private/glcontext_p.h
+include/gdkmm-%%API_VERSION%%/gdkmm/private/monitor_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbuf_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbufanimation_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbufanimationiter_p.h
@@ -31,6 +37,8 @@ include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbufloader_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/rectangle_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/rgba_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/screen_p.h
+include/gdkmm-%%API_VERSION%%/gdkmm/private/seat_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/shortcutlabel_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/timecoord_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/types_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/visual_p.h
@@ -38,6 +46,8 @@ include/gdkmm-%%API_VERSION%%/gdkmm/private/window_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/rectangle.h
 include/gdkmm-%%API_VERSION%%/gdkmm/rgba.h
 include/gdkmm-%%API_VERSION%%/gdkmm/screen.h
+include/gdkmm-%%API_VERSION%%/gdkmm/seat.h
+include/gtkmm-%%API_VERSION%%/gtkmm/shortcutlabel.h
 include/gdkmm-%%API_VERSION%%/gdkmm/timecoord.h
 include/gdkmm-%%API_VERSION%%/gdkmm/types.h
 include/gdkmm-%%API_VERSION%%/gdkmm/visual.h
@@ -137,6 +147,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/gesturerotate.h
 include/gtkmm-%%API_VERSION%%/gtkmm/gesturesingle.h
 include/gtkmm-%%API_VERSION%%/gtkmm/gestureswipe.h
 include/gtkmm-%%API_VERSION%%/gtkmm/gesturezoom.h
+include/gtkmm-%%API_VERSION%%/gtkmm/glarea.h
 include/gtkmm-%%API_VERSION%%/gtkmm/grid.h
 include/gtkmm-%%API_VERSION%%/gtkmm/handlebox.h
 include/gtkmm-%%API_VERSION%%/gtkmm/headerbar.h
@@ -174,6 +185,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/menushell.h
 include/gtkmm-%%API_VERSION%%/gtkmm/menutoolbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/messagedialog.h
 include/gtkmm-%%API_VERSION%%/gtkmm/misc.h
+include/gtkmm-%%API_VERSION%%/gtkmm/modelbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/notebook.h
 include/gtkmm-%%API_VERSION%%/gtkmm/numerableicon.h
 include/gtkmm-%%API_VERSION%%/gtkmm/object.h
@@ -186,6 +198,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/paned.h
 include/gtkmm-%%API_VERSION%%/gtkmm/papersize.h
 include/gtkmm-%%API_VERSION%%/gtkmm/placessidebar.h
 include/gtkmm-%%API_VERSION%%/gtkmm/plug.h
+include/gtkmm-%%API_VERSION%%/gtkmm/popovermenu.h
 include/gtkmm-%%API_VERSION%%/gtkmm/popover.h
 include/gtkmm-%%API_VERSION%%/gtkmm/printcontext.h
 include/gtkmm-%%API_VERSION%%/gtkmm/printer.h
@@ -281,6 +294,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/gesturerotate_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/gesturesingle_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/gestureswipe_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/gesturezoom_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/glarea_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/grid_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/handlebox_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/headerbar_p.h
@@ -317,6 +331,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/menushell_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/menutoolbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/messagedialog_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/misc_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/modelbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/notebook_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/numerableicon_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/object_p.h
@@ -330,6 +345,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/papersize_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/placessidebar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/plug_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/popover_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/popovermenu_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/printcontext_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/printer_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/printjob_p.h
@@ -365,6 +381,10 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/separator_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/separatormenuitem_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/separatortoolitem_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/settings_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/shortcutsgroup_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/shortcutssection_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/shortcutsshortcut_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/shortcutswindow_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/sizegroup_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/socket_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/spinbutton_p.h
@@ -449,6 +469,10 @@ include/gtkmm-%%API_VERSION%%/gtkmm/separator.h
 include/gtkmm-%%API_VERSION%%/gtkmm/separatormenuitem.h
 include/gtkmm-%%API_VERSION%%/gtkmm/separatortoolitem.h
 include/gtkmm-%%API_VERSION%%/gtkmm/settings.h
+include/gtkmm-%%API_VERSION%%/gtkmm/shortcutsgroup.h
+include/gtkmm-%%API_VERSION%%/gtkmm/shortcutssection.h
+include/gtkmm-%%API_VERSION%%/gtkmm/shortcutsshortcut.h
+include/gtkmm-%%API_VERSION%%/gtkmm/shortcutswindow.h
 include/gtkmm-%%API_VERSION%%/gtkmm/sizegroup.h
 include/gtkmm-%%API_VERSION%%/gtkmm/socket.h
 include/gtkmm-%%API_VERSION%%/gtkmm/spinbutton.h
diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
index bdc27832d1df..fe5e3ccde7bb 100644
--- a/x11-toolkits/pangomm/Makefile
+++ b/x11-toolkits/pangomm/Makefile
@@ -11,6 +11,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ wrapper for Pango
 
+LICENSE=	LGPL21
+
 USES=		tar:xz
 
 .if !defined(REFERENCE_PORT)