Update MC-ports to GNOME 3.12.

Dragons beware! Although most of them should be sleeping.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19571 df743ca5-7f9a-e211-a948-0013205c9059

23 files changed, 162 insertions, 93 deletions

diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 9e10417a7..6b5b5b9d0 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -1,9 +1,9 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11-toolkits/gdl3/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#   $MCom: ports-experimental/trunk/x11-toolkits/gdl/Makefile 19335 2014-03-25 19:25:32Z kwm $
 
 PORTNAME=	gdl
-PORTVERSION=	3.6.2
+PORTVERSION=	3.12.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	3
@@ -15,15 +15,14 @@ COMMENT=	Components intended to be shared between GNOME development tools
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_XZ=		yes
 USE_GNOME=	gnomeprefix gtk30 intltool
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdl-3.so.5
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdl-3.so.*
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gdl/distinfo b/x11-toolkits/gdl/distinfo
index d2c3b5a2c..e13b49050 100644
--- a/x11-toolkits/gdl/distinfo
+++ b/x11-toolkits/gdl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gdl-3.6.2.tar.xz) = e772319f1b133047f54e3c1b7e95a718168071cfef972f981337f6bf570ddf1c
-SIZE (gnome3/gdl-3.6.2.tar.xz) = 530604
+SHA256 (gnome3/gdl-3.12.0.tar.xz) = 4770f959f31ed5e616fe623c284e8dd6136e49902d19b6e37938d34be4f6b88d
+SIZE (gnome3/gdl-3.12.0.tar.xz) = 527944
diff --git a/x11-toolkits/gdl/files/patch-gdl_gdl-dock-bar.c b/x11-toolkits/gdl/files/patch-gdl_gdl-dock-bar.c
deleted file mode 100644
index 8a7a7112e..000000000
--- a/x11-toolkits/gdl/files/patch-gdl_gdl-dock-bar.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- gdl/gdl-dock-bar.c.orig	2012-08-05 19:14:31.000000000 +0000
-+++ gdl/gdl-dock-bar.c	2013-06-18 07:48:39.000000000 +0000
-@@ -484,7 +484,8 @@
- {
-     GdlDockBarStyle style;
- 
--    g_return_if_fail (GDL_IS_DOCK_BAR (dockbar));
-+    if (!GDL_IS_DOCK_BAR (dockbar))
-+        return NULL;
- 
-     g_object_get(G_OBJECT(dockbar), "dockbar-style", &style, NULL);
- 
diff --git a/x11-toolkits/gdl/pkg-plist b/x11-toolkits/gdl/pkg-plist
index df40a067e..9b5bcd1af 100644
--- a/x11-toolkits/gdl/pkg-plist
+++ b/x11-toolkits/gdl/pkg-plist
@@ -12,6 +12,7 @@ lib/girepository-1.0/Gdl-3.typelib
 lib/libgdl-3.la
 lib/libgdl-3.so
 lib/libgdl-3.so.5
+lib/libgdl-3.so.5.0.8
 libdata/pkgconfig/gdl-3.0.pc
 share/doc/gdl3-3.0/GdlDock.html
 share/doc/gdl3-3.0/GdlDockBar.html
@@ -107,6 +108,7 @@ share/locale/sr/LC_MESSAGES/gdl-3.mo
 share/locale/sr@latin/LC_MESSAGES/gdl-3.mo
 share/locale/sv/LC_MESSAGES/gdl-3.mo
 share/locale/te/LC_MESSAGES/gdl-3.mo
+share/locale/tg/LC_MESSAGES/gdl-3.mo
 share/locale/th/LC_MESSAGES/gdl-3.mo
 share/locale/tr/LC_MESSAGES/gdl-3.mo
 share/locale/ug/LC_MESSAGES/gdl-3.mo
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 8afafcdf0..3e4de83cd 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -1,10 +1,10 @@
 # Created by: Vanilla I. Shu <vanilla@MinJe.com.TW>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11-toolkits/gtk30/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#   $MCom: ports-experimental/trunk/x11-toolkits/gtk30/Makefile 19481 2014-04-12 21:28:04Z gusi $
 # Please keep gtk30 and x11-themes/gnome-themes-standard minor version in sync
 
 PORTNAME=	gtk
-PORTVERSION=	3.10.7
+PORTVERSION=	3.12.1
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
@@ -18,7 +18,7 @@ COMMENT=	Gimp Toolkit for X11 GUI (current stable version)
 
 LICENSE=	LGPL20
 
-USE_XZ=		yes
+USES=		tar:xz
 
 .if defined(REFERENCE_PORT)
 PORTSCOUT=	ignore:1
@@ -32,16 +32,17 @@ RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hico
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	atk pango gdkpixbuf2 gtk-update-icon-cache \
-		introspection:build
-USES=		gettext gmake libtool pathfix perl5 pkgconfig
+USE_GNOME=	atk gdkpixbuf2 gtk-update-icon-cache \
+		introspection:build pango
+USES+=		gettext gmake libtool pathfix perl5 pkgconfig
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
-CONFIGURE_ARGS=	--enable-gtk2-dependency --disable-packagekit
+CONFIGURE_ARGS=	--enable-gtk2-dependency --disable-packagekit \
+		--enable-introspection
 CPPFLAGS+=	-I${LOCALBASE}/include -fno-omit-frame-pointer
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-LIBVERSION=	0.1000.7
+LIBVERSION=	0.1200.1
 PLIST_SUB+=	LIBVERSION=${LIBVERSION}
 
 GLIB_SCHEMAS=	org.gtk.Demo.gschema.xml \
@@ -70,6 +71,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in
 	@${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
 		${WRKSRC}/gtk/Makefile.in
+	@${REINPLACE_CMD} -e 's|-DG_DISABLE_CHECKS||' \
+		${WRKSRC}/configure
 
 pre-configure:
 .if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc)
@@ -86,11 +89,12 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/loaders
 	${INSTALL_MAN} ${WRKSRC}/docs/reference/gtk/gtk-query-immodules-3.0.1 \
 		${STAGEDIR}${PREFIX}/man/man1
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdk-3.so.0
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgtk-3.so.0
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgailutil-3.so.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdk-3.so.0.*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgtk-3.so.0.*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgailutil-3.so.*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/3.0.0/immodules/im*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-*.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/3.0.0/immodules/im-*.so
 
 .include <bsd.port.mk>
 
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 605f1ca84..358359cdc 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtk+-3.10.7.tar.xz) = b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427
-SIZE (gnome3/gtk+-3.10.7.tar.xz) = 14363820
+SHA256 (gnome3/gtk+-3.12.1.tar.xz) = 719aae5fdb560f64cadb7e968c8c85c0823664de890c9f765ff4c0efeb0277cd
+SIZE (gnome3/gtk+-3.12.1.tar.xz) = 14731512
diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkselection.c b/x11-toolkits/gtk30/files/patch-gtk_gtkselection.c
deleted file mode 100644
index 19e224e75..000000000
--- a/x11-toolkits/gtk30/files/patch-gtk_gtkselection.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk/gtkselection.c.orig	2014-02-03 22:40:05.000000000 +0100
-+++ gtk/gtkselection.c	2014-02-03 22:40:43.000000000 +0100
-@@ -2294,7 +2294,7 @@ _gtk_selection_request (GtkWidget *widge
-   gulong selection_max_size;
- 
-   if (event->requestor == NULL)
--    return;
-+    return FALSE;
- 
-   if (initialize)
-     gtk_selection_init ();
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 607186723..5c39962cb 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -70,6 +70,8 @@ include/gtk-3.0/gtk/a11y/gtkcontaineraccessible.h
 include/gtk-3.0/gtk/a11y/gtkcontainercellaccessible.h
 include/gtk-3.0/gtk/a11y/gtkentryaccessible.h
 include/gtk-3.0/gtk/a11y/gtkexpanderaccessible.h
+include/gtk-3.0/gtk/a11y/gtkflowboxaccessible.h
+include/gtk-3.0/gtk/a11y/gtkflowboxchildaccessible.h
 include/gtk-3.0/gtk/a11y/gtkframeaccessible.h
 include/gtk-3.0/gtk/a11y/gtkiconviewaccessible.h
 include/gtk-3.0/gtk/a11y/gtkimageaccessible.h
@@ -81,11 +83,13 @@ include/gtk-3.0/gtk/a11y/gtklistboxaccessible.h
 include/gtk-3.0/gtk/a11y/gtklistboxrowaccessible.h
 include/gtk-3.0/gtk/a11y/gtklockbuttonaccessible.h
 include/gtk-3.0/gtk/a11y/gtkmenuaccessible.h
+include/gtk-3.0/gtk/a11y/gtkmenubuttonaccessible.h
 include/gtk-3.0/gtk/a11y/gtkmenuitemaccessible.h
 include/gtk-3.0/gtk/a11y/gtkmenushellaccessible.h
 include/gtk-3.0/gtk/a11y/gtknotebookaccessible.h
 include/gtk-3.0/gtk/a11y/gtknotebookpageaccessible.h
 include/gtk-3.0/gtk/a11y/gtkpanedaccessible.h
+include/gtk-3.0/gtk/a11y/gtkpopoveraccessible.h
 include/gtk-3.0/gtk/a11y/gtkprogressbaraccessible.h
 include/gtk-3.0/gtk/a11y/gtkradiobuttonaccessible.h
 include/gtk-3.0/gtk/a11y/gtkradiomenuitemaccessible.h
@@ -146,6 +150,7 @@ include/gtk-3.0/gtk/gtkaccellabel.h
 include/gtk-3.0/gtk/gtkaccelmap.h
 include/gtk-3.0/gtk/gtkaccessible.h
 include/gtk-3.0/gtk/gtkactionable.h
+include/gtk-3.0/gtk/gtkactionbar.h
 include/gtk-3.0/gtk/gtkadjustment.h
 include/gtk-3.0/gtk/gtkalignment.h
 include/gtk-3.0/gtk/gtkappchooser.h
@@ -211,6 +216,7 @@ include/gtk-3.0/gtk/gtkfilechooserdialog.h
 include/gtk-3.0/gtk/gtkfilechooserwidget.h
 include/gtk-3.0/gtk/gtkfilefilter.h
 include/gtk-3.0/gtk/gtkfixed.h
+include/gtk-3.0/gtk/gtkflowbox.h
 include/gtk-3.0/gtk/gtkfontbutton.h
 include/gtk-3.0/gtk/gtkfontchooser.h
 include/gtk-3.0/gtk/gtkfontchooserdialog.h
@@ -256,6 +262,7 @@ include/gtk-3.0/gtk/gtkpaned.h
 include/gtk-3.0/gtk/gtkpapersize.h
 include/gtk-3.0/gtk/gtkplacessidebar.h
 include/gtk-3.0/gtk/gtkplug.h
+include/gtk-3.0/gtk/gtkpopover.h
 include/gtk-3.0/gtk/gtkprintcontext.h
 include/gtk-3.0/gtk/gtkprintoperation.h
 include/gtk-3.0/gtk/gtkprintoperationpreview.h
@@ -394,10 +401,24 @@ libdata/pkgconfig/gtk+-unix-print-3.0.pc
 libdata/pkgconfig/gtk+-x11-3.0.pc
 man/man1/gtk-query-immodules-3.0.1.gz
 share/aclocal/gtk-3.0.m4
+share/applications/gtk3-demo.desktop
+share/applications/gtk3-widget-factory.desktop
 share/gir-1.0/Gdk-3.0.gir
 share/gir-1.0/GdkX11-3.0.gir
 share/gir-1.0/Gtk-3.0.gir
 share/gtk-3.0/gtkbuilder.rng
+share/icons/hicolor/16x16/apps/gtk3-demo.png
+share/icons/hicolor/16x16/apps/gtk3-widget-factory.png
+share/icons/hicolor/22x22/apps/gtk3-demo.png
+share/icons/hicolor/22x22/apps/gtk3-widget-factory.png
+share/icons/hicolor/24x24/apps/gtk3-demo.png
+share/icons/hicolor/24x24/apps/gtk3-widget-factory.png
+share/icons/hicolor/256x256/apps/gtk3-demo.png
+share/icons/hicolor/256x256/apps/gtk3-widget-factory.png
+share/icons/hicolor/32x32/apps/gtk3-demo.png
+share/icons/hicolor/32x32/apps/gtk3-widget-factory.png
+share/icons/hicolor/48x48/apps/gtk3-demo.png
+share/icons/hicolor/48x48/apps/gtk3-widget-factory.png
 share/locale/af/LC_MESSAGES/gtk30-properties.mo
 share/locale/af/LC_MESSAGES/gtk30.mo
 share/locale/am/LC_MESSAGES/gtk30-properties.mo
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 26a8b2aa3..5af20f0e3 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	gtkmm
-PORTVERSION=	3.8.1
+PORTVERSION=	3.12.0
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
@@ -13,20 +13,20 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ wrapper for Gtk+3
 
-USE_XZ=		yes
+USES=		tar:xz
 
 .if !defined(REFERENCE_PORT)
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USES=		gettext gmake pathfix pkgconfig
+USES+=		gettext gmake pathfix pkgconfig
+USE_GNOME=	gtk30 ltverhack glibmm cairomm atkmm pangomm
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	gtk30 ltverhack glibmm cairomm atkmm pangomm
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-documentation
-ltverhack_PATCH_FILES=	build/ltmain.sh
+#ltverhack_PATCH_FILES=	build/ltmain.sh
 
 PLIST_SUB=	VERSION="3.0" API_VERSION="3.0"
 
@@ -34,6 +34,9 @@ post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \
 		${WRKSRC}/Makefile.in
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libg?kmm-3.0.so.2
+
 .include <bsd.port.mk>
 
 .endif
diff --git a/x11-toolkits/gtkmm30/distinfo b/x11-toolkits/gtkmm30/distinfo
index 749b59964..0a22913da 100644
--- a/x11-toolkits/gtkmm30/distinfo
+++ b/x11-toolkits/gtkmm30/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtkmm-3.8.1.tar.xz) = d374c6d6d78fd9f61bca737cd7c23452de427a1662de8abf46df784e07e4c95b
-SIZE (gnome3/gtkmm-3.8.1.tar.xz) = 4313172
+SHA256 (gnome3/gtkmm-3.12.0.tar.xz) = 86c526ceec15d889996822128d566748bb36f70cf5a2c270530dfc546a2574e1
+SIZE (gnome3/gtkmm-3.12.0.tar.xz) = 10113956
diff --git a/x11-toolkits/gtkmm30/pkg-plist b/x11-toolkits/gtkmm30/pkg-plist
index 11053ab36..a4848a0c3 100644
--- a/x11-toolkits/gtkmm30/pkg-plist
+++ b/x11-toolkits/gtkmm30/pkg-plist
@@ -51,6 +51,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/accellabel.h
 include/gtkmm-%%API_VERSION%%/gtkmm/accelmap.h
 include/gtkmm-%%API_VERSION%%/gtkmm/action.h
 include/gtkmm-%%API_VERSION%%/gtkmm/actionable.h
+include/gtkmm-%%API_VERSION%%/gtkmm/actionbar.h
 include/gtkmm-%%API_VERSION%%/gtkmm/actiongroup.h
 include/gtkmm-%%API_VERSION%%/gtkmm/activatable.h
 include/gtkmm-%%API_VERSION%%/gtkmm/adjustment.h
@@ -115,6 +116,8 @@ include/gtkmm-%%API_VERSION%%/gtkmm/filechooserdialog.h
 include/gtkmm-%%API_VERSION%%/gtkmm/filechooserwidget.h
 include/gtkmm-%%API_VERSION%%/gtkmm/filefilter.h
 include/gtkmm-%%API_VERSION%%/gtkmm/fixed.h
+include/gtkmm-%%API_VERSION%%/gtkmm/flowbox.h
+include/gtkmm-%%API_VERSION%%/gtkmm/flowboxchild.h
 include/gtkmm-%%API_VERSION%%/gtkmm/fontbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/fontchooser.h
 include/gtkmm-%%API_VERSION%%/gtkmm/fontchooserdialog.h
@@ -123,6 +126,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/fontselection.h
 include/gtkmm-%%API_VERSION%%/gtkmm/frame.h
 include/gtkmm-%%API_VERSION%%/gtkmm/grid.h
 include/gtkmm-%%API_VERSION%%/gtkmm/handlebox.h
+include/gtkmm-%%API_VERSION%%/gtkmm/headerbar.h
 include/gtkmm-%%API_VERSION%%/gtkmm/hvbox.h
 include/gtkmm-%%API_VERSION%%/gtkmm/hvbuttonbox.h
 include/gtkmm-%%API_VERSION%%/gtkmm/hvpaned.h
@@ -143,6 +147,8 @@ include/gtkmm-%%API_VERSION%%/gtkmm/label.h
 include/gtkmm-%%API_VERSION%%/gtkmm/layout.h
 include/gtkmm-%%API_VERSION%%/gtkmm/levelbar.h
 include/gtkmm-%%API_VERSION%%/gtkmm/linkbutton.h
+include/gtkmm-%%API_VERSION%%/gtkmm/listbox.h
+include/gtkmm-%%API_VERSION%%/gtkmm/listboxrow.h
 include/gtkmm-%%API_VERSION%%/gtkmm/liststore.h
 include/gtkmm-%%API_VERSION%%/gtkmm/listviewtext.h
 include/gtkmm-%%API_VERSION%%/gtkmm/main.h
@@ -163,7 +169,9 @@ include/gtkmm-%%API_VERSION%%/gtkmm/pagesetup.h
 include/gtkmm-%%API_VERSION%%/gtkmm/pagesetupunixdialog.h
 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/popover.h
 include/gtkmm-%%API_VERSION%%/gtkmm/printcontext.h
 include/gtkmm-%%API_VERSION%%/gtkmm/printer.h
 include/gtkmm-%%API_VERSION%%/gtkmm/printjob.h
@@ -176,6 +184,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/accelgroup_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/accellabel_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/action_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/actionable_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/actionbar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/actiongroup_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/activatable_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/adjustment_p.h
@@ -238,6 +247,8 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/filechooserdialog_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/filechooserwidget_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/filefilter_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/fixed_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/flowbox_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/flowboxchild_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/fontbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/fontchooser_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/fontchooserdialog_p.h
@@ -246,6 +257,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/fontselection_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/frame_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
 include/gtkmm-%%API_VERSION%%/gtkmm/private/hvbox_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/hvbuttonbox_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/hvpaned_p.h
@@ -266,6 +278,8 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/label_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/layout_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/levelbar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/linkbutton_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/listbox_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/listboxrow_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/liststore_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/main_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/menu_p.h
@@ -285,7 +299,9 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/pagesetup_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/pagesetupunixdialog_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/paned_p.h
 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/printcontext_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/printer_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/printjob_p.h
@@ -308,11 +324,13 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/recentfilter_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/recentinfo_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/recentmanager_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/requisition_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/revealer_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/scale_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/scalebutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/scrollable_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/scrollbar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/scrolledwindow_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/searchbar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/searchentry_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/selectiondata_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/separator_p.h
@@ -323,6 +341,9 @@ 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
 include/gtkmm-%%API_VERSION%%/gtkmm/private/spinner_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/stack_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/stackswitcher.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/stackswitcher_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/statusbar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/statusicon_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/stockitem_p.h
@@ -385,11 +406,13 @@ include/gtkmm-%%API_VERSION%%/gtkmm/recentfilter.h
 include/gtkmm-%%API_VERSION%%/gtkmm/recentinfo.h
 include/gtkmm-%%API_VERSION%%/gtkmm/recentmanager.h
 include/gtkmm-%%API_VERSION%%/gtkmm/requisition.h
+include/gtkmm-%%API_VERSION%%/gtkmm/revealer.h
 include/gtkmm-%%API_VERSION%%/gtkmm/scale.h
 include/gtkmm-%%API_VERSION%%/gtkmm/scalebutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/scrollable.h
 include/gtkmm-%%API_VERSION%%/gtkmm/scrollbar.h
 include/gtkmm-%%API_VERSION%%/gtkmm/scrolledwindow.h
+include/gtkmm-%%API_VERSION%%/gtkmm/searchbar.h
 include/gtkmm-%%API_VERSION%%/gtkmm/searchentry.h
 include/gtkmm-%%API_VERSION%%/gtkmm/selectiondata.h
 include/gtkmm-%%API_VERSION%%/gtkmm/selectiondata_private.h
@@ -401,6 +424,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/sizegroup.h
 include/gtkmm-%%API_VERSION%%/gtkmm/socket.h
 include/gtkmm-%%API_VERSION%%/gtkmm/spinbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/spinner.h
+include/gtkmm-%%API_VERSION%%/gtkmm/stack.h
 include/gtkmm-%%API_VERSION%%/gtkmm/statusbar.h
 include/gtkmm-%%API_VERSION%%/gtkmm/statusicon.h
 include/gtkmm-%%API_VERSION%%/gtkmm/stock.h
@@ -462,10 +486,10 @@ lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtk.m4
 lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtkmm.m4
 lib/libgdkmm-%%VERSION%%.la
 lib/libgdkmm-%%VERSION%%.so
-lib/libgdkmm-%%VERSION%%.so.1
+lib/libgdkmm-%%VERSION%%.so.2
 lib/libgtkmm-%%VERSION%%.la
 lib/libgtkmm-%%VERSION%%.so
-lib/libgtkmm-%%VERSION%%.so.1
+lib/libgtkmm-%%VERSION%%.so.2
 libdata/pkgconfig/gdkmm-%%API_VERSION%%.pc
 libdata/pkgconfig/gtkmm-%%API_VERSION%%.pc
 @dirrm lib/gtkmm-%%API_VERSION%%/proc/m4
diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile
index 20f5a5b22..e007c12cf 100644
--- a/x11-toolkits/gtksourceview3/Makefile
+++ b/x11-toolkits/gtksourceview3/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	gtksourceview
-PORTVERSION=	3.6.3
-PORTREVISION?=	0
+PORTVERSION=	3.12.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	3
@@ -13,14 +12,13 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Text widget that adds syntax highlighting to the GtkTextView widget
 
-USE_XZ=		yes
-
 .if !defined(REFERENCE_PORT)
 
-USE_AUTOTOOLS=	libtool
+USES+=		gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	gnomeprefix gtk30 intlhack introspection:build \
+		libxml2 ltverhack referencehack
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		gettext gmake pathfix pkgconfig
-USE_GNOME=	gnomeprefix gtk30 intlhack libxml2 ltverhack referencehack
 CONFIGURE_ARGS=	--enable-compile-warnings=no --enable-glade-catalog=no \
 		--enable-introspection
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -30,6 +28,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|--warn-all||g' \
 		${WRKSRC}/gtksourceview/Makefile.in
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgtksourceview-3.0.so.1
+
 .include <bsd.port.mk>
 
 .endif
diff --git a/x11-toolkits/gtksourceview3/distinfo b/x11-toolkits/gtksourceview3/distinfo
index e4983833f..755fc761e 100644
--- a/x11-toolkits/gtksourceview3/distinfo
+++ b/x11-toolkits/gtksourceview3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtksourceview-3.6.3.tar.xz) = bb1e016779cf19e3a67d04b1067e8de24d8db6493abf7a43a284850e22225ded
-SIZE (gnome3/gtksourceview-3.6.3.tar.xz) = 1219664
+SHA256 (gnome3/gtksourceview-3.12.1.tar.xz) = 008cc0758197aeb4843fc4d1220cbe1586a419455b8ef2efdc9d05a2e6f6bd3e
+SIZE (gnome3/gtksourceview-3.12.1.tar.xz) = 1195804
diff --git a/x11-toolkits/gtksourceview3/pkg-plist b/x11-toolkits/gtksourceview3/pkg-plist
index d201530f2..71b183aee 100644
--- a/x11-toolkits/gtksourceview3/pkg-plist
+++ b/x11-toolkits/gtksourceview3/pkg-plist
@@ -16,18 +16,21 @@ include/gtksourceview-3.0/gtksourceview/gtksourcelanguagemanager.h
 include/gtksourceview-3.0/gtksourceview/gtksourcemark.h
 include/gtksourceview-3.0/gtksourceview/gtksourcemarkattributes.h
 include/gtksourceview-3.0/gtksourceview/gtksourceprintcompositor.h
+include/gtksourceview-3.0/gtksourceview/gtksourcesearchcontext.h
+include/gtksourceview-3.0/gtksourceview/gtksourcesearchsettings.h
 include/gtksourceview-3.0/gtksourceview/gtksourcestyle.h
 include/gtksourceview-3.0/gtksourceview/gtksourcestylescheme.h
 include/gtksourceview-3.0/gtksourceview/gtksourcestyleschememanager.h
 include/gtksourceview-3.0/gtksourceview/gtksourcetypes.h
 include/gtksourceview-3.0/gtksourceview/gtksourceundomanager.h
+include/gtksourceview-3.0/gtksourceview/gtksourceutils.h
 include/gtksourceview-3.0/gtksourceview/gtksourceview-typebuiltins.h
 include/gtksourceview-3.0/gtksourceview/gtksourceview.h
 lib/girepository-1.0/GtkSource-3.0.typelib
-lib/libgtksourceview-3.0.a
 lib/libgtksourceview-3.0.la
 lib/libgtksourceview-3.0.so
-lib/libgtksourceview-3.0.so.0
+lib/libgtksourceview-3.0.so.1
+lib/libgtksourceview-3.0.so.1.2.0
 libdata/pkgconfig/gtksourceview-3.0.pc
 share/gir-1.0/GtkSource-3.0.gir
 share/doc/gtksourceview-3.0/GtkSourceBuffer.html
@@ -37,12 +40,18 @@ share/doc/gtksourceview-3.0/GtkSourceCompletionInfo.html
 share/doc/gtksourceview-3.0/GtkSourceCompletionItem.html
 share/doc/gtksourceview-3.0/GtkSourceCompletionProposal.html
 share/doc/gtksourceview-3.0/GtkSourceCompletionProvider.html
+share/doc/gtksourceview-3.0/GtkSourceCompletionWords.html
 share/doc/gtksourceview-3.0/GtkSourceGutter.html
+share/doc/gtksourceview-3.0/GtkSourceGutterRenderer.html
+share/doc/gtksourceview-3.0/GtkSourceGutterRendererPixbuf.html
+share/doc/gtksourceview-3.0/GtkSourceGutterRendererText.html
 share/doc/gtksourceview-3.0/GtkSourceLanguage.html
 share/doc/gtksourceview-3.0/GtkSourceLanguageManager.html
 share/doc/gtksourceview-3.0/GtkSourceMark.html
 share/doc/gtksourceview-3.0/GtkSourceMarkAttributes.html
 share/doc/gtksourceview-3.0/GtkSourcePrintCompositor.html
+share/doc/gtksourceview-3.0/GtkSourceSearchContext.html
+share/doc/gtksourceview-3.0/GtkSourceSearchSettings.html
 share/doc/gtksourceview-3.0/GtkSourceStyle.html
 share/doc/gtksourceview-3.0/GtkSourceStyleScheme.html
 share/doc/gtksourceview-3.0/GtkSourceStyleSchemeManager.html
@@ -50,37 +59,43 @@ share/doc/gtksourceview-3.0/GtkSourceUndoManager.html
 share/doc/gtksourceview-3.0/GtkSourceView.html
 share/doc/gtksourceview-3.0/annotation-glossary.html
 share/doc/gtksourceview-3.0/api-index-3-0.html
+share/doc/gtksourceview-3.0/api-index-3-10.html
+share/doc/gtksourceview-3.0/api-index-3-12.html
+share/doc/gtksourceview-3.0/api-index-3-4.html
 share/doc/gtksourceview-3.0/api-index-deprecated.html
 share/doc/gtksourceview-3.0/api-index-full.html
-share/doc/gtksourceview-3.0/gtksourceview-3.0-GtkSourceGutterRenderer.html
-share/doc/gtksourceview-3.0/gtksourceview-3.0-GtkSourceGutterRendererPixbuf.html
-share/doc/gtksourceview-3.0/gtksourceview-3.0-GtkSourceGutterRendererText.html
+share/doc/gtksourceview-3.0/ch01.html
+share/doc/gtksourceview-3.0/ch02.html
+share/doc/gtksourceview-3.0/gtksourceview-3.0-GtkSourceUtils.html
 share/doc/gtksourceview-3.0/gtksourceview-3.0.devhelp2
 share/doc/gtksourceview-3.0/home.png
 share/doc/gtksourceview-3.0/index.html
 share/doc/gtksourceview-3.0/index.sgml
 share/doc/gtksourceview-3.0/lang-reference.html
 share/doc/gtksourceview-3.0/lang-tutorial.html
+share/doc/gtksourceview-3.0/left-insensitive.png
 share/doc/gtksourceview-3.0/left.png
+share/doc/gtksourceview-3.0/object-tree.html
+share/doc/gtksourceview-3.0/right-insensitive.png
 share/doc/gtksourceview-3.0/right.png
-share/doc/gtksourceview-3.0/rn01.html
-share/doc/gtksourceview-3.0/rn02.html
 share/doc/gtksourceview-3.0/style-reference.html
 share/doc/gtksourceview-3.0/style.css
+share/doc/gtksourceview-3.0/up-insensitive.png
 share/doc/gtksourceview-3.0/up.png
 share/gtksourceview-3.0/language-specs/R.lang
 share/gtksourceview-3.0/language-specs/actionscript.lang
+share/gtksourceview-3.0/language-specs/ansforth94.lang
 share/gtksourceview-3.0/language-specs/ada.lang
 share/gtksourceview-3.0/language-specs/asp.lang
 share/gtksourceview-3.0/language-specs/automake.lang
 share/gtksourceview-3.0/language-specs/awk.lang
 share/gtksourceview-3.0/language-specs/bennugd.lang
 share/gtksourceview-3.0/language-specs/bibtex.lang
+share/gtksourceview-3.0/language-specs/bluespec.lang
 share/gtksourceview-3.0/language-specs/boo.lang
 share/gtksourceview-3.0/language-specs/c.lang
 share/gtksourceview-3.0/language-specs/cg.lang
 share/gtksourceview-3.0/language-specs/changelog.lang
-share/gtksourceview-3.0/language-specs/check-language.sh
 share/gtksourceview-3.0/language-specs/chdr.lang
 share/gtksourceview-3.0/language-specs/cmake.lang
 share/gtksourceview-3.0/language-specs/cobol.lang
@@ -113,6 +128,7 @@ share/gtksourceview-3.0/language-specs/haddock.lang
 share/gtksourceview-3.0/language-specs/haskell-literate.lang
 share/gtksourceview-3.0/language-specs/haskell.lang
 share/gtksourceview-3.0/language-specs/html.lang
+share/gtksourceview-3.0/language-specs/idl-exelis.lang
 share/gtksourceview-3.0/language-specs/idl.lang
 share/gtksourceview-3.0/language-specs/imagej.lang
 share/gtksourceview-3.0/language-specs/ini.lang
@@ -120,17 +136,22 @@ share/gtksourceview-3.0/language-specs/j.lang
 share/gtksourceview-3.0/language-specs/java.lang
 share/gtksourceview-3.0/language-specs/javascript.lang
 share/gtksourceview-3.0/language-specs/json.lang
+share/gtksourceview-3.0/language-specs/julia.lang
 share/gtksourceview-3.0/language-specs/language.dtd
 share/gtksourceview-3.0/language-specs/language.rng
 share/gtksourceview-3.0/language-specs/language2.rng
 share/gtksourceview-3.0/language-specs/latex.lang
+share/gtksourceview-3.0/language-specs/lex.lang
 share/gtksourceview-3.0/language-specs/libtool.lang
+share/gtksourceview-3.0/language-specs/llvm.lang
 share/gtksourceview-3.0/language-specs/lua.lang
 share/gtksourceview-3.0/language-specs/m4.lang
 share/gtksourceview-3.0/language-specs/makefile.lang
 share/gtksourceview-3.0/language-specs/mallard.lang
 share/gtksourceview-3.0/language-specs/markdown.lang
 share/gtksourceview-3.0/language-specs/matlab.lang
+share/gtksourceview-3.0/language-specs/mediawiki.lang
+share/gtksourceview-3.0/language-specs/modelica.lang
 share/gtksourceview-3.0/language-specs/mxml.lang
 share/gtksourceview-3.0/language-specs/nemerle.lang
 share/gtksourceview-3.0/language-specs/netrexx.lang
@@ -154,13 +175,16 @@ share/gtksourceview-3.0/language-specs/puppet.lang
 share/gtksourceview-3.0/language-specs/python.lang
 share/gtksourceview-3.0/language-specs/python3.lang
 share/gtksourceview-3.0/language-specs/rpmspec.lang
+share/gtksourceview-3.0/language-specs/rst.lang
 share/gtksourceview-3.0/language-specs/ruby.lang
+share/gtksourceview-3.0/language-specs/scala.lang
 share/gtksourceview-3.0/language-specs/scheme.lang
 share/gtksourceview-3.0/language-specs/scilab.lang
 share/gtksourceview-3.0/language-specs/sh.lang
 share/gtksourceview-3.0/language-specs/sml.lang
 share/gtksourceview-3.0/language-specs/sparql.lang
 share/gtksourceview-3.0/language-specs/sql.lang
+share/gtksourceview-3.0/language-specs/sweave.lang
 share/gtksourceview-3.0/language-specs/systemverilog.lang
 share/gtksourceview-3.0/language-specs/t2t.lang
 share/gtksourceview-3.0/language-specs/tcl.lang
@@ -172,11 +196,13 @@ share/gtksourceview-3.0/language-specs/vhdl.lang
 share/gtksourceview-3.0/language-specs/xml.lang
 share/gtksourceview-3.0/language-specs/xslt.lang
 share/gtksourceview-3.0/language-specs/yacc.lang
-share/gtksourceview-3.0/styles/check-style.sh
+share/gtksourceview-3.0/language-specs/yaml.lang
 share/gtksourceview-3.0/styles/classic.xml
 share/gtksourceview-3.0/styles/cobalt.xml
 share/gtksourceview-3.0/styles/kate.xml
 share/gtksourceview-3.0/styles/oblivion.xml
+share/gtksourceview-3.0/styles/solarized-dark.xml
+share/gtksourceview-3.0/styles/solarized-light.xml
 share/gtksourceview-3.0/styles/styles.rng
 share/gtksourceview-3.0/styles/tango.xml
 share/locale/ar/LC_MESSAGES/gtksourceview-3.0.mo
@@ -249,6 +275,7 @@ share/locale/sr@latin/LC_MESSAGES/gtksourceview-3.0.mo
 share/locale/sv/LC_MESSAGES/gtksourceview-3.0.mo
 share/locale/ta/LC_MESSAGES/gtksourceview-3.0.mo
 share/locale/te/LC_MESSAGES/gtksourceview-3.0.mo
+share/locale/tg/LC_MESSAGES/gtksourceview-3.0.mo
 share/locale/th/LC_MESSAGES/gtksourceview-3.0.mo
 share/locale/tr/LC_MESSAGES/gtksourceview-3.0.mo
 share/locale/ug/LC_MESSAGES/gtksourceview-3.0.mo
diff --git a/x11-toolkits/libwnck3/Makefile b/x11-toolkits/libwnck3/Makefile
index 4236c5fdb..d46529650 100644
--- a/x11-toolkits/libwnck3/Makefile
+++ b/x11-toolkits/libwnck3/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	libwnck
-PORTVERSION=	3.4.5
-PORTREVISION?=	1
+PORTVERSION=	3.4.7
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	3
@@ -13,15 +12,16 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library used for writing pagers and taskslists
 
-USE_XZ=		yes
+USES=		tar:xz
 
 .if !defined(REFERENCE_PORT)
 
 LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
 
+USES+=		bison gettext gmake pathfix pkgconfig
+USE_GNOME=	gtk30 intlhack introspection:build ltverhack \
+		referencehack
 USE_XORG=	xres x11
-USE_GNOME=	gtk30 intlhack introspection:build ltverhack referencehack
-USES=		bison gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-tools
diff --git a/x11-toolkits/libwnck3/distinfo b/x11-toolkits/libwnck3/distinfo
index d585e79bc..d6bae75f9 100644
--- a/x11-toolkits/libwnck3/distinfo
+++ b/x11-toolkits/libwnck3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/libwnck-3.4.5.tar.xz) = 560f9709405fb33500c2f79efabdb1c4056866dec281f354ad3da97181fbf381
-SIZE (gnome3/libwnck-3.4.5.tar.xz) = 657792
+SHA256 (gnome3/libwnck-3.4.7.tar.xz) = d48ac9c7f50c0d563097f63d07bcc83744c7d92a1b4ef65e5faeab32b5ccb723
+SIZE (gnome3/libwnck-3.4.7.tar.xz) = 663768
diff --git a/x11-toolkits/libwnck3/pkg-plist b/x11-toolkits/libwnck3/pkg-plist
index edca2b983..c8233af87 100644
--- a/x11-toolkits/libwnck3/pkg-plist
+++ b/x11-toolkits/libwnck3/pkg-plist
@@ -47,6 +47,7 @@ share/gtk-doc/html/libwnck-3.0/ix13.html
 share/gtk-doc/html/libwnck-3.0/ix14.html
 share/gtk-doc/html/libwnck-3.0/left.png
 share/gtk-doc/html/libwnck-3.0/libwnck-3.0.devhelp2
+share/gtk-doc/html/libwnck-3.0/libwnck-Icons-Functions.html
 share/gtk-doc/html/libwnck-3.0/libwnck-Miscellaneous-Functions.html
 share/gtk-doc/html/libwnck-3.0/libwnck-Resource-Usage-of-X-Clients.html
 share/gtk-doc/html/libwnck-3.0/libwnck-Version-Information.html
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 20cd6048a..53643ecfb 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	pango
-PORTVERSION=	1.36.1
+PORTVERSION=	1.36.2
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
@@ -31,7 +31,9 @@ USE_GNOME=	cairo glib20 introspection:build referencehack
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_SUB=	VERSION="1.8.0"
+VERSION=	1.8.0
+LIBVERSION=     0.3600.2
+PLIST_SUB+=     VERSION=${VERSION} LIBVERSION=${LIBVERSION}
 
 FONTSCALE=	${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf
 FONTENCOD=	${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 98ef61895..df1a8a05e 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/pango-1.36.1.tar.xz) = 42e4b51cdc99e6878a9ea2a5ef2b31b79c1033f8518726df738a3c54c90e59f8
-SIZE (gnome2/pango-1.36.1.tar.xz) = 1017924
+SHA256 (gnome2/pango-1.36.2.tar.xz) = f07f9392c9cf20daf5c17a210b2c3f3823d517e1917b72f20bb19353b2bc2c63
+SIZE (gnome2/pango-1.36.2.tar.xz) = 1025208
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index a56c61c59..8c9a863d5 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -40,19 +40,19 @@ lib/girepository-1.0/PangoFT2-1.0.typelib
 lib/libpango-1.0.la
 lib/libpango-1.0.so
 lib/libpango-1.0.so.0
-lib/libpango-1.0.so.0.3600.1
+lib/libpango-1.0.so.%%LIBVERSION%%
 lib/libpangocairo-1.0.la
 lib/libpangocairo-1.0.so
 lib/libpangocairo-1.0.so.0
-lib/libpangocairo-1.0.so.0.3600.1
+lib/libpangocairo-1.0.so.%%LIBVERSION%%
 lib/libpangoft2-1.0.la
 lib/libpangoft2-1.0.so
 lib/libpangoft2-1.0.so.0
-lib/libpangoft2-1.0.so.0.3600.1
+lib/libpangoft2-1.0.so.%%LIBVERSION%%
 %%X11%%lib/libpangoxft-1.0.la
 %%X11%%lib/libpangoxft-1.0.so
 %%X11%%lib/libpangoxft-1.0.so.0
-%%X11%%lib/libpangoxft-1.0.so.0.3600.1
+%%X11%%lib/libpangoxft-1.0.so.%%LIBVERSION%%
 lib/pango/%%VERSION%%/modules/pango-arabic-lang.la
 lib/pango/%%VERSION%%/modules/pango-arabic-lang.so
 lib/pango/%%VERSION%%/modules/pango-basic-fc.la
@@ -101,6 +101,7 @@ share/gtk-doc/html/pango/home.png
 share/gtk-doc/html/pango/index.html
 share/gtk-doc/html/pango/index.sgml
 share/gtk-doc/html/pango/layout.gif
+share/gtk-doc/html/pango/left-insensitive.png
 share/gtk-doc/html/pango/left.png
 share/gtk-doc/html/pango/lowlevel.html
 share/gtk-doc/html/pango/pango-Bidirectional-Text.html
@@ -128,10 +129,12 @@ share/gtk-doc/html/pango/pango-querymodules.html
 share/gtk-doc/html/pango/pango.devhelp2
 share/gtk-doc/html/pango/pango.html
 share/gtk-doc/html/pango/rendering.html
+share/gtk-doc/html/pango/right-insensitive.png
 share/gtk-doc/html/pango/right.png
 share/gtk-doc/html/pango/rotated-text.png
 share/gtk-doc/html/pango/style.css
 share/gtk-doc/html/pango/tools.html
+share/gtk-doc/html/pango/up-insensitive.png
 share/gtk-doc/html/pango/up.png
 @dirrm share/gtk-doc/html/pango
 @dirrmtry share/gtk-doc/html
@@ -142,4 +145,5 @@ share/gtk-doc/html/pango/up.png
 @dirrm lib/pango
 @dirrm include/pango-1.0/pango
 @dirrm include/pango-1.0
+@dirrm etc/pango
 @exec %%LOCALBASE%%/bin/pango-querymodules --update-cache
diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile
index 730a00ceb..bf50775bd 100644
--- a/x11-toolkits/vte3/Makefile
+++ b/x11-toolkits/vte3/Makefile
@@ -1,10 +1,9 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11-toolkits/vte3/Makefile 18941 2013-12-08 01:18:10Z kwm $
+#   $MCom: ports-experimental/trunk/x11-toolkits/vte3/Makefile 19319 2014-03-25 13:00:06Z gusi $
 
 PORTNAME?=	vte
-PORTVERSION=	0.34.7
-PORTREVISION?=	0
+PORTVERSION=	0.36.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/gnome-pty-helper/vte/}/${PORTVERSION:R}
@@ -15,7 +14,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	Terminal widget with improved accessibility and I18N support
 
-USE_XZ=		yes
+USES=		tar:xz
 
 .if !defined(REFERENCE_PORT)
 VTE3_SLAVE?=	no
@@ -24,10 +23,10 @@ VTE3_SLAVE?=	no
 RUN_DEPENDS+=	${LOCALBASE}/libexec/gnome-pty-helper:${PORTSDIR}/x11-toolkits/gnome-pty-helper
 .endif
 
-USES=		bison gettext gmake pathfix pkgconfig
+USES+=		bison gettext gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME?=	gnomeprefix gtk30 ltverhack referencehack introspection:build
+USE_GNOME?=	gnomeprefix gtk30 referencehack introspection:build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS?=--disable-python \
diff --git a/x11-toolkits/vte3/distinfo b/x11-toolkits/vte3/distinfo
index 4bf4600d5..d9ada78d6 100644
--- a/x11-toolkits/vte3/distinfo
+++ b/x11-toolkits/vte3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/vte-0.34.7.tar.xz) = 187e49cca574f548d04ceea701e95a1531ff9dd9cd1953ce6455824720dab932
-SIZE (gnome3/vte-0.34.7.tar.xz) = 984068
+SHA256 (gnome3/vte-0.36.0.tar.xz) = faa036e5a89fd658f5c62e16a57c493d2107d840a0e918b9f8acb547471a85f7
+SIZE (gnome3/vte-0.36.0.tar.xz) = 1008028
diff --git a/x11-toolkits/vte3/pkg-plist b/x11-toolkits/vte3/pkg-plist
index e90ead230..8292ce999 100644
--- a/x11-toolkits/vte3/pkg-plist
+++ b/x11-toolkits/vte3/pkg-plist
@@ -12,6 +12,7 @@ lib/girepository-1.0/Vte-%%VERSION%%.typelib
 lib/libvte2_90.la
 lib/libvte2_90.so
 lib/libvte2_90.so.9
+lib/libvte2_90.so.9.3600.0
 libdata/pkgconfig/vte-%%VERSION%%.pc
 share/doc/vte-2.90/VteReaper.html
 share/doc/vte-2.90/VteTerminal.html
@@ -22,6 +23,7 @@ share/doc/vte-2.90/api-index-0-24.html
 share/doc/vte-2.90/api-index-0-26.html
 share/doc/vte-2.90/api-index-0-28.html
 share/doc/vte-2.90/api-index-0-34.html
+share/doc/vte-2.90/api-index-0-36.html
 share/doc/vte-2.90/api-index-deprecated.html
 share/doc/vte-2.90/api-index-full.html
 share/doc/vte-2.90/ch01.html
@@ -123,6 +125,7 @@ share/locale/sr@latin/LC_MESSAGES/vte-2.90.mo
 share/locale/sv/LC_MESSAGES/vte-2.90.mo
 share/locale/ta/LC_MESSAGES/vte-2.90.mo
 share/locale/te/LC_MESSAGES/vte-2.90.mo
+share/locale/tg/LC_MESSAGES/vte-2.90.mo
 share/locale/th/LC_MESSAGES/vte-2.90.mo
 share/locale/tr/LC_MESSAGES/vte-2.90.mo
 share/locale/ug/LC_MESSAGES/vte-2.90.mo
@@ -142,6 +145,8 @@ share/locale/zh_TW/LC_MESSAGES/vte-2.90.mo
 @dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/tg/LC_MESSAGES
+@dirrmtry share/locale/tg
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES