git: 024c982f5de3 - main - lang/vala: unify vala bindings option name to VAPI
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 31 Dec 2022 19:13:19 UTC
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=024c982f5de39cff338aa412660f5d77d6ada0dc
commit 024c982f5de39cff338aa412660f5d77d6ada0dc
Author: VVD <vvd@unislabs.com>
AuthorDate: 2022-12-24 10:05:01 +0000
Commit: Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2022-12-31 19:12:15 +0000
lang/vala: unify vala bindings option name to VAPI
- having a single option name for the bindings improves usability
PR: 268491
---
databases/evolution-data-server/Makefile | 11 +++++-----
databases/evolution-data-server/pkg-plist | 36 +++++++++++++++----------------
deskutils/libportal/Makefile | 10 ++++-----
deskutils/libportal/pkg-plist | 8 +++----
devel/libical/Makefile | 11 +++++-----
devel/libical/pkg-plist | 2 +-
devel/libvirt-glib/Makefile | 11 +++++-----
devel/libvirt-glib/pkg-plist | 12 +++++------
mail/gmime26/Makefile | 11 +++++-----
mail/gmime26/pkg-plist | 4 ++--
mail/gmime30/Makefile | 10 ++++-----
mail/gmime30/pkg-plist | 4 ++--
textproc/ibus/Makefile | 12 +++++------
textproc/ibus/pkg-plist | 4 ++--
14 files changed, 71 insertions(+), 75 deletions(-)
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 689e21889b48..f5e3dae8733c 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,6 +1,6 @@
PORTNAME= evolution-data-server
DISTVERSION= 3.44.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -56,8 +56,8 @@ GLIB_SCHEMAS= org.gnome.evolution-data-server.addressbook.gschema.xml \
PLIST_SUB= EVO_VERSION="1.2"
OPTIONS_SUB= yes
-OPTIONS_DEFINE= WEATHER KERBEROS LDAP VALA
-OPTIONS_DEFAULT=WEATHER KERBEROS LDAP VALA
+OPTIONS_DEFINE= WEATHER KERBEROS LDAP VAPI
+OPTIONS_DEFAULT=WEATHER KERBEROS LDAP VAPI
KERBEROS_CMAKE_ON= -DWITH_KRB5=/usr
KERBEROS_CMAKE_OFF= -DWITH_KRB5=OFF
@@ -67,9 +67,8 @@ LDAP_CMAKE_ON= -DWITH_OPENLDAP=${LOCALBASE}
LDAP_CMAKE_OFF= -DWITH_OPENLDAP=OFF
LDAP_USE= openldap=yes
-VALA_DESC= Build Vala language bindings
-VALA_USES= vala:build
-VALA_CMAKE_BOOL= ENABLE_VALA_BINDINGS
+VAPI_USES= vala:build
+VAPI_CMAKE_BOOL= ENABLE_VALA_BINDINGS
WEATHER_DESC= Weather calendar backend
WEATHER_LIB_DEPENDS= libgweather-3.so:net/libgweather
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index 0abed1329f50..030417dc1716 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -572,21 +572,21 @@ share/pixmaps/evolution-data-server/category_status_16.png
share/pixmaps/evolution-data-server/category_strategies_16.png
share/pixmaps/evolution-data-server/category_suppliers_16.png
share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
-%%VALA%%share/vala/vapi/camel-%%EVO_VERSION%%.deps
-%%VALA%%share/vala/vapi/camel-%%EVO_VERSION%%.vapi
-%%VALA%%share/vala/vapi/libebackend-%%EVO_VERSION%%.deps
-%%VALA%%share/vala/vapi/libebackend-%%EVO_VERSION%%.vapi
-%%VALA%%share/vala/vapi/libebook-%%EVO_VERSION%%.deps
-%%VALA%%share/vala/vapi/libebook-%%EVO_VERSION%%.vapi
-%%VALA%%share/vala/vapi/libebook-contacts-%%EVO_VERSION%%.deps
-%%VALA%%share/vala/vapi/libebook-contacts-%%EVO_VERSION%%.vapi
-%%VALA%%share/vala/vapi/libecal-2.0.deps
-%%VALA%%share/vala/vapi/libecal-2.0.vapi
-%%VALA%%share/vala/vapi/libedata-book-%%EVO_VERSION%%.deps
-%%VALA%%share/vala/vapi/libedata-book-%%EVO_VERSION%%.vapi
-%%VALA%%share/vala/vapi/libedata-cal-2.0.deps
-%%VALA%%share/vala/vapi/libedata-cal-2.0.vapi
-%%VALA%%share/vala/vapi/libedataserver-%%EVO_VERSION%%.deps
-%%VALA%%share/vala/vapi/libedataserver-%%EVO_VERSION%%.vapi
-%%VALA%%share/vala/vapi/libedataserverui-%%EVO_VERSION%%.deps
-%%VALA%%share/vala/vapi/libedataserverui-%%EVO_VERSION%%.vapi
+%%VAPI%%share/vala/vapi/camel-%%EVO_VERSION%%.deps
+%%VAPI%%share/vala/vapi/camel-%%EVO_VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libebackend-%%EVO_VERSION%%.deps
+%%VAPI%%share/vala/vapi/libebackend-%%EVO_VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libebook-%%EVO_VERSION%%.deps
+%%VAPI%%share/vala/vapi/libebook-%%EVO_VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libebook-contacts-%%EVO_VERSION%%.deps
+%%VAPI%%share/vala/vapi/libebook-contacts-%%EVO_VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libecal-2.0.deps
+%%VAPI%%share/vala/vapi/libecal-2.0.vapi
+%%VAPI%%share/vala/vapi/libedata-book-%%EVO_VERSION%%.deps
+%%VAPI%%share/vala/vapi/libedata-book-%%EVO_VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libedata-cal-2.0.deps
+%%VAPI%%share/vala/vapi/libedata-cal-2.0.vapi
+%%VAPI%%share/vala/vapi/libedataserver-%%EVO_VERSION%%.deps
+%%VAPI%%share/vala/vapi/libedataserver-%%EVO_VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libedataserverui-%%EVO_VERSION%%.deps
+%%VAPI%%share/vala/vapi/libedataserverui-%%EVO_VERSION%%.vapi
diff --git a/deskutils/libportal/Makefile b/deskutils/libportal/Makefile
index 217f39ed7071..0fc7e6e9304c 100644
--- a/deskutils/libportal/Makefile
+++ b/deskutils/libportal/Makefile
@@ -1,5 +1,6 @@
PORTNAME= libportal
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= deskutils
MAINTAINER= arrowd@FreeBSD.org
@@ -19,12 +20,11 @@ USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= flatpak
-OPTIONS_DEFINE= VALA
-OPTIONS_DEFAULT= VALA
+OPTIONS_DEFINE= VAPI
+OPTIONS_DEFAULT= VAPI
-VALA_MESON_TRUE= vapi
-VALA_USES= vala:build
-VALA_DESC= Install Vala language bindings
+VAPI_MESON_TRUE= vapi
+VAPI_USES= vala:build
# docs require a port for gi-docgen
MESON_ARGS= -Ddocs=false '-Dbackends=["qt5", "gtk3"]'
diff --git a/deskutils/libportal/pkg-plist b/deskutils/libportal/pkg-plist
index 1d4fbbdd97c8..d357d19b0ea4 100644
--- a/deskutils/libportal/pkg-plist
+++ b/deskutils/libportal/pkg-plist
@@ -38,7 +38,7 @@ libdata/pkgconfig/libportal-qt5.pc
libdata/pkgconfig/libportal.pc
share/gir-1.0/Xdp-1.0.gir
share/gir-1.0/XdpGtk3-1.0.gir
-%%VALA%%share/vala/vapi/libportal-gtk3.deps
-%%VALA%%share/vala/vapi/libportal-gtk3.vapi
-%%VALA%%share/vala/vapi/libportal.deps
-%%VALA%%share/vala/vapi/libportal.vapi
+%%VAPI%%share/vala/vapi/libportal-gtk3.deps
+%%VAPI%%share/vala/vapi/libportal-gtk3.vapi
+%%VAPI%%share/vala/vapi/libportal.deps
+%%VAPI%%share/vala/vapi/libportal.vapi
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index f4348baa9193..196c580439ed 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -1,6 +1,6 @@
PORTNAME= libical
DISTVERSION= 3.0.8
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel
MASTER_SITES= https://github.com/libical/libical/releases/download/v${PORTVERSION}/
@@ -23,17 +23,16 @@ MAKE_JOBS_UNSAFE= yes
CFLAGS_amd64= -fPIC
-OPTIONS_DEFINE= DOCS GLIB INTROSPECTION VALA
-OPTIONS_DEFAULT= GLIB INTROSPECTION VALA
+OPTIONS_DEFINE= DOCS GLIB INTROSPECTION VAPI
+OPTIONS_DEFAULT= GLIB INTROSPECTION VAPI
OPTIONS_SUB= yes
DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc
DOCS_CMAKE_BOOL= ICAL_BUILD_DOCS
DOCSDIR= ${PREFIX}/share/gtk-doc/html/libical-glib
-VALA_DESC= Build VALA bindings
-VALA_USES= vala:build
-VALA_CMAKE_BOOL= ICAL_GLIB_VAPI
+VAPI_USES= vala:build
+VAPI_CMAKE_BOOL= ICAL_GLIB_VAPI
INTROSPECTION_DESC= Build GObject Introspection
INTROSPECTION_USE= gnome=introspection:build
diff --git a/devel/libical/pkg-plist b/devel/libical/pkg-plist
index b3f9c4321d30..9d63783b5e5e 100644
--- a/devel/libical/pkg-plist
+++ b/devel/libical/pkg-plist
@@ -164,4 +164,4 @@ libdata/pkgconfig/libical.pc
%%PORTDOCS%%%%DOCSDIR%%/style.css
%%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png
%%PORTDOCS%%%%DOCSDIR%%/up.png
-%%VALA%%%%GLIB%%share/vala/vapi/libical-glib.vapi
+%%VAPI%%%%GLIB%%share/vala/vapi/libical-glib.vapi
diff --git a/devel/libvirt-glib/Makefile b/devel/libvirt-glib/Makefile
index c99e1ca1f09f..516b053064ce 100644
--- a/devel/libvirt-glib/Makefile
+++ b/devel/libvirt-glib/Makefile
@@ -1,6 +1,6 @@
PORTNAME= libvirt-glib
PORTVERSION= 4.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= ftp://libvirt.org/libvirt/glib/
@@ -15,14 +15,13 @@ LIB_DEPENDS= libvirt.so:devel/libvirt
USES= gettext gmake gnome libtool meson pathfix pkgconfig \
python:3.6+ tar:xz
-OPTIONS_DEFINE= DOCS VALA
-OPTIONS_DEFAULT= DOCS VALA
+OPTIONS_DEFINE= DOCS VAPI
+OPTIONS_DEFAULT= DOCS VAPI
OPTIONS_SUB= yes
DOCS_MESON_ENABLED= docs
DOCS_BUILD_DEPENDS= gtk-doc>=0:textproc/gtk-doc
-VALA_DESC= Vala binding
-VALA_MESON_ENABLED= vapi
-VALA_USES= vala:build
+VAPI_MESON_ENABLED= vapi
+VAPI_USES= vala:build
MESON_ARGS+= -Dintrospection=enabled
USE_LDCONFIG= yes
diff --git a/devel/libvirt-glib/pkg-plist b/devel/libvirt-glib/pkg-plist
index 8a94c20f74dd..af56a4ab9613 100644
--- a/devel/libvirt-glib/pkg-plist
+++ b/devel/libvirt-glib/pkg-plist
@@ -208,9 +208,9 @@ share/locale/pt_BR/LC_MESSAGES/libvirt-glib.mo
share/locale/ru/LC_MESSAGES/libvirt-glib.mo
share/locale/tr/LC_MESSAGES/libvirt-glib.mo
share/locale/uk/LC_MESSAGES/libvirt-glib.mo
-%%VALA%%share/vala/vapi/libvirt-gconfig-%%VERSION%%.deps
-%%VALA%%share/vala/vapi/libvirt-gconfig-%%VERSION%%.vapi
-%%VALA%%share/vala/vapi/libvirt-glib-%%VERSION%%.deps
-%%VALA%%share/vala/vapi/libvirt-glib-%%VERSION%%.vapi
-%%VALA%%share/vala/vapi/libvirt-gobject-%%VERSION%%.deps
-%%VALA%%share/vala/vapi/libvirt-gobject-%%VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libvirt-gconfig-%%VERSION%%.deps
+%%VAPI%%share/vala/vapi/libvirt-gconfig-%%VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libvirt-glib-%%VERSION%%.deps
+%%VAPI%%share/vala/vapi/libvirt-glib-%%VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libvirt-gobject-%%VERSION%%.deps
+%%VAPI%%share/vala/vapi/libvirt-gobject-%%VERSION%%.vapi
diff --git a/mail/gmime26/Makefile b/mail/gmime26/Makefile
index e4166d1a0484..3ba8b97dd9c3 100644
--- a/mail/gmime26/Makefile
+++ b/mail/gmime26/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gmime
PORTVERSION= 2.6.23
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= mail
MASTER_SITES= GNOME
PKGNAMESUFFIX?= 26
@@ -25,16 +25,15 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-OPTIONS_DEFINE= GINTRO VALA
+OPTIONS_DEFINE= GINTRO VAPI
OPTIONS_SUB= yes
GINTRO_DESC= Install GObject Introspection data
-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_USES= vala:build
-VALA_CONFIGURE_ENABLE= vala
-VALA_IMPLIES= GINTRO
+VAPI_USES= vala:build
+VAPI_CONFIGURE_ENABLE= vala
+VAPI_IMPLIES= GINTRO
# www.freebsd.org/cgi/query-pr.cgi?pr=118092
# Rename uudecode and uuencode to gmime-* to not conflict with userland
diff --git a/mail/gmime26/pkg-plist b/mail/gmime26/pkg-plist
index 8388867f064d..5eb99047d84f 100644
--- a/mail/gmime26/pkg-plist
+++ b/mail/gmime26/pkg-plist
@@ -58,5 +58,5 @@ lib/libgmime-2.6.so.0
lib/libgmime-2.6.so.0.623.0
libdata/pkgconfig/gmime-2.6.pc
%%GINTRO%%share/gir-1.0/GMime-2.6.gir
-%%VALA%%share/vala/vapi/gmime-2.6.deps
-%%VALA%%share/vala/vapi/gmime-2.6.vapi
+%%VAPI%%share/vala/vapi/gmime-2.6.deps
+%%VAPI%%share/vala/vapi/gmime-2.6.vapi
diff --git a/mail/gmime30/Makefile b/mail/gmime30/Makefile
index da069382addb..a2a44cdeb302 100644
--- a/mail/gmime30/Makefile
+++ b/mail/gmime30/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gmime
PORTVERSION= 3.2.7
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= GNOME
PKGNAMESUFFIX= 30
@@ -23,12 +24,11 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-OPTIONS_DEFINE= VALA
-OPTIONS_DEFAULT= VALA
+OPTIONS_DEFINE= VAPI
+OPTIONS_DEFAULT= VAPI
OPTIONS_SUB= yes
-VALA_DESC= Install vala binding
-VALA_USES= vala:build
-VALA_CONFIGURE_ENABLE= vala
+VAPI_USES= vala:build
+VAPI_CONFIGURE_ENABLE= vala
# www.freebsd.org/cgi/query-pr.cgi?pr=118092
# Rename uudecode and uuencode to gmime-* to not conflict with userland
diff --git a/mail/gmime30/pkg-plist b/mail/gmime30/pkg-plist
index bf51cab5b4cf..4b744a40864b 100644
--- a/mail/gmime30/pkg-plist
+++ b/mail/gmime30/pkg-plist
@@ -67,5 +67,5 @@ lib/libgmime-3.0.so.0
lib/libgmime-3.0.so.0.206.1
libdata/pkgconfig/gmime-3.0.pc
share/gir-1.0/GMime-3.0.gir
-%%VALA%%share/vala/vapi/gmime-3.0.deps
-%%VALA%%share/vala/vapi/gmime-3.0.vapi
+%%VAPI%%share/vala/vapi/gmime-3.0.deps
+%%VAPI%%share/vala/vapi/gmime-3.0.vapi
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 1184bf0af845..0ada954f0654 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -1,5 +1,6 @@
PORTNAME= ibus
PORTVERSION= 1.5.27
+PORTREVISION= 1
CATEGORIES= textproc
MAINTAINER= henry.hu.sh@gmail.com
@@ -37,8 +38,8 @@ INSTALL_TARGET= install-strip
TEST_TARGET= check
TEST_WRKSRC= ${WRKSRC}/src/tests
-OPTIONS_DEFINE= ENGINE VALA GTK2 GTK3 GINTRO DCONF XIM EMOJI DOCS NLS WAYLAND
-OPTIONS_DEFAULT= GTK2 GTK3 VALA GINTRO DCONF XIM ENGINE EMOJI
+OPTIONS_DEFINE= ENGINE VAPI GTK2 GTK3 GINTRO DCONF XIM EMOJI DOCS NLS WAYLAND
+OPTIONS_DEFAULT= GTK2 GTK3 VAPI GINTRO DCONF XIM ENGINE EMOJI
NO_OPTIONS_SORT= yes
OPTIONS_SUB= yes
@@ -48,7 +49,6 @@ ENGINE_DESC= Install ibus simple engine
GINTRO_DESC= Install GObject Introspection data
GTK2_DESC= Install GTK2 client
GTK3_DESC= Install GTK3 client and panel
-VALA_DESC= Install vala binding
WAYLAND_DESC= Enable Wayland support
XIM_DESC= Install XIM server
@@ -80,9 +80,9 @@ GTK3_LIBS= -lX11
NLS_USES= gettext
NLS_USES_OFF= gettext-tools
NLS_CONFIGURE_ENABLE= nls
-VALA_IMPLIES= GINTRO
-VALA_USES= vala:build
-VALA_CONFIGURE_ENABLE= vala
+VAPI_IMPLIES= GINTRO
+VAPI_USES= vala:build
+VAPI_CONFIGURE_ENABLE= vala
WAYLAND_BUILD_DEPENDS= wayland>1.14:graphics/wayland
WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
libxkbcommon.so:x11/libxkbcommon
diff --git a/textproc/ibus/pkg-plist b/textproc/ibus/pkg-plist
index 720901fc9599..95cb79d14389 100644
--- a/textproc/ibus/pkg-plist
+++ b/textproc/ibus/pkg-plist
@@ -300,8 +300,8 @@ share/icons/hicolor/scalable/apps/ibus.svg
%%NLS%%share/locale/zh_CN/LC_MESSAGES/ibus10.mo
%%NLS%%share/locale/zh_HK/LC_MESSAGES/ibus10.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/ibus10.mo
-%%VALA%%share/vala/vapi/ibus-1.0.deps
-%%VALA%%share/vala/vapi/ibus-1.0.vapi
+%%VAPI%%share/vala/vapi/ibus-1.0.deps
+%%VAPI%%share/vala/vapi/ibus-1.0.vapi
share/bash-completion/completions/ibus.bash
%%DCONF%%share/GConf/gsettings/ibus.convert
@dir %%DATADIR%%/setup