pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: nia
Date: Sun May 2 10:24:53 UTC 2021
Modified Files:
pkgsrc/archivers/file-roller: Makefile
pkgsrc/audio/ardour: Makefile
pkgsrc/audio/easytag: Makefile
pkgsrc/audio/rhythmbox: Makefile
pkgsrc/audio/sound-juicer: Makefile
pkgsrc/databases/libgda: Makefile.common
pkgsrc/devel/anjuta: Makefile
pkgsrc/devel/devhelp: Makefile
pkgsrc/devel/glade: Makefile
pkgsrc/devel/meld: Makefile
pkgsrc/editors/gedit: Makefile
pkgsrc/editors/ghex: Makefile
pkgsrc/editors/gtranslator: Makefile
pkgsrc/editors/pluma: Makefile
pkgsrc/games/gbrainy: Makefile
pkgsrc/games/gnome-sudoku: Makefile
pkgsrc/games/hitori: Makefile
pkgsrc/games/pioneers: Makefile
pkgsrc/geography/viking: Makefile
pkgsrc/graphics/cheese: Makefile
pkgsrc/graphics/eog: Makefile
pkgsrc/graphics/shotwell: Makefile
pkgsrc/mail/balsa: Makefile
pkgsrc/mail/evolution: Makefile
pkgsrc/math/gnome-calculator: Makefile
pkgsrc/math/gnumeric112: Makefile
pkgsrc/meta-pkgs/mate: Makefile.common
pkgsrc/misc/mate-calc: Makefile
pkgsrc/misc/mate-utils: Makefile
pkgsrc/misc/orca: Makefile
pkgsrc/misc/yelp3: Makefile
pkgsrc/mk/tools: bsd.tools.mk
pkgsrc/multimedia/pitivi: Makefile
pkgsrc/multimedia/totem: Makefile
pkgsrc/net/etherape: Makefile
pkgsrc/net/gnome-nettool: Makefile
pkgsrc/net/grilo-plugins: Makefile
pkgsrc/net/mate-user-share: Makefile
pkgsrc/net/vinagre: Makefile
pkgsrc/news/pan: Makefile
pkgsrc/print/evince3: Makefile.common
pkgsrc/print/glabels: Makefile
pkgsrc/security/seahorse: Makefile
pkgsrc/sysutils/brasero: Makefile
pkgsrc/textproc/gnome-dictionary: Makefile
pkgsrc/textproc/gtk-doc: Makefile
pkgsrc/textproc/yelp-xsl: Makefile
pkgsrc/wm/marco: Makefile
pkgsrc/www/epiphany: Makefile
pkgsrc/x11/gnome-terminal: Makefile
pkgsrc/x11/gtksourceview3: Makefile
pkgsrc/x11/gtksourceview4: Makefile
pkgsrc/x11/mate-applets: Makefile
pkgsrc/x11/mate-control-center: Makefile
pkgsrc/x11/mate-desktop: Makefile
pkgsrc/x11/mate-panel: Makefile
pkgsrc/x11/mate-terminal: Makefile
Added Files:
pkgsrc/mk/tools: itstool.mk
Log Message:
*: 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
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 pkgsrc/archivers/file-roller/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/audio/ardour/Makefile
cvs rdiff -u -r1.116 -r1.117 pkgsrc/audio/easytag/Makefile
cvs rdiff -u -r1.179 -r1.180 pkgsrc/audio/rhythmbox/Makefile
cvs rdiff -u -r1.117 -r1.118 pkgsrc/audio/sound-juicer/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/databases/libgda/Makefile.common
cvs rdiff -u -r1.157 -r1.158 pkgsrc/devel/anjuta/Makefile
cvs rdiff -u -r1.141 -r1.142 pkgsrc/devel/devhelp/Makefile
cvs rdiff -u -r1.101 -r1.102 pkgsrc/devel/glade/Makefile
cvs rdiff -u -r1.111 -r1.112 pkgsrc/devel/meld/Makefile
cvs rdiff -u -r1.159 -r1.160 pkgsrc/editors/gedit/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/editors/ghex/Makefile
cvs rdiff -u -r1.86 -r1.87 pkgsrc/editors/gtranslator/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/editors/pluma/Makefile
cvs rdiff -u -r1.105 -r1.106 pkgsrc/games/gbrainy/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/games/gnome-sudoku/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/games/hitori/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/games/pioneers/Makefile
cvs rdiff -u -r1.119 -r1.120 pkgsrc/geography/viking/Makefile
cvs rdiff -u -r1.95 -r1.96 pkgsrc/graphics/cheese/Makefile
cvs rdiff -u -r1.110 -r1.111 pkgsrc/graphics/eog/Makefile
cvs rdiff -u -r1.119 -r1.120 pkgsrc/graphics/shotwell/Makefile
cvs rdiff -u -r1.165 -r1.166 pkgsrc/mail/balsa/Makefile
cvs rdiff -u -r1.254 -r1.255 pkgsrc/mail/evolution/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/math/gnome-calculator/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/math/gnumeric112/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/meta-pkgs/mate/Makefile.common
cvs rdiff -u -r1.16 -r1.17 pkgsrc/misc/mate-calc/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/misc/mate-utils/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/misc/orca/Makefile
cvs rdiff -u -r1.75 -r1.76 pkgsrc/misc/yelp3/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/mk/tools/bsd.tools.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/mk/tools/itstool.mk
cvs rdiff -u -r1.60 -r1.61 pkgsrc/multimedia/pitivi/Makefile
cvs rdiff -u -r1.115 -r1.116 pkgsrc/multimedia/totem/Makefile
cvs rdiff -u -r1.110 -r1.111 pkgsrc/net/etherape/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/gnome-nettool/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/grilo-plugins/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/mate-user-share/Makefile
cvs rdiff -u -r1.102 -r1.103 pkgsrc/net/vinagre/Makefile
cvs rdiff -u -r1.110 -r1.111 pkgsrc/news/pan/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/print/evince3/Makefile.common
cvs rdiff -u -r1.118 -r1.119 pkgsrc/print/glabels/Makefile
cvs rdiff -u -r1.165 -r1.166 pkgsrc/security/seahorse/Makefile
cvs rdiff -u -r1.93 -r1.94 pkgsrc/sysutils/brasero/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/gnome-dictionary/Makefile
cvs rdiff -u -r1.85 -r1.86 pkgsrc/textproc/gtk-doc/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/textproc/yelp-xsl/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/wm/marco/Makefile
cvs rdiff -u -r1.202 -r1.203 pkgsrc/www/epiphany/Makefile
cvs rdiff -u -r1.95 -r1.96 pkgsrc/x11/gnome-terminal/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/x11/gtksourceview3/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/gtksourceview4/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/mate-applets/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/mate-control-center/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/mate-desktop/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/mate-panel/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/mate-terminal/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/archivers/file-roller/Makefile
diff -u pkgsrc/archivers/file-roller/Makefile:1.150 pkgsrc/archivers/file-roller/Makefile:1.151
--- pkgsrc/archivers/file-roller/Makefile:1.150 Thu Nov 12 01:20:02 2020
+++ pkgsrc/archivers/file-roller/Makefile Sun May 2 10:24:47 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.150 2020/11/12 01:20:02 gutteridge Exp $
+# $NetBSD: Makefile,v 1.151 2021/05/02 10:24:47 nia Exp $
DISTNAME= file-roller-3.38.0
MASTER_SITES= ${MASTER_SITE_GNOME:=/sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -10,9 +10,7 @@ HOMEPAGE= https://wiki.gnome.org/Apps/Fi
COMMENT= Archive manager for the GNOME desktop environment
LICENSE= gnu-gpl-v2
-USE_TOOLS+= msgfmt pkg-config
-
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
+USE_TOOLS+= msgfmt pkg-config itstool
MESON_ARGS+= -Dpackagekit=false
MESON_ARGS+= -Dnautilus-actions=false
Index: pkgsrc/audio/ardour/Makefile
diff -u pkgsrc/audio/ardour/Makefile:1.49 pkgsrc/audio/ardour/Makefile:1.50
--- pkgsrc/audio/ardour/Makefile:1.49 Thu Apr 29 23:30:12 2021
+++ pkgsrc/audio/ardour/Makefile Sun May 2 10:24:47 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2021/04/29 23:30:12 thor Exp $
+# $NetBSD: Makefile,v 1.50 2021/05/02 10:24:47 nia Exp $
DISTNAME= Ardour-5.12.0
PKGNAME= ${DISTNAME:tl}
@@ -17,11 +17,9 @@ LICENSE= gnu-gpl-v2
UNLIMIT_RESOURCES= stacksize
-USE_TOOLS+= pkg-config perl
+USE_TOOLS+= pkg-config perl itstool
USE_LANGUAGES= c c++11
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
EGDIR= ${PREFIX}/share/examples/ardour5
WAF_ENV+= EGDIR=${EGDIR}
Index: pkgsrc/audio/easytag/Makefile
diff -u pkgsrc/audio/easytag/Makefile:1.116 pkgsrc/audio/easytag/Makefile:1.117
--- pkgsrc/audio/easytag/Makefile:1.116 Mon Aug 17 20:18:05 2020
+++ pkgsrc/audio/easytag/Makefile Sun May 2 10:24:47 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2020/08/17 20:18:05 leot Exp $
+# $NetBSD: Makefile,v 1.117 2021/05/02 10:24:47 nia Exp $
DISTNAME= easytag-2.4.3
PKGREVISION= 6
@@ -11,12 +11,11 @@ HOMEPAGE= https://projects.gnome.org/eas
COMMENT= GTK+ tag editor for MP3, Ogg Vorbis files, and others
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool pkg-config xgettext
+USE_TOOLS+= itstool
PLIST_VARS+= man
Index: pkgsrc/audio/rhythmbox/Makefile
diff -u pkgsrc/audio/rhythmbox/Makefile:1.179 pkgsrc/audio/rhythmbox/Makefile:1.180
--- pkgsrc/audio/rhythmbox/Makefile:1.179 Wed Apr 21 11:41:01 2021
+++ pkgsrc/audio/rhythmbox/Makefile Sun May 2 10:24:47 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.179 2021/04/21 11:41:01 adam Exp $
+# $NetBSD: Makefile,v 1.180 2021/05/02 10:24:47 nia Exp $
DISTNAME= rhythmbox-3.4.4
PKGREVISION= 2
@@ -15,6 +15,7 @@ LICENSE= gnu-gpl-v2
GNU_CONFIGURE= YES
USE_TOOLS+= gmake intltool msgfmt pkg-config
+USE_TOOLS+= itstool
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
@@ -28,7 +29,6 @@ CONFIGURE_ARGS+= --enable-vala
CONFIGURE_ARGS+= --with-brasero
CONFIGURE_ARGS+= --with-ipod
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
DEPENDS+= gst-plugins1-libav-[0-9]*:../../multimedia/gst-plugins1-libav
DEPENDS+= gst-plugins1-good-[0-9]*:../../multimedia/gst-plugins1-good
DEPENDS+= gst-plugins1-oss-[0-9]*:../../audio/gst-plugins1-oss
Index: pkgsrc/audio/sound-juicer/Makefile
diff -u pkgsrc/audio/sound-juicer/Makefile:1.117 pkgsrc/audio/sound-juicer/Makefile:1.118
--- pkgsrc/audio/sound-juicer/Makefile:1.117 Wed Apr 21 13:24:23 2021
+++ pkgsrc/audio/sound-juicer/Makefile Sun May 2 10:24:47 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2021/04/21 13:24:23 adam Exp $
+# $NetBSD: Makefile,v 1.118 2021/05/02 10:24:47 nia Exp $
DISTNAME= sound-juicer-3.24.0
PKGREVISION= 9
@@ -11,13 +11,12 @@ HOMEPAGE= https://wiki.gnome.org/Apps/So
COMMENT= CD ripping tool
LICENSE= gnu-gpl-v2
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
-USE_TOOLS+= msgfmt msgmerge xgettext
+USE_TOOLS+= msgfmt msgmerge xgettext itstool
USE_TOOLS+= gmake
# XXX fails without GNU msgfmt
Index: pkgsrc/databases/libgda/Makefile.common
diff -u pkgsrc/databases/libgda/Makefile.common:1.59 pkgsrc/databases/libgda/Makefile.common:1.60
--- pkgsrc/databases/libgda/Makefile.common:1.59 Tue Jun 18 20:11:50 2019
+++ pkgsrc/databases/libgda/Makefile.common Sun May 2 10:24:47 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.59 2019/06/18 20:11:50 nia Exp $
+# $NetBSD: Makefile.common,v 1.60 2021/05/02 10:24:47 nia Exp $
#
# used by databases/libgda/Makefile
# used by databases/libgda-mysql/Makefile
@@ -17,9 +17,8 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
DISTINFO_FILE= ${.CURDIR}/../../databases/libgda/distinfo
PATCHDIR= ${.CURDIR}/../../databases/libgda/patches
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
USE_TOOLS+= gmake intltool pkg-config msgfmt
+USE_TOOLS+= itstool
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
Index: pkgsrc/devel/anjuta/Makefile
diff -u pkgsrc/devel/anjuta/Makefile:1.157 pkgsrc/devel/anjuta/Makefile:1.158
--- pkgsrc/devel/anjuta/Makefile:1.157 Wed Apr 21 11:41:22 2021
+++ pkgsrc/devel/anjuta/Makefile Sun May 2 10:24:47 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.157 2021/04/21 11:41:22 adam Exp $
+# $NetBSD: Makefile,v 1.158 2021/05/02 10:24:47 nia Exp $
DISTNAME= anjuta-3.34.0
PKGREVISION= 10
@@ -16,14 +16,13 @@ DEPENDS+= autoconf>=2.59:../../devel/aut
DEPENDS+= automake>=1.8.2:../../devel/automake
DEPENDS+= gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-schemas
DEPENDS+= libtool>=1.5.2:../../devel/libtool
-DEPENDS+= itstool-[0-9]*:../../textproc/itstool
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake:run intltool pkg-config:run perl:run sh:run
USE_TOOLS+= msgfmt:run msgmerge:run xgettext:run
-USE_TOOLS+= bash:run bison flex
+USE_TOOLS+= bash:run bison flex itstool
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-schemas-compile
Index: pkgsrc/devel/devhelp/Makefile
diff -u pkgsrc/devel/devhelp/Makefile:1.141 pkgsrc/devel/devhelp/Makefile:1.142
--- pkgsrc/devel/devhelp/Makefile:1.141 Wed Apr 21 11:41:23 2021
+++ pkgsrc/devel/devhelp/Makefile Sun May 2 10:24:47 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2021/04/21 11:41:23 adam Exp $
+# $NetBSD: Makefile,v 1.142 2021/05/02 10:24:47 nia Exp $
DISTNAME= devhelp-3.34.0
PKGREVISION= 7
@@ -11,9 +11,7 @@ HOMEPAGE= https://wiki.gnome.org/Apps/De
COMMENT= Tool for browsing and searching API documentation from GNOME
LICENSE= gnu-gpl-v3
-USE_TOOLS+= pkg-config msgfmt xgettext
-
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
+USE_TOOLS+= pkg-config msgfmt xgettext itstool
# workaround for build failure
# https://gitlab.gnome.org/GNOME/json-glib/issues/35
Index: pkgsrc/devel/glade/Makefile
diff -u pkgsrc/devel/glade/Makefile:1.101 pkgsrc/devel/glade/Makefile:1.102
--- pkgsrc/devel/glade/Makefile:1.101 Wed Apr 21 11:40:16 2021
+++ pkgsrc/devel/glade/Makefile Sun May 2 10:24:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2021/04/21 11:40:16 adam Exp $
+# $NetBSD: Makefile,v 1.102 2021/05/02 10:24:48 nia Exp $
DISTNAME= glade-3.36.0
PKGREVISION= 3
@@ -11,13 +11,13 @@ HOMEPAGE= https://glade.gnome.org/
COMMENT= User interface builder for the GTK3+ toolkit
LICENSE= gnu-gpl-v2
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config intltool gmake msgfmt
+USE_TOOLS+= itstool
# Requires --xml in msgfmt.
_TOOLS_USE_PKGSRC.msgfmt= yes
Index: pkgsrc/devel/meld/Makefile
diff -u pkgsrc/devel/meld/Makefile:1.111 pkgsrc/devel/meld/Makefile:1.112
--- pkgsrc/devel/meld/Makefile:1.111 Wed Apr 21 11:41:28 2021
+++ pkgsrc/devel/meld/Makefile Sun May 2 10:24:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2021/04/21 11:41:28 adam Exp $
+# $NetBSD: Makefile,v 1.112 2021/05/02 10:24:48 nia Exp $
DISTNAME= meld-3.21.0
PKGREVISION= 8
@@ -11,13 +11,12 @@ HOMEPAGE= https://meldmerge.org/
COMMENT= Visual diff and merge tool
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
BUILD_DEPENDS+= ${PYPKGPREFIX}-distro-[0-9]*:../../devel/py-distro
DEPENDS+= ${PYPKGPREFIX}-gobject3>=3.30:../../devel/py-gobject3
DEPENDS+= gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-schemas
DEPENDS+= dconf-[0-9]*:../../devel/dconf
-USE_TOOLS+= msgfmt pkg-config
+USE_TOOLS+= msgfmt pkg-config itstool
# only used when building the python way (not meson)
USE_TOOLS+= intltool
Index: pkgsrc/editors/gedit/Makefile
diff -u pkgsrc/editors/gedit/Makefile:1.159 pkgsrc/editors/gedit/Makefile:1.160
--- pkgsrc/editors/gedit/Makefile:1.159 Wed Apr 21 11:41:33 2021
+++ pkgsrc/editors/gedit/Makefile Sun May 2 10:24:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.159 2021/04/21 11:41:33 adam Exp $
+# $NetBSD: Makefile,v 1.160 2021/05/02 10:24:48 nia Exp $
DISTNAME= gedit-3.36.2
PKGREVISION= 5
@@ -14,6 +14,7 @@ LICENSE= gnu-gpl-v2
PREV_PKGPATH= editors/gedit3
USE_TOOLS+= gettext msgfmt perl pkg-config
+USE_TOOLS+= itstool
_TOOLS_USE_PKGSRC.msgfmt= yes
PYTHON_VERSIONS_INCOMPATIBLE= 27
@@ -26,7 +27,6 @@ MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/out
DEPENDS+= adwaita-icon-theme-[0-9]*:../../graphics/adwaita-icon-theme
DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
pre-configure:
${FIND} ${WRKSRC}/help -type f -exec ${CHMOD} 644 {} \;
Index: pkgsrc/editors/ghex/Makefile
diff -u pkgsrc/editors/ghex/Makefile:1.61 pkgsrc/editors/ghex/Makefile:1.62
--- pkgsrc/editors/ghex/Makefile:1.61 Mon Aug 17 20:18:33 2020
+++ pkgsrc/editors/ghex/Makefile Sun May 2 10:24:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2020/08/17 20:18:33 leot Exp $
+# $NetBSD: Makefile,v 1.62 2021/05/02 10:24:48 nia Exp $
DISTNAME= ghex-3.18.4
PKGREVISION= 3
@@ -11,9 +11,7 @@ HOMEPAGE= https://wiki.gnome.org/Apps/Gh
COMMENT= Hex editor
LICENSE= gnu-gpl-v2
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
-USE_TOOLS+= pkg-config msgfmt
+USE_TOOLS+= pkg-config msgfmt itstool
PYTHON_FOR_BUILD_ONLY= tool
Index: pkgsrc/editors/gtranslator/Makefile
diff -u pkgsrc/editors/gtranslator/Makefile:1.86 pkgsrc/editors/gtranslator/Makefile:1.87
--- pkgsrc/editors/gtranslator/Makefile:1.86 Wed Apr 21 11:41:33 2021
+++ pkgsrc/editors/gtranslator/Makefile Sun May 2 10:24:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2021/04/21 11:41:33 adam Exp $
+# $NetBSD: Makefile,v 1.87 2021/05/02 10:24:48 nia Exp $
DISTNAME= gtranslator-3.32.1
PKGREVISION= 8
@@ -11,10 +11,9 @@ HOMEPAGE= https://wiki.gnome.org/Apps/Gt
COMMENT= Gettext po file editor for the GNOME desktop environment
LICENSE= gnu-gpl-v3
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config itstool
REPLACE_PYTHON+= build-aux/meson/meson_post_install.py
Index: pkgsrc/editors/pluma/Makefile
diff -u pkgsrc/editors/pluma/Makefile:1.36 pkgsrc/editors/pluma/Makefile:1.37
--- pkgsrc/editors/pluma/Makefile:1.36 Wed Apr 21 11:41:33 2021
+++ pkgsrc/editors/pluma/Makefile Sun May 2 10:24:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2021/04/21 11:41:33 adam Exp $
+# $NetBSD: Makefile,v 1.37 2021/05/02 10:24:48 nia Exp $
PYTHON_VERSIONS_INCOMPATIBLE= 27
@@ -8,8 +8,7 @@ CATEGORIES= editors
COMMENT= Small and lightweight UTF-8 text editor for MATE
-USE_TOOLS+= bash:run perl
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
+USE_TOOLS+= bash:run perl itstool
TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
PKGCONFIG_OVERRIDE+= data/pluma.pc.in
Index: pkgsrc/games/gbrainy/Makefile
diff -u pkgsrc/games/gbrainy/Makefile:1.105 pkgsrc/games/gbrainy/Makefile:1.106
--- pkgsrc/games/gbrainy/Makefile:1.105 Wed Apr 21 11:41:40 2021
+++ pkgsrc/games/gbrainy/Makefile Sun May 2 10:24:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2021/04/21 11:41:40 adam Exp $
+# $NetBSD: Makefile,v 1.106 2021/05/02 10:24:48 nia Exp $
DISTNAME= gbrainy-2.4.1
PKGNAME= gbrainy-2.41
@@ -17,9 +17,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_LANGUAGES= c
USE_TOOLS+= gmake intltool pkg-config bash:run
-USE_TOOLS+= msgfmt msgmerge xgettext
-
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
+USE_TOOLS+= msgfmt msgmerge xgettext itstool
BUILDLINK_API_DEPENDS.cairo+= cairo>=1.2.0
Index: pkgsrc/games/gnome-sudoku/Makefile
diff -u pkgsrc/games/gnome-sudoku/Makefile:1.36 pkgsrc/games/gnome-sudoku/Makefile:1.37
--- pkgsrc/games/gnome-sudoku/Makefile:1.36 Mon Apr 19 13:51:17 2021
+++ pkgsrc/games/gnome-sudoku/Makefile Sun May 2 10:24:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2021/04/19 13:51:17 pgoyette Exp $
+# $NetBSD: Makefile,v 1.37 2021/05/02 10:24:48 nia Exp $
DISTNAME= gnome-sudoku-3.38.0
PKGREVISION= 1
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= c c++11
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= msgfmt pkg-config
+USE_TOOLS+= msgfmt pkg-config itstool
PYTHON_FOR_BUILD_ONLY= tool
.include "../../lang/python/tool.mk"
@@ -25,7 +25,6 @@ post-extract:
cd ${WRKSRC}/help/C && ${CHMOD} 0644 *.page legal.xml figures/*.png
REPLACE_PYTHON+= build-aux/post_install.py
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.40.0
.include "../../devel/glib2/schemas.mk"
Index: pkgsrc/games/hitori/Makefile
diff -u pkgsrc/games/hitori/Makefile:1.23 pkgsrc/games/hitori/Makefile:1.24
--- pkgsrc/games/hitori/Makefile:1.23 Mon Apr 12 13:17:31 2021
+++ pkgsrc/games/hitori/Makefile Sun May 2 10:24:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/04/12 13:17:31 nia Exp $
+# $NetBSD: Makefile,v 1.24 2021/05/02 10:24:48 nia Exp $
DISTNAME= hitori-3.38.0
CATEGORIES= games gnome
@@ -10,9 +10,7 @@ HOMEPAGE= https://wiki.gnome.org/Apps/Hi
COMMENT= Logic game similar to Sudoku
LICENSE= gnu-gpl-v3 AND cc-by-sa-v3.0
-USE_TOOLS+= msgfmt pkg-config xgettext
-
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
+USE_TOOLS+= msgfmt pkg-config xgettext itstool
.include "../../mk/bsd.prefs.mk"
# msgfmt: unknown option -- desktop
Index: pkgsrc/games/pioneers/Makefile
diff -u pkgsrc/games/pioneers/Makefile:1.73 pkgsrc/games/pioneers/Makefile:1.74
--- pkgsrc/games/pioneers/Makefile:1.73 Wed Apr 21 11:41:46 2021
+++ pkgsrc/games/pioneers/Makefile Sun May 2 10:24:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2021/04/21 11:41:46 adam Exp $
+# $NetBSD: Makefile,v 1.74 2021/05/02 10:24:49 nia Exp $
#
DISTNAME= pioneers-15.6
@@ -11,10 +11,8 @@ HOMEPAGE= http://pio.sourceforge.net/
COMMENT= GNOME version of the Settlers of Catan board game
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake pkg-config msgfmt intltool
+USE_TOOLS+= gmake pkg-config msgfmt intltool itstool
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
Index: pkgsrc/geography/viking/Makefile
diff -u pkgsrc/geography/viking/Makefile:1.119 pkgsrc/geography/viking/Makefile:1.120
--- pkgsrc/geography/viking/Makefile:1.119 Wed Apr 21 13:24:45 2021
+++ pkgsrc/geography/viking/Makefile Sun May 2 10:24:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2021/04/21 13:24:45 adam Exp $
+# $NetBSD: Makefile,v 1.120 2021/05/02 10:24:49 nia Exp $
#
VERSION= 1.9
@@ -14,13 +14,12 @@ COMMENT= Viking manages GPS data, suppo
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
# viking says it "will" use c++11, and mapnik (not yet included) needs
# c++11.
USE_LANGUAGES= c c++
USE_TOOLS+= gmake intltool msgfmt pkg-config
+USE_TOOLS+= itstool
GNU_CONFIGURE= yes
Index: pkgsrc/graphics/cheese/Makefile
diff -u pkgsrc/graphics/cheese/Makefile:1.95 pkgsrc/graphics/cheese/Makefile:1.96
--- pkgsrc/graphics/cheese/Makefile:1.95 Wed Apr 14 07:28:19 2021
+++ pkgsrc/graphics/cheese/Makefile Sun May 2 10:24:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2021/04/14 07:28:19 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2021/05/02 10:24:49 nia Exp $
DISTNAME= cheese-3.34.0
PKGREVISION= 6
@@ -11,11 +11,9 @@ HOMEPAGE= https://wiki.gnome.org/Apps/Ch
COMMENT= Use your webcam to take photos and videos
LICENSE= gnu-gpl-v2
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
DEPENDS+= gst-plugins1-v4l2-[0-9]*:../../multimedia/gst-plugins1-v4l2
-USE_TOOLS+= pkg-config msgfmt xgettext
+USE_TOOLS+= pkg-config msgfmt xgettext itstool
MESON_ARGS+= -Dgtk_doc=false
MESON_ARGS+= -Dman=false
Index: pkgsrc/graphics/eog/Makefile
diff -u pkgsrc/graphics/eog/Makefile:1.110 pkgsrc/graphics/eog/Makefile:1.111
--- pkgsrc/graphics/eog/Makefile:1.110 Wed Apr 21 11:41:51 2021
+++ pkgsrc/graphics/eog/Makefile Sun May 2 10:24:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2021/04/21 11:41:51 adam Exp $
+# $NetBSD: Makefile,v 1.111 2021/05/02 10:24:49 nia Exp $
DISTNAME= eog-3.38.0
PKGREVISION= 1
@@ -13,9 +13,7 @@ LICENSE= gnu-gpl-v2
PREV_PKGPATH= graphics/eog3
-USE_TOOLS+= msgfmt pkg-config xgettext
-
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
+USE_TOOLS+= msgfmt pkg-config xgettext itstool
# some linux-only packaging thing
MESON_ARGS+= -Dlibportal=false
Index: pkgsrc/graphics/shotwell/Makefile
diff -u pkgsrc/graphics/shotwell/Makefile:1.119 pkgsrc/graphics/shotwell/Makefile:1.120
--- pkgsrc/graphics/shotwell/Makefile:1.119 Wed Apr 21 13:24:50 2021
+++ pkgsrc/graphics/shotwell/Makefile Sun May 2 10:24:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2021/04/21 13:24:50 adam Exp $
+# $NetBSD: Makefile,v 1.120 2021/05/02 10:24:49 nia Exp $
DISTNAME= shotwell-0.30.8
PKGREVISION= 13
@@ -11,9 +11,7 @@ HOMEPAGE= https://wiki.gnome.org/Apps/Sh
COMMENT= Photo organizer for the GNOME desktop
LICENSE= gnu-lgpl-v2.1
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
-USE_TOOLS+= pkg-config msgfmt xgettext
+USE_TOOLS+= pkg-config msgfmt xgettext itstool
MESON_ARGS+= -Dudev=false
Index: pkgsrc/mail/balsa/Makefile
diff -u pkgsrc/mail/balsa/Makefile:1.165 pkgsrc/mail/balsa/Makefile:1.166
--- pkgsrc/mail/balsa/Makefile:1.165 Wed Apr 21 13:24:55 2021
+++ pkgsrc/mail/balsa/Makefile Sun May 2 10:24:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.165 2021/04/21 13:24:55 adam Exp $
+# $NetBSD: Makefile,v 1.166 2021/05/02 10:24:49 nia Exp $
DISTNAME= balsa-2.6.2
PKGREVISION= 2
@@ -12,12 +12,11 @@ COMMENT= Email client using GTK3
LICENSE= gnu-gpl-v3
USE_TOOLS+= gmake intltool perl pkg-config
-USE_TOOLS+= msgfmt msgmerge xgettext
+USE_TOOLS+= msgfmt msgmerge xgettext itstool
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
TOOL_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
TOOL_DEPENDS+= yelp-tools-[0-9]*:../../textproc/yelp-tools
Index: pkgsrc/mail/evolution/Makefile
diff -u pkgsrc/mail/evolution/Makefile:1.254 pkgsrc/mail/evolution/Makefile:1.255
--- pkgsrc/mail/evolution/Makefile:1.254 Wed Apr 21 11:40:28 2021
+++ pkgsrc/mail/evolution/Makefile Sun May 2 10:24:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.254 2021/04/21 11:40:28 adam Exp $
+# $NetBSD: Makefile,v 1.255 2021/05/02 10:24:49 nia Exp $
DISTNAME= evolution-3.34.1
PKGREVISION= 10
@@ -12,13 +12,12 @@ COMMENT= Mail and calendar client from G
LICENSE= gnu-gpl-v2
USE_CMAKE= yes
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config itstool
USE_TOOLS+= intltool msgfmt msgmerge xgettext
DEPENDS+= highlight-[0-9]*:../../textproc/highlight
TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/evolution
Index: pkgsrc/math/gnome-calculator/Makefile
diff -u pkgsrc/math/gnome-calculator/Makefile:1.51 pkgsrc/math/gnome-calculator/Makefile:1.52
--- pkgsrc/math/gnome-calculator/Makefile:1.51 Wed Apr 21 11:42:10 2021
+++ pkgsrc/math/gnome-calculator/Makefile Sun May 2 10:24:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2021/04/21 11:42:10 adam Exp $
+# $NetBSD: Makefile,v 1.52 2021/05/02 10:24:49 nia Exp $
DISTNAME= gnome-calculator-3.24.0
PKGREVISION= 29
@@ -12,13 +12,12 @@ COMMENT= Desktop calculator for GNOME
LICENSE= gnu-gpl-v2
DEPENDS+= gnome-icon-theme-symbolic-[0-9]*:../../graphics/gnome-icon-theme-symbolic
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
CONFLICTS+= gcalctool-[0-9]*
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
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
Index: pkgsrc/math/gnumeric112/Makefile
diff -u pkgsrc/math/gnumeric112/Makefile:1.73 pkgsrc/math/gnumeric112/Makefile:1.74
--- pkgsrc/math/gnumeric112/Makefile:1.73 Wed Apr 21 11:42:10 2021
+++ pkgsrc/math/gnumeric112/Makefile Sun May 2 10:24:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2021/04/21 11:42:10 adam Exp $
+# $NetBSD: Makefile,v 1.74 2021/05/02 10:24:50 nia Exp $
DISTNAME= gnumeric-1.12.48
PKGREVISION= 1
@@ -11,12 +11,12 @@ HOMEPAGE= http://www.gnumeric.org/
COMMENT= Spreadsheet program from the GNOME project
LICENSE= gnu-gpl-v2 OR gnu-gpl-v3
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config yacc
+USE_TOOLS+= itstool
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE= libspreadsheet.pc.in
Index: pkgsrc/meta-pkgs/mate/Makefile.common
diff -u pkgsrc/meta-pkgs/mate/Makefile.common:1.11 pkgsrc/meta-pkgs/mate/Makefile.common:1.12
--- pkgsrc/meta-pkgs/mate/Makefile.common:1.11 Mon Aug 24 04:41:40 2020
+++ pkgsrc/meta-pkgs/mate/Makefile.common Sun May 2 10:24:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2020/08/24 04:41:40 gutteridge Exp $
+# $NetBSD: Makefile.common,v 1.12 2021/05/02 10:24:50 nia Exp $
# used by meta-pkgs/mate/Makefile
# used by print/atril/Makefile
# used by sysutils/caja/Makefile
@@ -44,7 +44,7 @@ EXTRACT_SUFX= .tar.xz
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake msgfmt itstool pkg-config
# Fails without GNU msgfmt
_TOOLS_USE_PKGSRC.msgfmt= yes
@@ -52,7 +52,6 @@ _TOOLS_USE_PKGSRC.msgfmt= yes
MAINTAINER= youri%NetBSD.org@localhost
LICENSE= gnu-gpl-v3
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
TOOL_DEPENDS+= ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2
Index: pkgsrc/misc/mate-calc/Makefile
diff -u pkgsrc/misc/mate-calc/Makefile:1.16 pkgsrc/misc/mate-calc/Makefile:1.17
--- pkgsrc/misc/mate-calc/Makefile:1.16 Wed Apr 21 11:42:15 2021
+++ pkgsrc/misc/mate-calc/Makefile Sun May 2 10:24:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/04/21 11:42:15 adam Exp $
+# $NetBSD: Makefile,v 1.17 2021/05/02 10:24:50 nia Exp $
PKGREVISION= 5
.include "../../meta-pkgs/mate/Makefile.common"
@@ -8,8 +8,6 @@ CATEGORIES= misc
COMMENT= Calculator for MATE Desktop
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
USE_LANGUAGES= c
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
Index: pkgsrc/misc/mate-utils/Makefile
diff -u pkgsrc/misc/mate-utils/Makefile:1.27 pkgsrc/misc/mate-utils/Makefile:1.28
--- pkgsrc/misc/mate-utils/Makefile:1.27 Mon Aug 24 04:41:40 2020
+++ pkgsrc/misc/mate-utils/Makefile Sun May 2 10:24:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/08/24 04:41:40 gutteridge Exp $
+# $NetBSD: Makefile,v 1.28 2021/05/02 10:24:50 nia Exp $
PKGREVISION= 2
.include "../../meta-pkgs/mate/Makefile.common"
@@ -10,7 +10,6 @@ COMMENT= Utilities for MATE Desktop
USE_LANGUAGES= c c++
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
PKGCONFIG_OVERRIDE+= mate-dictionary/libgdict/mate-dict.pc.in
Index: pkgsrc/misc/orca/Makefile
diff -u pkgsrc/misc/orca/Makefile:1.55 pkgsrc/misc/orca/Makefile:1.56
--- pkgsrc/misc/orca/Makefile:1.55 Fri Dec 4 20:45:30 2020
+++ pkgsrc/misc/orca/Makefile Sun May 2 10:24:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2020/12/04 20:45:30 nia Exp $
+# $NetBSD: Makefile,v 1.56 2021/05/02 10:24:50 nia Exp $
DISTNAME= orca-3.34.1
PKGREVISION= 4
@@ -11,8 +11,6 @@ HOMEPAGE= https://wiki.gnome.org/Project
COMMENT= Screen reader
LICENSE= gnu-lgpl-v2.1
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
DEPENDS+= ${PYPKGPREFIX}-at-spi2-[0-9]*:../../devel/py-at-spi2
DEPENDS+= ${PYPKGPREFIX}-dbus-[0-9]*:../../sysutils/py-dbus
@@ -21,7 +19,7 @@ DEPENDS+= ${PYPKGPREFIX}-gstreamer1-[0-9
GNU_CONFIGURE= yes
PY_PATCHPLIST= yes
-USE_TOOLS+= pkg-config gmake
+USE_TOOLS+= pkg-config gmake itstool
USE_TOOLS+= msgfmt msgmerge xgettext
# XXX msgfmt: unknown option -- desktop
Index: pkgsrc/misc/yelp3/Makefile
diff -u pkgsrc/misc/yelp3/Makefile:1.75 pkgsrc/misc/yelp3/Makefile:1.76
--- pkgsrc/misc/yelp3/Makefile:1.75 Wed Apr 21 11:42:16 2021
+++ pkgsrc/misc/yelp3/Makefile Sun May 2 10:24:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2021/04/21 11:42:16 adam Exp $
+# $NetBSD: Makefile,v 1.76 2021/05/02 10:24:50 nia Exp $
DISTNAME= yelp-3.32.0
PKGREVISION= 9
@@ -11,13 +11,11 @@ HOMEPAGE= https://www.gnome.org/
COMMENT= Mallard capable help browser
LICENSE= gnu-gpl-v2 AND apache-2.0
-USE_TOOLS+= gmake intltool msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config itstool
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
# Requires --desktop in msgfmt.
_TOOLS_USE_PKGSRC.msgfmt= yes
Index: pkgsrc/mk/tools/bsd.tools.mk
diff -u pkgsrc/mk/tools/bsd.tools.mk:1.62 pkgsrc/mk/tools/bsd.tools.mk:1.63
--- pkgsrc/mk/tools/bsd.tools.mk:1.62 Wed May 13 04:24:17 2020
+++ pkgsrc/mk/tools/bsd.tools.mk Sun May 2 10:24:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.62 2020/05/13 04:24:17 rillig Exp $
+# $NetBSD: bsd.tools.mk,v 1.63 2021/05/02 10:24:50 nia Exp $
#
# Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -153,6 +153,7 @@ post-tools:
.include "strip.mk"
.include "cmake.mk"
.include "imake.mk"
+.include "itstool.mk"
.include "zip.mk"
.include "replace.mk"
.include "perl.mk"
Index: pkgsrc/multimedia/pitivi/Makefile
diff -u pkgsrc/multimedia/pitivi/Makefile:1.60 pkgsrc/multimedia/pitivi/Makefile:1.61
--- pkgsrc/multimedia/pitivi/Makefile:1.60 Fri Dec 4 20:45:31 2020
+++ pkgsrc/multimedia/pitivi/Makefile Sun May 2 10:24:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2020/12/04 20:45:31 nia Exp $
+# $NetBSD: Makefile,v 1.61 2021/05/02 10:24:50 nia Exp $
DISTNAME= pitivi-0.999
PKGREVISION= 4
@@ -11,9 +11,7 @@ HOMEPAGE= http://www.pitivi.org/
COMMENT= Video editor using GStreamer/GTK
LICENSE= gnu-lgpl-v2.1
-USE_TOOLS+= pkg-config intltool msgfmt xgettext
-
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
+USE_TOOLS+= pkg-config intltool msgfmt xgettext itstool
DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
DEPENDS+= ${PYPKGPREFIX}-gstreamer1-[0-9]*:../../multimedia/py-gstreamer1
Index: pkgsrc/multimedia/totem/Makefile
diff -u pkgsrc/multimedia/totem/Makefile:1.115 pkgsrc/multimedia/totem/Makefile:1.116
--- pkgsrc/multimedia/totem/Makefile:1.115 Wed Apr 21 13:25:05 2021
+++ pkgsrc/multimedia/totem/Makefile Sun May 2 10:24:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2021/04/21 13:25:05 adam Exp $
+# $NetBSD: Makefile,v 1.116 2021/05/02 10:24:50 nia Exp $
DISTNAME= totem-3.34.1
PKGREVISION= 10
@@ -11,9 +11,7 @@ HOMEPAGE= https://wiki.gnome.org/Apps/Vi
COMMENT= Movie player designed for GNOME
LICENSE= gnu-gpl-v2
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
-USE_TOOLS+= pkg-config msgfmt xgettext
+USE_TOOLS+= pkg-config msgfmt xgettext itstool
MESON_ARGS+= -Denable-python=no
Index: pkgsrc/net/etherape/Makefile
diff -u pkgsrc/net/etherape/Makefile:1.110 pkgsrc/net/etherape/Makefile:1.111
--- pkgsrc/net/etherape/Makefile:1.110 Fri Apr 9 14:03:14 2021
+++ pkgsrc/net/etherape/Makefile Sun May 2 10:24:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2021/04/09 14:03:14 nia Exp $
+# $NetBSD: Makefile,v 1.111 2021/05/02 10:24:51 nia Exp $
DISTNAME= etherape-0.9.19
CATEGORIES= net
@@ -9,10 +9,9 @@ HOMEPAGE= https://etherape.sourceforge.i
COMMENT= Graphical network monitor
LICENSE= gnu-gpl-v2 # or later
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
-USE_TOOLS+= gmake pkg-config
+USE_TOOLS+= gmake pkg-config itstool
USE_TOOLS+= msgfmt msgmerge xgettext
GNU_CONFIGURE= yes
Index: pkgsrc/net/gnome-nettool/Makefile
diff -u pkgsrc/net/gnome-nettool/Makefile:1.46 pkgsrc/net/gnome-nettool/Makefile:1.47
--- pkgsrc/net/gnome-nettool/Makefile:1.46 Mon Aug 31 18:10:34 2020
+++ pkgsrc/net/gnome-nettool/Makefile Sun May 2 10:24:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2020/08/31 18:10:34 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2021/05/02 10:24:51 nia Exp $
DISTNAME= gnome-nettool-3.8.1
PKGREVISION= 4
@@ -11,13 +11,12 @@ HOMEPAGE= https://gitlab.gnome.org/GNOME
COMMENT= GNOME interface for various network tools
LICENSE= gnu-gpl-v2
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
TOOL_DEPENDS+= p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML
GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config perl gmake
+USE_TOOLS+= pkg-config perl gmake itstool
USE_TOOLS+= intltool msgfmt msgmerge xgettext
.include "../../devel/glib2/schemas.mk"
Index: pkgsrc/net/grilo-plugins/Makefile
diff -u pkgsrc/net/grilo-plugins/Makefile:1.41 pkgsrc/net/grilo-plugins/Makefile:1.42
--- pkgsrc/net/grilo-plugins/Makefile:1.41 Wed Apr 21 13:25:08 2021
+++ pkgsrc/net/grilo-plugins/Makefile Sun May 2 10:24:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2021/04/21 13:25:08 adam Exp $
+# $NetBSD: Makefile,v 1.42 2021/05/02 10:24:51 nia Exp $
DISTNAME= grilo-plugins-0.3.10
PKGREVISION= 8
@@ -12,9 +12,8 @@ COMMENT= Plugins for grilo media browser
LICENSE= gnu-lgpl-v2
TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-USE_TOOLS+= pkg-config xgettext
+USE_TOOLS+= pkg-config xgettext itstool
PYTHON_FOR_BUILD_ONLY= tool
Index: pkgsrc/net/mate-user-share/Makefile
diff -u pkgsrc/net/mate-user-share/Makefile:1.23 pkgsrc/net/mate-user-share/Makefile:1.24
--- pkgsrc/net/mate-user-share/Makefile:1.23 Mon Aug 24 04:41:40 2020
+++ pkgsrc/net/mate-user-share/Makefile Sun May 2 10:24:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2020/08/24 04:41:40 gutteridge Exp $
+# $NetBSD: Makefile,v 1.24 2021/05/02 10:24:51 nia Exp $
PKGREVISION= 2
.include "../../meta-pkgs/mate/Makefile.common"
@@ -9,7 +9,6 @@ CATEGORIES= net
COMMENT= MATE user-level file sharing
DEPENDS+= ${APACHE_PKG_PREFIX}-dnssd>=0.6:../../www/ap22-dnssd
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
Index: pkgsrc/net/vinagre/Makefile
diff -u pkgsrc/net/vinagre/Makefile:1.102 pkgsrc/net/vinagre/Makefile:1.103
--- pkgsrc/net/vinagre/Makefile:1.102 Wed Apr 21 13:25:14 2021
+++ pkgsrc/net/vinagre/Makefile Sun May 2 10:24:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2021/04/21 13:25:14 adam Exp $
+# $NetBSD: Makefile,v 1.103 2021/05/02 10:24:51 nia Exp $
#
DISTNAME= vinagre-3.6.2
@@ -12,11 +12,9 @@ HOMEPAGE= https://projects.gnome.org/vin
COMMENT= VNC client for GNOME
LICENSE= gnu-gpl-v3
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake intltool pkg-config
+USE_TOOLS+= gmake intltool pkg-config itstool
USE_TOOLS+= msgfmt msgmerge xgettext
USE_LANGUAGES= c99 c++
Index: pkgsrc/news/pan/Makefile
diff -u pkgsrc/news/pan/Makefile:1.110 pkgsrc/news/pan/Makefile:1.111
--- pkgsrc/news/pan/Makefile:1.110 Wed Apr 21 13:25:15 2021
+++ pkgsrc/news/pan/Makefile Sun May 2 10:24:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2021/04/21 13:25:15 adam Exp $
+# $NetBSD: Makefile,v 1.111 2021/05/02 10:24:51 nia Exp $
DISTNAME= pan-0.146
PKGREVISION= 6
@@ -11,9 +11,7 @@ HOMEPAGE= http://pan.rebelbase.com/
COMMENT= Newsreader for GTK2
LICENSE= gnu-gpl-v2
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
-USE_TOOLS+= gmake msgfmt perl pkg-config
+USE_TOOLS+= gmake msgfmt perl pkg-config itstool
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
Index: pkgsrc/print/evince3/Makefile.common
diff -u pkgsrc/print/evince3/Makefile.common:1.21 pkgsrc/print/evince3/Makefile.common:1.22
--- pkgsrc/print/evince3/Makefile.common:1.21 Thu Dec 12 14:15:50 2019
+++ pkgsrc/print/evince3/Makefile.common Sun May 2 10:24:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2019/12/12 14:15:50 leot Exp $
+# $NetBSD: Makefile.common,v 1.22 2021/05/02 10:24:51 nia Exp $
#
# used by print/evince3/Makefile
# would probably be used by print/evince3-nautilus/Makefile if that existed
@@ -19,7 +19,7 @@ DISTINFO_FILE= ${.CURDIR}/../../print/e
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake intltool msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config itstool
USE_LANGUAGES= c c++
# Requires --desktop in msgfmt.
@@ -31,7 +31,6 @@ CONFIGURE_ARGS+= --without-gspell
CONFIGURE_ARGS+= --disable-libgnome-desktop
TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
# XXX fake for "configure" to allow build w/o a gs installed
# (avoid hard dependency on a specific version)
Index: pkgsrc/print/glabels/Makefile
diff -u pkgsrc/print/glabels/Makefile:1.118 pkgsrc/print/glabels/Makefile:1.119
--- pkgsrc/print/glabels/Makefile:1.118 Wed Apr 21 11:42:32 2021
+++ pkgsrc/print/glabels/Makefile Sun May 2 10:24:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2021/04/21 11:42:32 adam Exp $
+# $NetBSD: Makefile,v 1.119 2021/05/02 10:24:51 nia Exp $
DISTNAME= glabels-3.4.1
PKGREVISION= 7
@@ -14,10 +14,9 @@ LICENSE= gnu-gpl-v3
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= intltool pkg-config perl gmake
+USE_TOOLS+= intltool pkg-config perl gmake itstool
USE_TOOLS+= msgfmt msgmerge xgettext
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
PKGCONFIG_OVERRIDE+= libglabels/libglabels-3.0.pc.in
Index: pkgsrc/security/seahorse/Makefile
diff -u pkgsrc/security/seahorse/Makefile:1.165 pkgsrc/security/seahorse/Makefile:1.166
--- pkgsrc/security/seahorse/Makefile:1.165 Wed Apr 21 11:42:37 2021
+++ pkgsrc/security/seahorse/Makefile Sun May 2 10:24:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.165 2021/04/21 11:42:37 adam Exp $
+# $NetBSD: Makefile,v 1.166 2021/05/02 10:24:51 nia Exp $
DISTNAME= seahorse-3.38.0.1
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/3.38/}
@@ -12,9 +12,8 @@ COMMENT= GNOME encryption interface
LICENSE= gnu-gpl-v2
TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-USE_TOOLS+= pkg-config msgfmt xgettext
+USE_TOOLS+= pkg-config msgfmt xgettext itstool
# Why does it want specific point releases?
MESON_ARGS+= -Dcheck-compatible-gpg=false
Index: pkgsrc/sysutils/brasero/Makefile
diff -u pkgsrc/sysutils/brasero/Makefile:1.93 pkgsrc/sysutils/brasero/Makefile:1.94
--- pkgsrc/sysutils/brasero/Makefile:1.93 Wed Apr 21 11:42:38 2021
+++ pkgsrc/sysutils/brasero/Makefile Sun May 2 10:24:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2021/04/21 11:42:38 adam Exp $
+# $NetBSD: Makefile,v 1.94 2021/05/02 10:24:52 nia Exp $
DISTNAME= brasero-3.12.2
PKGREVISION= 7
@@ -14,11 +14,10 @@ LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= intltool pkg-config perl
-USE_TOOLS+= msgfmt xgettext
+USE_TOOLS+= msgfmt xgettext itstool
USE_TOOLS+= gmake
TOOL_DEPENDS+= p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
CONFIGURE_ARGS+= --disable-nautilus
CONFIGURE_ARGS+= --enable-compile-warnings=minimum # Disable Werror
Index: pkgsrc/textproc/gnome-dictionary/Makefile
diff -u pkgsrc/textproc/gnome-dictionary/Makefile:1.4 pkgsrc/textproc/gnome-dictionary/Makefile:1.5
--- pkgsrc/textproc/gnome-dictionary/Makefile:1.4 Thu Dec 31 05:04:08 2020
+++ pkgsrc/textproc/gnome-dictionary/Makefile Sun May 2 10:24:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/12/31 05:04:08 gutteridge Exp $
+# $NetBSD: Makefile,v 1.5 2021/05/02 10:24:52 nia Exp $
DISTNAME= gnome-dictionary-3.26.1
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
@@ -15,9 +15,8 @@ _TOOLS_USE_PKGSRC.msgfmt= yes
TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-USE_TOOLS+= pkg-config msgfmt xgettext
+USE_TOOLS+= pkg-config msgfmt xgettext itstool
PYTHON_FOR_BUILD_ONLY= tool
Index: pkgsrc/textproc/gtk-doc/Makefile
diff -u pkgsrc/textproc/gtk-doc/Makefile:1.85 pkgsrc/textproc/gtk-doc/Makefile:1.86
--- pkgsrc/textproc/gtk-doc/Makefile:1.85 Wed Apr 21 11:42:46 2021
+++ pkgsrc/textproc/gtk-doc/Makefile Sun May 2 10:24:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2021/04/21 11:42:46 adam Exp $
+# $NetBSD: Makefile,v 1.86 2021/05/02 10:24:52 nia Exp $
DISTNAME= gtk-doc-1.32
PKGREVISION= 6
@@ -16,7 +16,6 @@ DEPENDS+= docbook-xsl>=1.68.1:../../text
DEPENDS+= ${PYPKGPREFIX}-anytree-[0-9]*:../../devel/py-anytree
DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
TEST_DEPENDS+= ${PYPKGPREFIX}-parameterized-[0-9]*:../../devel/py-parameterized
@@ -24,6 +23,7 @@ GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE= gtk-doc.pc.in
CONFIGURE_ARGS+= --with-xml-catalog=${XML_DEFAULT_CATALOG:Q}
USE_TOOLS+= gmake pkg-config:run msgfmt
+USE_TOOLS+= itstool
SUBST_CLASSES+= fix-pc
SUBST_STAGE.fix-pc= pre-configure
Index: pkgsrc/textproc/yelp-xsl/Makefile
diff -u pkgsrc/textproc/yelp-xsl/Makefile:1.20 pkgsrc/textproc/yelp-xsl/Makefile:1.21
--- pkgsrc/textproc/yelp-xsl/Makefile:1.20 Tue Apr 13 10:02:53 2021
+++ pkgsrc/textproc/yelp-xsl/Makefile Sun May 2 10:24:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/04/13 10:02:53 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2021/05/02 10:24:52 nia Exp $
DISTNAME= yelp-xsl-3.32.1
PKGREVISION= 1
@@ -11,10 +11,8 @@ HOMEPAGE= https://www.gnome.org/
COMMENT= XSL stylesheets for Yelp help browser
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config intltool msgfmt
+USE_TOOLS+= pkg-config intltool msgfmt itstool
USE_PKGLOCALEDIR= yes
PYTHON_FOR_BUILD_ONLY= tool
Index: pkgsrc/wm/marco/Makefile
diff -u pkgsrc/wm/marco/Makefile:1.28 pkgsrc/wm/marco/Makefile:1.29
--- pkgsrc/wm/marco/Makefile:1.28 Thu Apr 29 03:06:02 2021
+++ pkgsrc/wm/marco/Makefile Sun May 2 10:24:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2021/04/29 03:06:02 gutteridge Exp $
+# $NetBSD: Makefile,v 1.29 2021/05/02 10:24:52 nia Exp $
.include "../../meta-pkgs/mate/Makefile.common"
@@ -10,7 +10,6 @@ COMMENT= Fork of GNOME Metacity
USE_LANGUAGES= c99
BUILD_DEPENDS+= gdk-pixbuf2-[0-9]*:../../graphics/gdk-pixbuf2
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
DEPENDS+= zenity-[0-9]*:../../x11/zenity
Index: pkgsrc/www/epiphany/Makefile
diff -u pkgsrc/www/epiphany/Makefile:1.202 pkgsrc/www/epiphany/Makefile:1.203
--- pkgsrc/www/epiphany/Makefile:1.202 Wed Apr 21 11:42:53 2021
+++ pkgsrc/www/epiphany/Makefile Sun May 2 10:24:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202 2021/04/21 11:42:53 adam Exp $
+# $NetBSD: Makefile,v 1.203 2021/05/02 10:24:52 nia Exp $
DISTNAME= epiphany-3.36.2
PKGREVISION= 3
@@ -12,9 +12,8 @@ COMMENT= Web browser for the GNOME deskt
LICENSE= gnu-gpl-v2
TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-USE_TOOLS+= pkg-config msgfmt xgettext
+USE_TOOLS+= pkg-config msgfmt xgettext itstool
MESON_ARGS+= -Dunit_tests=disabled
Index: pkgsrc/x11/gnome-terminal/Makefile
diff -u pkgsrc/x11/gnome-terminal/Makefile:1.95 pkgsrc/x11/gnome-terminal/Makefile:1.96
--- pkgsrc/x11/gnome-terminal/Makefile:1.95 Thu Aug 27 12:26:13 2020
+++ pkgsrc/x11/gnome-terminal/Makefile Sun May 2 10:24:52 2021
@@ -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
Index: pkgsrc/x11/gtksourceview3/Makefile
diff -u pkgsrc/x11/gtksourceview3/Makefile:1.55 pkgsrc/x11/gtksourceview3/Makefile:1.56
--- pkgsrc/x11/gtksourceview3/Makefile:1.55 Wed Apr 21 11:40:45 2021
+++ pkgsrc/x11/gtksourceview3/Makefile Sun May 2 10:24:52 2021
@@ -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)
Index: pkgsrc/x11/gtksourceview4/Makefile
diff -u pkgsrc/x11/gtksourceview4/Makefile:1.20 pkgsrc/x11/gtksourceview4/Makefile:1.21
--- pkgsrc/x11/gtksourceview4/Makefile:1.20 Wed Apr 21 11:40:45 2021
+++ pkgsrc/x11/gtksourceview4/Makefile Sun May 2 10:24:53 2021
@@ -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/Project
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
Index: pkgsrc/x11/mate-applets/Makefile
diff -u pkgsrc/x11/mate-applets/Makefile:1.39 pkgsrc/x11/mate-applets/Makefile:1.40
--- pkgsrc/x11/mate-applets/Makefile:1.39 Wed Apr 21 11:43:00 2021
+++ pkgsrc/x11/mate-applets/Makefile Sun May 2 10:24:53 2021
@@ -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}
Index: pkgsrc/x11/mate-control-center/Makefile
diff -u pkgsrc/x11/mate-control-center/Makefile:1.30 pkgsrc/x11/mate-control-center/Makefile:1.31
--- pkgsrc/x11/mate-control-center/Makefile:1.30 Wed Apr 21 11:40:48 2021
+++ pkgsrc/x11/mate-control-center/Makefile Sun May 2 10:24:53 2021
@@ -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
Index: pkgsrc/x11/mate-desktop/Makefile
diff -u pkgsrc/x11/mate-desktop/Makefile:1.29 pkgsrc/x11/mate-desktop/Makefile:1.30
--- pkgsrc/x11/mate-desktop/Makefile:1.29 Mon Aug 24 04:41:42 2020
+++ pkgsrc/x11/mate-desktop/Makefile Sun May 2 10:24:53 2021
@@ -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
Index: pkgsrc/x11/mate-panel/Makefile
diff -u pkgsrc/x11/mate-panel/Makefile:1.39 pkgsrc/x11/mate-panel/Makefile:1.40
--- pkgsrc/x11/mate-panel/Makefile:1.39 Wed Apr 21 11:43:00 2021
+++ pkgsrc/x11/mate-panel/Makefile Sun May 2 10:24:53 2021
@@ -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
Index: pkgsrc/x11/mate-terminal/Makefile
diff -u pkgsrc/x11/mate-terminal/Makefile:1.27 pkgsrc/x11/mate-terminal/Makefile:1.28
--- pkgsrc/x11/mate-terminal/Makefile:1.27 Thu Apr 15 05:36:03 2021
+++ pkgsrc/x11/mate-terminal/Makefile Sun May 2 10:24:53 2021
@@ -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"
Added files:
Index: pkgsrc/mk/tools/itstool.mk
diff -u /dev/null pkgsrc/mk/tools/itstool.mk:1.1
--- /dev/null Sun May 2 10:24:54 2021
+++ pkgsrc/mk/tools/itstool.mk Sun May 2 10:24:50 2021
@@ -0,0 +1,17 @@
+# $NetBSD: itstool.mk,v 1.1 2021/05/02 10:24:50 nia Exp $
+
+.if !empty(USE_TOOLS:Mitstool)
+TOOLS_CREATE+= itstool
+TOOLS_DEPENDS.itstool?= itstool-[0-9]*:../../textproc/itstool
+TOOLS_PATH.itstool= ${PREFIX}/bin/itstool
+.else
+#
+# If a package doesn't explicitly say it uses itstool, then create a "broken"
+# itstool in the tools directory.
+#
+TOOLS_FAIL+= itstool
+TOOLS_PATH.itstool= ${TOOLS_CMD.itstool}
+.endif
+
+CONFIGURE_ENV+= ITSTOOL=${TOOLS_CMD.itstool:Q}
+MAKE_ENV+= ITSTOOL=${TOOLS_CMD.itstool:Q}
Home |
Main Index |
Thread Index |
Old Index