pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc *: Use the tools framework for itstool
details: https://anonhg.NetBSD.org/pkgsrc/rev/98fe1434afa5
branches: trunk
changeset: 451831:98fe1434afa5
user: nia <nia%pkgsrc.org@localhost>
date: Sun May 02 10:24:47 2021 +0000
description:
*: 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
diffstat:
archivers/file-roller/Makefile | 6 ++----
audio/ardour/Makefile | 6 ++----
audio/easytag/Makefile | 5 ++---
audio/rhythmbox/Makefile | 4 ++--
audio/sound-juicer/Makefile | 5 ++---
databases/libgda/Makefile.common | 5 ++---
devel/anjuta/Makefile | 5 ++---
devel/devhelp/Makefile | 6 ++----
devel/glade/Makefile | 4 ++--
devel/meld/Makefile | 5 ++---
editors/gedit/Makefile | 4 ++--
editors/ghex/Makefile | 6 ++----
editors/gtranslator/Makefile | 5 ++---
editors/pluma/Makefile | 5 ++---
games/gbrainy/Makefile | 6 ++----
games/gnome-sudoku/Makefile | 5 ++---
games/hitori/Makefile | 6 ++----
games/pioneers/Makefile | 6 ++----
geography/viking/Makefile | 5 ++---
graphics/cheese/Makefile | 6 ++----
graphics/eog/Makefile | 6 ++----
graphics/shotwell/Makefile | 6 ++----
mail/balsa/Makefile | 5 ++---
mail/evolution/Makefile | 5 ++---
math/gnome-calculator/Makefile | 5 ++---
math/gnumeric112/Makefile | 4 ++--
meta-pkgs/mate/Makefile.common | 5 ++---
misc/mate-calc/Makefile | 4 +---
misc/mate-utils/Makefile | 3 +--
misc/orca/Makefile | 6 ++----
misc/yelp3/Makefile | 6 ++----
mk/tools/bsd.tools.mk | 3 ++-
mk/tools/itstool.mk | 17 +++++++++++++++++
multimedia/pitivi/Makefile | 6 ++----
multimedia/totem/Makefile | 6 ++----
net/etherape/Makefile | 5 ++---
net/gnome-nettool/Makefile | 5 ++---
net/grilo-plugins/Makefile | 5 ++---
net/mate-user-share/Makefile | 3 +--
net/vinagre/Makefile | 6 ++----
news/pan/Makefile | 6 ++----
print/evince3/Makefile.common | 5 ++---
print/glabels/Makefile | 5 ++---
security/seahorse/Makefile | 5 ++---
sysutils/brasero/Makefile | 5 ++---
textproc/gnome-dictionary/Makefile | 5 ++---
textproc/gtk-doc/Makefile | 4 ++--
textproc/yelp-xsl/Makefile | 6 ++----
wm/marco/Makefile | 3 +--
www/epiphany/Makefile | 5 ++---
x11/gnome-terminal/Makefile | 5 ++---
x11/gtksourceview3/Makefile | 6 ++----
x11/gtksourceview4/Makefile | 6 ++----
x11/mate-applets/Makefile | 3 +--
x11/mate-control-center/Makefile | 4 +---
x11/mate-desktop/Makefile | 3 +--
x11/mate-panel/Makefile | 3 +--
x11/mate-terminal/Makefile | 3 +--
58 files changed, 122 insertions(+), 176 deletions(-)
diffs (truncated from 1241 to 300 lines):
diff -r 0188254563aa -r 98fe1434afa5 archivers/file-roller/Makefile
--- a/archivers/file-roller/Makefile Sun May 02 10:20:42 2021 +0000
+++ b/archivers/file-roller/Makefile Sun May 02 10:24:47 2021 +0000
@@ -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 @@
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
diff -r 0188254563aa -r 98fe1434afa5 audio/ardour/Makefile
--- a/audio/ardour/Makefile Sun May 02 10:20:42 2021 +0000
+++ b/audio/ardour/Makefile Sun May 02 10:24:47 2021 +0000
@@ -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 @@
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}
diff -r 0188254563aa -r 98fe1434afa5 audio/easytag/Makefile
--- a/audio/easytag/Makefile Sun May 02 10:20:42 2021 +0000
+++ b/audio/easytag/Makefile Sun May 02 10:24:47 2021 +0000
@@ -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 @@
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
diff -r 0188254563aa -r 98fe1434afa5 audio/rhythmbox/Makefile
--- a/audio/rhythmbox/Makefile Sun May 02 10:20:42 2021 +0000
+++ b/audio/rhythmbox/Makefile Sun May 02 10:24:47 2021 +0000
@@ -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 @@
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+= --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
diff -r 0188254563aa -r 98fe1434afa5 audio/sound-juicer/Makefile
--- a/audio/sound-juicer/Makefile Sun May 02 10:20:42 2021 +0000
+++ b/audio/sound-juicer/Makefile Sun May 02 10:24:47 2021 +0000
@@ -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 @@
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
diff -r 0188254563aa -r 98fe1434afa5 databases/libgda/Makefile.common
--- a/databases/libgda/Makefile.common Sun May 02 10:20:42 2021 +0000
+++ b/databases/libgda/Makefile.common Sun May 02 10:24:47 2021 +0000
@@ -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 @@
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
diff -r 0188254563aa -r 98fe1434afa5 devel/anjuta/Makefile
--- a/devel/anjuta/Makefile Sun May 02 10:20:42 2021 +0000
+++ b/devel/anjuta/Makefile Sun May 02 10:24:47 2021 +0000
@@ -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+= 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
diff -r 0188254563aa -r 98fe1434afa5 devel/devhelp/Makefile
--- a/devel/devhelp/Makefile Sun May 02 10:20:42 2021 +0000
+++ b/devel/devhelp/Makefile Sun May 02 10:24:47 2021 +0000
@@ -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 @@
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
diff -r 0188254563aa -r 98fe1434afa5 devel/glade/Makefile
--- a/devel/glade/Makefile Sun May 02 10:20:42 2021 +0000
+++ b/devel/glade/Makefile Sun May 02 10:24:47 2021 +0000
@@ -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 @@
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
diff -r 0188254563aa -r 98fe1434afa5 devel/meld/Makefile
--- a/devel/meld/Makefile Sun May 02 10:20:42 2021 +0000
+++ b/devel/meld/Makefile Sun May 02 10:24:47 2021 +0000
@@ -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 @@
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
diff -r 0188254563aa -r 98fe1434afa5 editors/gedit/Makefile
--- a/editors/gedit/Makefile Sun May 02 10:20:42 2021 +0000
+++ b/editors/gedit/Makefile Sun May 02 10:24:47 2021 +0000
@@ -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 @@
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 @@
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 {} \;
diff -r 0188254563aa -r 98fe1434afa5 editors/ghex/Makefile
--- a/editors/ghex/Makefile Sun May 02 10:20:42 2021 +0000
+++ b/editors/ghex/Makefile Sun May 02 10:24:47 2021 +0000
@@ -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 @@
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
diff -r 0188254563aa -r 98fe1434afa5 editors/gtranslator/Makefile
--- a/editors/gtranslator/Makefile Sun May 02 10:20:42 2021 +0000
+++ b/editors/gtranslator/Makefile Sun May 02 10:24:47 2021 +0000
@@ -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 @@
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
diff -r 0188254563aa -r 98fe1434afa5 editors/pluma/Makefile
--- a/editors/pluma/Makefile Sun May 02 10:20:42 2021 +0000
+++ b/editors/pluma/Makefile Sun May 02 10:24:47 2021 +0000
@@ -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 $
Home |
Main Index |
Thread Index |
Old Index