git: d9b0d9ac4e6b - main - framework: switch tree to using vala.mk

From: Tobias C. Berner <tcberner_at_FreeBSD.org>
Date: Fri, 26 Aug 2022 17:02:57 UTC
The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d9b0d9ac4e6b3fc91eb160e6f884d96354caa9bd

commit d9b0d9ac4e6b3fc91eb160e6f884d96354caa9bd
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2022-08-26 15:31:20 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2022-08-26 17:02:25 +0000

    framework: switch tree to using vala.mk
    
    PR:             249940
---
 accessibility/feedbackd/Makefile         | 2 +-
 archivers/gcab/Makefile                  | 4 +---
 archivers/gnome-autoar/Makefile          | 4 +---
 audio/gradio/Makefile                    | 3 +--
 audio/gsound/Makefile                    | 3 +--
 audio/rhythmbox/Makefile                 | 3 +--
 audio/xfmpc/Makefile                     | 3 +--
 databases/evolution-data-server/Makefile | 2 +-
 databases/sequeler/Makefile              | 3 +--
 deskutils/baobab/Makefile                | 5 ++---
 deskutils/bookworm/Makefile              | 5 ++---
 deskutils/elementary-calendar/Makefile   | 3 +--
 deskutils/gnome-clocks/Makefile          | 5 ++---
 deskutils/gnome-contacts/Makefile        | 3 +--
 deskutils/gnome-pomodoro/Makefile        | 5 ++---
 deskutils/go-for-it/Makefile             | 3 +--
 deskutils/gucharmap/Makefile             | 5 ++---
 deskutils/libportal/Makefile             | 2 +-
 deskutils/lookbook/Makefile              | 3 +--
 deskutils/meteo/Makefile                 | 5 ++---
 deskutils/showdown/Makefile              | 5 ++---
 deskutils/synapse/Makefile               | 3 +--
 devel/appstream/Makefile                 | 5 ++---
 devel/ayatana-ido/Makefile               | 5 ++---
 devel/dconf-editor/Makefile              | 5 ++---
 devel/dconf/Makefile                     | 5 ++---
 devel/dee/Makefile                       | 3 +--
 devel/gitg/Makefile                      | 5 ++---
 devel/gnome-builder/Makefile             | 4 ++--
 devel/jsonrpc-glib/Makefile              | 3 +--
 devel/libappindicator/Makefile           | 2 +-
 devel/libayatana-indicator/Makefile      | 5 ++---
 devel/libdbusmenu/Makefile               | 3 +--
 devel/libgdata/Makefile                  | 5 ++---
 devel/libgee/Makefile                    | 4 +---
 devel/libgit2-glib/Makefile              | 3 +--
 devel/libgusb/Makefile                   | 5 ++---
 devel/libical/Makefile                   | 2 +-
 devel/libpeas/Makefile                   | 4 +---
 devel/libvirt-glib/Makefile              | 2 +-
 devel/msitools/Makefile                  | 3 +--
 devel/template-glib/Makefile             | 4 +---
 editors/elementary-code/Makefile         | 4 +---
 editors/gedit-plugins/Makefile           | 3 +--
 editors/gedit/Makefile                   | 3 +--
 editors/gnome-latex/Makefile             | 5 ++---
 editors/quilter/Makefile                 | 5 ++---
 games/crossfire-client/Makefile          | 3 +--
 games/eksanos/Makefile                   | 3 +--
 games/five-or-more/Makefile              | 5 ++---
 games/four-in-a-row/Makefile             | 3 +--
 games/gnome-2048/Makefile                | 5 ++---
 games/gnome-chess/Makefile               | 5 ++---
 games/gnome-klotski/Makefile             | 5 ++---
 games/gnome-mahjongg/Makefile            | 5 ++---
 games/gnome-mines/Makefile               | 5 ++---
 games/gnome-nibbles/Makefile             | 5 ++---
 games/gnome-robots/Makefile              | 5 ++---
 games/gnome-sudoku/Makefile              | 5 ++---
 games/gnome-taquin/Makefile              | 5 ++---
 games/gnome-tetravex/Makefile            | 5 ++---
 games/iagno/Makefile                     | 5 ++---
 games/libgnome-games-support/Makefile    | 3 +--
 games/libmanette/Makefile                | 5 ++---
 games/lightsoff/Makefile                 | 5 ++---
 games/quadrapassel/Makefile              | 5 ++---
 games/swell-foop/Makefile                | 5 ++---
 graphics/akira/Makefile                  | 3 +--
 graphics/birdfont/Makefile               | 5 ++---
 graphics/colord/Makefile                 | 2 +-
 graphics/elementary-photos/Makefile      | 3 +--
 graphics/gegl/Makefile                   | 2 +-
 graphics/gexiv2/Makefile                 | 5 ++---
 graphics/libchamplain/Makefile           | 3 +--
 graphics/librsvg2-rust/Makefile          | 3 +--
 graphics/librsvg2/Makefile               | 2 +-
 graphics/minder/Makefile                 | 5 ++---
 graphics/pdfpc/Makefile                  | 5 ++---
 graphics/shotwell/Makefile               | 5 ++---
 graphics/simple-scan/Makefile            | 5 ++---
 japanese/ibus-skk/Makefile               | 3 +--
 japanese/libskk/Makefile                 | 5 ++---
 mail/geary/Makefile                      | 5 ++---
 mail/gmime26/Makefile                    | 2 +-
 mail/gmime30/Makefile                    | 2 +-
 math/elementary-calculator/Makefile      | 3 +--
 math/gnome-calculator/Makefile           | 5 ++---
 multimedia/cheese/Makefile               | 3 +--
 multimedia/elementary-videos/Makefile    | 3 +--
 multimedia/libmediaart/Makefile          | 4 +---
 multimedia/peek/Makefile                 | 3 +--
 net-im/cawbird/Makefile                  | 3 +--
 net-im/dino/Makefile                     | 3 +--
 net-im/folks/Makefile                    | 3 +--
 net-im/libaccounts-glib/Makefile         | 5 ++---
 net-im/libsignon-glib/Makefile           | 5 ++---
 net-im/telepathy-glib/Makefile           | 4 +---
 net-mgmt/seafile-client/Makefile         | 3 +--
 net-mgmt/seafile-server/Makefile         | 3 +--
 net/geoclue/Makefile                     | 3 +--
 net/gnome-connections/Makefile           | 5 ++---
 net/gnome-online-accounts/Makefile       | 5 ++---
 net/grilo/Makefile                       | 3 +--
 net/gssdp/Makefile                       | 2 +-
 net/gssdp14/Makefile                     | 2 +-
 net/gtk-vnc/Makefile                     | 3 +--
 net/gupnp-av/Makefile                    | 2 +-
 net/gupnp-dlna/Makefile                  | 5 ++---
 net/gupnp/Makefile                       | 2 +-
 net/gupnp14/Makefile                     | 2 +-
 net/libdmapsharing/Makefile              | 3 +--
 net/libgweather/Makefile                 | 3 +--
 net/libgweather4/Makefile                | 5 ++---
 net/uhttpmock/Makefile                   | 3 +--
 net/vinagre/Makefile                     | 5 ++---
 security/gcr/Makefile                    | 5 ++---
 security/gpg-gui/Makefile                | 3 +--
 security/libsecret/Makefile              | 5 ++---
 security/seahorse/Makefile               | 5 ++---
 sysutils/bamf/Makefile                   | 5 ++---
 sysutils/contractor/Makefile             | 3 +--
 sysutils/tiramisu/Makefile               | 4 +---
 sysutils/tracker-miners/Makefile         | 3 +--
 sysutils/tracker/Makefile                | 3 +--
 sysutils/tracker3/Makefile               | 3 +--
 sysutils/zeitgeist/Makefile              | 5 ++---
 textproc/gspell/Makefile                 | 3 +--
 textproc/gtkspell3/Makefile              | 5 ++---
 textproc/ibus/Makefile                   | 2 +-
 textproc/libxmlbird/Makefile             | 5 ++---
 www/midori/Makefile                      | 3 +--
 x11-fm/polo/Makefile                     | 3 +--
 x11-fonts/font-manager/Makefile          | 3 +--
 x11-toolkits/granite/Makefile            | 3 +--
 x11-toolkits/granite7/Makefile           | 3 +--
 x11-toolkits/gtksourceview3/Makefile     | 3 +--
 x11-toolkits/gtksourceview4/Makefile     | 3 +--
 x11-toolkits/gtksourceview5/Makefile     | 3 +--
 x11-toolkits/libadwaita/Makefile         | 5 ++---
 x11-toolkits/libdazzle/Makefile          | 4 +---
 x11-toolkits/libhandy/Makefile           | 3 +--
 x11-toolkits/libhandy0/Makefile          | 3 +--
 x11-toolkits/vte3/Makefile               | 5 ++---
 x11-wm/lxsession/Makefile                | 3 +--
 x11-wm/xfce4-panel/Makefile              | 2 +-
 x11/appmenu-registrar/Makefile           | 3 +--
 x11/babl/Makefile                        | 3 +--
 x11/elementary-terminal/Makefile         | 3 +--
 x11/gnome-pie/Makefile                   | 3 +--
 x11/gnome-terminal/Makefile              | 3 +--
 x11/gtk-app-menu/Makefile                | 3 +--
 x11/libfm/Makefile                       | 6 +++---
 x11/libxfce4menu/Makefile                | 2 +-
 x11/libxfce4util/Makefile                | 2 +-
 x11/lightdm/Makefile                     | 2 +-
 x11/mate-applet-appmenu/Makefile         | 3 +--
 x11/plank/Makefile                       | 3 +--
 x11/remontoire/Makefile                  | 3 +--
 x11/slick-greeter/Makefile               | 4 ++--
 x11/swayfloatingswitcher/Makefile        | 5 ++---
 x11/swaync/Makefile                      | 3 +--
 x11/swaysettings/Makefile                | 3 +--
 x11/xapp/Makefile                        | 3 +--
 x11/xfce4-appmenu-plugin/Makefile        | 3 +--
 x11/xfce4-conf/Makefile                  | 2 +-
 165 files changed, 228 insertions(+), 378 deletions(-)

diff --git a/accessibility/feedbackd/Makefile b/accessibility/feedbackd/Makefile
index 4e2a9cef2d7e..d1c647bd8ed8 100644
--- a/accessibility/feedbackd/Makefile
+++ b/accessibility/feedbackd/Makefile
@@ -42,7 +42,7 @@ GIR_MESON_ENABLED=	introspection
 MANPAGES_BUILD_DEPENDS=	xsltproc:textproc/libxslt
 MANPAGES_MESON_TRUE=	man
 
-VAPI_BUILD_DEPENDS=	vapigen:lang/vala
+VAPI_USES=		vala:build
 VAPI_MESON_TRUE=	vapi
 VAPI_IMPLIES=		GIR
 
diff --git a/archivers/gcab/Makefile b/archivers/gcab/Makefile
index b758008d7bcb..693dee79acfc 100644
--- a/archivers/gcab/Makefile
+++ b/archivers/gcab/Makefile
@@ -6,12 +6,10 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GObject library to create cabinet files
 
-BUILD_DEPENDS=	vala:lang/vala
-
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe gettext gnome meson pkgconfig tar:xz
+USES=		cpe gettext gnome meson pkgconfig tar:xz vala:build
 USE_GNOME=	glib20 introspection:build
 CPE_VENDOR=	gnome
 
diff --git a/archivers/gnome-autoar/Makefile b/archivers/gnome-autoar/Makefile
index 912a0137a99a..3fdd79261e96 100644
--- a/archivers/gnome-autoar/Makefile
+++ b/archivers/gnome-autoar/Makefile
@@ -10,10 +10,8 @@ COMMENT=	Glib wrapper around libarchives
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:lang/vala
-
 USES=		cpe gettext-runtime gmake gnome libarchive meson pkgconfig \
-		tar:xz
+		tar:xz vala:build
 
 CPE_VENDOR=	gnome
 USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build
diff --git a/audio/gradio/Makefile b/audio/gradio/Makefile
index 445a0f232fdb..b333c16432da 100644
--- a/audio/gradio/Makefile
+++ b/audio/gradio/Makefile
@@ -9,11 +9,10 @@ COMMENT=	GTK3 app for finding and listening to internet radio stations
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libjson-glib-1.0.so:devel/json-glib
 
-USES=		gettext gnome gstreamer meson pkgconfig python:3.4+,env sqlite
+USES=		gettext gnome gstreamer meson pkgconfig python:3.4+,env sqlite vala:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	haecker-felix
 GH_PROJECT=	Gradio
diff --git a/audio/gsound/Makefile b/audio/gsound/Makefile
index 142229ca7075..7debe4dc815c 100644
--- a/audio/gsound/Makefile
+++ b/audio/gsound/Makefile
@@ -6,10 +6,9 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GObject library for playing system sounds
 
-BUILD_DEPENDS=	vala:lang/vala
 LIB_DEPENDS=	libcanberra.so:audio/libcanberra
 
-USES=		gnome meson pathfix pkgconfig tar:xz
+USES=		gnome meson pathfix pkgconfig tar:xz vala:build
 USE_GNOME=	glib20 introspection:build
 
 .include <bsd.port.mk>
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 8550ffbb9db0..36fba8446f13 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -11,7 +11,6 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
-		valac:lang/vala \
 		itstool:textproc/itstool
 LIB_DEPENDS=	libtotem-plparser.so:multimedia/totem-pl-parser \
 		libdbus-1.so:devel/dbus \
@@ -24,7 +23,7 @@ LIB_DEPENDS=	libtotem-plparser.so:multimedia/totem-pl-parser \
 		libtdb.so:databases/tdb
 
 USES=		desktop-file-utils gettext gnome gstreamer localbase:ldflags meson \
-		pkgconfig tar:xz xorg
+		pkgconfig tar:xz vala:build xorg
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 introspection libxml2
 USE_XORG=	ice x11 xorgproto
 USE_GSTREAMER=	flac lame jpeg cdparanoia vorbis
diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile
index 0a73cb88b559..2c71960d4f1b 100644
--- a/audio/xfmpc/Makefile
+++ b/audio/xfmpc/Makefile
@@ -10,11 +10,10 @@ COMMENT=	Graphical MPD client focusing on low footprint
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libmpd.so:audio/libmpd
 
 USES=		compiler:c11 gettext-tools gmake gnome pkgconfig tar:bzip2 \
-		xfce xorg
+		vala:build xfce xorg
 USE_GNOME=	cairo gtk30 intltool
 USE_XFCE=	libmenu
 USE_XORG=	ice sm x11
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 10d8b3a1fb50..5e6c7890bc6a 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -66,7 +66,7 @@ LDAP_CMAKE_OFF=		-DWITH_OPENLDAP=OFF
 LDAP_USE=		openldap=yes
 
 VALA_DESC=		Build Vala language bindings
-VALA_BUILD_DEPENDS=	vapigen:lang/vala
+VALA_USES=		vala:build
 VALA_CMAKE_BOOL=	ENABLE_VALA_BINDINGS
 
 WEATHER_DESC=	Weather calendar backend
diff --git a/databases/sequeler/Makefile b/databases/sequeler/Makefile
index d7501f4ea5ca..fe0bc707ef5b 100644
--- a/databases/sequeler/Makefile
+++ b/databases/sequeler/Makefile
@@ -10,14 +10,13 @@ COMMENT=	Friendly SQL client
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	vala:lang/vala
 LIB_DEPENDS=	libgee-0.8.so:devel/libgee \
 		libgranite.so:x11-toolkits/granite \
 		libsecret-1.so:security/libsecret \
 		libssh2.so:security/libssh2
 
 USES=		desktop-file-utils gettext gnome meson pkgconfig \
-		python:3.5+,build
+		python:3.5+,build vala:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	Alecaddd
 USE_GNOME=	cairo glib20 gtk30 gtksourceview3 libgda5
diff --git a/deskutils/baobab/Makefile b/deskutils/baobab/Makefile
index 327378d88f1c..ec75053eb0e2 100644
--- a/deskutils/baobab/Makefile
+++ b/deskutils/baobab/Makefile
@@ -12,12 +12,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 PORTSCOUT=	limitw:1,even
 
-BUILD_DEPENDS=	valac:lang/vala \
-		itstool:textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libhandy-1.so:x11-toolkits/libhandy
 
 USES=		desktop-file-utils gettext gnome meson pkgconfig \
-		python:3.5+,build tar:xz
+		python:3.5+,build tar:xz vala:build
 USE_GNOME=	cairo gtk40 libadwaita
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
diff --git a/deskutils/bookworm/Makefile b/deskutils/bookworm/Makefile
index 37417741f039..7953a2a1b975 100644
--- a/deskutils/bookworm/Makefile
+++ b/deskutils/bookworm/Makefile
@@ -10,8 +10,7 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	curl>0:ftp/curl \
-		html2text>0:textproc/html2text \
-		valac:lang/vala
+		html2text>0:textproc/html2text
 LIB_DEPENDS=	libappstream-glib.so:devel/appstream-glib \
 		libgee-0.8.so:devel/libgee \
 		libgranite.so:x11-toolkits/granite \
@@ -25,7 +24,7 @@ RUN_DEPENDS=	bash:shells/bash \
 		unzip:archivers/unzip
 
 USES=		desktop-file-utils gettext gnome meson pkgconfig \
-		python shebangfix sqlite
+		python shebangfix sqlite vala:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	babluboy
 USE_GNOME=	gdkpixbuf2 glib20 gtk30 libxml2 pango
diff --git a/deskutils/elementary-calendar/Makefile b/deskutils/elementary-calendar/Makefile
index cff5593b1060..10729d3aa706 100644
--- a/deskutils/elementary-calendar/Makefile
+++ b/deskutils/elementary-calendar/Makefile
@@ -9,7 +9,6 @@ COMMENT=	Desktop calendar app designed for elementary OS
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libchamplain-0.12.so:graphics/libchamplain \
 		libclutter-1.0.so:graphics/clutter \
@@ -25,7 +24,7 @@ LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libsoup-2.4.so:devel/libsoup
 RUN_DEPENDS=	consolekit2>0:sysutils/consolekit2
 
-USES=		desktop-file-utils gettext gnome meson pkgconfig
+USES=		desktop-file-utils gettext gnome meson pkgconfig vala:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	elementary
 USE_GNOME=	gdkpixbuf2 glib20 gtk30 evolutiondataserver3
diff --git a/deskutils/gnome-clocks/Makefile b/deskutils/gnome-clocks/Makefile
index 13031c768580..9273ba11a3bd 100644
--- a/deskutils/gnome-clocks/Makefile
+++ b/deskutils/gnome-clocks/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Clocks for GNOME
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-BUILD_DEPENDS=	itstool:textproc/itstool \
-		vala:lang/vala
+BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libgeoclue-2.so:net/geoclue \
 		libgeocode-glib.so:net/geocode-glib \
 		libgweather-3.so:net/libgweather \
@@ -21,7 +20,7 @@ LIB_DEPENDS=	libgeoclue-2.so:net/geoclue \
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 gettext gnome localbase meson pkgconfig \
-		python:3.4+,build shebangfix tar:xz
+		python:3.4+,build shebangfix tar:xz vala:build
 USE_LDCONFIG=	yes
 USE_GNOME=	cairo gnomedesktop3 gsound
 SHEBANG_FILES=	build-aux/post-install.py
diff --git a/deskutils/gnome-contacts/Makefile b/deskutils/gnome-contacts/Makefile
index 40f7b8330d27..930e50d5071a 100644
--- a/deskutils/gnome-contacts/Makefile
+++ b/deskutils/gnome-contacts/Makefile
@@ -10,7 +10,6 @@ COMMENT=	Contacts manager for gnome
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vala>=0.14.0:lang/vala
 LIB_DEPENDS=	libchamplain-0.12.so:graphics/libchamplain \
 		libclutter-1.0.so:graphics/clutter \
 		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
@@ -37,7 +36,7 @@ USE_GNOME=	cairo evolutiondataserver3 gdkpixbuf2 gnomedesktop3 gtk30 \
 		intlhack introspection:build
 USE_XORG=	x11 xcomposite xdamage xext xfixes xi xrandr
 USES=		compiler:c11 gettext gl gnome localbase meson perl5 pkgconfig \
-		python:3.4+,build sqlite tar:xz xorg
+		python:3.4+,build sqlite tar:xz vala:build xorg
 
 GLIB_SCHEMAS=	org.gnome.Contacts.gschema.xml
 
diff --git a/deskutils/gnome-pomodoro/Makefile b/deskutils/gnome-pomodoro/Makefile
index 33fd8233b87f..3e860730582a 100644
--- a/deskutils/gnome-pomodoro/Makefile
+++ b/deskutils/gnome-pomodoro/Makefile
@@ -8,14 +8,13 @@ COMMENT=	Time management utility for GNOME
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	appstream-util:devel/appstream-glib \
-		valac:lang/vala
+BUILD_DEPENDS=	appstream-util:devel/appstream-glib
 LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libgom-1.0.so:databases/gom \
 		libpeas-1.0.so:devel/libpeas
 
 USES=		desktop-file-utils gettext-tools gmake gnome gstreamer libtool meson \
-		pkgconfig sqlite
+		pkgconfig sqlite vala:build
 
 USE_GITHUB=	yes
 
diff --git a/deskutils/go-for-it/Makefile b/deskutils/go-for-it/Makefile
index f8091fa18586..f8462a03ff99 100644
--- a/deskutils/go-for-it/Makefile
+++ b/deskutils/go-for-it/Makefile
@@ -8,11 +8,10 @@ COMMENT=	Stylish to-do list with built-in productivity timer
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libnotify.so:devel/libnotify
 
-USES=		cmake compiler:c11 gettext gnome pkgconfig
+USES=		cmake compiler:c11 gettext gnome pkgconfig vala:build
 CMAKE_ARGS=	-DAPP_SYSTEM_NAME:STRING=${PORTNAME}
 USE_GITHUB=	yes
 GH_ACCOUNT=	JMoerman
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 40113414a55f..70c4f9967b36 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -15,13 +15,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool:textproc/itstool \
 		UCD>=0:textproc/UCD \
-		${LOCALBASE}/share/aclocal/yelp.m4:textproc/yelp-tools \
-		vala>=0.16:lang/vala
+		${LOCALBASE}/share/aclocal/yelp.m4:textproc/yelp-tools
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpcre2-8.so:devel/pcre2
 
 USES=		desktop-file-utils gettext-tools gnome localbase meson perl5 pkgconfig \
-		python:build tar:xz
+		python:build tar:xz vala:build
 USE_GNOME=	cairo glib20 gtk30 introspection:build
 USE_PERL5=	build
 BINARY_ALIAS=	python3=${PYTHON_CMD}
diff --git a/deskutils/libportal/Makefile b/deskutils/libportal/Makefile
index 762f797856b0..aa28e3519190 100644
--- a/deskutils/libportal/Makefile
+++ b/deskutils/libportal/Makefile
@@ -22,7 +22,7 @@ OPTIONS_DEFINE=		VALA
 OPTIONS_DEFAULT=	VALA
 
 VALA_MESON_TRUE=	vapi
-VALA_BUILD_DEPENDS=	vapigen:lang/vala
+VALA_USES=		vala:build
 VALA_DESC=		Install Vala language bindings
 
 # docs require a port for gi-docgen
diff --git a/deskutils/lookbook/Makefile b/deskutils/lookbook/Makefile
index 623f0ec09c6a..a238bed4dc90 100644
--- a/deskutils/lookbook/Makefile
+++ b/deskutils/lookbook/Makefile
@@ -9,11 +9,10 @@ COMMENT=	Browse and find system icons
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libgranite.so:x11-toolkits/granite \
 		libhandy-1.so:x11-toolkits/libhandy
 
-USES=		gettext-tools gnome meson pkgconfig python:3.6+,build
+USES=		gettext-tools gnome meson pkgconfig python:3.6+,build vala:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	danrabbit
 USE_GNOME=	glib20 gtk30 gtksourceview4
diff --git a/deskutils/meteo/Makefile b/deskutils/meteo/Makefile
index 111336f32cbd..0af7665eb3c6 100644
--- a/deskutils/meteo/Makefile
+++ b/deskutils/meteo/Makefile
@@ -8,15 +8,14 @@ COMMENT=	Weather forecast application using OpenWeatherMap API
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	appstream-util:devel/appstream-glib \
-		valac:lang/vala
+BUILD_DEPENDS=	appstream-util:devel/appstream-glib
 LIB_DEPENDS=	libappindicator3.so:devel/libappindicator \
 		libjson-glib-1.0.so:devel/json-glib \
 		libsoup-2.4.so:devel/libsoup \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 USES=		compiler:c11 desktop-file-utils gettext gnome meson pkgconfig \
-		python:3.5+,build shebangfix
+		python:3.5+,build shebangfix vala:build
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	bitseater
diff --git a/deskutils/showdown/Makefile b/deskutils/showdown/Makefile
index ca7f2fac544d..9bb4705dfc53 100644
--- a/deskutils/showdown/Makefile
+++ b/deskutils/showdown/Makefile
@@ -8,13 +8,12 @@ COMMENT=	Simple markdown viewer, written in Vala and GTK 3
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libmarkdown.a:textproc/discount \
-		valac:lang/vala
+BUILD_DEPENDS=	${LOCALBASE}/lib/libmarkdown.a:textproc/discount
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 USES=		compiler:c++11-lang desktop-file-utils gmake gnome \
-		pkgconfig xorg
+		pkgconfig vala:build xorg
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 pango
 USE_XORG=	x11
 USE_GITHUB=	yes
diff --git a/deskutils/synapse/Makefile b/deskutils/synapse/Makefile
index 717cf3483119..b9f5378bb5f0 100644
--- a/deskutils/synapse/Makefile
+++ b/deskutils/synapse/Makefile
@@ -13,7 +13,6 @@ LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPL2
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPL2.1
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libzeitgeist-2.0.so:sysutils/zeitgeist \
 		libgee-0.8.so:devel/libgee \
 		libjson-glib-1.0.so:devel/json-glib \
@@ -22,7 +21,7 @@ LIB_DEPENDS=	libzeitgeist-2.0.so:sysutils/zeitgeist \
 		librest-0.7.so:devel/librest \
 		libsoup-2.4.so:devel/libsoup
 
-USES=		gettext-tools gmake gnome pkgconfig tar:xz xorg
+USES=		gettext-tools gmake gnome pkgconfig tar:xz vala:build xorg
 GNU_CONFIGURE=	yes
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 libxml2 pango
 USE_XORG=	x11
diff --git a/devel/appstream/Makefile b/devel/appstream/Makefile
index 1ad7a108d30c..f59276536983 100644
--- a/devel/appstream/Makefile
+++ b/devel/appstream/Makefile
@@ -12,8 +12,7 @@ LICENSE_COMB=	multi
 BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
 		gperf>0:devel/gperf \
 		itstool:textproc/itstool \
-		lmdb>0:databases/lmdb \
-		valac:lang/vala
+		lmdb>0:databases/lmdb
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		liblmdb.so:databases/lmdb \
 		libstemmer.so:textproc/snowballstemmer \
@@ -21,7 +20,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libyaml.so:textproc/libyaml
 
 USES=		gettext gnome localbase:ldflags meson pkgconfig \
-		python:3.6+,build tar:xz
+		python:3.6+,build tar:xz vala:build
 
 USE_GNOME=	glib20 introspection:build libxml2 libxslt
 
diff --git a/devel/ayatana-ido/Makefile b/devel/ayatana-ido/Makefile
index 348ed1e82de3..9d91f7c17cb6 100644
--- a/devel/ayatana-ido/Makefile
+++ b/devel/ayatana-ido/Makefile
@@ -10,10 +10,9 @@ LICENSE=	LGPL3
 
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
 		libgtest.so:devel/googletest
-BUILD_DEPENDS=	vala>=0:lang/vala \
-		lcov>=0:devel/lcov
+BUILD_DEPENDS=	lcov>=0:devel/lcov
 
-USES=	cmake localbase:ldflags gnome pkgconfig
+USES=	cmake localbase:ldflags gnome pkgconfig vala:build
 
 USE_GNOME=	introspection glib20 gtk30 pango atk cairo gdkpixbuf2
 
diff --git a/devel/dconf-editor/Makefile b/devel/dconf-editor/Makefile
index cc275c34a96e..4a5377d811e0 100644
--- a/devel/dconf-editor/Makefile
+++ b/devel/dconf-editor/Makefile
@@ -13,14 +13,13 @@ COMMENT=	Configuration database editor for GNOME
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	dconf>=0.23.2:devel/dconf \
-		vala>=0.18.1:lang/vala
+BUILD_DEPENDS=	dconf>=0.23.2:devel/dconf
 LIB_DEPENDS=	libdconf.so:devel/dconf
 
 PORTSCOUT=	limitw:1,even
 
 USES=		gettext gnome localbase meson \
-		pkgconfig python:3.6+,build tar:xz
+		pkgconfig python:3.6+,build tar:xz vala:build
 USE_GNOME=	gtk30
 USE_LDCONFIG=	yes
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 6dbd4aa2ac21..1271fb172836 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -12,14 +12,13 @@ COMMENT=	Configuration database system for GNOME
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vala>=0.18.1:lang/vala \
-		docbook-xsl>=0:textproc/docbook-xsl \
+BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
 		${LOCALBASE}/libdata/pkgconfig/bash-completion.pc:shells/bash-completion
 LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gnome localbase meson pkgconfig python:3.6+,build tar:xz
+USES=		gettext gnome localbase meson pkgconfig python:3.6+,build tar:xz vala:build
 USE_CSTD=	c99
 USE_GNOME=	glib20 libxslt:build
 USE_LDCONFIG=	yes
diff --git a/devel/dee/Makefile b/devel/dee/Makefile
index 85578d3b8c72..a3dd6dc80d02 100644
--- a/devel/dee/Makefile
+++ b/devel/dee/Makefile
@@ -13,11 +13,10 @@ LICENSE=	GPLv3
 EXTRA_PATCHES=	${FILESDIR}/dee-1.2.7-deprecated-g_type_class_add_private.patch:-p1 \
 		${FILESDIR}/vapi-skip-properties.patch:-p1
 
-BUILD_DEPENDS=	vapigen:lang/vala
 LIB_DEPENDS=	libicutu.so:devel/icu
 
 USES=		compiler:c11 gmake gnome libtool localbase pathfix pkgconfig \
-		python:3.5+
+		python:3.5+ vala:build
 USE_GNOME=	glib20 introspection:build pygobject3
 
 CONFIGURE_ARGS=	--disable-gcov \
diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index 97df3dc8a0ef..73053451e126 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -14,8 +14,7 @@ COMMENT=	GTK-based git repository viewer
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
-		valac:lang/vala
+BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libenchant.so:textproc/enchant \
 		libgee-0.8.so:devel/libgee \
@@ -31,7 +30,7 @@ CONFLICTS=	gitg0
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 desktop-file-utils gettext gnome localbase \
-		meson pathfix pkgconfig python:3.4+,build tar:xz
+		meson pathfix pkgconfig python:3.4+,build tar:xz vala:build
 USE_GNOME=	cairo gtk30 gtksourceview3 intltool introspection
 
 USE_LDCONFIG=	yes
diff --git a/devel/gnome-builder/Makefile b/devel/gnome-builder/Makefile
index f1eaa4bb8d4f..2f6ddab59c89 100644
--- a/devel/gnome-builder/Makefile
+++ b/devel/gnome-builder/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gnome-builder
 PORTVERSION=	42.1
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
@@ -27,7 +28,6 @@ LIB_DEPENDS=	libcmark.so:textproc/cmark \
 		libportal.so:deskutils/libportal \
 		libsoup-2.4.so:devel/libsoup \
 		libtemplate_glib-1.0.so:devel/template-glib \
-		libvala-0.48.so:lang/vala \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 PORTSCOUT=	limitw:1,even
@@ -37,7 +37,7 @@ CONFLICTS_BUILD=	gnome-builder-3.16.*
 
 USES=		compiler:c++11-lang desktop-file-utils gettext gnome \
 		localbase:lfdlags meson pkgconfig python:3.6+,build shebangfix \
-		tar:xz
+		tar:xz vala:lib
 USE_GNOME=	cairo gtksourceview4 introspection libxml2 vte3
 SHEBANG_FILES=	${WRKSRC}/src/plugins/gradle/gradle_plugin.py \
 		${WRKSRC}/src/plugins/maven/maven_plugin.py
diff --git a/devel/jsonrpc-glib/Makefile b/devel/jsonrpc-glib/Makefile
index 61f7b24c2660..a9b86809a3fe 100644
--- a/devel/jsonrpc-glib/Makefile
+++ b/devel/jsonrpc-glib/Makefile
@@ -9,10 +9,9 @@ COMMENT=	Library to communicate using the JSON-RPC 2.0 specification
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib
 
-USES=		compiler:c11 gnome meson pkgconfig tar:xz
+USES=		compiler:c11 gnome meson pkgconfig tar:xz vala:build
 USE_GNOME=	glib20 introspection:build
 
 .include <bsd.port.mk>
diff --git a/devel/libappindicator/Makefile b/devel/libappindicator/Makefile
index 870ceb91bca8..09aae7ffe773 100644
--- a/devel/libappindicator/Makefile
+++ b/devel/libappindicator/Makefile
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=		VAPI
 OPTIONS_DEFAULT=	VAPI
 OPTIONS_SUB=		yes
 
-VAPI_BUILD_DEPENDS=	vala>=0:lang/vala
+VAPI_USES=		vala:build
 VAPI_CONFIGURE_ENV_OFF=	ac_cv_path_VALA_API_GEN= \
 			ac_cv_path_VALAC=
 
diff --git a/devel/libayatana-indicator/Makefile b/devel/libayatana-indicator/Makefile
index 375673be7e50..50ac4415afde 100644
--- a/devel/libayatana-indicator/Makefile
+++ b/devel/libayatana-indicator/Makefile
@@ -8,10 +8,9 @@ COMMENT=	Ayatana Indicators Shared Library
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	vala>=0:lang/vala \
-		lcov>=0:devel/lcov
+BUILD_DEPENDS=	lcov>=0:devel/lcov
 
-USES=	cmake localbase:ldflags gnome pkgconfig
+USES=	cmake localbase:ldflags gnome pkgconfig vala:build
 
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
 		libgtest.so:devel/googletest \
diff --git a/devel/libdbusmenu/Makefile b/devel/libdbusmenu/Makefile
index d9805c54b51a..54098fe96081 100644
--- a/devel/libdbusmenu/Makefile
+++ b/devel/libdbusmenu/Makefile
@@ -14,13 +14,12 @@ LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING-GPL3
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.2.1
 
-BUILD_DEPENDS=	vapigen:lang/vala
 LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
 		libharfbuzz.so:print/harfbuzz
 
 GNU_CONFIGURE=	yes
 USES=		compiler gettext-tools gmake gnome libtool pathfix pkgconfig python:run \
-		shebangfix xorg
+		shebangfix vala:build xorg
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 intltool intlhack libxslt \
 		introspection:build
 USE_XORG=	x11
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index ebf81980ee61..9e0254c0663e 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -9,8 +9,7 @@ COMMENT=	GLib-based implementation of the GData protocol
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	uhttpmock>0:net/uhttpmock \
-		valac:lang/vala
+BUILD_DEPENDS=	uhttpmock>0:net/uhttpmock
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libjson-glib-1.0.so:devel/json-glib \
 		libp11-kit.so:security/p11-kit \
@@ -18,7 +17,7 @@ LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libgcr-base-3.so:security/gcr \
 		liboauth.so:net/liboauth
 
-USES=		gettext gnome localbase meson pkgconfig tar:xz
+USES=		gettext gnome localbase meson pkgconfig tar:xz vala:build
 USE_GNOME=	glib20 introspection:build libxml2
 USE_LDCONFIG=	yes
 
diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile
index e44e87e8830f..26263871d594 100644
--- a/devel/libgee/Makefile
+++ b/devel/libgee/Makefile
@@ -10,13 +10,11 @@ COMMENT=	GObject collection library
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:lang/vala
-
 PORTSCOUT=	limitw:1,even
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-introspection=yes
-USES=		cpe gettext gmake gnome libtool pathfix pkgconfig tar:xz
+USES=		cpe gettext gmake gnome libtool pathfix pkgconfig tar:xz vala:build
 USE_GNOME=	glib20 introspection:build
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
diff --git a/devel/libgit2-glib/Makefile b/devel/libgit2-glib/Makefile
index 85916d810e49..ec84bf3852b0 100644
--- a/devel/libgit2-glib/Makefile
+++ b/devel/libgit2-glib/Makefile
@@ -13,11 +13,10 @@ COMMENT=	Glib wrapper library around the libgit2 git access library
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vapigen:lang/vala
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		compiler:c11 gnome localbase \
-		meson pkgconfig python:3.4+,build tar:xz
+		meson pkgconfig python:3.4+,build tar:xz vala:build
 USE_GNOME=	glib20 introspection
 USE_LDCONFIG=	yes
 MESON_ARGS=	-Dpython=false
diff --git a/devel/libgusb/Makefile b/devel/libgusb/Makefile
index 7f5277647f56..94b74a9c3c6c 100644
--- a/devel/libgusb/Makefile
+++ b/devel/libgusb/Makefile
@@ -8,10 +8,9 @@ COMMENT=	GUsb is a GObject wrapper for libusb1
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gtk-doc>0:textproc/gtk-doc \
-		vapigen:lang/vala
+BUILD_DEPENDS=	gtk-doc>0:textproc/gtk-doc
 
-USES=		gnome meson pkgconfig
+USES=		gnome meson pkgconfig vala:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hughsie
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index ac7aeff7150e..71eebe8a3c6d 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -31,7 +31,7 @@ DOCS_CMAKE_BOOL=	ICAL_BUILD_DOCS
 DOCSDIR=		${PREFIX}/share/gtk-doc/html/libical-glib
 
 VALA_DESC=		Build VALA bindings
-VALA_BUILD_DEPENDS=	valac:lang/vala
+VALA_USES=		vala:build
 VALA_CMAKE_BOOL=	ICAL_GLIB_VAPI
 
 INTROSPECTION_DESC=		Build GObject Introspection
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 2d10b0e5ffb9..91c70dfd2ce8 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -11,8 +11,6 @@ COMMENT?=	Next evolution of the Gedit plugins engine
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:lang/vala
-
 LIBPEAS_SLAVE?=	no
 
 .if ${LIBPEAS_SLAVE} == no
@@ -22,7 +20,7 @@ LIB_DEPENDS+=	libpeas-1.0.so:devel/libpeas
 PORTSCOUT=	ignore:1
 .endif
 
-USES=		cpe gettext gnome meson pkgconfig tar:xz
+USES=		cpe gettext gnome meson pkgconfig tar:xz vala:build
 USE_GNOME=	cairo gtk30 intlhack introspection
 USE_LDCONFIG=	yes
 CPE_VENDOR=	gnome
diff --git a/devel/libvirt-glib/Makefile b/devel/libvirt-glib/Makefile
index 93387a0502f0..914297a9bc57 100644
--- a/devel/libvirt-glib/Makefile
+++ b/devel/libvirt-glib/Makefile
@@ -21,7 +21,7 @@ DOCS_MESON_ENABLED=	docs
 DOCS_BUILD_DEPENDS=	gtk-doc>=0:textproc/gtk-doc
 VALA_DESC=	Vala binding
 VALA_MESON_ENABLED=	vapi
-VALA_BUILD_DEPENDS=	valac:lang/vala
+VALA_USES=		vala:build
 
 MESON_ARGS+=	-Dintrospection=enabled
 USE_LDCONFIG=	yes
diff --git a/devel/msitools/Makefile b/devel/msitools/Makefile
index c9cc012a3ea5..d59bd3f0d3e8 100644
--- a/devel/msitools/Makefile
+++ b/devel/msitools/Makefile
@@ -14,13 +14,12 @@ COMMENT=	Inspect and build Windows Installer (.MSI) files
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/copyright
 
-BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libgcab-1.0.so:archivers/gcab \
 		libgsf-1.so:devel/libgsf \
 		libuuid.so:misc/e2fsprogs-libuuid
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		bison gnome libtool meson perl5 pkgconfig shebangfix tar:xz
+USES=		bison gnome libtool meson perl5 pkgconfig shebangfix tar:xz vala:build
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20 introspection libxml2
 SHEBANG_FILES=	tools/msidiff.in \
diff --git a/devel/template-glib/Makefile b/devel/template-glib/Makefile
index e328527c79cf..30d7a737083d 100644
--- a/devel/template-glib/Makefile
+++ b/devel/template-glib/Makefile
@@ -9,9 +9,7 @@ COMMENT=	Templating library for GLib
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:lang/vala
-
-USES=		bison compiler:c11 gettext gnome meson pkgconfig tar:xz
+USES=		bison compiler:c11 gettext gnome meson pkgconfig tar:xz vala:build
 USE_GNOME=	glib20 introspection
 
 .include <bsd.port.mk>
diff --git a/editors/elementary-code/Makefile b/editors/elementary-code/Makefile
index 27b8b2c397e7..e619d7a2083e 100644
--- a/editors/elementary-code/Makefile
+++ b/editors/elementary-code/Makefile
@@ -8,7 +8,6 @@ COMMENT=	Code editor designed for elementary OS
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libatk-1.0.so:accessibility/atk \
 		libeditorconfig.so:editors/editorconfig-core-c \
 		libfontconfig.so:x11-fonts/fontconfig \
@@ -20,14 +19,13 @@ LIB_DEPENDS=	libatk-1.0.so:accessibility/atk \
 		libpeas-1.0.so:devel/libpeas \
 		libpeas-gtk-1.0.so:devel/libpeas \
 		libsoup-2.4.so:devel/libsoup \
-		libvala-0.48.so:lang/vala \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 		libzeitgeist-2.0.so:sysutils/zeitgeist
 RUN_DEPENDS=	droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \
 		pkcheck:sysutils/polkit
 
 USES=		compiler:c++11-lang desktop-file-utils gettext gnome meson \
-		ninja pkgconfig python:3.6+,build xorg
*** 2314 LINES SKIPPED ***