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

9 files changed, 58 insertions, 163 deletions

diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index 6e88ea507..bbf2984ef 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	gjs
-PORTVERSION=	1.34.0
+PORTVERSION=	1.40.1
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -12,26 +12,18 @@ 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.*
-
-USE_XZ=		yes
-USES=		gettext gmake pathfix pkgconfig shebangfix
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	cairo glib20 gnomeprefix introspection:build \
+		intlhack
 USE_PYTHON_BUILD=yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	cairo glib20 gnomeprefix introspection:build \
-		intlhack ltverhack
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-SHEBANG_FILES=	scripts/make-tests
-python_OLD_CMD=	/usr/bin/env python
-python_CMD=	${PYTHON_CMD}
-
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so*
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gjs-1.0/*.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgjs.so.*
 
 .include <bsd.port.mk>
diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo
index 25d125ca9..8f58246ca 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.40.1.tar.xz) = 2f0d80ec96c6284785143abe51377d8a284977ea6c3cf0cef1020d92eae41793
+SIZE (gnome3/gjs-1.40.1.tar.xz) = 448204
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 5bf70a844..000000000
--- 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 203ac5252..405af5a92 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,67 +17,30 @@ 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.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
-@dirrm share/gjs-1.0/tweener
-@dirrm share/gjs-1.0/overrides
-@dirrm share/gjs-1.0
+@dirrm libexec/gjs/installed-tests/js
+@dirrm libexec/gjs/installed-tests
+@dirrm libexec/gjs
 @dirrm lib/gjs/girepository-1.0
-@dirrm lib/gjs-1.0
 @dirrm lib/gjs
 @dirrm include/gjs-1.0/gjs
-@dirrm include/gjs-1.0/gjs-dbus
 @dirrm include/gjs-1.0/gi
 @dirrm include/gjs-1.0
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index dc6ebb4aa..8a2104a16 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	vala
-PORTVERSION=	0.22.1
+PORTVERSION=	0.24.0
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 
@@ -12,9 +12,8 @@ COMMENT=	Programming language and compiler that converts Vala code into C code
 
 LICENSE=	LGPL21
 
-USES=		bison gettext gmake libtool pathfix pkgconfig
-USE_XZ=		yes
-USE_GNOME=	glib20 gnomeprefix libxslt introspection:build
+USES=		bison gettext gmake pathfix pkgconfig tar:xz
+USE_GNOME=	glib20 gnomeprefix libxslt
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -31,6 +30,17 @@ 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
+
+PLIST_SUB=	VERSION=${VALA_VER}
+.endif
+
+.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:
@@ -41,25 +51,24 @@ post-patch:
 		-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
+#	@${REINPLACE_CMD} -e 's|cp $$< $$@|cp libvala.pc libvala-${VALA_VER}.pc|g' \
+#		${WRKSRC}/Makefile.in
 
 .if defined(VALA_SLAVE)
 pre-build:
 	@cd ${WRKSRC} && ${GMAKE} version.h
-	@cd ${WRKSRC}/gobject-introspection && ${MAKE_CMD} libgidl.la && \
-		${MAKE_CMD} gen-introspect
-	@cd ${WRKSRC}/vapigen && ${MAKE_CMD} all
+	@cd ${WRKSRC}/gobject-introspection && ${GMAKE} libgidl.la && \
+		${GMAKE} gen-introspect
 
 post-install:
 	@cd ${WRKSRC}/gobject-introspection && DESTDIR=${STAGEDIR} ${GMAKE} install
-	${INSTALL_MAN} ${WRKSRC}/doc/vapigen.1 ${WRKSRC}/doc/vala-gen-introspect.1 \
+	@${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.*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/vala/distinfo b/lang/vala/distinfo
index 9ff0eb068..099eb9eb0 100644
--- a/lang/vala/distinfo
+++ b/lang/vala/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vala-0.22.1.tar.xz) = 92c61b94a427f281ba2537b69135a3be23248b153268057d7195003dd6aba28c
-SIZE (vala-0.22.1.tar.xz) = 2690324
+SHA256 (vala-0.24.0.tar.xz) = 22a37c977512c19cd29c373eaaef96cb2c994795d491106f32387f3f9d1e899c
+SIZE (vala-0.24.0.tar.xz) = 2666032
diff --git a/lang/vala/files/patch-vapi_libpq.vapi b/lang/vala/files/patch-vapi_libpq.vapi
index 061585de0..3e0a8bcaf 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/pkg-descr b/lang/vala/pkg-descr
index cfde332b3..e5c2f9fc4 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 0c76e5512..36b3c3edb 100644
--- a/lang/vala/pkg-plist
+++ b/lang/vala/pkg-plist
@@ -9,7 +9,6 @@ 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
 libdata/pkgconfig/libvala-%%VERSION%%.pc
 libdata/pkgconfig/vala-1.0.pc
 man/man1/valac-%%VERSION%%.1.gz
@@ -48,6 +47,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
@@ -62,8 +63,6 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/enchant.vapi
 %%DATADIR%%-%%VERSION%%/vapi/fuse.deps
 %%DATADIR%%-%%VERSION%%/vapi/fuse.vapi
-%%DATADIR%%-%%VERSION%%/vapi/geocode-glib-1.0.deps
-%%DATADIR%%-%%VERSION%%/vapi/geocode-glib-1.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gconf-2.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gdk-2.0.deps
 %%DATADIR%%-%%VERSION%%/vapi/gdk-2.0.vapi
@@ -87,6 +86,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
@@ -229,6 +230,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
@@ -254,6 +257,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
@@ -304,6 +309,7 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/webkit-1.0.deps
 %%DATADIR%%-%%VERSION%%/vapi/webkit-1.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