pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

*: remove gmake from tools for meson users



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Tue Apr 13 12:08:34 2021 +0200
Changeset:	a85d82effb7a797eee7d2c75b162f724f805f233

Modified Files:
	MesaLib-dfbsd-meson/Makefile
	MesaLib-dfbsd/Makefile
	cinnamon-desktop/Makefile
	cinnamon-menus/Makefile
	cinnamon-screensaver/Makefile
	cinnamon-session/Makefile
	elogind/Makefile
	eolie/Makefile
	gdm/Makefile
	json-glib/Makefile
	libdrm-dfbsd-meson/Makefile
	libdrm-dfbsd/Makefile
	modular-xorg-server-dfbsd-meson/Makefile.common
	modular-xorg-server-dfbsd/Makefile.common
	nemo/Makefile
	pango/Makefile

Log Message:
*: remove gmake from tools for meson users

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a85d82effb7a797eee7d2c75b162f724f805f233

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 MesaLib-dfbsd-meson/Makefile                    | 4 ++--
 MesaLib-dfbsd/Makefile                          | 4 ++--
 cinnamon-desktop/Makefile                       | 2 +-
 cinnamon-menus/Makefile                         | 2 +-
 cinnamon-screensaver/Makefile                   | 2 +-
 cinnamon-session/Makefile                       | 2 +-
 elogind/Makefile                                | 2 +-
 eolie/Makefile                                  | 2 +-
 gdm/Makefile                                    | 3 +--
 json-glib/Makefile                              | 2 +-
 libdrm-dfbsd-meson/Makefile                     | 2 +-
 libdrm-dfbsd/Makefile                           | 2 +-
 modular-xorg-server-dfbsd-meson/Makefile.common | 4 ++--
 modular-xorg-server-dfbsd/Makefile.common       | 4 ++--
 nemo/Makefile                                   | 2 +-
 pango/Makefile                                  | 2 +-
 16 files changed, 20 insertions(+), 21 deletions(-)

diffs:
diff --git a/MesaLib-dfbsd-meson/Makefile b/MesaLib-dfbsd-meson/Makefile
index cfdcaa3a36..0b460dfac9 100644
--- a/MesaLib-dfbsd-meson/Makefile
+++ b/MesaLib-dfbsd-meson/Makefile
@@ -78,8 +78,8 @@ COMMENT=	The Mesa 3D Graphics Library
 LICENSE=	mit
 
 # GNU_CONFIGURE=	yes
-# USE_TOOLS+=	autoconf automake autoreconf bison pkg-config gmake flex
-USE_TOOLS+=	bison pkg-config gmake flex
+# USE_TOOLS+=	autoconf automake autoreconf bison pkg-config flex
+USE_TOOLS+=	bison pkg-config flex
 USE_LANGUAGES=	c99 c++
 # USE_LIBTOOL=	yes
 
diff --git a/MesaLib-dfbsd/Makefile b/MesaLib-dfbsd/Makefile
index 44839ea446..fe708822b5 100644
--- a/MesaLib-dfbsd/Makefile
+++ b/MesaLib-dfbsd/Makefile
@@ -16,8 +16,8 @@ COMMENT=	The Mesa 3D Graphics Library
 LICENSE=	mit
 
 # GNU_CONFIGURE=	yes
-# USE_TOOLS+=	autoconf automake autoreconf bison pkg-config gmake flex
-USE_TOOLS+=	bison pkg-config gmake flex
+# USE_TOOLS+=	autoconf automake autoreconf bison pkg-config flex
+USE_TOOLS+=	bison pkg-config flex
 USE_LANGUAGES=	c99 c++
 # USE_LIBTOOL=	yes
 
diff --git a/cinnamon-desktop/Makefile b/cinnamon-desktop/Makefile
index be6a74d02f..cb34957685 100644
--- a/cinnamon-desktop/Makefile
+++ b/cinnamon-desktop/Makefile
@@ -15,7 +15,7 @@ LICENSE=	gnu-gpl-v2
 
 #USE_LIBTOOL=	yes
 #GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake pkg-config automake autoreconf intltool msgfmt
+USE_TOOLS+=	pkg-config automake autoreconf intltool msgfmt
 
 REPLACE_PYTHON=	install-scripts/meson_install_schemas.py \
 		files/usr/bin/cinnamon-desktop-migrate-mediakeys
diff --git a/cinnamon-menus/Makefile b/cinnamon-menus/Makefile
index f02b28b962..7a370b1a1d 100644
--- a/cinnamon-menus/Makefile
+++ b/cinnamon-menus/Makefile
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config intltool
-#USE_TOOLS+=	gmake pkg-config automake autoreconf intltool msgfmt
+#USE_TOOLS+=	pkg-config automake autoreconf intltool msgfmt
 #GNU_CONFIGURE=	yes
 
 #PKGCONFIG_OVERRIDE+=	libmenu/libcinnamon-menu-3.0.pc.in
diff --git a/cinnamon-screensaver/Makefile b/cinnamon-screensaver/Makefile
index 4c95b39b70..9861ba7b3f 100644
--- a/cinnamon-screensaver/Makefile
+++ b/cinnamon-screensaver/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/linuxmint/cinnamon-screensaver
 COMMENT=	Cinnamon screensaver
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=	gmake pkg-config automake autoreconf intltool msgfmt
+USE_TOOLS+=	pkg-config automake autoreconf intltool msgfmt
 
 WRKSRC=	${WRKDIR}/cinnamon-screensaver-4.6.0
 
diff --git a/cinnamon-session/Makefile b/cinnamon-session/Makefile
index dd739943b5..5682742927 100644
--- a/cinnamon-session/Makefile
+++ b/cinnamon-session/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=	https://github.com/linuxmint/cinnamon-session
 COMMENT=	Cinnamon session
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 
-USE_TOOLS+=	gmake pkg-config intltool msgfmt
+USE_TOOLS+=	pkg-config intltool msgfmt
 
 BUILD_DEPENDS+=	autoconf-archive-[0-9]*:../../devel/autoconf-archive
 BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
diff --git a/elogind/Makefile b/elogind/Makefile
index 8af8e4ea12..d23644ab94 100644
--- a/elogind/Makefile
+++ b/elogind/Makefile
@@ -17,7 +17,7 @@ WRKSRC=			${WRKDIR}/elogind-246.10
 HAS_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake m4
+USE_TOOLS+=		m4
 
 PKGCONFIG_OVERRIDE+=	src/libelogind/libelogind.pc.in
 
diff --git a/eolie/Makefile b/eolie/Makefile
index b95cce5d0d..2cf602e378 100644
--- a/eolie/Makefile
+++ b/eolie/Makefile
@@ -12,7 +12,7 @@ LICENSE=	gnu-gpl-v3
 
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c
-USE_TOOLS+=                     gmake gettext msgfmt perl pkg-config
+USE_TOOLS+=                     gettext msgfmt perl pkg-config
 _TOOLS_USE_PKGSRC.msgfmt=       yes
 
 PYTHON_VERSIONS_INCOMPATIBLE=   27
diff --git a/gdm/Makefile b/gdm/Makefile
index 0ba3238028..2710daa160 100644
--- a/gdm/Makefile
+++ b/gdm/Makefile
@@ -15,8 +15,7 @@ DEPENDS+=	zenity>=3.32.0:../../x11/zenity
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_TOOLS+=		gmake msgfmt pkg-config
-USE_TOOLS+=		automake autoconf autoreconf
+USE_TOOLS+=		msgfmt pkg-config
 BUILD_DEFS+=		VARBASE
 
 USE_LANGUAGES=		c c++
diff --git a/json-glib/Makefile b/json-glib/Makefile
index 0b2bf62b6b..ce0b5614a4 100644
--- a/json-glib/Makefile
+++ b/json-glib/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE=	https://wiki.gnome.org/Projects/JsonGlib
 COMMENT=	JSON parser for GLib-based libraries and applications
 LICENSE=	gnu-lgpl-v2.1
 
-USE_TOOLS+=	gmake msgfmt msgmerge pkg-config xgettext
+USE_TOOLS+=	msgfmt msgmerge pkg-config xgettext
 
 CONFIGURE_ARGS+=	--disable-man
 
diff --git a/libdrm-dfbsd-meson/Makefile b/libdrm-dfbsd-meson/Makefile
index 945989346d..f7a75ccb81 100644
--- a/libdrm-dfbsd-meson/Makefile
+++ b/libdrm-dfbsd-meson/Makefile
@@ -65,7 +65,7 @@ ONLY_FOR_PLATFORM=	NetBSD-*-* DragonFly-*-* FreeBSD-*-* OpenBSD-*-* \
 			Linux-*-* SunOS-*-*
 
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		pkg-config
 # USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	libdrm.pc.in
 # GNU_CONFIGURE=		yes
diff --git a/libdrm-dfbsd/Makefile b/libdrm-dfbsd/Makefile
index e1b7c9370b..c8636e8dc2 100644
--- a/libdrm-dfbsd/Makefile
+++ b/libdrm-dfbsd/Makefile
@@ -28,7 +28,7 @@ ONLY_FOR_PLATFORM=	NetBSD-*-* DragonFly-*-* FreeBSD-*-* OpenBSD-*-* \
 			Linux-*-* SunOS-*-*
 
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		pkg-config
 # USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	libdrm.pc.in
 # GNU_CONFIGURE=		yes
diff --git a/modular-xorg-server-dfbsd-meson/Makefile.common b/modular-xorg-server-dfbsd-meson/Makefile.common
index 79c0fc7d5d..7a93df156e 100644
--- a/modular-xorg-server-dfbsd-meson/Makefile.common
+++ b/modular-xorg-server-dfbsd-meson/Makefile.common
@@ -81,8 +81,8 @@ LICENSE=	mit AND modified-bsd AND x11 # with no-advertising clause
 
 # GNU_CONFIGURE=	yes
 # USE_LIBTOOL=	yes
-# USE_TOOLS+=	gmake pkg-config autoconf automake autoreconf
-USE_TOOLS+=	gmake pkg-config
+# USE_TOOLS+=	pkg-config autoconf automake autoreconf
+USE_TOOLS+=	pkg-config
 USE_LANGUAGES+=	c99
 
 PKGCONFIG_OVERRIDE+=	xorg-server.pc.in
diff --git a/modular-xorg-server-dfbsd/Makefile.common b/modular-xorg-server-dfbsd/Makefile.common
index 69b28736f2..ec235b510b 100644
--- a/modular-xorg-server-dfbsd/Makefile.common
+++ b/modular-xorg-server-dfbsd/Makefile.common
@@ -21,8 +21,8 @@ LICENSE=	mit AND modified-bsd AND x11 # with no-advertising clause
 
 # GNU_CONFIGURE=	yes
 # USE_LIBTOOL=	yes
-# USE_TOOLS+=	gmake pkg-config autoconf automake autoreconf
-USE_TOOLS+=	gmake pkg-config
+# USE_TOOLS+=	pkg-config autoconf automake autoreconf
+USE_TOOLS+=	pkg-config
 USE_LANGUAGES+=	c99
 
 PKGCONFIG_OVERRIDE+=	xorg-server.pc.in
diff --git a/nemo/Makefile b/nemo/Makefile
index 530dd1a9a9..614a189d04 100644
--- a/nemo/Makefile
+++ b/nemo/Makefile
@@ -13,7 +13,7 @@ COMMENT=	File Manager for Cinnamon
 LICENSE=	gnu-gpl-v2
 
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake pkg-config intltool
+USE_TOOLS+=		pkg-config intltool
 MESON_ARGS+=		--buildtype=debug
 
 SUBST_CLASSES=		prefix
diff --git a/pango/Makefile b/pango/Makefile
index 1e0e967e54..3c3e444360 100644
--- a/pango/Makefile
+++ b/pango/Makefile
@@ -13,7 +13,7 @@ LICENSE=	gnu-lgpl-v2
 TOOL_DEPENDS+=		help2man-[0-9]*:../../converters/help2man
 
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		pkg-config
 INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
 SUBST_CLASSES+=		wrksrc


Home | Main Index | Thread Index | Old Index