5 files changed, 50 insertions, 27 deletions
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index e5ac118a9155..0de597e5556c 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	vala
-PORTVERSION=	0.30.2
+PORTVERSION=	0.36.4
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 
@@ -15,16 +15,13 @@ PORTSCOUT=	limitw:1,even
 
 USES=		bison gettext-runtime gmake gnome libtool \
 		localbase pathfix pkgconfig tar:xz
-USE_GNOME=	glib20 gnomeprefix libxslt
+USE_GNOME=	glib20 gnomeprefix libxslt:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 VALA_VER=	${PORTVERSION:R}
 
-# Version got bumped to 0.30, replace VERSION with that instead
-# of using VALA_VER. Replace 0.30 with VALA_VER when vala gets to 0.30.0
-#PLIST_SUB=	VERSION=${VALA_VER}
-PLIST_SUB=	VERSION=0.30
+PLIST_SUB=	VERSION=0.36
 
 .include <bsd.port.mk>
diff --git a/lang/vala/distinfo b/lang/vala/distinfo
index 1e25ba887455..5a9630a9e79e 100644
--- a/lang/vala/distinfo
+++ b/lang/vala/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466535422
-SHA256 (vala-0.30.2.tar.xz) = ea3822e97ff94860aca615380f2082ca50c79bc830536cb00c3d3b5955e73e02
-SIZE (vala-0.30.2.tar.xz) = 2727240
+TIMESTAMP = 1504109248
+SHA256 (vala-0.36.4.tar.xz) = e9f23ce711c1a72ce664d10946fbc5953f01b0b7f2a3562e7a01e362d86de059
+SIZE (vala-0.36.4.tar.xz) = 2846516
diff --git a/lang/vala/files/patch-vapi_libpq.vapi b/lang/vala/files/patch-vapi_libpq.vapi
index 3e0a8bcafb16..bf916a26fce4 100644
--- a/lang/vala/files/patch-vapi_libpq.vapi
+++ b/lang/vala/files/patch-vapi_libpq.vapi
@@ -1,7 +1,7 @@
---- vapi/libpq.vapi.orig	2014-02-03 19:35:53.000000000 +0000
-+++ vapi/libpq.vapi	2014-03-10 10:22:09.771304414 +0000
+--- vapi/libpq.vapi.orig	2017-03-02 09:33:15 UTC
++++ vapi/libpq.vapi
 @@ -20,11 +20,7 @@
-  * 	Jukka-Pekka Iivonen <jp0409@jippii.fi>
+  *	Jukka-Pekka Iivonen <jp0409@jippii.fi>
   */
  
 -#if LIBPQ_9_3
diff --git a/lang/vala/pkg-descr b/lang/vala/pkg-descr
index e5c2f9fc49e1..cfde332b3860 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: http://live.gnome.org/Vala
+WWW: https://wiki.gnome.org/Projects/Vala
diff --git a/lang/vala/pkg-plist b/lang/vala/pkg-plist
index 6404f429bb14..f3d3e6cff68c 100644
--- a/lang/vala/pkg-plist
+++ b/lang/vala/pkg-plist
@@ -27,21 +27,26 @@ 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%%/Attributes.html
+share/devhelp/books/vala-%%VERSION%%/Classes.html
+share/devhelp/books/vala-%%VERSION%%/Concepts.html
+share/devhelp/books/vala-%%VERSION%%/Delegates.html
+share/devhelp/books/vala-%%VERSION%%/Enumerated_types__Enums_.html
+share/devhelp/books/vala-%%VERSION%%/Errors.html
+share/devhelp/books/vala-%%VERSION%%/Expressions.html
+share/devhelp/books/vala-%%VERSION%%/GIDL_metadata_format.html
+share/devhelp/books/vala-%%VERSION%%/GIR_metadata_format.html
+share/devhelp/books/vala-%%VERSION%%/Generics.html
+share/devhelp/books/vala-%%VERSION%%/Interfaces.html
+share/devhelp/books/vala-%%VERSION%%/Methods.html
+share/devhelp/books/vala-%%VERSION%%/Namespaces.html
+share/devhelp/books/vala-%%VERSION%%/Overview.html
+share/devhelp/books/vala-%%VERSION%%/Preprocessor.html
+share/devhelp/books/vala-%%VERSION%%/Statements.html
+share/devhelp/books/vala-%%VERSION%%/Structs.html
+share/devhelp/books/vala-%%VERSION%%/Types.html
 share/devhelp/books/vala-%%VERSION%%/default.css
-share/devhelp/books/vala-%%VERSION%%/delegates.html
-share/devhelp/books/vala-%%VERSION%%/enums.html
-share/devhelp/books/vala-%%VERSION%%/exceptions.html
-share/devhelp/books/vala-%%VERSION%%/expressions.html
 share/devhelp/books/vala-%%VERSION%%/index.html
-share/devhelp/books/vala-%%VERSION%%/interfaces.html
-share/devhelp/books/vala-%%VERSION%%/methods.html
-share/devhelp/books/vala-%%VERSION%%/namespaces.html
-share/devhelp/books/vala-%%VERSION%%/overview.html
-share/devhelp/books/vala-%%VERSION%%/statements.html
-share/devhelp/books/vala-%%VERSION%%/structs.html
-share/devhelp/books/vala-%%VERSION%%/types.html
 share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/alsa.deps
 %%DATADIR%%-%%VERSION%%/vapi/alsa.vapi
@@ -70,7 +75,6 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/clutter-gtk-0.10.vapi
 %%DATADIR%%-%%VERSION%%/vapi/clutter-gtk-1.0.deps
 %%DATADIR%%-%%VERSION%%/vapi/clutter-gtk-1.0.vapi
-%%DATADIR%%-%%VERSION%%/vapi/clutter-json-1.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/clutter-x11-1.0.deps
 %%DATADIR%%-%%VERSION%%/vapi/clutter-x11-1.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/cogl-1.0.deps
@@ -110,6 +114,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/gio-2.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gio-unix-2.0.deps
 %%DATADIR%%-%%VERSION%%/vapi/gio-unix-2.0.vapi
+%%DATADIR%%-%%VERSION%%/vapi/gio-windows-2.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/gio-windows-2.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/glib-2.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gmodule-2.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gnet-2.0.deps
@@ -123,6 +129,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/gobject-introspection-1.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/goocanvas.deps
 %%DATADIR%%-%%VERSION%%/vapi/goocanvas.vapi
+%%DATADIR%%-%%VERSION%%/vapi/graphene-1.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/graphene-1.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gsl.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-0.10.deps
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-0.10.vapi
@@ -137,6 +145,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-audio-0.10.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-audio-1.0.deps
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-audio-1.0.vapi
+%%DATADIR%%-%%VERSION%%/vapi/gstreamer-bad-allocators-1.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/gstreamer-bad-allocators-1.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-base-0.10.deps
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-base-0.10.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-base-1.0.deps
@@ -169,6 +179,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-pbutils-0.10.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-pbutils-1.0.deps
 %%DATADIR%%-%%VERSION%%/vapi/gstreamer-pbutils-1.0.vapi
+%%DATADIR%%-%%VERSION%%/vapi/gstreamer-player-1.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/gstreamer-player-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
@@ -199,6 +211,14 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/gtk+-2.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gtk+-3.0.deps
 %%DATADIR%%-%%VERSION%%/vapi/gtk+-3.0.vapi
+%%DATADIR%%-%%VERSION%%/vapi/gtk+-4.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/gtk+-4.0.vapi
+%%DATADIR%%-%%VERSION%%/vapi/gtk+-unix-print-2.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/gtk+-unix-print-2.0.vapi
+%%DATADIR%%-%%VERSION%%/vapi/gtk+-unix-print-3.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/gtk+-unix-print-3.0.vapi
+%%DATADIR%%-%%VERSION%%/vapi/gtk+-unix-print-4.0.deps
+%%DATADIR%%-%%VERSION%%/vapi/gtk+-unix-print-4.0.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gtkmozembed.deps
 %%DATADIR%%-%%VERSION%%/vapi/gtkmozembed.vapi
 %%DATADIR%%-%%VERSION%%/vapi/gtksourceview-2.0.deps
@@ -236,6 +256,8 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/libgnome-menu.vapi
 %%DATADIR%%-%%VERSION%%/vapi/libgnomeui-2.0.deps
 %%DATADIR%%-%%VERSION%%/vapi/libgnomeui-2.0.vapi
+%%DATADIR%%-%%VERSION%%/vapi/libgrss.deps
+%%DATADIR%%-%%VERSION%%/vapi/libgrss.vapi
 %%DATADIR%%-%%VERSION%%/vapi/libgsf-1.deps
 %%DATADIR%%-%%VERSION%%/vapi/libgsf-1.vapi
 %%DATADIR%%-%%VERSION%%/vapi/libgvc.vapi
@@ -287,6 +309,10 @@ share/devhelp/books/vala-%%VERSION%%/vala-%%VERSION%%.devhelp2
 %%DATADIR%%-%%VERSION%%/vapi/pangocairo.deps
 %%DATADIR%%-%%VERSION%%/vapi/pangocairo.vapi
 %%DATADIR%%-%%VERSION%%/vapi/pixman-1.vapi
+%%DATADIR%%-%%VERSION%%/vapi/polkit-agent-1.deps
+%%DATADIR%%-%%VERSION%%/vapi/polkit-agent-1.vapi
+%%DATADIR%%-%%VERSION%%/vapi/polkit-gobject-1.deps
+%%DATADIR%%-%%VERSION%%/vapi/polkit-gobject-1.vapi
 %%DATADIR%%-%%VERSION%%/vapi/poppler-glib.deps
 %%DATADIR%%-%%VERSION%%/vapi/poppler-glib.vapi
 %%DATADIR%%-%%VERSION%%/vapi/posix.vapi