aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2022-08-26 15:31:20 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2022-08-26 17:02:25 +0000
commitd9b0d9ac4e6b3fc91eb160e6f884d96354caa9bd (patch)
tree6578caaa36b53619d5b5d061d20daeb70aa32dc3
parent19a9a1889f0e14b7ec179103da50cfd8b1216970 (diff)
downloadports-d9b0d9ac4e6b3fc91eb160e6f884d96354caa9bd.tar.gz
ports-d9b0d9ac4e6b3fc91eb160e6f884d96354caa9bd.zip
framework: switch tree to using vala.mk
PR: 249940
-rw-r--r--accessibility/feedbackd/Makefile2
-rw-r--r--archivers/gcab/Makefile4
-rw-r--r--archivers/gnome-autoar/Makefile4
-rw-r--r--audio/gradio/Makefile3
-rw-r--r--audio/gsound/Makefile3
-rw-r--r--audio/rhythmbox/Makefile3
-rw-r--r--audio/xfmpc/Makefile3
-rw-r--r--databases/evolution-data-server/Makefile2
-rw-r--r--databases/sequeler/Makefile3
-rw-r--r--deskutils/baobab/Makefile5
-rw-r--r--deskutils/bookworm/Makefile5
-rw-r--r--deskutils/elementary-calendar/Makefile3
-rw-r--r--deskutils/gnome-clocks/Makefile5
-rw-r--r--deskutils/gnome-contacts/Makefile3
-rw-r--r--deskutils/gnome-pomodoro/Makefile5
-rw-r--r--deskutils/go-for-it/Makefile3
-rw-r--r--deskutils/gucharmap/Makefile5
-rw-r--r--deskutils/libportal/Makefile2
-rw-r--r--deskutils/lookbook/Makefile3
-rw-r--r--deskutils/meteo/Makefile5
-rw-r--r--deskutils/showdown/Makefile5
-rw-r--r--deskutils/synapse/Makefile3
-rw-r--r--devel/appstream/Makefile5
-rw-r--r--devel/ayatana-ido/Makefile5
-rw-r--r--devel/dconf-editor/Makefile5
-rw-r--r--devel/dconf/Makefile5
-rw-r--r--devel/dee/Makefile3
-rw-r--r--devel/gitg/Makefile5
-rw-r--r--devel/gnome-builder/Makefile4
-rw-r--r--devel/jsonrpc-glib/Makefile3
-rw-r--r--devel/libappindicator/Makefile2
-rw-r--r--devel/libayatana-indicator/Makefile5
-rw-r--r--devel/libdbusmenu/Makefile3
-rw-r--r--devel/libgdata/Makefile5
-rw-r--r--devel/libgee/Makefile4
-rw-r--r--devel/libgit2-glib/Makefile3
-rw-r--r--devel/libgusb/Makefile5
-rw-r--r--devel/libical/Makefile2
-rw-r--r--devel/libpeas/Makefile4
-rw-r--r--devel/libvirt-glib/Makefile2
-rw-r--r--devel/msitools/Makefile3
-rw-r--r--devel/template-glib/Makefile4
-rw-r--r--editors/elementary-code/Makefile4
-rw-r--r--editors/gedit-plugins/Makefile3
-rw-r--r--editors/gedit/Makefile3
-rw-r--r--editors/gnome-latex/Makefile5
-rw-r--r--editors/quilter/Makefile5
-rw-r--r--games/crossfire-client/Makefile3
-rw-r--r--games/eksanos/Makefile3
-rw-r--r--games/five-or-more/Makefile5
-rw-r--r--games/four-in-a-row/Makefile3
-rw-r--r--games/gnome-2048/Makefile5
-rw-r--r--games/gnome-chess/Makefile5
-rw-r--r--games/gnome-klotski/Makefile5
-rw-r--r--games/gnome-mahjongg/Makefile5
-rw-r--r--games/gnome-mines/Makefile5
-rw-r--r--games/gnome-nibbles/Makefile5
-rw-r--r--games/gnome-robots/Makefile5
-rw-r--r--games/gnome-sudoku/Makefile5
-rw-r--r--games/gnome-taquin/Makefile5
-rw-r--r--games/gnome-tetravex/Makefile5
-rw-r--r--games/iagno/Makefile5
-rw-r--r--games/libgnome-games-support/Makefile3
-rw-r--r--games/libmanette/Makefile5
-rw-r--r--games/lightsoff/Makefile5
-rw-r--r--games/quadrapassel/Makefile5
-rw-r--r--games/swell-foop/Makefile5
-rw-r--r--graphics/akira/Makefile3
-rw-r--r--graphics/birdfont/Makefile5
-rw-r--r--graphics/colord/Makefile2
-rw-r--r--graphics/elementary-photos/Makefile3
-rw-r--r--graphics/gegl/Makefile2
-rw-r--r--graphics/gexiv2/Makefile5
-rw-r--r--graphics/libchamplain/Makefile3
-rw-r--r--graphics/librsvg2-rust/Makefile3
-rw-r--r--graphics/librsvg2/Makefile2
-rw-r--r--graphics/minder/Makefile5
-rw-r--r--graphics/pdfpc/Makefile5
-rw-r--r--graphics/shotwell/Makefile5
-rw-r--r--graphics/simple-scan/Makefile5
-rw-r--r--japanese/ibus-skk/Makefile3
-rw-r--r--japanese/libskk/Makefile5
-rw-r--r--mail/geary/Makefile5
-rw-r--r--mail/gmime26/Makefile2
-rw-r--r--mail/gmime30/Makefile2
-rw-r--r--math/elementary-calculator/Makefile3
-rw-r--r--math/gnome-calculator/Makefile5
-rw-r--r--multimedia/cheese/Makefile3
-rw-r--r--multimedia/elementary-videos/Makefile3
-rw-r--r--multimedia/libmediaart/Makefile4
-rw-r--r--multimedia/peek/Makefile3
-rw-r--r--net-im/cawbird/Makefile3
-rw-r--r--net-im/dino/Makefile3
-rw-r--r--net-im/folks/Makefile3
-rw-r--r--net-im/libaccounts-glib/Makefile5
-rw-r--r--net-im/libsignon-glib/Makefile5
-rw-r--r--net-im/telepathy-glib/Makefile4
-rw-r--r--net-mgmt/seafile-client/Makefile3
-rw-r--r--net-mgmt/seafile-server/Makefile3
-rw-r--r--net/geoclue/Makefile3
-rw-r--r--net/gnome-connections/Makefile5
-rw-r--r--net/gnome-online-accounts/Makefile5
-rw-r--r--net/grilo/Makefile3
-rw-r--r--net/gssdp/Makefile2
-rw-r--r--net/gssdp14/Makefile2
-rw-r--r--net/gtk-vnc/Makefile3
-rw-r--r--net/gupnp-av/Makefile2
-rw-r--r--net/gupnp-dlna/Makefile5
-rw-r--r--net/gupnp/Makefile2
-rw-r--r--net/gupnp14/Makefile2
-rw-r--r--net/libdmapsharing/Makefile3
-rw-r--r--net/libgweather/Makefile3
-rw-r--r--net/libgweather4/Makefile5
-rw-r--r--net/uhttpmock/Makefile3
-rw-r--r--net/vinagre/Makefile5
-rw-r--r--security/gcr/Makefile5
-rw-r--r--security/gpg-gui/Makefile3
-rw-r--r--security/libsecret/Makefile5
-rw-r--r--security/seahorse/Makefile5
-rw-r--r--sysutils/bamf/Makefile5
-rw-r--r--sysutils/contractor/Makefile3
-rw-r--r--sysutils/tiramisu/Makefile4
-rw-r--r--sysutils/tracker-miners/Makefile3
-rw-r--r--sysutils/tracker/Makefile3
-rw-r--r--sysutils/tracker3/Makefile3
-rw-r--r--sysutils/zeitgeist/Makefile5
-rw-r--r--textproc/gspell/Makefile3
-rw-r--r--textproc/gtkspell3/Makefile5
-rw-r--r--textproc/ibus/Makefile2
-rw-r--r--textproc/libxmlbird/Makefile5
-rw-r--r--www/midori/Makefile3
-rw-r--r--x11-fm/polo/Makefile3
-rw-r--r--x11-fonts/font-manager/Makefile3
-rw-r--r--x11-toolkits/granite/Makefile3
-rw-r--r--x11-toolkits/granite7/Makefile3
-rw-r--r--x11-toolkits/gtksourceview3/Makefile3
-rw-r--r--x11-toolkits/gtksourceview4/Makefile3
-rw-r--r--x11-toolkits/gtksourceview5/Makefile3
-rw-r--r--x11-toolkits/libadwaita/Makefile5
-rw-r--r--x11-toolkits/libdazzle/Makefile4
-rw-r--r--x11-toolkits/libhandy/Makefile3
-rw-r--r--x11-toolkits/libhandy0/Makefile3
-rw-r--r--x11-toolkits/vte3/Makefile5
-rw-r--r--x11-wm/lxsession/Makefile3
-rw-r--r--x11-wm/xfce4-panel/Makefile2
-rw-r--r--x11/appmenu-registrar/Makefile3
-rw-r--r--x11/babl/Makefile3
-rw-r--r--x11/elementary-terminal/Makefile3
-rw-r--r--x11/gnome-pie/Makefile3
-rw-r--r--x11/gnome-terminal/Makefile3
-rw-r--r--x11/gtk-app-menu/Makefile3
-rw-r--r--x11/libfm/Makefile6
-rw-r--r--x11/libxfce4menu/Makefile2
-rw-r--r--x11/libxfce4util/Makefile2
-rw-r--r--x11/lightdm/Makefile2
-rw-r--r--x11/mate-applet-appmenu/Makefile3
-rw-r--r--x11/plank/Makefile3
-rw-r--r--x11/remontoire/Makefile3
-rw-r--r--x11/slick-greeter/Makefile4
-rw-r--r--x11/swayfloatingswitcher/Makefile5
-rw-r--r--x11/swaync/Makefile3
-rw-r--r--x11/swaysettings/Makefile3
-rw-r--r--x11/xapp/Makefile3
-rw-r--r--x11/xfce4-appmenu-plugin/Makefile3
-rw-r--r--x11/xfce4-conf/Makefile2
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
+ ninja pkgconfig python:3.6+,build xorg vala:lib
USE_GITHUB= yes
GH_ACCOUNT= elementary
GH_PROJECT= code
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index f31b7f89a1b8..39237279c384 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -11,7 +11,6 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gedit>=0:editors/gedit \
- valac:lang/vala \
itstool:textproc/itstool \
${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR}
LIB_DEPENDS= libpeas-1.0.so:devel/libpeas \
@@ -24,7 +23,7 @@ RUN_DEPENDS= gedit>=0:editors/gedit \
PORTSCOUT= limitw:1,even
USES= compiler:c11 gettext gnome localbase meson pkgconfig \
- python:3.4+ shebangfix tar:xz
+ python:3.4+ shebangfix tar:xz vala:build
USE_GNOME= cairo gdkpixbuf2 gtk30 gtksourceview4 intlhack introspection \
vte3
USE_CSTD= c11
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 76c07b75472f..a02c088d01fb 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -11,7 +11,6 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= iso-codes>=0:misc/iso-codes \
- vala:lang/vala \
gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
itstool:textproc/itstool
LIB_DEPENDS= libenchant.so:textproc/enchant \
@@ -28,7 +27,7 @@ RUN_DEPENDS= iso-codes>=0:misc/iso-codes \
PORTSCOUT= limitw:1,even
USES= compiler:c11 cpe desktop-file-utils gettext gnome localbase meson \
- pkgconfig python:3.4+ tar:xz xorg
+ pkgconfig python:3.4+ tar:xz vala:build xorg
USE_CSTD= c11
USE_GNOME= cairo gdkpixbuf2 gtksourceview4 intlhack introspection \
libxml2 pygobject3
diff --git a/editors/gnome-latex/Makefile b/editors/gnome-latex/Makefile
index 1327a056be09..633ce8af228b 100644
--- a/editors/gnome-latex/Makefile
+++ b/editors/gnome-latex/Makefile
@@ -9,8 +9,7 @@ COMMENT= Integrated LaTeX environment
LICENSE= GPLv3
-BUILD_DEPENDS= valac:lang/vala \
- itstool:textproc/itstool \
+BUILD_DEPENDS= itstool:textproc/itstool \
gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libfribidi.so:converters/fribidi \
@@ -19,7 +18,7 @@ LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libgspell-1.so:textproc/gspell
USES= compiler:c11 desktop-file-utils gettext gmake gnome \
- pkgconfig tar:xz
+ pkgconfig tar:xz vala:build
GNU_CONFIGURE= yes
USE_GNOME= cairo dconf intltool gtksourceview4
USE_TEX= latex dvipsk
diff --git a/editors/quilter/Makefile b/editors/quilter/Makefile
index 168590538499..2218382b2e06 100644
--- a/editors/quilter/Makefile
+++ b/editors/quilter/Makefile
@@ -9,14 +9,13 @@ COMMENT= Editor allowing you to focus on your writing
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= valac:lang/vala \
- discount>0:textproc/discount
+BUILD_DEPENDS= discount>0:textproc/discount
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libgranite.so:x11-toolkits/granite \
libgtkspell3-3.so:textproc/gtkspell3 \
libwebkit2gtk-4.0.so:www/webkit2-gtk3
-USES= compiler:c11 desktop-file-utils gettext gnome meson pkgconfig python:build
+USES= compiler:c11 desktop-file-utils gettext gnome meson pkgconfig python:build vala:build
USE_GITHUB= yes
GH_ACCOUNT= lainsce
USE_GNOME= glib20 gtk30 gtksourceview3
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index cd5740ed6ed9..24b7dfac5e87 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -9,10 +9,9 @@ COMMENT= Cooperative multiplayer graphical RPG and adventure game
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vala:lang/vala
LIB_DEPENDS= libcurl.so:ftp/curl
-USES= cmake gnome perl5 pkgconfig sdl
+USES= cmake gnome perl5 pkgconfig sdl vala:build
USE_GNOME= gtk20
USE_PERL5= build
USE_SDL= sdl image mixer
diff --git a/games/eksanos/Makefile b/games/eksanos/Makefile
index 361746ae42c6..e444099116b6 100644
--- a/games/eksanos/Makefile
+++ b/games/eksanos/Makefile
@@ -8,11 +8,10 @@ COMMENT= Simple TicTacToe game written for elementary OS
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libgranite.so:x11-toolkits/granite \
libhandy-1.so:x11-toolkits/libhandy
-USES= gnome meson pkgconfig
+USES= gnome meson pkgconfig vala:build
USE_GITHUB= yes
GH_ACCOUNT= ${PORTNAME}
USE_GNOME= glib20 gtk30
diff --git a/games/five-or-more/Makefile b/games/five-or-more/Makefile
index d63ad4bac652..eb3eac74b486 100644
--- a/games/five-or-more/Makefile
+++ b/games/five-or-more/Makefile
@@ -10,14 +10,13 @@ COMMENT= Form a line of 5 or more colored balls
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= itstool:textproc/itstool \
- valac:lang/vala
+BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libgnome-games-support-1.so:games/libgnome-games-support \
libgee-0.8.so:devel/libgee
PORTSCOUT= limitw:1,even
-USES= gettext gnome meson pkgconfig tar:xz
+USES= gettext gnome meson pkgconfig tar:xz vala:build
USE_GNOME= cairo gtk30 librsvg2
GLIB_SCHEMAS= org.gnome.five-or-more.gschema.xml
diff --git a/games/four-in-a-row/Makefile b/games/four-in-a-row/Makefile
index 31fc8a21e334..a56ef8fa8191 100644
--- a/games/four-in-a-row/Makefile
+++ b/games/four-in-a-row/Makefile
@@ -12,14 +12,13 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= itstool:textproc/itstool \
- vala:lang/vala \
appstream-util:devel/appstream-glib
LIB_DEPENDS= libcanberra.so:audio/libcanberra \
libcanberra-gtk3.so:audio/libcanberra-gtk3
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome localbase meson pathfix pkgconfig tar:xz xorg
+USES= gettext gmake gnome localbase meson pathfix pkgconfig tar:xz vala:build xorg
USE_GNOME= cairo gtk30 intlhack librsvg2 libxml2:build gsound
USE_XORG= x11
diff --git a/games/gnome-2048/Makefile b/games/gnome-2048/Makefile
index fde876a44376..cb30b4ffd07f 100644
--- a/games/gnome-2048/Makefile
+++ b/games/gnome-2048/Makefile
@@ -11,8 +11,7 @@ PATCHFILES+= 194e22699f71.patch:-p1 # https://gitlab.gnome.org/GNOME/gnome-2048/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Move the tiles until you obtain the 2048 tile
-BUILD_DEPENDS= vala:lang/vala \
- itstool:textproc/itstool \
+BUILD_DEPENDS= itstool:textproc/itstool \
appstream-util:devel/appstream-glib
LIB_DEPENDS= libclutter-1.0.so:graphics/clutter \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
@@ -23,7 +22,7 @@ LIB_DEPENDS= libclutter-1.0.so:graphics/clutter \
PORTSCOUT= limitw:1,even
-USES= gettext gl gmake gnome localbase meson pathfix pkgconfig tar:xz xorg
+USES= gettext gl gmake gnome localbase meson pathfix pkgconfig tar:xz vala:build xorg
USE_GNOME= cairo gtk30 intltool libxml2:build
USE_GL= egl
USE_XORG+= x11 xext xdamage xfixes xcomposite xi xrandr
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index f245264e4f9f..91c57f3946a5 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -11,14 +11,13 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= appstream-util:devel/appstream-glib \
- itstool:textproc/itstool \
- vala:lang/vala
+ itstool:textproc/itstool
LIB_DEPENDS= libadwaita-1.so:x11-toolkits/libadwaita
PORTSCOUT= limitw:1,even
USES= desktop-file-utils gettext gl gnome localbase meson pkgconfig \
- python:3.6+,build tar:xz
+ python:3.6+,build tar:xz vala:build
USE_GNOME= cairo gtk40 librsvg2 libxml2:build
USE_GL= egl gl
BINARY_ALIAS= python3=${PYTHON_VERSION}
diff --git a/games/gnome-klotski/Makefile b/games/gnome-klotski/Makefile
index 6107c3dab06b..00c47c702e1c 100644
--- a/games/gnome-klotski/Makefile
+++ b/games/gnome-klotski/Makefile
@@ -10,15 +10,14 @@ COMMENT= Gnome klotski
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vala:lang/vala \
- itstool:textproc/itstool
+BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libgnome-games-support-1.so:games/libgnome-games-support \
libgee-0.8.so:devel/libgee
PORTSCOUT= limitw:1,even
USES= gettext gmake gnome localbase meson pathfix \
- pkgconfig tar:xz
+ pkgconfig tar:xz vala:build
USE_GNOME= cairo gtk30 intlhack librsvg2 libxml2:build
GLIB_SCHEMAS= org.gnome.Klotski.gschema.xml
diff --git a/games/gnome-mahjongg/Makefile b/games/gnome-mahjongg/Makefile
index 578d51492e70..15c7a9c95c99 100644
--- a/games/gnome-mahjongg/Makefile
+++ b/games/gnome-mahjongg/Makefile
@@ -13,10 +13,9 @@ COMMENT= Gnome mahjongg
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vala:lang/vala \
- itstool:textproc/itstool
+BUILD_DEPENDS= itstool:textproc/itstool
-USES= gettext gmake gnome localbase meson pathfix pkgconfig tar:xz
+USES= gettext gmake gnome localbase meson pathfix pkgconfig tar:xz vala:build
USE_GNOME= cairo gtk30 intlhack librsvg2 libxml2:build
GLIB_SCHEMAS= org.gnome.Mahjongg.gschema.xml
diff --git a/games/gnome-mines/Makefile b/games/gnome-mines/Makefile
index 953b65227bbb..0456a23d12e7 100644
--- a/games/gnome-mines/Makefile
+++ b/games/gnome-mines/Makefile
@@ -10,14 +10,13 @@ COMMENT= Gnome minesweeper
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vala:lang/vala \
- itstool:textproc/itstool
+BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libgnome-games-support-1.so:games/libgnome-games-support \
libgee-0.8.so:devel/libgee
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_GNOME= gtk30 librsvg2
BINARY_ALIAS= python3=${PYTHON_VERSION}
diff --git a/games/gnome-nibbles/Makefile b/games/gnome-nibbles/Makefile
index 489bbfc4f8a1..f3511c3f0622 100644
--- a/games/gnome-nibbles/Makefile
+++ b/games/gnome-nibbles/Makefile
@@ -11,8 +11,7 @@ COMMENT= Gnome nibbles
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vala:lang/vala \
- itstool:textproc/itstool \
+BUILD_DEPENDS= itstool:textproc/itstool \
appstream-util:devel/appstream-glib
LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libcanberra.so:audio/libcanberra \
@@ -26,7 +25,7 @@ LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
PORTSCOUT= limitw:1,even
USES= gettext gl gnome meson pathfix \
- pkgconfig tar:xz xorg
+ pkgconfig tar:xz vala:build xorg
USE_GNOME= cairo gsound gtk30 librsvg2 libxml2:build
USE_GL= gl egl
USE_XORG= x11 xcomposite xdamage xext xi xfixes xrandr
diff --git a/games/gnome-robots/Makefile b/games/gnome-robots/Makefile
index f0cb6a4c8562..cc98b88d545d 100644
--- a/games/gnome-robots/Makefile
+++ b/games/gnome-robots/Makefile
@@ -11,8 +11,7 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= appstream-util:devel/appstream-glib \
- itstool:textproc/itstool \
- vala>0:lang/vala
+ itstool:textproc/itstool
LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libcanberra.so:audio/libcanberra \
libgee-0.8.so:devel/libgee \
@@ -21,7 +20,7 @@ LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
PORTSCOUT= limitw:1,even
USES= gettext gmake gnome localbase meson pathfix pkgconfig tar:xz \
- xorg
+ vala:build xorg
USE_GNOME= cairo gsound gtk30 intlhack librsvg2 libxml2:build
USE_XORG= x11
diff --git a/games/gnome-sudoku/Makefile b/games/gnome-sudoku/Makefile
index bd03ae6c304c..74550a983d42 100644
--- a/games/gnome-sudoku/Makefile
+++ b/games/gnome-sudoku/Makefile
@@ -11,8 +11,7 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= itstool:textproc/itstool \
- appstream-util:devel/appstream-glib \
- vala:lang/vala
+ appstream-util:devel/appstream-glib
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libqqwing.so:games/qqwing \
libjson-glib-1.0.so:devel/json-glib
@@ -20,7 +19,7 @@ LIB_DEPENDS= libgee-0.8.so:devel/libgee \
PORTSCOUT= limitw:1,even
USES= compiler:c++11-lang gettext gmake gnome meson \
- python:3.7+ pkgconfig tar:xz
+ python:3.7+ pkgconfig tar:xz vala:build
USE_GNOME= cairo gtk30
BINARY_ALIAS= python3=${PYTHON_CMD}
diff --git a/games/gnome-taquin/Makefile b/games/gnome-taquin/Makefile
index 6dd5ee2214e6..1dbe22b5759a 100644
--- a/games/gnome-taquin/Makefile
+++ b/games/gnome-taquin/Makefile
@@ -11,14 +11,13 @@ COMMENT= Move tiles so that they reach their places
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vala:lang/vala \
- itstool:textproc/itstool
+BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libcanberra.so:audio/libcanberra \
libcanberra-gtk3.so:audio/libcanberra-gtk3
PORTSCOUT= limitw:1,even
-USES= gettext gmake gnome localbase meson pathfix pkgconfig tar:xz xorg
+USES= gettext gmake gnome localbase meson pathfix pkgconfig tar:xz vala:build xorg
USE_GNOME= cairo gsound gtk30 intlhack librsvg2 libxml2:build
USE_XORG= x11
diff --git a/games/gnome-tetravex/Makefile b/games/gnome-tetravex/Makefile
index 7e9d7ffdd5ff..268b9541d2c1 100644
--- a/games/gnome-tetravex/Makefile
+++ b/games/gnome-tetravex/Makefile
@@ -13,13 +13,12 @@ COMMENT= Gnome tetravex
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vala:lang/vala \
- itstool:textproc/itstool
+BUILD_DEPENDS= itstool:textproc/itstool
PORTSCOUT= limitw:1,even
USES= gettext gmake gnome localbase meson pathfix pkgconfig \
- python:3.7+ tar:xz
+ python:3.7+ tar:xz vala:build
USE_GNOME= cairo gtk30 intlhack librsvg2 libxml2:build
BINARY_ALIAS= python3=${PYTHON_VERSION}
diff --git a/games/iagno/Makefile b/games/iagno/Makefile
index 520bef3105b9..8a7492ba77d6 100644
--- a/games/iagno/Makefile
+++ b/games/iagno/Makefile
@@ -11,8 +11,7 @@ COMMENT= Iagno
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vala:lang/vala \
- itstool:textproc/itstool \
+BUILD_DEPENDS= itstool:textproc/itstool \
appstream-util:devel/appstream-glib
LIB_DEPENDS= libcanberra.so:audio/libcanberra \
@@ -21,7 +20,7 @@ LIB_DEPENDS= libcanberra.so:audio/libcanberra \
PORTSCOUT= limitw:1,even
USES= gettext gmake gnome localbase meson \
- pathfix pkgconfig tar:xz xorg
+ pathfix pkgconfig tar:xz vala:build xorg
USE_GNOME= cairo gsound gtk30 intlhack librsvg2 libxml2:build
USE_XORG= x11
diff --git a/games/libgnome-games-support/Makefile b/games/libgnome-games-support/Makefile
index c4c4cc4e3115..f304f692f758 100644
--- a/games/libgnome-games-support/Makefile
+++ b/games/libgnome-games-support/Makefile
@@ -10,12 +10,11 @@ COMMENT= Small library intended for internal use by GNOME Games
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libgee-0.8.so:devel/libgee
PORTSCOUT= limitw:1,even
-USES= gettext gnome meson pkgconfig tar:xz
+USES= gettext gnome meson pkgconfig tar:xz vala:build
USE_GNOME= cairo gdkpixbuf2 gtk30
.include <bsd.port.mk>
diff --git a/games/libmanette/Makefile b/games/libmanette/Makefile
index e568c33733d9..820bd748fea7 100644
--- a/games/libmanette/Makefile
+++ b/games/libmanette/Makefile
@@ -10,12 +10,11 @@ COMMENT= Simple GObject game controller library
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vapigen:lang/vala \
- evdev-proto>0:devel/evdev-proto
+BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto
LIB_DEPENDS= libevdev.so:devel/libevdev \
libgudev-1.0.so:devel/libgudev
-USES= compiler:c11 gnome meson pkgconfig tar:xz
+USES= compiler:c11 gnome meson pkgconfig tar:xz vala:build
USE_GNOME= glib20 introspection
USE_LDCONFIG= yes
diff --git a/games/lightsoff/Makefile b/games/lightsoff/Makefile
index 4d6251f64d10..adba247dda3e 100644
--- a/games/lightsoff/Makefile
+++ b/games/lightsoff/Makefile
@@ -10,8 +10,7 @@ COMMENT= Gnome ligthsoff
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vala:lang/vala \
- itstool:textproc/itstool
+BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
libclutter-1.0.so:graphics/clutter \
libcogl.so:graphics/cogl \
@@ -20,7 +19,7 @@ LIB_DEPENDS= libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
PORTSCOUT= limitw:1,even
USES= gettext gl gmake gnome localbase meson \
- pathfix pkgconfig sqlite tar:xz xorg
+ pathfix pkgconfig sqlite tar:xz vala:build xorg
USE_GNOME= cairo gtk30 intlhack librsvg2 libxml2:build
USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr
USE_GL= egl gl
diff --git a/games/quadrapassel/Makefile b/games/quadrapassel/Makefile
index be182bce17b4..0f39a11ba1ca 100644
--- a/games/quadrapassel/Makefile
+++ b/games/quadrapassel/Makefile
@@ -11,8 +11,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= appstream-util:devel/appstream-glib \
- itstool:textproc/itstool \
- vala:lang/vala
+ itstool:textproc/itstool
LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libcanberra.so:audio/libcanberra \
libclutter-1.0.so:graphics/clutter \
@@ -22,7 +21,7 @@ LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
PORTSCOUT= limitw:1,even
-USES= gettext gl gnome localbase meson pathfix pkgconfig tar:xz xorg
+USES= gettext gl gnome localbase meson pathfix pkgconfig tar:xz vala:build xorg
USE_GNOME= cairo gsound gtk30 intlhack librsvg2 libxml2:build
USE_GL= egl gl
USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr
diff --git a/games/swell-foop/Makefile b/games/swell-foop/Makefile
index 2c6b40df6dc7..537c8e1b0c80 100644
--- a/games/swell-foop/Makefile
+++ b/games/swell-foop/Makefile
@@ -10,8 +10,7 @@ COMMENT= Gnome swell-foop
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= itstool:textproc/itstool \
- vala:lang/vala
+BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libclutter-1.0.so:graphics/clutter \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
libgnome-games-support-1.so:games/libgnome-games-support
@@ -19,7 +18,7 @@ LIB_DEPENDS= libclutter-1.0.so:graphics/clutter \
PORTSCOUT= limitw:1,even
USES= gettext gnome localbase meson pkgconfig python:3.6+,build \
- tar:xz
+ tar:xz vala:build
USE_GNOME= gtk30
GLIB_SCHEMAS= org.gnome.SwellFoop.gschema.xml
BINARY_ALIAS= python3=${PYTHON_VERSION}
diff --git a/graphics/akira/Makefile b/graphics/akira/Makefile
index 1c28b5c0ecf3..18f24e61c27a 100644
--- a/graphics/akira/Makefile
+++ b/graphics/akira/Makefile
@@ -9,14 +9,13 @@ COMMENT= Graphical UI/UX design tool
LICENSE= GPLv3+
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libgoocanvas-3.0.so:graphics/goocanvas3 \
libgranite.so:x11-toolkits/granite \
libjson-glib-1.0.so:devel/json-glib
USES= desktop-file-utils gettext gnome libarchive meson pkgconfig \
- python:build shared-mime-info shebangfix
+ python:build shared-mime-info shebangfix vala:build
USE_GNOME= cairo gdkpixbuf2 gtk30
USE_GITHUB= yes
GH_ACCOUNT= akiraux
diff --git a/graphics/birdfont/Makefile b/graphics/birdfont/Makefile
index 615ebf3634fe..1356c33a217e 100644
--- a/graphics/birdfont/Makefile
+++ b/graphics/birdfont/Makefile
@@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/GPLv3.txt
# there's only "NOT_STARTED".
BROKEN= build/libbirdfont/TestBirdFont.c:107:46: error: use of undeclared identifier 'BIRD_FONT_TEST_BIRD_FONT_NOT_STARTED'
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}doit>0:devel/py-doit@${PY_FLAVOR} \
- valac:lang/vala
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}doit>0:devel/py-doit@${PY_FLAVOR}
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libgee-0.8.so:devel/libgee \
@@ -26,7 +25,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libxmlbird.so:textproc/libxmlbird
USES= compiler:c++11-lang gettext-tools gnome pkgconfig \
- python:3.7+,build shared-mime-info shebangfix sqlite:3 tar:xz
+ python:3.7+,build shared-mime-info shebangfix sqlite:3 tar:xz vala:build
USE_GITHUB= yes
GH_ACCOUNT= johanmattssonm
USE_GNOME= cairo gdkpixbuf2 glib20 gtk30
diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index ead4e4d03adb..7d41eba76431 100644
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@@ -51,7 +51,7 @@ MANPAGES_BUILD_DEPENDS= docbook2html:textproc/docbook-utils \
docbook-sgml>0:textproc/docbook-sgml
PPROFILES_CONFIGURE_ENABLE= print-profiles
VALA_CONFIGURE_ENABLE= vala
-VALA_BUILD_DEPENDS= vapigen:lang/vala
+VALA_USES= vala:build
MAKE_ENV= PYTHONDONTWRITEBYTECODE=1
.include <bsd.port.options.mk>
diff --git a/graphics/elementary-photos/Makefile b/graphics/elementary-photos/Makefile
index d993048fbd84..810087a07591 100644
--- a/graphics/elementary-photos/Makefile
+++ b/graphics/elementary-photos/Makefile
@@ -8,7 +8,6 @@ COMMENT= Photo viewer and organizer designed for elementary OS
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libexif.so:graphics/libexif \
libgee-0.8.so:devel/libgee \
libgeocode-glib.so:net/geocode-glib \
@@ -26,7 +25,7 @@ LIB_DEPENDS= libexif.so:graphics/libexif \
libwebp.so:graphics/webp
USES= compiler:c11 desktop-file-utils gettext gnome gstreamer meson \
- pkgconfig sqlite:3 xorg
+ pkgconfig sqlite:3 vala:build xorg
USE_GITHUB= yes
GH_ACCOUNT= elementary
GH_PROJECT= photos
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index 27cc7430a951..1d39ad68af94 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -113,7 +113,7 @@ GEXIV2_MESON_ENABLED= gexiv2
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
TIFF_MESON_ENABLED= libtiff
-VAPI_BUILD_DEPENDS= vapigen:lang/vala
+VAPI_USES= vala:build
VAPI_MESON_ENABLED= vapigen
.include <bsd.port.pre.mk>
diff --git a/graphics/gexiv2/Makefile b/graphics/gexiv2/Makefile
index 133dbe886e2d..8354ae566088 100644
--- a/graphics/gexiv2/Makefile
+++ b/graphics/gexiv2/Makefile
@@ -9,13 +9,12 @@ COMMENT= GObject-based wrapper around Exiv2 library
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR} \
- vala>=0:lang/vala
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
LIB_DEPENDS= libexiv2.so:graphics/exiv2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
USES= compiler:c++11-lang gnome libtool:build meson pathfix pkgconfig \
- python:build tar:xz
+ python:build tar:xz vala:build
USE_GNOME= glib20 introspection:build
USE_LDCONFIG= yes
BINARY_WRAPPERS= gm4
diff --git a/graphics/libchamplain/Makefile b/graphics/libchamplain/Makefile
index ed6c0085dafb..78e71babd43d 100644
--- a/graphics/libchamplain/Makefile
+++ b/graphics/libchamplain/Makefile
@@ -10,7 +10,6 @@ COMMENT= C library aimed to provide a Gtk+ widget to display rasterized maps and
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vapigen:lang/vala
LIB_DEPENDS= libcogl.so:graphics/cogl \
libclutter-1.0.so:graphics/clutter \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
@@ -18,7 +17,7 @@ LIB_DEPENDS= libcogl.so:graphics/cogl \
libsoup-2.4.so:devel/libsoup
USES= gettext-runtime gl gnome localbase meson \
- pkgconfig sqlite tar:xz xorg
+ pkgconfig sqlite tar:xz vala:build xorg
USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build
USE_GL= egl
USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr
diff --git a/graphics/librsvg2-rust/Makefile b/graphics/librsvg2-rust/Makefile
index 7e653daf823d..2571d2ea80fa 100644
--- a/graphics/librsvg2-rust/Makefile
+++ b/graphics/librsvg2-rust/Makefile
@@ -12,7 +12,6 @@ COMMENT= Library for parsing and rendering SVG vector-graphic files
LICENSE= LGPL20
BUILD_DEPENDS= ${RUST_DEFAULT}>=1.39.0:lang/${RUST_DEFAULT} \
- valac:lang/vala \
gi-docgen:textproc/py-gi-docgen \
rst2man:textproc/py-docutils
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
@@ -20,7 +19,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libharfbuzz.so:print/harfbuzz \
libpng.so:graphics/png
-USES= compiler:c11 cpe gettext gmake gnome libtool pkgconfig tar:xz
+USES= compiler:c11 cpe gettext gmake gnome libtool pkgconfig tar:xz vala:build
CPE_VENDOR= gnome
USE_GNOME= cairo gdkpixbuf2 gnomeprefix libxml2 pango introspection:build
USE_LDCONFIG= yes
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index f6c6121eb464..ee4a3ec3b289 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -30,7 +30,7 @@ OPTIONS_SUB= yes
DOCS_CONFIGURE_ENABLE= grk-doc-html
-VAPI_BUILD_DEPENDS= valac:lang/vala
+VAPI_USES= vala:build
VAPI_CONFIGURE_ON= --enable-vala=yes
VAPI_CONFIGURE_OFF= --enable-vala=no
diff --git a/graphics/minder/Makefile b/graphics/minder/Makefile
index 4f403792c0fa..bc57bf616a75 100644
--- a/graphics/minder/Makefile
+++ b/graphics/minder/Makefile
@@ -11,15 +11,14 @@ COMMENT= Mind-mapping application
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= discount>0:textproc/discount \
- vala:lang/vala
+BUILD_DEPENDS= discount>0:textproc/discount
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libgranite.so:x11-toolkits/granite \
libhandy-1.so:x11-toolkits/libhandy \
libmarkdown.so:textproc/discount
USES= desktop-file-utils gettext gnome libarchive localbase:ldflags \
- meson pkgconfig python:3.5+,build shared-mime-info shebangfix
+ meson pkgconfig python:3.5+,build shared-mime-info shebangfix vala:build
USE_GITHUB= yes
GH_ACCOUNT= phase1geo
GH_PROJECT= Minder
diff --git a/graphics/pdfpc/Makefile b/graphics/pdfpc/Makefile
index 73f71d247d9f..30d18e856356 100644
--- a/graphics/pdfpc/Makefile
+++ b/graphics/pdfpc/Makefile
@@ -10,15 +10,14 @@ COMMENT= Keynote-like multi-monitor presentation viewer
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= valac:lang/vala \
- ${LOCALBASE}/lib/libmarkdown.a:textproc/discount
+BUILD_DEPENDS= ${LOCALBASE}/lib/libmarkdown.a:textproc/discount
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libpoppler-glib.so:graphics/poppler-glib \
libwebkit2gtk-4.0.so:www/webkit2-gtk3
USE_GITHUB= yes
-USES= cmake compiler:c11 gnome gstreamer pkgconfig
+USES= cmake compiler:c11 gnome gstreamer pkgconfig vala:build
USE_GNOME= gtk30
CMAKE_ARGS= -DMANDIR:STRING="man/"
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index 438b723a4ece..068e73dd5d69 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -9,8 +9,7 @@ COMMENT= Open source photo manager for GNOME
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vala>=0.20.1:lang/vala \
- itstool:textproc/itstool
+BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libgio-2.0.so:devel/glib20 \
libjson-glib-1.0.so:devel/json-glib \
libgdata.so:devel/libgdata \
@@ -27,7 +26,7 @@ LIB_DEPENDS= libgio-2.0.so:devel/glib20 \
libxml2.so:textproc/libxml2
USES= compiler:c++11-lib cpe desktop-file-utils gettext gnome gstreamer meson \
- ninja pkgconfig python:3.4+,build shebangfix sqlite tar:xz xorg
+ ninja pkgconfig python:3.4+,build shebangfix sqlite tar:xz vala:build xorg
CPE_VENDOR= gnome
USE_GNOME= cairo dconf gtk30
USE_LDCONFIG= yes
diff --git a/graphics/simple-scan/Makefile b/graphics/simple-scan/Makefile
index bb3cacc135ce..f28d67876129 100644
--- a/graphics/simple-scan/Makefile
+++ b/graphics/simple-scan/Makefile
@@ -10,13 +10,12 @@ COMMENT= Simple scanning utility
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala \
- itstool:textproc/itstool
+BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libgusb.so:devel/libgusb \
libsane.so:graphics/sane-backends \
libhandy-1.so:x11-toolkits/libhandy
-USES= gettext gnome meson pkgconfig python:build shebangfix tar:xz
+USES= gettext gnome meson pkgconfig python:build shebangfix tar:xz vala:build
USE_GNOME= cairo gdkpixbuf2 gtk30
SHEBANG_FILES= data/meson_compile_gschema.py
GLIB_SCHEMAS= org.gnome.SimpleScan.gschema.xml
diff --git a/japanese/ibus-skk/Makefile b/japanese/ibus-skk/Makefile
index 1e4b7a12709c..6de959cf4093 100644
--- a/japanese/ibus-skk/Makefile
+++ b/japanese/ibus-skk/Makefile
@@ -9,13 +9,12 @@ COMMENT= Japanese SKK input engine for IBus
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
RUN_DEPENDS= ${LOCALBASE}/share/skk/SKK-JISYO.L:japanese/skk-jisyo
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libibus-1.0.so:textproc/ibus \
libskk.so:japanese/libskk
-USES= autoreconf gettext gmake gnome libtool pkgconfig python
+USES= autoreconf gettext gmake gnome libtool pkgconfig python vala:build
GNU_CONFIGURE= yes
CONFIGURE_ENV= DATADIRNAME=share
USE_GITHUB= yes
diff --git a/japanese/libskk/Makefile b/japanese/libskk/Makefile
index 931cc72236e0..b0bfb37c22f7 100644
--- a/japanese/libskk/Makefile
+++ b/japanese/libskk/Makefile
@@ -8,13 +8,12 @@ COMMENT= Library to deal with Japanese Kana-to-Kanji conversion method
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala \
- p5-XML-Parser>=0:textproc/p5-XML-Parser
+BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libjson-glib-1.0.so:devel/json-glib \
libxkbcommon.so:x11/libxkbcommon
-USES= autoreconf gmake gnome libtool pathfix pkgconfig
+USES= autoreconf gmake gnome libtool pathfix pkgconfig vala:build
USE_GITHUB= yes
GH_ACCOUNT= ueno
GNU_CONFIGURE= yes
diff --git a/mail/geary/Makefile b/mail/geary/Makefile
index 81d2373121d6..536c0c2be9fd 100644
--- a/mail/geary/Makefile
+++ b/mail/geary/Makefile
@@ -11,8 +11,7 @@ COMMENT= Mail client for GNOME
LICENSE= BSD2CLAUSE CC-BY-3.0 LGPL21+
LICENSE_COMB= multi
-BUILD_DEPENDS= itstool:textproc/itstool \
- vapigen:lang/vala
+BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libappstream-glib.so:devel/appstream-glib \
libcanberra.so:audio/libcanberra \
libenchant-2.so:textproc/enchant2 \
@@ -35,7 +34,7 @@ LIB_DEPENDS= libappstream-glib.so:devel/appstream-glib \
libytnef.so:converters/ytnef
USES= compiler:c11 cpe desktop-file-utils gettext gnome meson pkgconfig \
- python:3.5+,build shebangfix sqlite tar:xz
+ python:3.5+,build shebangfix sqlite tar:xz vala:build
CPE_VENDOR= gnome
USE_GNOME= cairo gsound gtk30 libxml2
GLIB_SCHEMAS= org.gnome.Geary.gschema.xml
diff --git a/mail/gmime26/Makefile b/mail/gmime26/Makefile
index 8a7cd0d307e9..10f4f06d898c 100644
--- a/mail/gmime26/Makefile
+++ b/mail/gmime26/Makefile
@@ -31,7 +31,7 @@ VALA_DESC= Install vala binding
GINTRO_BUILD_DEPENDS= gobject-introspection>=0.6.8:devel/gobject-introspection
GINTRO_RUN_DEPENDS= gobject-introspection>=0.6.8:devel/gobject-introspection
GINTRO_CONFIGURE_ENABLE=introspection
-VALA_BUILD_DEPENDS= vala>=0.20:lang/vala
+VALA_USES= vala:build
VALA_CONFIGURE_ENABLE= vala
VALA_IMPLIES= GINTRO
diff --git a/mail/gmime30/Makefile b/mail/gmime30/Makefile
index 5aa8febac0a4..348d3bcb5246 100644
--- a/mail/gmime30/Makefile
+++ b/mail/gmime30/Makefile
@@ -26,7 +26,7 @@ OPTIONS_DEFINE= VALA
OPTIONS_DEFAULT= VALA
OPTIONS_SUB= yes
VALA_DESC= Install vala binding
-VALA_BUILD_DEPENDS= vala>=0.20:lang/vala
+VALA_USES= vala:build
VALA_CONFIGURE_ENABLE= vala
# www.freebsd.org/cgi/query-pr.cgi?pr=118092
diff --git a/math/elementary-calculator/Makefile b/math/elementary-calculator/Makefile
index 51a01fd03077..2b746d1896e5 100644
--- a/math/elementary-calculator/Makefile
+++ b/math/elementary-calculator/Makefile
@@ -9,12 +9,11 @@ COMMENT= Simple calculator written in Vala
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libgranite-7.so:x11-toolkits/granite7 \
libhandy-1.so:x11-toolkits/libhandy
-USES= gettext gnome meson pkgconfig python:3.6+,build
+USES= gettext gnome meson pkgconfig python:3.6+,build vala:build
USE_GITHUB= yes
GH_ACCOUNT= elementary
diff --git a/math/gnome-calculator/Makefile b/math/gnome-calculator/Makefile
index f9349ab2404b..8daf2fa8e91b 100644
--- a/math/gnome-calculator/Makefile
+++ b/math/gnome-calculator/Makefile
@@ -10,8 +10,7 @@ COMMENT= GNOME calculator tool
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= itstool:textproc/itstool \
- vala:lang/vala
+BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libadwaita-1.so:x11-toolkits/libadwaita \
libgee-0.8.so:devel/libgee \
libhandy-1.so:x11-toolkits/libhandy \
@@ -22,7 +21,7 @@ LIB_DEPENDS= libadwaita-1.so:x11-toolkits/libadwaita \
PORTSCOUT= limitw:1,even
USES= compiler:c11 gettext gnome localbase:ldflags meson pkgconfig \
- python:3.6+,build tar:xz
+ python:3.6+,build tar:xz vala:build
USE_GNOME= gtk40 gtksourceview5 introspection libxml2
BINARY_ALIAS= python3=${PYTHON_VERSION}
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index 0b6a68d60ce5..fbdfb8cb9511 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat \
gnome-video-effects>=0:graphics/gnome-video-effects \
- vala>=0.14.0:lang/vala \
itstool:textproc/itstool
LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libcanberra-gtk.so:audio/libcanberra-gtk2 \
@@ -27,7 +26,7 @@ RUN_DEPENDS= gnome-video-effects>=0:graphics/gnome-video-effects
PORTSCOUT= limitw:1,even
-USES= gettext gl gnome gstreamer localbase:ldflags pkgconfig meson tar:xz xorg
+USES= gettext gl gnome gstreamer localbase:ldflags pkgconfig meson tar:xz xorg vala:build
USE_GNOME= cairo librsvg2 gnomedesktop3 libxml2:build introspection:build
USE_GL= egl
USE_XORG= xi xext xdamage xfixes xcomposite xrandr xxf86vm x11
diff --git a/multimedia/elementary-videos/Makefile b/multimedia/elementary-videos/Makefile
index 80d4ba6de1a4..8b6ba30fe691 100644
--- a/multimedia/elementary-videos/Makefile
+++ b/multimedia/elementary-videos/Makefile
@@ -8,7 +8,6 @@ COMMENT= Elementary OS video player
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libclutter-1.0.so:graphics/clutter \
libclutter-gst-3.0.so:multimedia/clutter-gst3 \
libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
@@ -16,7 +15,7 @@ LIB_DEPENDS= libclutter-1.0.so:graphics/clutter \
libgranite.so:x11-toolkits/granite \
libhandy-1.so:x11-toolkits/libhandy
-USES= desktop-file-utils gettext gnome gstreamer meson pkgconfig xorg
+USES= desktop-file-utils gettext gnome gstreamer meson pkgconfig vala:build xorg
USE_GITHUB= yes
GH_ACCOUNT= elementary
GH_PROJECT= videos
diff --git a/multimedia/libmediaart/Makefile b/multimedia/libmediaart/Makefile
index 1a65fd86dc72..6f35f79e0188 100644
--- a/multimedia/libmediaart/Makefile
+++ b/multimedia/libmediaart/Makefile
@@ -11,9 +11,7 @@ LICENSE_COMB= dual
LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LESSER
-BUILD_DEPENDS= vala>=0:lang/vala
-
-USES= gnome meson pathfix pkgconfig tar:xz
+USES= gnome meson pathfix pkgconfig tar:xz vala:build
USE_GNOME= gdkpixbuf2 introspection:build
USE_LDCONFIG= yes
diff --git a/multimedia/peek/Makefile b/multimedia/peek/Makefile
index cfc5c8621ddd..326e5564e4c3 100644
--- a/multimedia/peek/Makefile
+++ b/multimedia/peek/Makefile
@@ -8,11 +8,10 @@ COMMENT= Simple animated GIF screen recorder with an easy to use interface
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libkeybinder-3.0.so:x11/keybinder-gtk3
RUN_DEPENDS= ffmpeg:multimedia/ffmpeg
-USES= gettext-tools gnome meson pkgconfig python:build
+USES= gettext-tools gnome meson pkgconfig python:build vala:build
USE_GITHUB= yes
GH_ACCOUNT= phw
USE_GNOME= cairo glib20 gtk30 pango
diff --git a/net-im/cawbird/Makefile b/net-im/cawbird/Makefile
index e2e0218a04eb..20c31cdb6083 100644
--- a/net-im/cawbird/Makefile
+++ b/net-im/cawbird/Makefile
@@ -9,13 +9,12 @@ COMMENT= Fork of Corebird GTK Twitter client
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vala:lang/vala
LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \
liboauth.so:net/liboauth \
librest-0.7.so:devel/librest \
libsoup-gnome-2.4.so:devel/libsoup
-USES= gettext gnome meson pkgconfig sqlite:3
+USES= gettext gnome meson pkgconfig sqlite:3 vala:build
USE_GITHUB= yes
GH_ACCOUNT= IBBoard
diff --git a/net-im/dino/Makefile b/net-im/dino/Makefile
index 52bbca287a6b..f6e0c7aa3da8 100644
--- a/net-im/dino/Makefile
+++ b/net-im/dino/Makefile
@@ -10,7 +10,6 @@ COMMENT= Modern XMPP Chat Client using GTK+/Vala
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= vala:lang/vala
LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \
libgee-0.8.so:devel/libgee \
libicuuc.so:devel/icu \
@@ -22,7 +21,7 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \
libsrtp2.so:net/libsrtp2
USES= cmake cpe desktop-file-utils gettext-tools gnome \
- ninja pkgconfig
+ ninja pkgconfig vala:build
USE_GITHUB= yes
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index b8175bc70d69..636f4d542c0c 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -9,7 +9,6 @@ COMMENT= Library to aggregates people from multiple sources
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vapigen:lang/vala
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libgcr-base-3.so:security/gcr \
libzeitgeist-2.0.so:sysutils/zeitgeist \
@@ -22,7 +21,7 @@ LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libdbus-1.so:devel/dbus
USES= gettext gnome localbase meson python:3.5+,build pkgconfig \
- readline sqlite tar:xz
+ readline sqlite tar:xz vala:build
USE_GNOME= evolutiondataserver3 intlhack introspection:build
USE_LDCONFIG= yes
diff --git a/net-im/libaccounts-glib/Makefile b/net-im/libaccounts-glib/Makefile
index 0024b4bf3b89..5e757bfe3b25 100644
--- a/net-im/libaccounts-glib/Makefile
+++ b/net-im/libaccounts-glib/Makefile
@@ -10,11 +10,10 @@ COMMENT= Accounts and SSO framework for Linux and POSIX based platforms
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vapigen:lang/vala \
- checkmk:devel/check
+BUILD_DEPENDS= checkmk:devel/check
LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
-USES= gnome libtool meson pathfix pkgconfig python sqlite:3
+USES= gnome libtool meson pathfix pkgconfig python sqlite:3 vala:build
USE_GNOME= pygobject3 introspection libxml2
USE_PYTHON= py3kplist
diff --git a/net-im/libsignon-glib/Makefile b/net-im/libsignon-glib/Makefile
index e28911b95b0e..da5045362358 100644
--- a/net-im/libsignon-glib/Makefile
+++ b/net-im/libsignon-glib/Makefile
@@ -9,11 +9,10 @@ COMMENT= GLib-based client library for applications handling account authenticat
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= signond:sysutils/signon-qt5 \
- vapigen:lang/vala
+BUILD_DEPENDS= signond:sysutils/signon-qt5
RUN_DEPENDS= signond:sysutils/signon-qt5
-USES= gnome libtool meson pathfix pkgconfig python tar:bz2
+USES= gnome libtool meson pathfix pkgconfig python tar:bz2 vala:build
USE_GNOME= introspection pygobject3
USE_PYTHON= py3kplist
diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index 973067581062..4185a86b6e5c 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -10,13 +10,11 @@ COMMENT= GLib utility library for the Telepathy framework
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vapigen:lang/vala
LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
-RUN_DEPENDS= vapigen:lang/vala
PORTSCOUT= limitw:1,even
-USES= gmake gnome libtool pathfix pkgconfig python:build
+USES= gmake gnome libtool pathfix pkgconfig python:build vala:lib
USE_GNOME= glib20 introspection:build libxslt:build
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/net-mgmt/seafile-client/Makefile b/net-mgmt/seafile-client/Makefile
index 3b0fc42f37f5..1456911dbdc3 100644
--- a/net-mgmt/seafile-client/Makefile
+++ b/net-mgmt/seafile-client/Makefile
@@ -9,7 +9,6 @@ COMMENT= Open Source Cloud Storage (Client)
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libsearpc.so:devel/libsearpc \
libcurl.so:ftp/curl \
libinotify.so:devel/libinotify \
@@ -21,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
bash:shells/bash
USES= autoreconf gnome iconv libarchive libtool localbase \
- pathfix pkgconfig python:3.6+ shebangfix sqlite ssl
+ pathfix pkgconfig python:3.6+ shebangfix sqlite ssl vala:build
USE_GITHUB= yes
GH_ACCOUNT= haiwen
GH_PROJECT= seafile
diff --git a/net-mgmt/seafile-server/Makefile b/net-mgmt/seafile-server/Makefile
index 952051191018..4143fa9a45ff 100644
--- a/net-mgmt/seafile-server/Makefile
+++ b/net-mgmt/seafile-server/Makefile
@@ -10,7 +10,6 @@ COMMENT= Open Source Cloud Storage (Server)
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libsearpc.so:devel/libsearpc \
libevhtp.so:www/libevhtp \
libzdb.so:databases/libzdb \
@@ -27,7 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
CONFLICTS= seafile
USES= autoreconf compiler:c11 gnome iconv libarchive libtool localbase mysql \
- pathfix pgsql pkgconfig python:3.7+ shebangfix sqlite ssl
+ pathfix pgsql pkgconfig python:3.7+ shebangfix sqlite ssl vala:build
USE_GITHUB= yes
GH_ACCOUNT= haiwen
USE_GNOME= glib20
diff --git a/net/geoclue/Makefile b/net/geoclue/Makefile
index f41d4932048f..98c53c800c95 100644
--- a/net/geoclue/Makefile
+++ b/net/geoclue/Makefile
@@ -8,12 +8,11 @@ COMMENT= D-Bus service that provides location information
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \
libsoup-2.4.so:devel/libsoup \
libnotify.so:devel/libnotify
-USES= gettext gnome meson pkgconfig tar:xz
+USES= gettext gnome meson pkgconfig tar:xz vala:build
USE_GNOME= glib20 introspection:build
USE_LDCONFIG= yes
diff --git a/net/gnome-connections/Makefile b/net/gnome-connections/Makefile
index 42945d81d1f3..54111c400a1b 100644
--- a/net/gnome-connections/Makefile
+++ b/net/gnome-connections/Makefile
@@ -10,15 +10,14 @@ COMMENT= Remote desktop client for GNOME
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vapigen:lang/vala \
- itstool:textproc/itstool
+BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libgtk-vnc-2.0.so:net/gtk-vnc \
libhandy-1.so:x11-toolkits/libhandy \
libfreerdp2.so:net/freerdp \
libsecret-1.so:security/libsecret
USES= desktop-file-utils shared-mime-info gettext gnome meson \
- python:env pkgconfig tar:xz
+ python:env pkgconfig tar:xz vala:build
USE_GNOME= glib20 gtk30
BINARY_ALIAS= python3=${PYTHON_VERSION}
diff --git a/net/gnome-online-accounts/Makefile b/net/gnome-online-accounts/Makefile
index a129ac20292e..f0e89ed470b4 100644
--- a/net/gnome-online-accounts/Makefile
+++ b/net/gnome-online-accounts/Makefile
@@ -9,8 +9,7 @@ COMMENT= Interface provider to access the user's online accounts
LICENSE= LGPL20+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \
- valac:lang/vala
+BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl
LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
libjson-glib-1.0.so:devel/json-glib \
libsecret-1.so:security/libsecret \
@@ -22,7 +21,7 @@ LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
PORTSCOUT= limitw:1,even
USES= compiler:c++11-lib gettext gmake gnome libtool \
- localbase pathfix pkgconfig tar:xz
+ localbase pathfix pkgconfig tar:xz vala:build
USE_GNOME= cairo gtk30 introspection:build libxml2 libxslt:build
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/net/grilo/Makefile b/net/grilo/Makefile
index bc2ea665bdbf..260ed45c6ba2 100644
--- a/net/grilo/Makefile
+++ b/net/grilo/Makefile
@@ -10,13 +10,12 @@ COMMENT= Framework focused on making media discovery and browsing
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vapigen:lang/vala
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
liboauth.so:net/liboauth \
libtotem-plparser.so:multimedia/totem-pl-parser
USES= cpe gettext gnome localbase meson pathfix pkgconfig \
- python:3.4+,build tar:xz
+ python:3.4+,build tar:xz vala:build
CPE_VENDOR= gnome
USE_LDCONFIG= yes
USE_GNOME= glib20 introspection:build libxml2
diff --git a/net/gssdp/Makefile b/net/gssdp/Makefile
index d63238e55c73..219d351f41b4 100644
--- a/net/gssdp/Makefile
+++ b/net/gssdp/Makefile
@@ -29,7 +29,7 @@ SNIFFER_DESC= Build graphical SSDP sniffer
SNIFFER_BUILD_DEPENDS= gtk4>=4:x11-toolkits/gtk40
SNIFFER_MESON_TRUE= sniffer
SNIFFER_USE= GNOME=gtk40
-VAPI_BUILD_DEPENDS= vala>=0.20:lang/vala
+VAPI_USES= vala:build
VAPI_MESON_TRUE= vapi
.include <bsd.port.mk>
diff --git a/net/gssdp14/Makefile b/net/gssdp14/Makefile
index d9211a90d390..6dcac72745f1 100644
--- a/net/gssdp14/Makefile
+++ b/net/gssdp14/Makefile
@@ -32,7 +32,7 @@ SNIFFER_DESC= Build graphical SSDP sniffer
SNIFFER_BUILD_DEPENDS= gtk4>=4:x11-toolkits/gtk40
SNIFFER_MESON_TRUE= sniffer
SNIFFER_USE= GNOME=gtk40
-VAPI_BUILD_DEPENDS= vala>=0.20:lang/vala
+VAPI_USES= vala:build
VAPI_MESON_TRUE= vapi
.include <bsd.port.mk>
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index eefd5fe872a6..2b8233db2fb3 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -9,14 +9,13 @@ COMMENT= VNC viewer widget for GTK+
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
-BUILD_DEPENDS= vapigen:lang/vala
LIB_DEPENDS= libgnutls.so:security/gnutls \
libgcrypt.so:security/libgcrypt \
libgpg-error.so:security/libgpg-error \
libsasl2.so:security/cyrus-sasl2
USES= gettext gnome localbase meson perl5 pkgconfig python \
- tar:xz xorg
+ tar:xz vala:build xorg
USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build
USE_XORG= x11
USE_LDCONFIG= yes
diff --git a/net/gupnp-av/Makefile b/net/gupnp-av/Makefile
index ea2c2d7d9d2e..5b4abf5363d1 100644
--- a/net/gupnp-av/Makefile
+++ b/net/gupnp-av/Makefile
@@ -22,7 +22,7 @@ USE_LDCONFIG= yes
OPTIONS_DEFINE= VAPI
OPTIONS_SUB= yes
-VAPI_BUILD_DEPENDS= vala>=0.22:lang/vala
+VAPI_USES= vala:build
VAPI_MESON_TRUE= vapi
.include <bsd.port.mk>
diff --git a/net/gupnp-dlna/Makefile b/net/gupnp-dlna/Makefile
index 836610758571..51668d04d125 100644
--- a/net/gupnp-dlna/Makefile
+++ b/net/gupnp-dlna/Makefile
@@ -10,15 +10,14 @@ COMMENT= Helpers for DLNA-related tasks using GUPnP
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala \
- gupnp14>=0.19.0:net/gupnp14
+BUILD_DEPENDS= gupnp14>=0.19.0:net/gupnp14
LIB_DEPENDS= libgupnp-1.2.so:net/gupnp14
RUN_DEPENDS= gupnp14>=0.19.0:net/gupnp14
CONFIGURE_ARGS= --enable-introspection \
--enable-gstreamer-metadata-backend
-USES= gmake gnome gstreamer libtool pathfix pkgconfig tar:xz
+USES= gmake gnome gstreamer libtool pathfix pkgconfig tar:xz vala:build
USE_GNOME= glib20 introspection:build libxml2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile
index d68f79e8d0ae..c8b99ffab56a 100644
--- a/net/gupnp/Makefile
+++ b/net/gupnp/Makefile
@@ -33,7 +33,7 @@ SHEBANG_FILES= tools/gupnp-binding-tool
OPTIONS_DEFINE= VAPI
OPTIONS_SUB= yes
-VAPI_BUILD_DEPENDS= vala>=0.20:lang/vala
+VAPI_USES= vala:build
VAPI_MESON_TRUE= vapi
.include <bsd.port.pre.mk>
diff --git a/net/gupnp14/Makefile b/net/gupnp14/Makefile
index ddc0be10c47c..efaaa64cb554 100644
--- a/net/gupnp14/Makefile
+++ b/net/gupnp14/Makefile
@@ -36,7 +36,7 @@ SHEBANG_FILES= tools/gupnp-binding-tool-1.2
OPTIONS_DEFINE= VAPI
OPTIONS_SUB= yes
-VAPI_BUILD_DEPENDS= vala>=0.20:lang/vala
+VAPI_USES= vala:build
VAPI_MESON_TRUE= vapi
.include <bsd.port.pre.mk>
diff --git a/net/libdmapsharing/Makefile b/net/libdmapsharing/Makefile
index 607295bcb890..a5c5785cd363 100644
--- a/net/libdmapsharing/Makefile
+++ b/net/libdmapsharing/Makefile
@@ -10,11 +10,10 @@ COMMENT= GNOME music playing application
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vapigen:lang/vala
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libgee-0.8.so:devel/libgee
-USES= gettext gnome gmake gstreamer libtool pathfix pkgconfig
+USES= gettext gnome gmake gstreamer libtool pathfix pkgconfig vala:build
USE_GNOME= cairo gdkpixbuf2 gnomeprefix gtk30 introspection:build
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-tests \
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index b474b57f8513..32034496efcb 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -12,14 +12,13 @@ COMMENT= Library to access online weather information
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vala:lang/vala
LIB_DEPENDS= libgeocode-glib.so:net/geocode-glib \
libsoup-2.4.so:devel/libsoup
PORTSCOUT= limitw:1,even
USES= gettext gnome localbase meson pkgconfig python:3.6+,build \
- shebangfix tar:xz
+ shebangfix tar:xz vala:build
USE_GNOME= gtk30 libxml2 pygobject3 introspection:build
USE_LDCONFIG= yes
MESON_ARGS= -Dglade_catalog=false
diff --git a/net/libgweather4/Makefile b/net/libgweather4/Makefile
index 008d1c4b25dd..ab9028feecfc 100644
--- a/net/libgweather4/Makefile
+++ b/net/libgweather4/Makefile
@@ -13,15 +13,14 @@ COMMENT= Library to access online weather information
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= gi-docgen:textproc/py-gi-docgen \
- vala:lang/vala
+BUILD_DEPENDS= gi-docgen:textproc/py-gi-docgen
LIB_DEPENDS= libgeocode-glib.so:net/geocode-glib \
libsoup-2.4.so:devel/libsoup
PORTSCOUT= limitw:1,even
USES= gettext gnome localbase meson pkgconfig python:3.6+,build \
- shebangfix tar:xz
+ shebangfix tar:xz vala:build
USE_GNOME= gtk30 libxml2 pygobject3 introspection:build
USE_LDCONFIG= yes
diff --git a/net/uhttpmock/Makefile b/net/uhttpmock/Makefile
index fbf5f51130c7..349a9770cf7e 100644
--- a/net/uhttpmock/Makefile
+++ b/net/uhttpmock/Makefile
@@ -11,10 +11,9 @@ COMMENT= HTTP web service mocking library for GNOME
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vapigen:lang/vala
LIB_DEPENDS= libsoup-2.4.so:devel/libsoup
-USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz
+USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz vala:build
USE_GNOME= gnomeprefix glib20 introspection:build
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index fce588f5c3d4..9df157f24f9d 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= appstream-glib>=0:devel/appstream-glib \
itstool:textproc/itstool \
gnome-autogen.sh:devel/gnome-common \
- yelp-tools>=0:textproc/yelp-tools \
- valac:lang/vala
+ yelp-tools>=0:textproc/yelp-tools
LIB_DEPENDS= libgtk-vnc-2.0.so:net/gtk-vnc \
libfribidi.so:converters/fribidi \
libgdbm.so:databases/gdbm \
@@ -28,7 +27,7 @@ RUN_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme
PORTSCOUT= limitw:1,even
USES= autoreconf:2.69 desktop-file-utils gettext gmake gnome \
- localbase pathfix pkgconfig shared-mime-info tar:xz xorg
+ localbase pathfix pkgconfig shared-mime-info tar:xz vala:build xorg
USE_GNOME= cairo gtk30 intlhack libxml2 vte3
USE_XORG= x11
GNU_CONFIGURE= yes
diff --git a/security/gcr/Makefile b/security/gcr/Makefile
index 642b1d16da27..08ae3fd4815a 100644
--- a/security/gcr/Makefile
+++ b/security/gcr/Makefile
@@ -12,8 +12,7 @@ PATCHFILES+= b3ca1d02bb01.patch:-p1 # https://gitlab.gnome.org/GNOME/gcr/-/merge
MAINTAINER= gnome@FreeBSD.org
COMMENT= Library for bits of crypto UI and parsing
-BUILD_DEPENDS= gpg2:security/gnupg \
- vapigen:lang/vala
+BUILD_DEPENDS= gpg2:security/gnupg
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libgpg-error.so:security/libgpg-error \
libp11-kit.so:security/p11-kit \
@@ -24,7 +23,7 @@ PORTSCOUT= limitw:1,even
USE_GNOME= cairo gtk30 intlhack introspection:build
USES= desktop-file-utils gettext gmake gnome libtool meson pathfix \
- pkgconfig python:3.6+ shared-mime-info tar:xz
+ pkgconfig python:3.6+ shared-mime-info tar:xz vala:build
USE_LDCONFIG= yes
BINARY_ALIAS= python3=${PYTHON_VERSION}
INSTALL_TARGET= install-strip
diff --git a/security/gpg-gui/Makefile b/security/gpg-gui/Makefile
index 552bdc0193b4..4f8f1acf6d68 100644
--- a/security/gpg-gui/Makefile
+++ b/security/gpg-gui/Makefile
@@ -9,10 +9,9 @@ COMMENT= GUI wrapper for symmetric GPG file encryption
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
RUN_DEPENDS= gpg2:security/gnupg
-USES= gnome meson pkgconfig
+USES= gnome meson pkgconfig vala:build
USE_GNOME= glib20 gtk30
USE_GITHUB= yes
diff --git a/security/libsecret/Makefile b/security/libsecret/Makefile
index 03cc5ff881ae..1fc0e77daa65 100644
--- a/security/libsecret/Makefile
+++ b/security/libsecret/Makefile
@@ -10,12 +10,11 @@ COMMENT= Library to access the secret service API
LICENSE= LGPL21
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gi-docgen>0:textproc/py-gi-docgen@${PY_FLAVOR} \
- docbook-xsl>=0:textproc/docbook-xsl \
- vala:lang/vala
+ docbook-xsl>=0:textproc/docbook-xsl
LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
libgpg-error.so:security/libgpg-error
-USES= gnome meson pkgconfig python:3.8+ tar:xz
+USES= gnome meson pkgconfig python:3.8+ tar:xz vala:build
USE_GNOME= glib20 intltool introspection:build libxslt:build
.include <bsd.port.mk>
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 93ceab2fde10..3dfa87bee71e 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -11,8 +11,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gnupg>=2.1.4:security/gnupg \
- itstool:textproc/itstool \
- valac:lang/vala
+ itstool:textproc/itstool
LIB_DEPENDS= libgcr-base-3.so:security/gcr \
libgpgme.so:security/gpgme \
libhandy-1.so:x11-toolkits/libhandy \
@@ -22,7 +21,7 @@ LIB_DEPENDS= libgcr-base-3.so:security/gcr \
RUN_DEPENDS= gnupg>=2.1.4:security/gnupg
USES= cpe gettext gnome localbase:ldflags meson pkgconfig \
- python:3.5+,build tar:xz xorg
+ python:3.5+,build tar:xz vala:build xorg
USE_CSTD= c99
USE_GNOME= gtk30
GLIB_SCHEMAS= org.gnome.seahorse.gschema.xml \
diff --git a/sysutils/bamf/Makefile b/sysutils/bamf/Makefile
index cbb4b0959ec7..9143ce3d2c27 100644
--- a/sysutils/bamf/Makefile
+++ b/sysutils/bamf/Makefile
@@ -9,14 +9,13 @@ COMMENT= BAMF Application Matching Framework
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/COPYING.LGPL
-BUILD_DEPENDS= vapigen:lang/vala \
- ${PYTHON_PKGNAMEPREFIX}lxml>=4.4.2:devel/py-lxml@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.4.2:devel/py-lxml@${PY_FLAVOR}
LIB_DEPENDS= libgtop-2.0.so:devel/libgtop \
libstartup-notification-1.so:x11/startup-notification \
libharfbuzz.so:print/harfbuzz
USES= compiler:c11 gettext-runtime gmake gnome libtool pathfix \
- pkgconfig python:3.6+,build xorg
+ pkgconfig python:3.6+,build vala:build xorg
USE_GNOME= gtk30 glib20 introspection:build libwnck3 cairo gdkpixbuf2
USE_XORG= x11
diff --git a/sysutils/contractor/Makefile b/sysutils/contractor/Makefile
index af65634d634a..3514dff761d5 100644
--- a/sysutils/contractor/Makefile
+++ b/sysutils/contractor/Makefile
@@ -8,11 +8,10 @@ COMMENT= Desktop-wide extension service
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
libgee-0.8.so:devel/libgee
-USES= gettext-runtime gnome meson pkgconfig tar:xz
+USES= gettext-runtime gnome meson pkgconfig tar:xz vala:build
USE_GITHUB= yes
GH_ACCOUNT= elementary
USE_GNOME= glib20
diff --git a/sysutils/tiramisu/Makefile b/sysutils/tiramisu/Makefile
index 0460e8b3b399..8d730916256c 100644
--- a/sysutils/tiramisu/Makefile
+++ b/sysutils/tiramisu/Makefile
@@ -8,9 +8,7 @@ COMMENT= Desktop notifications, the UNIX way
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= valac:lang/vala
-
-USES= gmake gnome pkgconfig
+USES= gmake gnome pkgconfig vala:build
USE_GITHUB= yes
USE_GNOME= glib20
GH_ACCOUNT= Sweets
diff --git a/sysutils/tracker-miners/Makefile b/sysutils/tracker-miners/Makefile
index 348b4ba79e11..03d807932590 100644
--- a/sysutils/tracker-miners/Makefile
+++ b/sysutils/tracker-miners/Makefile
@@ -10,7 +10,6 @@ COMMENT= Miners for tracker2
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.LGPL
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libicuuc.so:devel/icu \
libupower-glib.so:sysutils/upower \
libexempi.so:textproc/exempi \
@@ -32,7 +31,7 @@ LIB_DEPENDS= libicuuc.so:devel/icu \
PORTSCOUT= limitw:1,even
USES= gettext gnome jpeg localbase:ldflags meson \
- pathfix pkgconfig python:3.4+,build sqlite tar:xz
+ pathfix pkgconfig python:3.4+,build sqlite tar:xz vala:build
USE_GNOME= cairo intltool libgsf libxml2
MESON_ARGS= -Dsystemd_user_services=no \
diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index 0091fb0e679e..70b9ac246819 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -10,7 +10,6 @@ COMMENT= Object database, tag/metadata database, search tool and indexer
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.LGPL
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
libsoup-2.4.so:devel/libsoup \
libdbus-1.so:devel/dbus \
@@ -20,7 +19,7 @@ LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
PORTSCOUT= limitw:1,even
USES= compiler:c++11-lib gettext gnome localbase:ldflags meson \
- pkgconfig python:3.4+,build sqlite tar:xz
+ pkgconfig python:3.4+,build sqlite tar:xz vala:build
USE_GNOME= glib20 introspection:build libxml2
USE_LDCONFIG= yes
MESON_ARGS= -Ddocs=false \
diff --git a/sysutils/tracker3/Makefile b/sysutils/tracker3/Makefile
index 553a6ee08ca9..b0f88294a924 100644
--- a/sysutils/tracker3/Makefile
+++ b/sysutils/tracker3/Makefile
@@ -11,7 +11,6 @@ COMMENT= Object database, tag/metadata database, search tool and indexer
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.LGPL
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libdbus-1.so:devel/dbus \
libicutu.so:devel/icu \
libjson-glib-1.0.so:devel/json-glib \
@@ -19,7 +18,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
libuuid.so:misc/e2fsprogs-libuuid
USES= compiler:c++11-lib gettext gnome localbase:ldflags meson \
- pkgconfig python:3.6+,build sqlite tar:xz
+ pkgconfig python:3.6+,build sqlite tar:xz vala:build
USE_GNOME= glib20 libxml2 introspection:build
USE_LDCONFIG= yes
diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile
index fe5fdbfe0b7d..ba80eecca022 100644
--- a/sysutils/zeitgeist/Makefile
+++ b/sysutils/zeitgeist/Makefile
@@ -10,15 +10,14 @@ COMMENT= Event logging framework
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
-BUILD_DEPENDS= valac:lang/vala \
- dee-tool:devel/dee \
+BUILD_DEPENDS= dee-tool:devel/dee \
rapper:textproc/raptor2 \
${PYTHON_PKGNAMEPREFIX}rdflib>=4.1.1:textproc/py-rdflib@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${PY_FLAVOR} \
${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus@${PY_FLAVOR}
USES= autoreconf gettext gmake gnome libtool pathfix pkgconfig python \
- sqlite tar:xz
+ sqlite tar:xz vala:build
USE_GITLAB= yes
GL_SITE= https://gitlab.freedesktop.org
GL_COMMIT= 8b89364c077b46734d193c5b8a80f83b0fc917dd
diff --git a/textproc/gspell/Makefile b/textproc/gspell/Makefile
index b66980ca153d..9a90d969f64a 100644
--- a/textproc/gspell/Makefile
+++ b/textproc/gspell/Makefile
@@ -10,14 +10,13 @@ COMMENT= Spell checking for GTK+
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libenchant-2.so:textproc/enchant2 \
libfribidi.so:converters/fribidi \
libicudata.so:devel/icu
PORTSCOUT= limitw:even
-USES= gmake gnome iconv libtool pathfix pkgconfig tar:xz
+USES= gmake gnome iconv libtool pathfix pkgconfig tar:xz vala:build
USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 introspection:build \
libxml2 pango
GNU_CONFIGURE= yes
diff --git a/textproc/gtkspell3/Makefile b/textproc/gtkspell3/Makefile
index 2d0058eaf981..f926aa566eba 100644
--- a/textproc/gtkspell3/Makefile
+++ b/textproc/gtkspell3/Makefile
@@ -9,13 +9,12 @@ COMMENT= GTK+ 3 spell checking component
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vapigen:lang/vala \
- iso-codes>0:misc/iso-codes
+BUILD_DEPENDS= iso-codes>0:misc/iso-codes
LIB_DEPENDS= libenchant-2.so:textproc/enchant2 \
libfribidi.so:converters/fribidi
RUN_DEPENDS= iso-codes>0:misc/iso-codes
-USES= gettext gmake gnome localbase libtool pathfix pkgconfig tar:xz
+USES= gettext gmake gnome localbase libtool pathfix pkgconfig tar:xz vala:build
USE_GNOME= cairo gdkpixbuf2 gtk30 intlhack introspection:build
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index bfaf3362d4f0..4dcb54bdf74c 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -81,7 +81,7 @@ NLS_USES= gettext
NLS_USES_OFF= gettext-tools
NLS_CONFIGURE_ENABLE= nls
VALA_IMPLIES= GINTRO
-VALA_BUILD_DEPENDS= vala>=0.20:lang/vala
+VALA_USES= vala:build
VALA_CONFIGURE_ENABLE= vala
WAYLAND_BUILD_DEPENDS= wayland>1.14:graphics/wayland
WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
diff --git a/textproc/libxmlbird/Makefile b/textproc/libxmlbird/Makefile
index 8a95b3c39c52..8b0c461f252a 100644
--- a/textproc/libxmlbird/Makefile
+++ b/textproc/libxmlbird/Makefile
@@ -9,10 +9,9 @@ COMMENT= XML parser for Vala and C programs
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/LGPLv3.txt
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}doit>0:devel/py-doit@${PY_FLAVOR} \
- valac:lang/vala
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}doit>0:devel/py-doit@${PY_FLAVOR}
-USES= gettext-runtime gnome pkgconfig python:3.7+,build shebangfix tar:xz
+USES= gettext-runtime gnome pkgconfig python:3.7+,build shebangfix tar:xz vala:build
USE_GNOME= glib20
USE_LDCONFIG= yes
SHEBANG_FILES= configure install.py
diff --git a/www/midori/Makefile b/www/midori/Makefile
index f2da6d09d081..435fa0d0a074 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -10,7 +10,6 @@ COMMENT= Lightweight web browser using WebKit browser engine
LICENSE= LGPL21 MIT
LICENSE_COMB= multi
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libnotify.so:devel/libnotify \
libjson-glib-1.0.so:devel/json-glib \
libsoup-2.4.so:devel/libsoup \
@@ -22,7 +21,7 @@ LIB_DEPENDS= libnotify.so:devel/libnotify \
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
USES= cmake compiler:c++11-lang cpe desktop-file-utils gettext gnome \
- libarchive localbase:ldflags pkgconfig sqlite tar:bzip2
+ libarchive localbase:ldflags pkgconfig sqlite tar:bzip2 vala:build
USE_GNOME= cairo glib20 gtk30 intltool introspection librsvg2:build \
libxml2
diff --git a/x11-fm/polo/Makefile b/x11-fm/polo/Makefile
index 381761034b52..eaab41cbf9f3 100644
--- a/x11-fm/polo/Makefile
+++ b/x11-fm/polo/Makefile
@@ -9,12 +9,11 @@ COMMENT= Advanced graphical file manager written in Vala
LICENSE= GPLv2+
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libharfbuzz.so:print/harfbuzz \
libjson-glib-1.0.so:devel/json-glib
-USES= desktop-file-utils gettext-tools gmake gnome pkgconfig
+USES= desktop-file-utils gettext-tools gmake gnome pkgconfig vala:build
USE_GNOME= cairo gdkpixbuf2 gtk30 libxml2 vte3
USE_GITHUB= yes
GH_ACCOUNT= teejee2008
diff --git a/x11-fonts/font-manager/Makefile b/x11-fonts/font-manager/Makefile
index 4b13d2510aaf..9af64e4146b0 100644
--- a/x11-fonts/font-manager/Makefile
+++ b/x11-fonts/font-manager/Makefile
@@ -11,7 +11,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= cmake:devel/cmake \
itstool:textproc/itstool \
- valac:lang/vala \
yelp-build:textproc/yelp-tools
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
@@ -21,7 +20,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libwebkit2gtk-4.0.so:www/webkit2-gtk3
USES= compiler:c++11-lang desktop-file-utils gettext-tools gnome \
- meson pkgconfig python:3.6+ shebangfix sqlite
+ meson pkgconfig python:3.6+ shebangfix sqlite vala:build
USE_GITHUB= yes
GH_ACCOUNT= FontManager
USE_GNOME= cairo glib20 gtk30 libxml2 pango
diff --git a/x11-toolkits/granite/Makefile b/x11-toolkits/granite/Makefile
index 3f5b45415954..6c7ba500fd4d 100644
--- a/x11-toolkits/granite/Makefile
+++ b/x11-toolkits/granite/Makefile
@@ -8,12 +8,11 @@ COMMENT= Extensions of GTK+3 toolkit
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libgee-0.8.so:devel/libgee
RUN_DEPENDS= contractor:sysutils/contractor \
gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas
-USES= gettext gnome meson pkgconfig python:3.6+,build tar:xz
+USES= gettext gnome meson pkgconfig python:3.6+,build tar:xz vala:build
USE_GITHUB= yes
GH_ACCOUNT= elementary
USE_GNOME= cairo glib20 gtk30 gdkpixbuf2 introspection:build
diff --git a/x11-toolkits/granite7/Makefile b/x11-toolkits/granite7/Makefile
index 3413f5cabb06..c4b9b3a811f3 100644
--- a/x11-toolkits/granite7/Makefile
+++ b/x11-toolkits/granite7/Makefile
@@ -9,13 +9,12 @@ COMMENT= Extensions of GTK 4.0 toolkit
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libgee-0.8.so:devel/libgee
RUN_DEPENDS= contractor:sysutils/contractor \
gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \
xdg-desktop-portal>0:deskutils/xdg-desktop-portal
-USES= gettext gnome meson pkgconfig python:3.6+,build tar:xz
+USES= gettext gnome meson pkgconfig python:3.6+,build tar:xz vala:build
USE_GITHUB= yes
GH_ACCOUNT= elementary
USE_GNOME= cairo glib20 gtk40 gdkpixbuf2 introspection:build
diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile
index 8ec307e512c6..cb62c1419af0 100644
--- a/x11-toolkits/gtksourceview3/Makefile
+++ b/x11-toolkits/gtksourceview3/Makefile
@@ -12,11 +12,10 @@ COMMENT= Text widget that adds syntax highlighting to the GtkTextView widget
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= compiler:c11 tar:xz
+USES= compiler:c11 tar:xz vala:build
PORTSCOUT= limitw:1,even
-BUILD_DEPENDS= vala:lang/vala
LIB_DEPENDS= libfribidi.so:converters/fribidi
USES+= gettext gmake gnome libtool localbase pathfix pkgconfig
diff --git a/x11-toolkits/gtksourceview4/Makefile b/x11-toolkits/gtksourceview4/Makefile
index e05589e788f5..e96f2e82144c 100644
--- a/x11-toolkits/gtksourceview4/Makefile
+++ b/x11-toolkits/gtksourceview4/Makefile
@@ -11,12 +11,11 @@ COMMENT= Text widget that adds syntax highlighting to the GtkTextView widget
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vala:lang/vala
LIB_DEPENDS= libfribidi.so:converters/fribidi
PORTSCOUT= limitw:1,even
-USES= compiler:c11 gettext gnome meson pkgconfig tar:xz
+USES= compiler:c11 gettext gnome meson pkgconfig tar:xz vala:build
USE_CSTD= c11
USE_GNOME= cairo gdkpixbuf2 gtk30 libxml2 introspection:build
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gtksourceview5/Makefile b/x11-toolkits/gtksourceview5/Makefile
index 679652351a46..ce6f6721776f 100644
--- a/x11-toolkits/gtksourceview5/Makefile
+++ b/x11-toolkits/gtksourceview5/Makefile
@@ -11,13 +11,12 @@ COMMENT= Text widget that adds syntax highlighting to the GtkTextView widget
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vala:lang/vala
LIB_DEPENDS= libfribidi.so:converters/fribidi \
libpcre2-8.so:devel/pcre2
PORTSCOUT= limitw:1,even
-USES= compiler:c11 gettext gnome meson pkgconfig tar:xz
+USES= compiler:c11 gettext gnome meson pkgconfig tar:xz vala:build
USE_CSTD= c11
USE_GNOME= cairo gdkpixbuf2 gtk40 introspection:build libxml2
USE_LDCONFIG= yes
diff --git a/x11-toolkits/libadwaita/Makefile b/x11-toolkits/libadwaita/Makefile
index 8b1e16cdff0a..43e3edda6eb0 100644
--- a/x11-toolkits/libadwaita/Makefile
+++ b/x11-toolkits/libadwaita/Makefile
@@ -9,12 +9,11 @@ COMMENT= Building blocks for modern GNOME applications
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= sassc:textproc/sassc \
- valac:lang/vala
+BUILD_DEPENDS= sassc:textproc/sassc
LIB_DEPENDS= libfribidi.so:converters/fribidi \
libgraphene-1.0.so:graphics/graphene
-USES= gettext gnome meson ninja pkgconfig
+USES= gettext gnome meson ninja pkgconfig vala:build
USE_GITLAB= yes
USE_GNOME= cairo gdkpixbuf2 gtk40 introspection:build
GL_SITE= https://gitlab.gnome.org
diff --git a/x11-toolkits/libdazzle/Makefile b/x11-toolkits/libdazzle/Makefile
index 48f305c590c3..62bcc049ea84 100644
--- a/x11-toolkits/libdazzle/Makefile
+++ b/x11-toolkits/libdazzle/Makefile
@@ -10,9 +10,7 @@ COMMENT= Companion library to GObject and Gtk+
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
-
-USES= compiler:c11 gettext gnome meson pkgconfig tar:xz
+USES= compiler:c11 gettext gnome meson pkgconfig tar:xz vala:build
USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build
.include <bsd.port.mk>
diff --git a/x11-toolkits/libhandy/Makefile b/x11-toolkits/libhandy/Makefile
index 62ce5339cbcc..f64d868541dc 100644
--- a/x11-toolkits/libhandy/Makefile
+++ b/x11-toolkits/libhandy/Makefile
@@ -9,11 +9,10 @@ COMMENT= Library with GTK+ widgets for mobile phones
LICENSE= LGPL21
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libfribidi.so:converters/fribidi \
libgladeui-2.so:devel/glade
-USES= compiler:c11 gettext gnome meson pkgconfig tar:xz
+USES= compiler:c11 gettext gnome meson pkgconfig tar:xz vala:build
USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build
USE_LDCONFIG= yes
diff --git a/x11-toolkits/libhandy0/Makefile b/x11-toolkits/libhandy0/Makefile
index 6dbad8483104..c2aff3801816 100644
--- a/x11-toolkits/libhandy0/Makefile
+++ b/x11-toolkits/libhandy0/Makefile
@@ -11,10 +11,9 @@ LICENSE= LGPL21
BROKEN= fails to build with glade >= 3.36
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libgladeui-2.so:devel/glade
-USES= compiler:c11 gettext gnome meson pkgconfig
+USES= compiler:c11 gettext gnome meson pkgconfig vala:build
USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build
USE_LDCONFIG= yes
diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile
index a2447fa83bb4..f619b7d30659 100644
--- a/x11-toolkits/vte3/Makefile
+++ b/x11-toolkits/vte3/Makefile
@@ -11,8 +11,7 @@ COMMENT= Terminal widget with improved accessibility and I18N support
LICENSE= LGPL21
-BUILD_DEPENDS= vapigen:lang/vala \
- bash:shells/bash
+BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS= libgnutls.so:security/gnutls \
libfribidi.so:converters/fribidi \
libpcre2-8.so:devel/pcre2 \
@@ -21,7 +20,7 @@ LIB_DEPENDS= libgnutls.so:security/gnutls \
PORTSCOUT= limitw:1,even
USES= compiler:c++11-lang gettext gnome localbase meson \
- pkgconfig python:3.6+ tar:xz
+ pkgconfig python:3.6+ tar:xz vala:build
USE_LDCONFIG= yes
USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build
diff --git a/x11-wm/lxsession/Makefile b/x11-wm/lxsession/Makefile
index 934f034ffcfc..e75e3c10b5e3 100644
--- a/x11-wm/lxsession/Makefile
+++ b/x11-wm/lxsession/Makefile
@@ -10,7 +10,6 @@ COMMENT= LXDE Session Manager
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
@@ -18,7 +17,7 @@ LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
libpolkit-agent-1.so:sysutils/polkit \
libck-connector.so:sysutils/consolekit2
-USES= autoreconf gmake gnome localbase pkgconfig tar:xz xorg
+USES= autoreconf gmake gnome localbase pkgconfig tar:xz vala:build xorg
USE_GNOME= glib20 gtk20 intltool cairo gdkpixbuf2 libxslt
USE_XORG= x11
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 87a4608f37ce..48aa4483cb48 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -43,7 +43,7 @@ GIR_CONFIGURE_OFF= --enable-introspection=no
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
-VAPI_BUILD_DEPENDS= vapigen:lang/vala
+VAPI_USES= vala:build
VAPI_CONFIGURE_ENABLE= vala
VAPI_IMPLIES= GIR
diff --git a/x11/appmenu-registrar/Makefile b/x11/appmenu-registrar/Makefile
index c65fb130f8fb..814d429a4fc4 100644
--- a/x11/appmenu-registrar/Makefile
+++ b/x11/appmenu-registrar/Makefile
@@ -12,9 +12,8 @@ LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libbamf3.so:sysutils/bamf
-BUILD_DEPENDS= valac:lang/vala
-USES= meson gnome pkgconfig gettext
+USES= meson gnome pkgconfig gettext vala:build
MESON_ARGS= -Dvalapanel=disabled \
-Dxfce=disabled \
diff --git a/x11/babl/Makefile b/x11/babl/Makefile
index 3f51bf05b013..b471f4fcdf3c 100644
--- a/x11/babl/Makefile
+++ b/x11/babl/Makefile
@@ -9,10 +9,9 @@ COMMENT= Dynamic pixel format conversion library
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vapigen:lang/vala
LIB_DEPENDS= liblcms2.so:graphics/lcms2
-USES= compiler:c11 gnome libtool localbase meson pathfix pkgconfig tar:xz
+USES= compiler:c11 gnome libtool localbase meson pathfix pkgconfig tar:xz vala:build
USE_LDCONFIG= yes
USE_GNOME= introspection:build
diff --git a/x11/elementary-terminal/Makefile b/x11/elementary-terminal/Makefile
index 2bd632937abb..6d6f37fed8a3 100644
--- a/x11/elementary-terminal/Makefile
+++ b/x11/elementary-terminal/Makefile
@@ -9,13 +9,12 @@ COMMENT= Terminal emulator designed for elementary OS
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libgranite.so:x11-toolkits/granite \
libhandy-1.so:x11-toolkits/libhandy \
libpcre2-posix.so:devel/pcre2
-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= cairo gdkpixbuf2 glib20 gtk30 vte3
diff --git a/x11/gnome-pie/Makefile b/x11/gnome-pie/Makefile
index 753159cfb019..eb4b18b14112 100644
--- a/x11/gnome-pie/Makefile
+++ b/x11/gnome-pie/Makefile
@@ -10,13 +10,12 @@ COMMENT= Circular application launcher
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
RUN_DEPENDS= gnome-settings-daemon>=2.32.1_4:sysutils/gnome-settings-daemon
LIB_DEPENDS= libbamf3.so:sysutils/bamf \
libgee-0.8.so:devel/libgee \
libunique-1.0.so:x11-toolkits/unique
-USES= cmake gnome pkgconfig xorg
+USES= cmake gnome pkgconfig vala:build xorg
USE_GITHUB= yes
USE_GNOME= cairo gnomemenus3 gtk30 librsvg2 libwnck3
USE_XORG= xtst
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 57b7a2628860..e6c184b5f6f1 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl \
gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
itstool:textproc/itstool \
- vala:lang/vala \
xsltproc:textproc/libxslt
LIB_DEPENDS= libfribidi.so:converters/fribidi \
libgnutls.so:security/gnutls \
@@ -24,7 +23,7 @@ RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
PORTSCOUT= limitw:1,even
USES= cpe gettext gnome localbase meson pathfix pkgconfig python:3.7+ \
- tar:xz xorg
+ tar:xz vala:build xorg
USE_GNOME= cairo dconf gdkpixbuf2 gtk30 intltool vte3
USE_XORG= x11
CPE_VENDOR= gnome
diff --git a/x11/gtk-app-menu/Makefile b/x11/gtk-app-menu/Makefile
index 89bb9dea0e03..9bddc7373631 100644
--- a/x11/gtk-app-menu/Makefile
+++ b/x11/gtk-app-menu/Makefile
@@ -12,10 +12,9 @@ COMMENT= GTK module for putting application menubar in a global menubar
LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/subprojects/appmenu-gtk-module/LICENSE
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libbamf3.so:sysutils/bamf
-USES= meson gnome pkgconfig
+USES= meson gnome pkgconfig vala:build
MESON_ARGS= -Dappmenu-gtk-module=enabled \
-Dbudgie=disabled \
diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index 773130574781..c413ab0d27e3 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -12,8 +12,8 @@ LICENSE_COMB= multi
LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
.if ! defined(EXTRA_ONLY)
-BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
- valac:lang/vala
+USES+= vala:build
+BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \
libexif.so:graphics/libexif \
libfontconfig.so:x11-fonts/fontconfig \
@@ -31,7 +31,7 @@ gtk3_CONFLICTS_INSTALL= libfm
SLAVEDIRS= ${CATEGORIES}/${PORTNAME}-extra
-USES= gettext-tools gmake gnome libtool localbase \
+USES+= gettext-tools gmake gnome libtool localbase \
pkgconfig tar:xz
USE_GNOME= intltool
USE_LDCONFIG= yes
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index bab6ec82112d..8543fd61d63f 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -51,7 +51,7 @@ STARTUP_CONFIGURE_ENABLE= startup-notification
STARTUP_DESC= Startup notification
STARTUP_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification
-VAPI_BUILD_DEPENDS= vapigen:lang/vala
+VAPI_USES= vala:build
VAPI_CONFIGURE_ENABLE= vala
VAPI_IMPLIES= GIR
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 9152eea91a1e..99c267d5bf09 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -33,7 +33,7 @@ GIR_CONFIGURE_OFF= --enable-introspection=no
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
-VAPI_BUILD_DEPENDS= vapigen:lang/vala
+VAPI_USES= vala:build
VAPI_CONFIGURE_ENABLE= vala
VAPI_IMPLIES= GIR
diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile
index 46ef01da27f6..676a05b253a4 100644
--- a/x11/lightdm/Makefile
+++ b/x11/lightdm/Makefile
@@ -45,7 +45,7 @@ OPTIONS_SUB= yes
DOCS_BUILD_DEPENDS= gtkdoc-check:textproc/gtk-doc
DOCS_CONFIGURE_ENABLE= gtk-doc
-VAPI_BUILD_DEPENDS= vapigen:lang/vala
+VAPI_USES= vala:build
VAPI_CONFIGURE_ENABLE= vala
VAPI_USE= gnome=introspection:build
diff --git a/x11/mate-applet-appmenu/Makefile b/x11/mate-applet-appmenu/Makefile
index 7a7b3aec7960..832213b1c1b5 100644
--- a/x11/mate-applet-appmenu/Makefile
+++ b/x11/mate-applet-appmenu/Makefile
@@ -12,11 +12,10 @@ LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libbamf3.so:sysutils/bamf
-BUILD_DEPENDS= valac:lang/vala
RUN_DEPENDS= appmenu-registrar>=0:x11/appmenu-registrar \
appmenu-gtk-module>=0:x11/gtk-app-menu
-USES= meson gnome mate pkgconfig gettext
+USES= meson gnome mate pkgconfig gettext vala:build
MESON_ARGS= -Dvalapanel=disabled \
-Dxfce=disabled \
diff --git a/x11/plank/Makefile b/x11/plank/Makefile
index f65976b76f1d..ffae9be005ba 100644
--- a/x11/plank/Makefile
+++ b/x11/plank/Makefile
@@ -10,12 +10,11 @@ COMMENT= Elegant, simple, and clean dock
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= vapigen:lang/vala
LIB_DEPENDS= libbamf3.so:sysutils/bamf \
libgee-0.8.so:devel/libgee \
libgnome-menu-3.so:x11/gnome-menus
-USES= gmake gnome libtool localbase pathfix pkgconfig tar:xz xorg
+USES= gmake gnome libtool localbase pathfix pkgconfig tar:xz vala:build xorg
USE_GNOME= glib20 gtk30 gdkpixbuf2 cairo intlhack libxml2 libwnck3 dconf
USE_XORG= x11 xfixes xi
diff --git a/x11/remontoire/Makefile b/x11/remontoire/Makefile
index 86e5b96f4cc8..ca5576d3d631 100644
--- a/x11/remontoire/Makefile
+++ b/x11/remontoire/Makefile
@@ -7,11 +7,10 @@ COMMENT= Keybinding viewer for i3 and other programs
LICENSE= GPLv3
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
libjson-glib-1.0.so:devel/json-glib
-USES= gettext-tools gnome meson pkgconfig python:build shebangfix
+USES= gettext-tools gnome meson pkgconfig python:build shebangfix vala:build
USE_GITHUB= yes
USE_GNOME= gtk30
GH_ACCOUNT= regolith-linux
diff --git a/x11/slick-greeter/Makefile b/x11/slick-greeter/Makefile
index d66711674442..7f30bae3cf67 100644
--- a/x11/slick-greeter/Makefile
+++ b/x11/slick-greeter/Makefile
@@ -14,10 +14,10 @@ LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz \
liblightdm-gobject-1.so:x11/lightdm
-BUILD_DEPENDS= valac:lang/vala
RUN_DEPENDS= numlockx>=0:x11/numlockx
-USES= autoreconf gettext gmake gnome localbase pkgconfig python:run shebangfix xorg
+USES= autoreconf gettext gmake gnome localbase pkgconfig python:run shebangfix \
+ vala:build xorg
USE_GNOME= cairo dconf gdkpixbuf2 gtk30 intltool pygobject3
USE_XORG= pixman x11 xext
diff --git a/x11/swayfloatingswitcher/Makefile b/x11/swayfloatingswitcher/Makefile
index e5845b2a198f..c6076e2f775d 100644
--- a/x11/swayfloatingswitcher/Makefile
+++ b/x11/swayfloatingswitcher/Makefile
@@ -8,13 +8,12 @@ COMMENT= Simple Alt+Tab switcher for floating windows
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= valac:lang/vala \
- granite>0:x11-toolkits/granite
+BUILD_DEPENDS= granite>0:x11-toolkits/granite
LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \
libgee-0.8.so:devel/libgee \
libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
-USES= gnome localbase:ldflags meson pkgconfig
+USES= gnome localbase:ldflags meson pkgconfig vala:build
USE_GITHUB= yes
USE_GNOME= gtk30
GH_ACCOUNT= ErikReider
diff --git a/x11/swaync/Makefile b/x11/swaync/Makefile
index 1eb186e61f93..e5edb1b7e68f 100644
--- a/x11/swaync/Makefile
+++ b/x11/swaync/Makefile
@@ -9,12 +9,11 @@ COMMENT= Simple Wayland notification daemon with GTK panel
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \
libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell \
libhandy-1.so:x11-toolkits/libhandy
-USES= compiler:c11 gnome localbase:ldflags meson pkgconfig
+USES= compiler:c11 gnome localbase:ldflags meson pkgconfig vala:build
USE_GITHUB= yes
USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build
GH_ACCOUNT= ErikReider
diff --git a/x11/swaysettings/Makefile b/x11/swaysettings/Makefile
index fb0836084f0c..1477bba17538 100644
--- a/x11/swaysettings/Makefile
+++ b/x11/swaysettings/Makefile
@@ -9,14 +9,13 @@ COMMENT= GUI for setting Sway wallpaper, default apps, GTK themes, etc.
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= valac:lang/vala
LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \
libgee-0.8.so:devel/libgee \
libaccountsservice.so:sysutils/accountsservice \
libgranite.so:x11-toolkits/granite \
libhandy-1.so:x11-toolkits/libhandy
-USES= compiler:c11 gettext gnome meson pkgconfig python:build shebangfix
+USES= compiler:c11 gettext gnome meson pkgconfig python:build shebangfix vala:build
USE_GITHUB= yes
USE_GNOME= cairo gdkpixbuf2 gtk30 libxml2
GH_ACCOUNT= ErikReider
diff --git a/x11/xapp/Makefile b/x11/xapp/Makefile
index e450beba91be..7a431f2725f3 100644
--- a/x11/xapp/Makefile
+++ b/x11/xapp/Makefile
@@ -9,11 +9,10 @@ COMMENT= Cross-desktop libraries and common resources
LICENSE= LGPL3
LICENSE_FILE?= ${WRKSRC}/COPYING.LESSER
-BUILD_DEPENDS= vapigen:lang/vala
LIB_DEPENDS= libdbusmenu-gtk3.so:devel/libdbusmenu
RUN_DEPENDS= bash:shells/bash
-USES= gettext-tools gnome meson pkgconfig python shebangfix xorg
+USES= gettext-tools gnome meson pkgconfig python shebangfix vala:build xorg
USE_GITHUB= yes
GH_ACCOUNT= linuxmint
USE_GNOME= cairo gdkpixbuf2 glib20 gtk-update-icon-cache gtk30 \
diff --git a/x11/xfce4-appmenu-plugin/Makefile b/x11/xfce4-appmenu-plugin/Makefile
index 909e0abb4a1e..1e5a75cac3fb 100644
--- a/x11/xfce4-appmenu-plugin/Makefile
+++ b/x11/xfce4-appmenu-plugin/Makefile
@@ -12,11 +12,10 @@ LICENSE= LGPL3
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libbamf3.so:sysutils/bamf
-BUILD_DEPENDS= valac:lang/vala
RUN_DEPENDS= appmenu-registrar>=0:x11/appmenu-registrar \
appmenu-gtk-module>=0:x11/gtk-app-menu
-USES= meson gnome xfce pkgconfig gettext
+USES= meson gnome xfce pkgconfig gettext vala:build
MESON_ARGS= -Dvalapanel=disabled \
-Dxfce=enabled \
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 4e007b07be2a..c8e4c7373349 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -40,7 +40,7 @@ GIR_CONFIGURE_OFF= --enable-introspection=no
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
-VAPI_BUILD_DEPENDS= vapigen:lang/vala
+VAPI_USES= vala:build
VAPI_CONFIGURE_ENABLE= vala
VAPI_IMPLIES= GIR