First batch of updated gnome 3.14 ports:

	- at-spi2-atk-2.14.1
	- at-spi2-core-2.14.0
	- atk-2.14.0
	- baobab-3.14.0
	- caribou-0.4.15
	- gjs-1.42.0
	- glib-2.42.0 [1]
	- glib-networking-2.42.0
	- glibmm-2.42.0
	- libgdata-0.16.0 [2]
	- vala-0.26.1 [3]

As usual, some fix here and there. While here, remove the @dir[rm|rmmty]
from the pkg-plist files, those are not needed anymore.

[1] The code on gio_gunixmounts.c seems to have changed. I've tried
to keep the logic, but need to check it in run time
[2] Add gtk-doc to the run_deps
[3] Take into account that vala_vapigen is gone and now is part of
the vala port itself


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

35 files changed, 118 insertions, 544 deletions

diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile
index dbe1f8363..402b4940f 100644
--- a/accessibility/at-spi2-atk/Makefile
+++ b/accessibility/at-spi2-atk/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	at-spi2-atk
-PORTVERSION=	2.12.1
-PORTREVISION=	1
+PORTVERSION=	2.14.1
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -25,7 +24,7 @@ USE_GNOME=	atk glib20 gnomehier intlhack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-p2p
 INSTALL_TARGET=	install-strip
 
diff --git a/accessibility/at-spi2-atk/distinfo b/accessibility/at-spi2-atk/distinfo
index fe70a0e96..c92b3a8c0 100644
--- a/accessibility/at-spi2-atk/distinfo
+++ b/accessibility/at-spi2-atk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/at-spi2-atk-2.12.1.tar.xz) = 5fa9c527bdec028e06797563cd52d49bcf06f638549df983424d88db89bb1336
-SIZE (gnome3/at-spi2-atk-2.12.1.tar.xz) = 280568
+SHA256 (gnome3/at-spi2-atk-2.14.1.tar.xz) = 058f34ea60edf0a5f831c9f2bdd280fe95c1bcafb76e466e44aa0fb356d17bcb
+SIZE (gnome3/at-spi2-atk-2.14.1.tar.xz) = 280952
diff --git a/accessibility/at-spi2-atk/pkg-plist b/accessibility/at-spi2-atk/pkg-plist
index aa24c6432..b63a83eba 100644
--- a/accessibility/at-spi2-atk/pkg-plist
+++ b/accessibility/at-spi2-atk/pkg-plist
@@ -5,9 +5,3 @@ lib/libatk-bridge-2.0.so.0.0.0
 lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
 lib/gtk-2.0/modules/libatk-bridge.so
 libdata/pkgconfig/atk-bridge-2.0.pc
-@dirrmtry lib/gtk-2.0/modules
-@dirrmtry lib/gtk-2.0
-@dirrmtry lib/gnome-settings-daemon-3.0/gtk-modules
-@dirrmtry lib/gnome-settings-daemon-3.0
-@dirrm include/at-spi2-atk/2.0
-@dirrm include/at-spi2-atk
diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile
index 150204a3c..e2efffd5a 100644
--- a/accessibility/at-spi2-core/Makefile
+++ b/accessibility/at-spi2-core/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	at-spi2-core
-PORTVERSION=	2.12.0
-PORTREVISION=	1
+PORTVERSION=	2.14.0
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/accessibility/at-spi2-core/distinfo b/accessibility/at-spi2-core/distinfo
index e55bd31df..fefbfe5f8 100644
--- a/accessibility/at-spi2-core/distinfo
+++ b/accessibility/at-spi2-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/at-spi2-core-2.12.0.tar.xz) = db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89
-SIZE (gnome3/at-spi2-core-2.12.0.tar.xz) = 454668
+SHA256 (gnome3/at-spi2-core-2.14.0.tar.xz) = 5807b02e6ef695b52fde7ff26d675dd94a0707df3c42fe7fd224828e092514c8
+SIZE (gnome3/at-spi2-core-2.14.0.tar.xz) = 456376
diff --git a/accessibility/at-spi2-core/pkg-plist b/accessibility/at-spi2-core/pkg-plist
index afa0ee30a..5ac21fb49 100644
--- a/accessibility/at-spi2-core/pkg-plist
+++ b/accessibility/at-spi2-core/pkg-plist
@@ -56,7 +56,6 @@ share/gtk-doc/html/libatspi/ch01.html
 share/gtk-doc/html/libatspi/home.png
 share/gtk-doc/html/libatspi/index.html
 share/gtk-doc/html/libatspi/index.sgml
-share/gtk-doc/html/libatspi/left-insensitive.png
 share/gtk-doc/html/libatspi/left.png
 share/gtk-doc/html/libatspi/libatspi-AtspiApplication.html
 share/gtk-doc/html/libatspi/libatspi-atspi-action.html
@@ -78,10 +77,8 @@ share/gtk-doc/html/libatspi/libatspi-atspi-types.html
 share/gtk-doc/html/libatspi/libatspi-atspi-value.html
 share/gtk-doc/html/libatspi/libatspi.devhelp2
 share/gtk-doc/html/libatspi/object-tree.html
-share/gtk-doc/html/libatspi/right-insensitive.png
 share/gtk-doc/html/libatspi/right.png
 share/gtk-doc/html/libatspi/style.css
-share/gtk-doc/html/libatspi/up-insensitive.png
 share/gtk-doc/html/libatspi/up.png
 share/locale/an/LC_MESSAGES/at-spi2-core.mo
 share/locale/as/LC_MESSAGES/at-spi2-core.mo
@@ -148,33 +145,3 @@ share/locale/vi/LC_MESSAGES/at-spi2-core.mo
 share/locale/zh_CN/LC_MESSAGES/at-spi2-core.mo
 share/locale/zh_HK/LC_MESSAGES/at-spi2-core.mo
 share/locale/zh_TW/LC_MESSAGES/at-spi2-core.mo
-@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
-@dirrmtry share/locale/uz@cyrillic
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/km/LC_MESSAGES
-@dirrmtry share/locale/km
-@dirrmtry share/locale/fur/LC_MESSAGES
-@dirrmtry share/locale/fur
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry share/locale/an/LC_MESSAGES
-@dirrmtry share/locale/an
-@dirrm share/gtk-doc/html/libatspi
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
-@dirrm include/at-spi-2.0/atspi
-@dirrm include/at-spi-2.0
-@dirrm etc/at-spi2
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 09214bf9d..92626220b 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -3,8 +3,8 @@
 #   $MCom$
 
 PORTNAME=	atk
-PORTVERSION=	2.12.0
-PORTREVISION?=	1
+PORTVERSION=	2.14.0
+PORTREVISION?=	0
 CATEGORIES=	accessibility devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -22,7 +22,7 @@ USES+=		gettext gmake libtool pathfix pkgconfig
 USE_GNOME=	glib20 gnomehier introspection:build referencehack
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ENV=	AUTOCONF=${TRUE} AUTOMAKE=${TRUE}
 INSTALL_TARGET=	install-strip
 
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 1d6066bde..ae33145a7 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/atk-2.12.0.tar.xz) = 48a8431974639c5a59c24fcd3ece1a19709872d5dfe78907524d9f5e9993f18f
-SIZE (gnome2/atk-2.12.0.tar.xz) = 688716
+SHA256 (gnome2/atk-2.14.0.tar.xz) = 2875cc0b32bfb173c066c22a337f79793e0c99d2cc5e81c4dac0d5a523b8fbad
+SIZE (gnome2/atk-2.14.0.tar.xz) = 696064
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 3611212c6..2cbe7315e 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -35,7 +35,7 @@ include/atk-1.0/atk/atkwindow.h
 lib/girepository-1.0/Atk-1.0.typelib
 lib/libatk-1.0.so
 lib/libatk-1.0.so.0
-lib/libatk-1.0.so.0.21209.1
+lib/libatk-1.0.so.0.21409.1
 libdata/pkgconfig/atk.pc
 share/gir-1.0/Atk-1.0.gir
 share/locale/af/LC_MESSAGES/atk10.mo
@@ -135,59 +135,3 @@ share/locale/zh_CN/LC_MESSAGES/atk10.mo
 share/locale/zh_HK/LC_MESSAGES/atk10.mo
 share/locale/zh_TW/LC_MESSAGES/atk10.mo
 share/locale/zu/LC_MESSAGES/atk10.mo
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/yi/LC_MESSAGES
-@dirrmtry share/locale/yi
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/tt/LC_MESSAGES
-@dirrmtry share/locale/tt
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/km/LC_MESSAGES
-@dirrmtry share/locale/km
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry share/locale/an/LC_MESSAGES
-@dirrmtry share/locale/an
-@dirrm include/atk-1.0/atk
-@dirrm include/atk-1.0
diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile
index 3a150fcad..41b7649a1 100644
--- a/accessibility/caribou/Makefile
+++ b/accessibility/caribou/Makefile
@@ -3,7 +3,7 @@
 #    $MCom$
 
 PORTNAME=	caribou
-PORTVERSION=	0.4.14
+PORTVERSION=	0.4.15
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/accessibility/caribou/distinfo b/accessibility/caribou/distinfo
index e1fb963ab..9972914d0 100644
--- a/accessibility/caribou/distinfo
+++ b/accessibility/caribou/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/caribou-0.4.14.tar.xz) = 291c5fd856c081ddaedd6fabd510bbe21c15ac689274ab99c88174a609a7e1c1
-SIZE (gnome3/caribou-0.4.14.tar.xz) = 405860
+SHA256 (gnome3/caribou-0.4.15.tar.xz) = fdb7c645f4b35d2e106bb7d48fba914950ef84020fc8ad470cfab6a44e925f10
+SIZE (gnome3/caribou-0.4.15.tar.xz) = 405968
diff --git a/deskutils/baobab/Makefile b/deskutils/baobab/Makefile
index 3d15b9b66..a1b82c314 100644
--- a/deskutils/baobab/Makefile
+++ b/deskutils/baobab/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	baobab
-PORTVERSION=	3.12.1
-PORTREVISION=	1
+PORTVERSION=	3.14.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -13,7 +12,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 graphical directory tree analyzer
 
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
-		vapigen:${PORTSDIR}/lang/vala-vapigen
+		vapigen:${PORTSDIR}/lang/vala
 LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop
 
 CONFLICTS=	gnome-utils-2.[0-9]*
diff --git a/deskutils/baobab/distinfo b/deskutils/baobab/distinfo
index e5022b291..efdb595a0 100644
--- a/deskutils/baobab/distinfo
+++ b/deskutils/baobab/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/baobab-3.12.1.tar.xz) = 494808d8a5b1776377749a1dcd5b251eb399208a4c90380dc8b8c789811e514c
-SIZE (gnome3/baobab-3.12.1.tar.xz) = 870624
+SHA256 (gnome3/baobab-3.14.0.tar.xz) = 63295bb25b2edea9ce67ba879e45dc9a7267488245532c8b6e74e5f97f738955
+SIZE (gnome3/baobab-3.14.0.tar.xz) = 882104
diff --git a/deskutils/baobab/pkg-plist b/deskutils/baobab/pkg-plist
index 09c984955..fa1524500 100644
--- a/deskutils/baobab/pkg-plist
+++ b/deskutils/baobab/pkg-plist
@@ -1,6 +1,6 @@
 bin/baobab
 man/man1/baobab.1.gz
-share/appdata/baobab.appdata.xml
+share/appdata/org.gnome.baobab.appdata.xml
 share/applications/org.gnome.baobab.desktop
 share/dbus-1/services/org.gnome.baobab.service
 share/help/C/baobab/index.page
@@ -63,6 +63,16 @@ share/help/es/baobab/scan-file-system.page
 share/help/es/baobab/scan-folder.page
 share/help/es/baobab/scan-home.page
 share/help/es/baobab/scan-remote.page
+share/help/fi/baobab/index.page
+share/help/fi/baobab/introduction.page
+share/help/fi/baobab/legal.xml
+share/help/fi/baobab/pref-view-chart.page
+share/help/fi/baobab/problem-permissions.page
+share/help/fi/baobab/problem-slow-scan.page
+share/help/fi/baobab/scan-file-system.page
+share/help/fi/baobab/scan-folder.page
+share/help/fi/baobab/scan-home.page
+share/help/fi/baobab/scan-remote.page
 share/help/fr/baobab/index.page
 share/help/fr/baobab/introduction.page
 share/help/fr/baobab/legal.xml
@@ -165,8 +175,6 @@ share/icons/hicolor/24x24/apps/baobab.png
 share/icons/hicolor/256x256/apps/baobab.png
 share/icons/hicolor/32x32/apps/baobab.png
 share/icons/hicolor/48x48/apps/baobab.png
-share/icons/hicolor/scalable/actions/view-ringschart-symbolic.svg
-share/icons/hicolor/scalable/actions/view-treemap-symbolic.svg
 share/locale/af/LC_MESSAGES/baobab.mo
 share/locale/am/LC_MESSAGES/baobab.mo
 share/locale/an/LC_MESSAGES/baobab.mo
@@ -261,88 +269,3 @@ share/locale/xh/LC_MESSAGES/baobab.mo
 share/locale/zh_CN/LC_MESSAGES/baobab.mo
 share/locale/zh_HK/LC_MESSAGES/baobab.mo
 share/locale/zh_TW/LC_MESSAGES/baobab.mo
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/km/LC_MESSAGES
-@dirrmtry share/locale/km
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrm share/help/zh_CN/baobab
-@dirrmtry share/help/zh_CN
-@dirrm share/help/sl/baobab
-@dirrmtry share/help/sl
-@dirrm share/help/ru/baobab
-@dirrmtry share/help/ru
-@dirrm share/help/pt_BR/baobab
-@dirrmtry share/help/pt_BR
-@dirrm share/help/it/baobab
-@dirrmtry share/help/it
-@dirrm share/help/id/baobab
-@dirrmtry share/help/id
-@dirrm share/help/hu/baobab
-@dirrmtry share/help/hu
-@dirrm share/help/gl/baobab
-@dirrmtry share/help/gl
-@dirrm share/help/fr/baobab
-@dirrmtry share/help/fr
-@dirrm share/help/es/baobab
-@dirrmtry share/help/es
-@dirrm share/help/el/baobab
-@dirrmtry share/help/el
-@dirrm share/help/de/baobab
-@dirrmtry share/help/de
-@dirrm share/help/cs/baobab
-@dirrmtry share/help/cs
-@dirrm share/help/ca/baobab
-@dirrmtry share/help/ca
-@dirrm share/help/C/baobab
-@dirrmtry share/help/C
-@dirrmtry share/help
-@dirrmtry share/icons/HighContrast/48x48/apps
-@dirrmtry share/icons/HighContrast/48x48
-@dirrmtry share/icons/HighContrast/32x32/apps
-@dirrmtry share/icons/HighContrast/32x32
-@dirrmtry share/icons/HighContrast/256x256/apps
-@dirrmtry share/icons/HighContrast/256x256
-@dirrmtry share/icons/HighContrast/24x24/apps
-@dirrmtry share/icons/HighContrast/24x24
-@dirrmtry share/icons/HighContrast/22x22/apps
-@dirrmtry share/icons/HighContrast/22x22
-@dirrmtry share/icons/HighContrast/16x16/apps
-@dirrmtry share/icons/HighContrast/16x16
-@dirrmtry share/icons/HighContrast
-@dirrm share/appdata
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 5cf251f15..7ff281e5b 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	glib
-PORTVERSION=	2.40.2
+PORTVERSION=	2.42.0
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -38,9 +38,9 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
-SHEBANG_FILES=	*/*.pl glib/gen-iswide-table.py
+SHEBANG_FILES=	*/*.pl
 
-LIBVERSION=	0.4002.0
+LIBVERSION=	0.4200.0
 PLIST_SUB+=	LIBVERSION=${LIBVERSION}
 
 OPTIONS_DEFINE=	COLLATION_FIX DEBUG GDB
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 2a8a4ccf2..720249fcd 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.40.2.tar.xz) = e8ff8af2950897e805408480c454c415d1eade4e670ec5fb507f5e5853726c7a
-SIZE (gnome2/glib-2.40.2.tar.xz) = 7001344
+SHA256 (gnome2/glib-2.42.0.tar.xz) = 94fbc0a7d10633433ff383e540607de649c1b46baaa59dea446a50977a6c4472
+SIZE (gnome2/glib-2.42.0.tar.xz) = 7062896
diff --git a/devel/glib20/files/patch-configure b/devel/glib20/files/patch-configure
index 331a77152..96ba9d202 100644
--- a/devel/glib20/files/patch-configure
+++ b/devel/glib20/files/patch-configure
@@ -1,6 +1,22 @@
---- configure.orig	2013-09-26 18:07:07.000000000 +0200
-+++ configure	2013-09-26 18:08:15.000000000 +0200
-@@ -7643,13 +7646,12 @@
+--- configure.orig	2014-09-28 09:31:41.079343419 +0200
++++ configure	2014-09-28 09:31:41.243342071 +0200
+@@ -7534,13 +7534,12 @@
+       fi
+       # Check if we have a iconv in -liconv, possibly from vendor
+       if test $found_iconv = "no"; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5
+-$as_echo_n "checking for iconv_open in -liconv... " >&6; }
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open" >&5
++$as_echo_n "checking for iconv_open... " >&6; }
+ if ${ac_cv_lib_iconv_iconv_open+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-liconv  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -7626,13 +7625,12 @@
  
        ;;
      native)
@@ -16,15 +32,7 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -8684,6 +8686,7 @@
-     ;;
-   native)
- 
-+ICONV_LIBS=""
- $as_echo "#define USE_LIBICONV_NATIVE 1" >>confdefs.h
- 
-     ;;
-@@ -27013,10 +27016,10 @@
+@@ -26730,9 +26728,12 @@
    *android*)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
@@ -32,8 +40,9 @@
 +  *-*-linux*)
      G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`"
      ;;
--  *-*-openbsd*)
-+  *-*-freebsd*|*-*-openbsd*)
-     LDFLAGS="$LDFLAGS -pthread"
-     ;;
++  *-*-freebsd*)
++    LDFLAGS="$LDFLAGS -pthread"
++    ;;    
    *)
+     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
+     ;;
diff --git a/devel/glib20/files/patch-gio_gunixmounts.c b/devel/glib20/files/patch-gio_gunixmounts.c
index 30247a52e..f73b3af2a 100644
--- a/devel/glib20/files/patch-gio_gunixmounts.c
+++ b/devel/glib20/files/patch-gio_gunixmounts.c
@@ -1,46 +1,16 @@
---- gio/gunixmounts.c.orig	2013-06-09 18:03:17.000000000 -0400
-+++ gio/gunixmounts.c	2013-12-14 11:45:36.749181267 -0500
-@@ -155,6 +155,9 @@ struct _GUnixMountMonitor {
+--- gio/gunixmounts.c.orig	2014-09-22 15:42:12.000000000 +0200
++++ gio/gunixmounts.c	2014-09-28 10:03:52.141514611 +0200
+@@ -150,6 +150,7 @@
    GFileMonitor *fstab_monitor;
    GFileMonitor *mtab_monitor;
  
 +  guint mount_poller_source;
-+  GList *mount_poller_mounts;
-+
-   GSource *proc_mounts_watch_source;
- };
- 
-@@ -167,6 +170,8 @@ static GUnixMountMonitor *the_mount_moni
- static GList *_g_get_unix_mounts (void);
- static GList *_g_get_unix_mount_points (void);
- 
-+static guint64 mount_poller_time = 0;
-+
- G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
- 
- #define MOUNT_POLL_INTERVAL 4000
-@@ -193,6 +198,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
- #endif
+   GList *mount_poller_mounts;
  
- #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
-+#include <sys/param.h>
- #include <sys/ucred.h>
- #include <sys/mount.h>
- #include <fstab.h>
-@@ -1126,6 +1141,10 @@ get_mounts_timestamp (void)
-       if (stat (monitor_file, &buf) == 0)
- 	return (guint64)buf.st_mtime;
-     }
-+  else
-+    {
-+      return mount_poller_time;
-+    }
-   return 0;
- }
+   GSource *proc_mounts_watch_source;
+@@ -1293,6 +1294,13 @@
  
-@@ -1271,6 +1290,13 @@ g_unix_mount_monitor_finalize (GObject *
-       g_object_unref (monitor->mtab_monitor);
-     }
+   g_list_free_full (monitor->mount_poller_mounts, (GDestroyNotify)g_unix_mount_free);
  
 +  if (monitor->mount_poller_source > 0)
 +    {
@@ -52,69 +22,3 @@
    the_mount_monitor = NULL;
  
    G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
-@@ -1352,6 +1378,52 @@ mtab_file_changed (GFileMonitor      *mo
- }
- 
- static gboolean
-+mount_change_poller (gpointer user_data)
-+{
-+  GUnixMountMonitor *mount_monitor;
-+  GList *current_mounts;
-+  gboolean has_changed = FALSE;
-+
-+  mount_monitor = user_data;
-+  current_mounts = _g_get_unix_mounts ();
-+
-+  if (g_list_length (current_mounts) != g_list_length (mount_monitor->mount_poller_mounts))
-+    {
-+      g_list_foreach (mount_monitor->mount_poller_mounts, (GFunc)g_unix_mount_free, NULL);
-+      has_changed = TRUE;
-+    }
-+  else
-+    {
-+      int i;
-+
-+      for (i = 0; i < g_list_length (current_mounts); i++)
-+        {
-+          GUnixMountEntry *m1;
-+         GUnixMountEntry *m2;
-+
-+         m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i);
-+         m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i);
-+          if (! has_changed && g_unix_mount_compare (m1, m2) != 0)
-+            has_changed = TRUE;
-+
-+         g_unix_mount_free (m2);
-+       }
-+    }
-+
-+  g_list_free (mount_monitor->mount_poller_mounts);
-+  mount_monitor->mount_poller_mounts = current_mounts;
-+
-+  if (has_changed)
-+    {
-+      mount_poller_time = (guint64)time (NULL);
-+      g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
-+    }
-+
-+  return TRUE;
-+}
-+
-+
-+static gboolean
- proc_mounts_changed (GIOChannel   *channel,
-                      GIOCondition  cond,
-                      gpointer      user_data)
-@@ -1416,6 +1488,12 @@ g_unix_mount_monitor_init (GUnixMountMon
-           g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
-         }
-     }
-+  else
-+    {
-+      monitor->mount_poller_mounts = _g_get_unix_mounts ();
-+      mount_poller_time = (guint64)time (NULL);
-+      monitor->mount_poller_source = g_timeout_add_seconds (3, (GSourceFunc)mount_change_poller, monitor);
-+    }
- }
- 
- /**
diff --git a/devel/glib20/files/patch-glib_gthread-posix.c b/devel/glib20/files/patch-glib_gthread-posix.c
index f19007f8c..3334a19ba 100644
--- a/devel/glib20/files/patch-glib_gthread-posix.c
+++ b/devel/glib20/files/patch-glib_gthread-posix.c
@@ -1,15 +1,15 @@
---- glib/gthread-posix.c.orig	2012-11-10 03:24:06.000000000 +0000
-+++ glib/gthread-posix.c	2012-11-12 18:06:36.000000000 +0000
-@@ -89,7 +89,7 @@
+--- glib/gthread-posix.c.orig	2014-09-22 15:42:12.000000000 +0200
++++ glib/gthread-posix.c	2014-09-28 09:46:56.659280343 +0200
+@@ -98,7 +98,7 @@
    if G_UNLIKELY (mutex == NULL)
      g_thread_abort (errno, "malloc");
  
 -#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
 +#if defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) && !defined(__FreeBSD__)
-   {
-     pthread_mutexattr_t attr;
-     pthread_mutexattr_init (&attr);
-@@ -101,7 +101,7 @@
+   pthread_mutexattr_init (&attr);
+   pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
+   pattr = &attr;
+@@ -107,7 +107,7 @@
    if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0)
      g_thread_abort (status, "pthread_mutex_init");
  
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 89c963b80..681452c84 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -425,87 +425,12 @@ share/locale/yi/LC_MESSAGES/glib20.mo
 share/locale/zh_CN/LC_MESSAGES/glib20.mo
 share/locale/zh_HK/LC_MESSAGES/glib20.mo
 share/locale/zh_TW/LC_MESSAGES/glib20.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/yi/LC_MESSAGES
-@dirrmtry share/locale/yi
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/tt/LC_MESSAGES
-@dirrmtry share/locale/tt
-@dirrmtry share/locale/tl/LC_MESSAGES
-@dirrmtry share/locale/tl
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry share/locale/an/LC_MESSAGES
-@dirrmtry share/locale/an
 @exec mkdir -p %D/share/glib-2.0/schemas
 @exec glib-compile-schemas %D/share/glib-2.0/schemas
-@dirrm share/glib-2.0/schemas
-@dirrm share/glib-2.0/gettext/po
-@dirrm share/glib-2.0/gettext
-%%GDB%%@dirrm share/glib-2.0/gdb
-@dirrm share/glib-2.0/codegen
-@dirrm share/glib-2.0
-%%GDB%%@dirrmtry share/gdb/auto-load
-%%GDB%%@dirrmtry share/gdb
-@dirrmtry share/bash-completion/completions
-@dirrmtry share/bash-completion
 @exec mkdir -p %D/share/GConf/gsettings
 @dirrm share/GConf/gsettings
 @dirrm share/GConf
-@dirrm lib/glib-2.0/include
-@dirrm lib/glib-2.0
 @exec mkdir -p %D/lib/gio/modules
 @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
 @dirrmtry lib/gio/modules
 @dirrmtry lib/gio
-@dirrm include/glib-2.0/gobject
-@dirrm include/glib-2.0/glib/deprecated
-@dirrm include/glib-2.0/glib
-@dirrm include/glib-2.0/gio
-@dirrm include/glib-2.0
-@dirrm include/gio-unix-2.0/gio
-@dirrm include/gio-unix-2.0
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index ac963c0b5..b5fae5b84 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	glibmm
-PORTVERSION=	2.40.0
-PORTREVISION=	1
+PORTVERSION=	2.42.0
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 051345d44..67c65b0ab 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glibmm-2.40.0.tar.xz) = 34f320fad7e0057c63863706caa802ae0051b21523bed91ec33baf8421ca484f
-SIZE (gnome2/glibmm-2.40.0.tar.xz) = 5645840
+SHA256 (gnome2/glibmm-2.42.0.tar.xz) = 985083d97378d234da27a7243587cc0d186897a4b2d3c1286f794089be1a3397
+SIZE (gnome2/glibmm-2.42.0.tar.xz) = 6031860
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index 55bef7ec9..720ca6ba6 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -79,6 +79,7 @@ include/giomm-%%API_VERSION%%/giomm/networkaddress.h
 include/giomm-%%API_VERSION%%/giomm/networkservice.h
 include/giomm-%%API_VERSION%%/giomm/notification.h
 include/giomm-%%API_VERSION%%/giomm/outputstream.h
+include/giomm-%%API_VERSION%%/giomm/permission.h
 include/giomm-%%API_VERSION%%/giomm/pollableinputstream.h
 include/giomm-%%API_VERSION%%/giomm/pollableoutputstream.h
 include/giomm-%%API_VERSION%%/giomm/private/action_p.h
@@ -161,6 +162,8 @@ include/giomm-%%API_VERSION%%/giomm/private/notification_p.h
 include/giomm-%%API_VERSION%%/giomm/private/outputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/pollableinputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/pollableoutputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/permission_p.h
+include/giomm-%%API_VERSION%%/giomm/private/simplepermission_p.h
 include/giomm-%%API_VERSION%%/giomm/private/proxy_p.h
 include/giomm-%%API_VERSION%%/giomm/private/proxyaddress_p.h
 include/giomm-%%API_VERSION%%/giomm/private/proxyresolver_p.h
@@ -212,6 +215,7 @@ include/giomm-%%API_VERSION%%/giomm/seekable.h
 include/giomm-%%API_VERSION%%/giomm/settings.h
 include/giomm-%%API_VERSION%%/giomm/simpleaction.h
 include/giomm-%%API_VERSION%%/giomm/simpleactiongroup.h
+include/giomm-%%API_VERSION%%/giomm/simplepermission.h
 include/giomm-%%API_VERSION%%/giomm/socket.h
 include/giomm-%%API_VERSION%%/giomm/socketaddress.h
 include/giomm-%%API_VERSION%%/giomm/socketaddressenumerator.h
@@ -221,6 +225,7 @@ include/giomm-%%API_VERSION%%/giomm/socketconnection.h
 include/giomm-%%API_VERSION%%/giomm/socketcontrolmessage.h
 include/giomm-%%API_VERSION%%/giomm/socketlistener.h
 include/giomm-%%API_VERSION%%/giomm/socketservice.h
+include/giomm-%%API_VERSION%%/giomm/socketsource.h
 include/giomm-%%API_VERSION%%/giomm/srvtarget.h
 include/giomm-%%API_VERSION%%/giomm/tcpconnection.h
 include/giomm-%%API_VERSION%%/giomm/themedicon.h
@@ -407,17 +412,3 @@ lib/libglibmm_generate_extra_defs-%%VERSION%%.so.1
 lib/libglibmm_generate_extra_defs-%%VERSION%%.so.1.3.0
 libdata/pkgconfig/giomm-%%API_VERSION%%.pc
 libdata/pkgconfig/glibmm-%%API_VERSION%%.pc
-@dirrm lib/glibmm-%%API_VERSION%%/proc/pm
-@dirrm lib/glibmm-%%API_VERSION%%/proc/m4
-@dirrm lib/glibmm-%%API_VERSION%%/proc
-@dirrm lib/glibmm-%%API_VERSION%%/include
-@dirrm lib/glibmm-%%API_VERSION%%
-@dirrm lib/giomm-%%API_VERSION%%/include
-@dirrm lib/giomm-%%API_VERSION%%
-@dirrm include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs
-@dirrm include/glibmm-%%API_VERSION%%/glibmm/private
-@dirrm include/glibmm-%%API_VERSION%%/glibmm
-@dirrm include/glibmm-%%API_VERSION%%
-@dirrm include/giomm-%%API_VERSION%%/giomm/private
-@dirrm include/giomm-%%API_VERSION%%/giomm
-@dirrm include/giomm-%%API_VERSION%%
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index d38db08c2..ad52ac8e7 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -11,6 +11,7 @@ MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GLib based implimentation of the GData protocol
 
 BUILD_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
+		gtkdoc-check:${PORTSDIR}/textproc/gtk-doc \
 		vapigen:${PORTSDIR}/lang/vala-vapigen
 LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
 		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
diff --git a/devel/libgdata/pkg-plist b/devel/libgdata/pkg-plist
index 9cdd27676..5b58be61e 100644
--- a/devel/libgdata/pkg-plist
+++ b/devel/libgdata/pkg-plist
@@ -321,33 +321,3 @@ share/locale/zh_HK/LC_MESSAGES/gdata.mo
 share/locale/zh_TW/LC_MESSAGES/gdata.mo
 share/vala/vapi/libgdata.deps
 share/vala/vapi/libgdata.vapi
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrm share/doc/gdata
-@dirrm include/libgdata/gdata/services/youtube
-@dirrm include/libgdata/gdata/services/tasks
-@dirrm include/libgdata/gdata/services/picasaweb
-@dirrm include/libgdata/gdata/services/freebase
-@dirrm include/libgdata/gdata/services/documents
-@dirrm include/libgdata/gdata/services/contacts
-@dirrm include/libgdata/gdata/services/calendar
-@dirrm include/libgdata/gdata/services
-@dirrm include/libgdata/gdata/media
-@dirrm include/libgdata/gdata/gd
-@dirrm include/libgdata/gdata/gcontact
-@dirrm include/libgdata/gdata/atom
-@dirrm include/libgdata/gdata/app
-@dirrm include/libgdata/gdata
-@dirrm include/libgdata
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index be93c3c85..20d389d15 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	gjs
-PORTVERSION=	1.40.1
-PORTREVISION=	1
+PORTVERSION=	1.42.0
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -22,7 +21,7 @@ USE_GNOME=	cairo glib20 gnomeprefix introspection:build \
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo
index 8f58246ca..4ec110ba8 100644
--- a/lang/gjs/distinfo
+++ b/lang/gjs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gjs-1.40.1.tar.xz) = 2f0d80ec96c6284785143abe51377d8a284977ea6c3cf0cef1020d92eae41793
-SIZE (gnome3/gjs-1.40.1.tar.xz) = 448204
+SHA256 (gnome3/gjs-1.42.0.tar.xz) = 0c9afb7d5be6ead5b68059596f08eb7c3902b1676ee9c8846aa8df09647dba13
+SIZE (gnome3/gjs-1.42.0.tar.xz) = 449264
diff --git a/lang/gjs/pkg-plist b/lang/gjs/pkg-plist
index b482b5718..a583616dc 100644
--- a/lang/gjs/pkg-plist
+++ b/lang/gjs/pkg-plist
@@ -35,11 +35,3 @@ lib/libgjs.so.0
 lib/libgjs.so.0.0.0
 libdata/pkgconfig/gjs-1.0.pc
 libdata/pkgconfig/gjs-internals-1.0.pc
-@dirrm libexec/gjs/installed-tests/js
-@dirrm libexec/gjs/installed-tests
-@dirrm libexec/gjs
-@dirrm lib/gjs/girepository-1.0
-@dirrm lib/gjs
-@dirrm include/gjs-1.0/gjs
-@dirrm include/gjs-1.0/gi
-@dirrm include/gjs-1.0
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 0191d7119..5e3607eab 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	vala
-PORTVERSION=	0.24.0
-PORTREVISION=	1
+PORTVERSION=	0.26.1
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 
diff --git a/lang/vala/distinfo b/lang/vala/distinfo
index 099eb9eb0..5cc984415 100644
--- a/lang/vala/distinfo
+++ b/lang/vala/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vala-0.24.0.tar.xz) = 22a37c977512c19cd29c373eaaef96cb2c994795d491106f32387f3f9d1e899c
-SIZE (vala-0.24.0.tar.xz) = 2666032
+SHA256 (vala-0.26.1.tar.xz) = 8407abb19ab3a58bbfc0d288abb47666ef81f76d0540258c03965e7545f59e6b
+SIZE (vala-0.26.1.tar.xz) = 2690124
diff --git a/lang/vala/files/patch-vapigen_Makefile.in b/lang/vala/files/patch-vapigen_Makefile.in
deleted file mode 100644
index bc1780d20..000000000
--- a/lang/vala/files/patch-vapigen_Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
---- vapigen/Makefile.in.orig	2010-08-10 23:24:52.000000000 +0200
-+++ vapigen/Makefile.in	2010-08-10 23:27:28.000000000 +0200
-@@ -56,7 +56,6 @@
- vapicheck_OBJECTS = $(am_vapicheck_OBJECTS)
- am__DEPENDENCIES_1 =
- vapicheck_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	../codegen/libvala@PACKAGE_SUFFIX@.la \
- 	../gobject-introspection/libgidl.la $(am__DEPENDENCIES_1)
- AM_V_lt = $(am__v_lt_$(V))
- am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-@@ -66,7 +65,6 @@
- am_vapigen_OBJECTS = $(am__objects_3) $(am__objects_1)
- vapigen_OBJECTS = $(am_vapigen_OBJECTS)
- vapigen_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	../codegen/libvala@PACKAGE_SUFFIX@.la \
- 	../gobject-introspection/libgidl.la $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-@@ -307,13 +305,13 @@
- 
- vapigen_LDADD = \
- 	$(GLIB_LIBS) \
--	../codegen/libvala@PACKAGE_SUFFIX@.la \
-+	-lvala@PACKAGE_SUFFIX@ \
- 	../gobject-introspection/libgidl.la \
- 	$(NULL)
- 
- vapicheck_LDADD = \
- 	$(GLIB_LIBS) \
--	../codegen/libvala@PACKAGE_SUFFIX@.la \
-+	-lvala@PACKAGE_SUFFIX@ \
- 	../gobject-introspection/libgidl.la \
- 	$(NULL)
- 
diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist
index dd9ef2437..ffc13cddb 100644
--- a/lang/vala/pkg-plist
+++ b/lang/vala/pkg-plist
@@ -1,7 +1,13 @@
 bin/vala
 bin/vala-%%VERSION%%
+bin/vala-gen-introspect
+bin/vala-gen-introspect-%%VERSION%%
 bin/valac
 bin/valac-%%VERSION%%
+bin/vapicheck
+bin/vapicheck-%%VERSION%%
+bin/vapigen
+bin/vapigen-%%VERSION%%
 include/vala-%%VERSION%%/vala.h
 include/vala-%%VERSION%%/valaccode.h
 include/vala-%%VERSION%%/valacodegen.h
@@ -9,11 +15,19 @@ include/vala-%%VERSION%%/valagee.h
 lib/libvala-%%VERSION%%.so
 lib/libvala-%%VERSION%%.so.0
 lib/libvala-%%VERSION%%.so.0.0.0
+lib/vala-%%VERSION%%/gen-introspect-%%VERSION%%
 libdata/pkgconfig/libvala-%%VERSION%%.pc
 libdata/pkgconfig/vala-1.0.pc
+libdata/pkgconfig/vapigen-%%VERSION%%.pc
+libdata/pkgconfig/vapigen.pc
+man/man1/vala-gen-introspect-%%VERSION%%.1.gz
+man/man1/vala-gen-introspect.1.gz
 man/man1/valac-%%VERSION%%.1.gz
 man/man1/valac.1.gz
+man/man1/vapigen-%%VERSION%%.1.gz
+man/man1/vapigen.1.gz
 share/aclocal/vala.m4
+share/aclocal/vapigen.m4
 share/devhelp/books/vala-%%VERSION%%/attributes.html
 share/devhelp/books/vala-%%VERSION%%/classes.html
 share/devhelp/books/vala-%%VERSION%%/default.css
@@ -108,6 +122,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-0.10.deps
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-0.10.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-1.0.vapi
+%%DATADIR%%-%%VERSION%%/vapi/gstreamer-allocators-1.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/gstreamer-allocators-1.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-app-0.10.deps
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-app-0.10.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-app-1.0.deps
@@ -150,6 +166,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-pbutils-1.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-riff-0.10.deps
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-riff-0.10.vapi
+%%DATADIR%%-%%VERSION%%/vapi/gstreamer-riff-1.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/gstreamer-riff-1.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtp-0.10.deps
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtp-0.10.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-rtp-1.0.deps
@@ -308,15 +326,14 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/vte.vapi
 %%DATADIR%%-%%VERSION%%/vapi/webkit-1.0.deps
 %%DATADIR%%-%%VERSION%%/vapi/webkit-1.0.vapi
+%%DATADIR%%-%%VERSION%%/vapi/webkit2gtk-4.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/webkit2gtk-4.0.vapi
+%%DATADIR%%-%%VERSION%%/vapi/webkit2gtk-web-extension-4.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/webkit2gtk-web-extension-4.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/x11.vapi
 %%DATADIR%%-%%VERSION%%/vapi/xcb-icccm.vapi
 %%DATADIR%%-%%VERSION%%/vapi/xcb.vapi
 %%DATADIR%%-%%VERSION%%/vapi/xtst.deps
 %%DATADIR%%-%%VERSION%%/vapi/xtst.vapi
 %%DATADIR%%-%%VERSION%%/vapi/zlib.vapi
-@dirrm %%DATADIR%%-%%VERSION%%/vapi
-@dirrm %%DATADIR%%-%%VERSION%%
-@dirrm share/devhelp/books/vala-%%VERSION%%
-@dirrmtry share/devhelp/books
-@dirrmtry share/devhelp
-@dirrm include/vala-%%VERSION%%
+%%DATADIR%%/Makefile.vapigen
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index 2b183e1ca..37b96b17c 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -3,8 +3,7 @@
 #   $MCom$
 
 PORTNAME=	glib-networking
-PORTVERSION=	2.40.1
-PORTREVISION=	2
+PORTVERSION=	2.42.0
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -27,7 +26,7 @@ USE_GNOME=	glib20 intltool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 post-patch:
diff --git a/net/glib-networking/distinfo b/net/glib-networking/distinfo
index 12fb4b393..36e473273 100644
--- a/net/glib-networking/distinfo
+++ b/net/glib-networking/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-networking-2.40.1.tar.xz) = 9fb3e54d049a480afdb814ff7452e7ab67e5d5f607ade230d7713f19922b5a28
-SIZE (gnome2/glib-networking-2.40.1.tar.xz) = 368444
+SHA256 (gnome2/glib-networking-2.42.0.tar.xz) = 304dd9e4c0ced69094300e0b9e66cd2eaae7161b9fc3186536d11458677d820d
+SIZE (gnome2/glib-networking-2.42.0.tar.xz) = 370188
diff --git a/net/glib-networking/pkg-plist b/net/glib-networking/pkg-plist
index 6b8e742b8..4f01e8702 100644
--- a/net/glib-networking/pkg-plist
+++ b/net/glib-networking/pkg-plist
@@ -68,27 +68,5 @@ share/locale/vi/LC_MESSAGES/glib-networking.mo
 share/locale/zh_CN/LC_MESSAGES/glib-networking.mo
 share/locale/zh_HK/LC_MESSAGES/glib-networking.mo
 share/locale/zh_TW/LC_MESSAGES/glib-networking.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/km/LC_MESSAGES
-@dirrmtry share/locale/km
-@dirrmtry share/locale/fur/LC_MESSAGES
-@dirrmtry share/locale/fur
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry share/locale/an/LC_MESSAGES
-@dirrmtry share/locale/an
 @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
 @unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true