*: Use the tools framework for itstool

Now it should be more obvious when a package needs it as a dependency,
as it will fail loudly if it isn't declared as a tool.

While here, some duplicate dependencies on itstool were removed from the
MATE packages

8 files changed, 11 insertions, 22 deletions

diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 5993be1d95b..23dc62883e8 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2020/08/27 12:26:13 joerg Exp $
+# $NetBSD: Makefile,v 1.96 2021/05/02 10:24:52 nia Exp $
 
 DISTNAME=	gnome-terminal-3.36.2
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-terminal/${PKGVERSION_NOREV:R}/}
@@ -12,12 +12,11 @@ COMMENT=	Terminal emulator for GNOME
 LICENSE=	gnu-gpl-v3
 
 TOOL_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-TOOL_DEPENDS+=	itstool-[0-9]*:../../textproc/itstool
 TOOL_DEPENDS+=	libxml2-[0-9]*:../../textproc/libxml2
 
 GNU_CONFIGURE=	yes
 
-USE_TOOLS+=	pkg-config gmake
+USE_TOOLS+=	pkg-config gmake itstool
 USE_TOOLS+=	msgfmt msgmerge xgettext
 
 CONFIGURE_ARGS+=	--disable-search-provider
diff --git a/x11/gtksourceview3/Makefile b/x11/gtksourceview3/Makefile
index 9807d4ccec8..7c1a7e74c07 100644
--- a/x11/gtksourceview3/Makefile
+++ b/x11/gtksourceview3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2021/04/21 11:40:45 adam Exp $
+# $NetBSD: Makefile,v 1.56 2021/05/02 10:24:52 nia Exp $
 
 DISTNAME=	gtksourceview-3.24.11
 PKGNAME=	${DISTNAME:S/gtksourceview/gtksourceview3/}
@@ -14,7 +14,7 @@ LICENSE=	gnu-lgpl-v2.1
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake gsed intltool msgfmt pkg-config
+USE_TOOLS+=		gmake gsed intltool msgfmt pkg-config itstool
 USE_PKGLOCALEDIR=	yes
 #CONFIGURE_ARGS+=	--disable-deprecations
 CONFIGURE_ARGS+=	--disable-maintainer-mode
@@ -29,8 +29,6 @@ PLIST_VARS+=		introspection
 
 .include "../../mk/bsd.options.mk"
 
-BUILD_DEPENDS+=		itstool-[0-9]*:../../textproc/itstool
-
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.48
 .include "../../devel/glib2/buildlink3.mk"
 .if !empty(PKG_OPTIONS:Mintrospection)
diff --git a/x11/gtksourceview4/Makefile b/x11/gtksourceview4/Makefile
index 8937572bd2b..c1134fbfff3 100644
--- a/x11/gtksourceview4/Makefile
+++ b/x11/gtksourceview4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/04/21 11:40:45 adam Exp $
+# $NetBSD: Makefile,v 1.21 2021/05/02 10:24:53 nia Exp $
 
 DISTNAME=	gtksourceview-4.8.0
 PKGNAME=	${DISTNAME:S/gtksourceview/gtksourceview4/}
@@ -12,9 +12,7 @@ HOMEPAGE=	https://wiki.gnome.org/Projects/GtkSourceView
 COMMENT=	Text widget that extends GTK3's GtkTextView widget (v4)
 LICENSE=	gnu-lgpl-v2.1
 
-BUILD_DEPENDS+=		itstool-[0-9]*:../../textproc/itstool
-
-USE_TOOLS+=		intltool msgfmt pkg-config
+USE_TOOLS+=		intltool msgfmt pkg-config itstool
 
 # avoid vala dependency
 MESON_ARGS+=		-Dvapi=false
diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile
index 0b1a766ac6c..c9d15f8ea82 100644
--- a/x11/mate-applets/Makefile
+++ b/x11/mate-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2021/04/21 11:43:00 adam Exp $
+# $NetBSD: Makefile,v 1.40 2021/05/02 10:24:53 nia Exp $
 
 PYTHON_VERSIONS_ACCEPTED=	27
 
@@ -11,7 +11,6 @@ CATEGORIES=	x11
 COMMENT=	MATE panel applets
 
 DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-TOOL_DEPENDS+=	itstool-[0-9]*:../../textproc/itstool
 TOOL_DEPENDS+=	libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/x11/mate-control-center/Makefile b/x11/mate-control-center/Makefile
index 78e7a781b6e..f8e11aefa16 100644
--- a/x11/mate-control-center/Makefile
+++ b/x11/mate-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2021/04/21 11:40:48 adam Exp $
+# $NetBSD: Makefile,v 1.31 2021/05/02 10:24:53 nia Exp $
 
 PKGREVISION= 6
 .include "../../meta-pkgs/mate/Makefile.common"
@@ -8,8 +8,6 @@ CATEGORIES=	sysutils
 
 COMMENT=	MATE Control Center
 
-BUILD_DEPENDS+=	itstool>=0:../../textproc/itstool
-
 PKGCONFIG_OVERRIDE+=	capplets/keybindings/mate-keybindings.pc.in
 PKGCONFIG_OVERRIDE+=	capplets/default-applications/mate-default-applications.pc.in
 PKGCONFIG_OVERRIDE+=	libslab/libslab.pc.in
diff --git a/x11/mate-desktop/Makefile b/x11/mate-desktop/Makefile
index 56f133cbfd0..61a6885d3b7 100644
--- a/x11/mate-desktop/Makefile
+++ b/x11/mate-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2020/08/24 04:41:42 gutteridge Exp $
+# $NetBSD: Makefile,v 1.30 2021/05/02 10:24:53 nia Exp $
 
 PKGREVISION= 2
 .include "../../meta-pkgs/mate/Makefile.common"
@@ -8,7 +8,6 @@ CATEGORIES=	x11
 
 COMMENT=	MATE desktop library
 
-TOOL_DEPENDS+=		itstool-[0-9]*:../../textproc/itstool
 TOOL_DEPENDS+=		libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
 
 PKGCONFIG_OVERRIDE+=	libmate-desktop/mate-desktop-2.0.pc.in
diff --git a/x11/mate-panel/Makefile b/x11/mate-panel/Makefile
index 11d4a5d910a..84c94b74489 100644
--- a/x11/mate-panel/Makefile
+++ b/x11/mate-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2021/04/21 11:43:00 adam Exp $
+# $NetBSD: Makefile,v 1.40 2021/05/02 10:24:53 nia Exp $
 
 PYTHON_VERSIONS_ACCEPTED=	27
 PKGREVISION= 2
@@ -9,7 +9,6 @@ CATEGORIES=	x11
 
 COMMENT=	MATE panel application
 
-TOOL_DEPENDS+=		itstool-[0-9]*:../../textproc/itstool
 TOOL_DEPENDS+=		libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
 
 PKGCONFIG_OVERRIDE+=	libmate-panel-applet/libmatepanelapplet-4.0.pc.in
diff --git a/x11/mate-terminal/Makefile b/x11/mate-terminal/Makefile
index ad42c2602c1..2e6172d4fc3 100644
--- a/x11/mate-terminal/Makefile
+++ b/x11/mate-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2021/04/15 05:36:03 nia Exp $
+# $NetBSD: Makefile,v 1.28 2021/05/02 10:24:53 nia Exp $
 
 .include "../../meta-pkgs/mate/Makefile.common"
 
@@ -9,7 +9,6 @@ USE_TOOLS+=	perl:run
 
 COMMENT=	MATE terminal emulator application
 
-TOOL_DEPENDS+=	itstool-[0-9]*:../../textproc/itstool
 TOOL_DEPENDS+=	libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
 
 .include "options.mk"