The FreeBSD GNOME team proudly presents GNOME 3.14 and Cinnamon 2.2.

Gnome 3.14.1 and Cinnamon 2.2.16 are supported on FreeBSD 9.3-RELEASE and up.

This commit removes the old GNOME 2 desktop, bindings and some ports that
can't be compiled. A few ports where updated to more recent versions to
allow them to compile with this update.

Apart from updating ports to newer versions

GDM is more integrated with gnome-shell now, and handles several things for
the GNOME desktop such as screen locking. If you want to use GNOME 3 via
startx, you will have to add your own lock screen/screensaver. For example xscreensaver
can be used for sessions started without GDM.

Shell Extensions can be installed via https://extensions.gnome.org/ , we have
ported a few that can't be installed via this way.
The old gnome-utils and gnome-games ports where split up into single ports
and where converted to meta-ports.
gnome-terminal requires a UTF-8 locale to run, gdm handles this already, but
if you use startx you need to do this yourself.

Upgrade instructions:

Delete the old and conflicting packages:
# pkg delete clutter gnome-utils gnome-panel gnome-keyring vala-vapigen \
    guile gcalctool gnome-media libgnomekbd
# pkg delete gnome-screensaver gnome-applets bug-buddy evolution-exchange \
    evolution-webcal gnome-system-tools seahorse-plugins gnome-control-center

For package users the following lines will be enough:
# pkg upgrade
# pkg install gnome3

For ports users should do the following:
# portmaster -a
# portmaster x11/gnome3

We are currently aware of two issues. The first issue is a bug in the
file monitoring code in the glib20 port. This bug causes glib programs
to crash when files in a monitored directory are added or removed.
Upstream is aware of the problem, but since the problem is quite complex
there is no solution yet. This problem isn't restricted to BSD.

The second issue is that on certain video cards totem will display a
purple/pink overlay on the video. It not clear yet where the issues
comes from.

Major thanks goes to Gustau Perez for being a driving force behind getting
GNOME 3 up to speed again. Also thanks to Antoine Brodin for running the exp-runs.

This update was also made possible by:
	Joe Maloney
	Kris Moore
	Beeblebrox
	Ryan Lortie
	Antoine Jacoutot
	and everyone I missed

19 files changed, 176 insertions, 260 deletions

diff --git a/lang/Makefile b/lang/Makefile
index c42e802a5ab7..52c855c9a4d4 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -29,6 +29,7 @@
     SUBDIR += cfortran
     SUBDIR += chicken
     SUBDIR += cint
+    SUBDIR += cjs
     SUBDIR += clang-cheri
     SUBDIR += clang-devel
     SUBDIR += clang32
@@ -321,7 +322,6 @@
     SUBDIR += v8
     SUBDIR += v8-devel
     SUBDIR += vala
-    SUBDIR += vala-vapigen
     SUBDIR += visualworks
     SUBDIR += whitespace
     SUBDIR += x10
diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile
new file mode 100644
index 000000000000..8be263bef545
--- /dev/null
+++ b/lang/cjs/Makefile
@@ -0,0 +1,40 @@
+# Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
+# $FreeBSD$
+#    $MCom: ports/trunk/lang/cjs/Makefile 20008 2014-10-21 15:13:35Z gusi $
+
+PORTNAME=	cjs
+PORTVERSION=	2.2.2
+CATEGORIES=	lang gnome
+MASTER_SITES=	http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
+DIST_SUBDIR=	gnome3
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	JavaScript bindings based on gobject-introspection
+
+BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
+LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libmozjs185.so:${PORTSDIR}/lang/spidermonkey185
+
+CONFLICTS_BUILD=spidermonkey17-1.7.*
+
+USES=		autoreconf:build gettext libtool gmake pathfix pkgconfig python:build \
+		shebangfix
+USE_GNOME=	cairo glib20 gnomeprefix introspection:build \
+		intlhack
+USE_LDCONFIG=	yes
+PATHFIX_MAKEFILEIN=	Makefile.am
+GNU_CONFIGURE=	yes
+CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
+CONFIGURE_ARGS+=--enable-compile-warnings=no
+
+SHEBANG_FILES=	scripts/make-tests
+python_OLD_CMD=	/usr/bin/env python
+python_CMD=	${PYTHON_CMD}
+
+pre-configure:
+	cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh
+
+.include <bsd.port.mk>
diff --git a/lang/cjs/distinfo b/lang/cjs/distinfo
new file mode 100644
index 000000000000..180e892e9823
--- /dev/null
+++ b/lang/cjs/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome3/cjs-2.2.2.tar.gz) = 870709463709a92b9d19c351211952bdec5a5e660d8f4a5d2ec4411885e00fca
+SIZE (gnome3/cjs-2.2.2.tar.gz) = 355632
diff --git a/lang/cjs/pkg-descr b/lang/cjs/pkg-descr
new file mode 100644
index 000000000000..123c49224d03
--- /dev/null
+++ b/lang/cjs/pkg-descr
@@ -0,0 +1,3 @@
+This module contains JavaScript bindings based on gobject-introspection.
+
+WWW: http://cinnamon.linuxmint.com
diff --git a/lang/cjs/pkg-plist b/lang/cjs/pkg-plist
new file mode 100644
index 000000000000..a5f98e32c1fe
--- /dev/null
+++ b/lang/cjs/pkg-plist
@@ -0,0 +1,63 @@
+bin/cjs
+bin/cjs-console
+include/cjs-1.0/cjs/byteArray.h
+include/cjs-1.0/cjs/compat.h
+include/cjs-1.0/cjs/context.h
+include/cjs-1.0/cjs/gjs-module.h
+include/cjs-1.0/cjs/gjs.h
+include/cjs-1.0/cjs/importer.h
+include/cjs-1.0/cjs/jsapi-util.h
+include/cjs-1.0/cjs/mem.h
+include/cjs-1.0/cjs/native.h
+include/cjs-1.0/cjs/type-module.h
+include/cjs-1.0/cjs-dbus/dbus-proxy.h
+include/cjs-1.0/cjs-dbus/dbus.h
+include/cjs-1.0/gi/arg.h
+include/cjs-1.0/gi/boxed.h
+include/cjs-1.0/gi/closure.h
+include/cjs-1.0/gi/enumeration.h
+include/cjs-1.0/gi/foreign.h
+include/cjs-1.0/gi/function.h
+include/cjs-1.0/gi/gerror.h
+include/cjs-1.0/gi/gtype.h
+include/cjs-1.0/gi/interface.h
+include/cjs-1.0/gi/keep-alive.h
+include/cjs-1.0/gi/ns.h
+include/cjs-1.0/gi/object.h
+include/cjs-1.0/gi/param.h
+include/cjs-1.0/gi/repo.h
+include/cjs-1.0/gi/union.h
+include/cjs-1.0/gi/value.h
+lib/cjs/girepository-1.0/CjsPrivate-1.0.typelib
+lib/cjs-1.0/cairoNative.so
+lib/cjs-1.0/console.so
+lib/cjs-1.0/dbusNative.so
+lib/cjs-1.0/debugger.so
+lib/cjs-1.0/formatNative.so
+lib/cjs-1.0/gettextNative.so
+lib/cjs-1.0/langNative.so
+lib/cjs-1.0/mainloop.so
+lib/cjs-1.0/system.so
+lib/libcjs-dbus.so
+lib/libcjs-dbus.so.0
+lib/libcjs-dbus.so.0.0.0
+lib/libcjs.so
+lib/libcjs.so.0
+lib/libcjs.so.0.0.0
+libdata/pkgconfig/cjs-1.0.pc
+libdata/pkgconfig/cjs-dbus-1.0.pc
+libdata/pkgconfig/cjs-internals-1.0.pc
+%%DATADIR%%-1.0/cairo.js
+%%DATADIR%%-1.0/dbus.js
+%%DATADIR%%-1.0/format.js
+%%DATADIR%%-1.0/gettext.js
+%%DATADIR%%-1.0/jsUnit.js
+%%DATADIR%%-1.0/lang.js
+%%DATADIR%%-1.0/promise.js
+%%DATADIR%%-1.0/signals.js
+%%DATADIR%%-1.0/overrides/GLib.js
+%%DATADIR%%-1.0/overrides/GObject.js
+%%DATADIR%%-1.0/overrides/Gio.js
+%%DATADIR%%-1.0/tweener/equations.js
+%%DATADIR%%-1.0/tweener/tweenList.js
+%%DATADIR%%-1.0/tweener/tweener.js
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index efbbe8d248ee..b30b882851d7 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -1,10 +1,9 @@
 # Created by: Pawel Worach <pawel.worach@gmail.com>
 # $FreeBSD$
-#   $MCom: ports/trunk/lang/gjs/Makefile 18581 2013-06-23 10:50:00Z kwm $
+#   $MCom: ports/trunk/lang/gjs/Makefile 19944 2014-10-15 05:33:09Z gusi $
 
 PORTNAME=	gjs
-PORTVERSION=	1.34.0
-PORTREVISION=	2
+PORTVERSION=	1.42.0
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -13,21 +12,16 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME Javascript binding
 
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libmozjs185.so:${PORTSDIR}/lang/spidermonkey185
+		libmozjs-24.so:${PORTSDIR}/lang/spidermonkey24
 
-CONFLICTS_BUILD=spidermonkey17-1.7.*
-
-USES=		gettext gmake libtool:keepla pathfix pkgconfig python:2,build \
-		shebangfix tar:xz
-USE_GNOME=	cairo glib20 gnomeprefix introspection:build intlhack
+USES=		compiler:c11 gettext gmake libtool pathfix pkgconfig \
+		python:build tar:xz
+USE_GNOME=	cairo glib20 gnomeprefix introspection:build \
+		intlhack
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-GNU_CONFIGURE=	yes
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
-python_OLD_CMD=	/usr/bin/env python
-python_CMD=	/usr/bin/env python2
-SHEBANG_FILES=	scripts/make-tests
-
 .include <bsd.port.mk>
diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo
index 25d125ca9618..4ec110ba8e18 100644
--- a/lang/gjs/distinfo
+++ b/lang/gjs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gjs-1.34.0.tar.xz) = 3d62c717a0522a36c6faa1eb021872255e3cd285a72786afe23b7cca2e3084cb
-SIZE (gnome3/gjs-1.34.0.tar.xz) = 474004
+SHA256 (gnome3/gjs-1.42.0.tar.xz) = 0c9afb7d5be6ead5b68059596f08eb7c3902b1676ee9c8846aa8df09647dba13
+SIZE (gnome3/gjs-1.42.0.tar.xz) = 449264
diff --git a/lang/gjs/files/patch-modules_overrides_GLib.js b/lang/gjs/files/patch-modules_overrides_GLib.js
deleted file mode 100644
index 5bf70a844a74..000000000000
--- a/lang/gjs/files/patch-modules_overrides_GLib.js
+++ /dev/null
@@ -1,79 +0,0 @@
---- modules/overrides/GLib.js.orig	2011-12-15 16:10:34.000000000 +0100
-+++ modules/overrides/GLib.js	2011-12-15 16:23:47.000000000 +0100
-@@ -25,27 +25,27 @@ let originalVariantClass;
- const SIMPLE_TYPES = ['b', 'y', 'n', 'q', 'i', 'u', 'x', 't', 'h', 'd', 's', 'o', 'g'];
- 
- function _read_single_type(signature, forceSimple) {
--    let char = signature.shift();
-+    let xchar = signature.shift();
-     let isSimple = false;
- 
--    if (SIMPLE_TYPES.indexOf(char) == -1) {
-+    if (SIMPLE_TYPES.indexOf(xchar) == -1) {
- 	if (forceSimple)
- 	    throw new TypeError('Invalid GVariant signature (a simple type was expected)');
-     } else
- 	isSimple = true;
- 
--    if (char == 'm' || char == 'a')
--	return [char].concat(_read_single_type(signature, false));
--    if (char == '{') {
-+    if (xchar == 'm' || xchar == 'a')
-+	return [xchar].concat(_read_single_type(signature, false));
-+    if (xchar == '{') {
- 	let key = _read_single_type(signature, true);
- 	let val = _read_single_type(signature, false);
- 	let close = signature.shift();
- 	if (close != '}')
- 	    throw new TypeError('Invalid GVariant signature for type DICT_ENTRY (expected "}"');
--	return [char].concat(key, val, close);
-+	return [xchar].concat(key, val, close);
-     }
--    if (char == '(') {
--	let res = [char];
-+    if (xchar == '(') {
-+	let res = [xchar];
- 	while (true) {
- 	    if (signature.length == 0)
- 		throw new TypeError('Invalid GVariant signature for type TUPLE (expected ")")');
-@@ -60,10 +60,10 @@ function _read_single_type(signature, fo
-     }
- 
-     // Valid types are simple types, arrays, maybes, tuples, dictionary entries and variants
--    if (!isSimple && char != 'v')
--	throw new TypeError('Invalid GVariant signature (' + char + ' is not a valid type)');
-+    if (!isSimple && xchar != 'v')
-+	throw new TypeError('Invalid GVariant signature (' + xchar + ' is not a valid type)');
- 
--    return [char];
-+    return [xchar];
- }
- 
- 
-@@ -71,8 +71,8 @@ function _pack_variant(signature, value)
-     if (signature.length == 0)
- 	    throw new TypeError('GVariant signature cannot be empty');
- 
--    let char = signature.shift();
--    switch (char) {
-+    let xchar = signature.shift();
-+    switch (xchar) {
-     case 'b':
- 	return GLib.Variant.new_boolean(value);
-     case 'y':
-@@ -160,7 +160,7 @@ function _pack_variant(signature, value)
- 
- 	return GLib.Variant.new_dict_entry(key, child);
-     default:
--	throw new TypeError('Invalid GVariant signature (unexpected character ' + char + ')');
-+	throw new TypeError('Invalid GVariant signature (unexpected character ' + xchar + ')');
-     }
- }
- 
-@@ -258,4 +258,4 @@ function _init() {
-     this.Variant.prototype.toString = function() {
- 	return '[object variant of type "' + this.get_type_string() + '"]';
-     }
--}
-\ No newline at end of file
-+}
diff --git a/lang/gjs/pkg-plist b/lang/gjs/pkg-plist
index 83d375c3ae13..a583616dcc2f 100644
--- a/lang/gjs/pkg-plist
+++ b/lang/gjs/pkg-plist
@@ -6,6 +6,7 @@ include/gjs-1.0/gi/closure.h
 include/gjs-1.0/gi/enumeration.h
 include/gjs-1.0/gi/foreign.h
 include/gjs-1.0/gi/function.h
+include/gjs-1.0/gi/fundamental.h
 include/gjs-1.0/gi/gerror.h
 include/gjs-1.0/gi/gtype.h
 include/gjs-1.0/gi/interface.h
@@ -16,59 +17,21 @@ include/gjs-1.0/gi/param.h
 include/gjs-1.0/gi/repo.h
 include/gjs-1.0/gi/union.h
 include/gjs-1.0/gi/value.h
-include/gjs-1.0/gjs-dbus/dbus-proxy.h
-include/gjs-1.0/gjs-dbus/dbus.h
 include/gjs-1.0/gjs/byteArray.h
 include/gjs-1.0/gjs/compat.h
 include/gjs-1.0/gjs/context.h
-include/gjs-1.0/gjs/gjs.h
+include/gjs-1.0/gjs/coverage.h
 include/gjs-1.0/gjs/gjs-module.h
+include/gjs-1.0/gjs/gjs.h
 include/gjs-1.0/gjs/importer.h
 include/gjs-1.0/gjs/jsapi-util.h
 include/gjs-1.0/gjs/mem.h
 include/gjs-1.0/gjs/native.h
+include/gjs-1.0/gjs/runtime.h
 include/gjs-1.0/gjs/type-module.h
-lib/gjs-1.0/cairoNative.la
-lib/gjs-1.0/cairoNative.so
-lib/gjs-1.0/console.la
-lib/gjs-1.0/console.so
-lib/gjs-1.0/dbusNative.la
-lib/gjs-1.0/dbusNative.so
-lib/gjs-1.0/debugger.la
-lib/gjs-1.0/debugger.so
-lib/gjs-1.0/formatNative.la
-lib/gjs-1.0/formatNative.so
-lib/gjs-1.0/gettextNative.la
-lib/gjs-1.0/gettextNative.so
-lib/gjs-1.0/langNative.la
-lib/gjs-1.0/langNative.so
-lib/gjs-1.0/mainloop.la
-lib/gjs-1.0/mainloop.so
-lib/gjs-1.0/system.la
-lib/gjs-1.0/system.so
 lib/gjs/girepository-1.0/GjsPrivate-1.0.typelib
-lib/libgjs-dbus.la
-lib/libgjs-dbus.so
-lib/libgjs-dbus.so.0
-lib/libgjs-dbus.so.0.0.0
-lib/libgjs.la
 lib/libgjs.so
 lib/libgjs.so.0
 lib/libgjs.so.0.0.0
 libdata/pkgconfig/gjs-1.0.pc
-libdata/pkgconfig/gjs-dbus-1.0.pc
 libdata/pkgconfig/gjs-internals-1.0.pc
-share/gjs-1.0/cairo.js
-share/gjs-1.0/dbus.js
-share/gjs-1.0/gettext.js
-share/gjs-1.0/format.js
-share/gjs-1.0/jsUnit.js
-share/gjs-1.0/lang.js
-share/gjs-1.0/overrides/GLib.js
-share/gjs-1.0/overrides/GObject.js
-share/gjs-1.0/overrides/Gio.js
-share/gjs-1.0/promise.js
-share/gjs-1.0/signals.js
-share/gjs-1.0/tweener/equations.js
-share/gjs-1.0/tweener/tweenList.js
-share/gjs-1.0/tweener/tweener.js
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 44935e250d94..f6cf2f778a3e 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	squeak
 PORTVERSION=	4.10.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	http://www.squeakvm.org/unix/release/:vmsrc \
 		http://ftp.squeak.org/${IMAGE_VERSION}/:src \
@@ -32,6 +32,7 @@ LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas \
 ONLY_FOR_ARCHS=	i386 amd64 powerpc
 
 USES=		pkgconfig
+USE_GNOME=	cairo pango
 USE_GL=		gl
 HAS_CONFIGURE=	yes
 USE_GSTREAMER=	yes
diff --git a/lang/vala-vapigen/Makefile b/lang/vala-vapigen/Makefile
deleted file mode 100644
index 6722640140ee..000000000000
--- a/lang/vala-vapigen/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
-# $FreeBSD$
-#   $MCom: ports/trunk/lang/vala-vapigen/Makefile 18374 2013-04-15 09:25:19Z kwm $
-
-PORTREVISION=	1
-CATEGORIES=	devel gnome
-PKGNAMESUFFIX=	-vapigen
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	The vapigen program from vala
-
-MASTERDIR=	${.CURDIR}/../vala
-BUILD_WRKSRC=	${WRKSRC}/vapigen
-INSTALL_WRKSRC=	${WRKSRC}/vapigen
-DESCR=		${.CURDIR}/pkg-descr
-PLIST=		${.CURDIR}/pkg-plist
-
-VALA_SLAVE=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/lang/vala-vapigen/pkg-descr b/lang/vala-vapigen/pkg-descr
deleted file mode 100644
index 715f54ef3b48..000000000000
--- a/lang/vala-vapigen/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-vapigen is a utility which generates Vala API (vapi) from 
-gobject-introspection (GI) files.
-
-WWW: https://wiki.gnome.org/Projects/Vala
diff --git a/lang/vala-vapigen/pkg-plist b/lang/vala-vapigen/pkg-plist
deleted file mode 100644
index fc36be000c84..000000000000
--- a/lang/vala-vapigen/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-bin/vala-gen-introspect
-bin/vala-gen-introspect-%%VERSION%%
-bin/vapicheck
-bin/vapicheck-%%VERSION%%
-bin/vapigen
-bin/vapigen-%%VERSION%%
-lib/vala-%%VERSION%%/gen-introspect-%%VERSION%%
-libdata/pkgconfig/vapigen-%%VERSION%%.pc
-libdata/pkgconfig/vapigen.pc
-man/man1/vala-gen-introspect.1.gz
-man/man1/vapigen.1.gz
-share/aclocal/vapigen.m4
-%%DATADIR%%/Makefile.vapigen
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 703679c05215..a8406ec8cae1 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -1,10 +1,9 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/lang/vala/Makefile 19019 2014-03-08 14:51:46Z kwm $
+#   $MCom: ports/trunk/lang/vala/Makefile 19985 2014-10-17 12:35:17Z kwm $
 
 PORTNAME=	vala
-PORTVERSION=	0.20.1
-PORTREVISION=	1
+PORTVERSION=	0.26.1
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 
@@ -13,53 +12,20 @@ COMMENT=	Programming language and compiler that converts Vala code into C code
 
 LICENSE=	LGPL21
 
-USES=		bison gettext gmake libtool:keepla pathfix pkgconfig tar:xz
-USE_GNOME=	glib20 gnomeprefix libxslt introspection:build
+USES=		bison gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	glib20 gnomeprefix libxslt
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 VALA_VER=	${PORTVERSION:R}
 
 PLIST_SUB=	VERSION=${VALA_VER}
 
-.if defined(VALA_SLAVE)
-LIB_DEPENDS+=	libvala-${VALA_VER}.so:${PORTSDIR}/lang/vala
-CONFIGURE_ARGS+=--enable-vapigen
-BUILD_DEPENDS+=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
-RUN_DEPENDS+=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
-.else
-CONFIGURE_ARGS+=--disable-vapigen
-.endif
-
-post-patch:
-# We cheat here, because vala records vapigen related stuff in its .pc file
-# This makes vapigen work again, although it might get weird when
-# vala-vapigen isn't installed.
-	@${REINPLACE_CMD} -e 's|@vapigen_decl@|vapigen=$${bindir}/vapigen-${VALA_VER}|g' \
-		-e 's|@gen_introspect_decl@|gen_introspect=$${libdir}/vala-${VALA_VER}/gen-introspect-${VALA_VER}|g' \
-		-e 's|@vala_gen_introspect_decl@|vala_gen_introspect=$${bindir}/vala-gen-introspect-${VALA_VER}|g' \
-		${WRKSRC}/libvala.pc.in
-	@${REINPLACE_CMD} -e 's|cp $$< $$@|cp libvala.pc libvala-${VALA_VER}.pc|g' \
-		${WRKSRC}/Makefile.in
-
-.if defined(VALA_SLAVE)
-pre-build:
-	@cd ${WRKSRC} && ${MAKE_CMD} version.h
-	@cd ${WRKSRC}/gobject-introspection && ${MAKE_CMD} libgidl.la && \
-		${MAKE_CMD} gen-introspect
-	@cd ${WRKSRC}/vapigen && ${MAKE_CMD} all
-
-post-install:
-	@cd ${WRKSRC}/gobject-introspection && DESTDIR=${STAGEDIR} ${MAKE_CMD} install
-	${INSTALL_MAN} ${WRKSRC}/doc/vapigen.1 ${WRKSRC}/doc/vala-gen-introspect.1 \
-		 ${STAGEDIR}${PREFIX}/man/man1/
-.else
 post-install:
 	${LN} -fs ${PREFIX}/libdata/pkgconfig/libvala-${VALA_VER}.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/vala-1.0.pc
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
-.endif
 
 .include <bsd.port.mk>
diff --git a/lang/vala/distinfo b/lang/vala/distinfo
index b2acf129e50d..5cc984415cfc 100644
--- a/lang/vala/distinfo
+++ b/lang/vala/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vala-0.20.1.tar.xz) = 9cb7ecd18a23525e401c204d4d08341c7d911cd5d78078eee10b747ecb45e481
-SIZE (vala-0.20.1.tar.xz) = 2627808
+SHA256 (vala-0.26.1.tar.xz) = 8407abb19ab3a58bbfc0d288abb47666ef81f76d0540258c03965e7545f59e6b
+SIZE (vala-0.26.1.tar.xz) = 2690124
diff --git a/lang/vala/files/patch-vapi_libpq.vapi b/lang/vala/files/patch-vapi_libpq.vapi
index 061585de0da3..3e0a8bcafb16 100644
--- a/lang/vala/files/patch-vapi_libpq.vapi
+++ b/lang/vala/files/patch-vapi_libpq.vapi
@@ -1,11 +1,14 @@
---- vapi/libpq.vapi.orig	2009-07-17 21:34:39.000000000 +0600
-+++ vapi/libpq.vapi	2009-11-23 01:18:21.000000000 +0500
-@@ -22,7 +22,7 @@
- 
- using GLib;
+--- vapi/libpq.vapi.orig	2014-02-03 19:35:53.000000000 +0000
++++ vapi/libpq.vapi	2014-03-10 10:22:09.771304414 +0000
+@@ -20,11 +20,7 @@
+  * 	Jukka-Pekka Iivonen <jp0409@jippii.fi>
+  */
  
+-#if LIBPQ_9_3
+ [CCode (cprefix = "PQ", cheader_filename = "libpq-fe.h")]
+-#else
 -[CCode (cprefix = "PQ", cheader_filename = "postgresql/libpq-fe.h")]
-+[CCode (cprefix = "PQ", cheader_filename = "libpq-fe.h")]
+-#endif
  namespace Postgres {
  
- 	[CCode (cname = "ConnStatusType", cprefix = "CONNECTION_")]
+ 	[CCode (cname = "ConnStatusType", cprefix = "CONNECTION_", has_type_id = false)]
diff --git a/lang/vala/files/patch-vapigen_Makefile.in b/lang/vala/files/patch-vapigen_Makefile.in
deleted file mode 100644
index bc1780d20f73..000000000000
--- 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-descr b/lang/vala/pkg-descr
index cfde332b3860..e5c2f9fc49e1 100644
--- a/lang/vala/pkg-descr
+++ b/lang/vala/pkg-descr
@@ -9,4 +9,4 @@ type system to create classes and interfaces declared in the Vala source
 code. It's also planned to generate GIDL files when gobject-
 introspection is ready.
 
-WWW: https://wiki.gnome.org/Projects/Vala
+WWW: http://live.gnome.org/Vala
diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist
index 08994446a392..ffc13cddb398 100644
--- a/lang/vala/pkg-plist
+++ b/lang/vala/pkg-plist
@@ -1,20 +1,33 @@
 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
 include/vala-%%VERSION%%/valagee.h
-lib/libvala-%%VERSION%%.la
 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
@@ -48,6 +61,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/clutter-1.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/clutter-gst-1.0.deps
 %%DATADIR%%-%%VERSION%%/vapi/clutter-gst-1.0.vapi
+%%DATADIR%%-%%VERSION%%/vapi/clutter-gst-2.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/clutter-gst-2.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/clutter-gtk-0.10.deps
 %%DATADIR%%-%%VERSION%%/vapi/clutter-gtk-0.10.vapi
 %%DATADIR%%-%%VERSION%%/vapi/clutter-gtk-1.0.deps
@@ -85,6 +100,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/gedit-2.20.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gedit.deps
 %%DATADIR%%-%%VERSION%%/vapi/gedit.vapi
+%%DATADIR%%-%%VERSION%%/vapi/geocode-glib-1.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/geocode-glib-1.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gio-2.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gio-unix-2.0.deps
 %%DATADIR%%-%%VERSION%%/vapi/gio-unix-2.0.vapi
@@ -105,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
@@ -147,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
@@ -227,6 +248,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/libpanelapplet-2.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/libpeas-1.0.deps
 %%DATADIR%%-%%VERSION%%/vapi/libpeas-1.0.vapi
+%%DATADIR%%-%%VERSION%%/vapi/libpeas-gtk-1.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/libpeas-gtk-1.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/libpq.vapi
 %%DATADIR%%-%%VERSION%%/vapi/librsvg-2.0.deps
 %%DATADIR%%-%%VERSION%%/vapi/librsvg-2.0.vapi
@@ -252,6 +275,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/mx-1.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/mysql.vapi
 %%DATADIR%%-%%VERSION%%/vapi/orc-0.4.vapi
+%%DATADIR%%-%%VERSION%%/vapi/packagekit-glib2.deps
+%%DATADIR%%-%%VERSION%%/vapi/packagekit-glib2.vapi
 %%DATADIR%%-%%VERSION%%/vapi/pango.deps
 %%DATADIR%%-%%VERSION%%/vapi/pango.vapi
 %%DATADIR%%-%%VERSION%%/vapi/pangocairo.deps
@@ -301,8 +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
+%%DATADIR%%/Makefile.vapigen