summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam>2005-05-22 20:07:36 +0000
committerjlam <jlam>2005-05-22 20:07:36 +0000
commit9de24f22bc36b6b4056ab56dd2c15fffe3e8413e (patch)
treeed91fd903dcb96e6914328617419b0659c2bb9f1 /x11
parent5bc50cfa0e921c9ff61145c62023b2e2dcc094f1 (diff)
downloadpkgsrc-9de24f22bc36b6b4056ab56dd2c15fffe3e8413e.tar.gz
Remove USE_GNU_TOOLS and replace with the correct USE_TOOLS definitions:
USE_GNU_TOOLS -> USE_TOOLS awk -> gawk m4 -> gm4 make -> gmake sed -> gsed yacc -> bison
Diffstat (limited to 'x11')
-rw-r--r--x11/XaoS/Makefile4
-rw-r--r--x11/XmHTML/Makefile4
-rw-r--r--x11/controlcenter/Makefile4
-rw-r--r--x11/ebuilder/Makefile4
-rw-r--r--x11/fltk/Makefile4
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-gkrellm/Makefile4
-rw-r--r--x11/gnome-libs/Makefile4
-rw-r--r--x11/gnome-mag/Makefile4
-rw-r--r--x11/gnome-panel/Makefile4
-rw-r--r--x11/gnome-session/Makefile4
-rw-r--r--x11/gnome-themes-extras/Makefile4
-rw-r--r--x11/gnome-themes/Makefile4
-rw-r--r--x11/gnome2-applets/Makefile4
-rw-r--r--x11/gnome2-control-center/Makefile4
-rw-r--r--x11/gnome2-terminal/Makefile4
-rw-r--r--x11/gnopernicus/Makefile4
-rw-r--r--x11/gnustep-preferences/Makefile4
-rw-r--r--x11/gtk+extra/Makefile4
-rw-r--r--x11/gtk-thinice-engine/Makefile4
-rw-r--r--x11/gtk/Makefile4
-rw-r--r--x11/gtk2-chtheme/Makefile4
-rw-r--r--x11/gtk2-engines-bluecurve/Makefile4
-rw-r--r--x11/gtk2-theme-switch/Makefile4
-rw-r--r--x11/gtk2/Makefile6
-rw-r--r--x11/gtkmm/Makefile4
-rw-r--r--x11/gtkmm24/Makefile4
-rw-r--r--x11/gtksourceview/Makefile4
-rw-r--r--x11/kdebase3/Makefile4
-rw-r--r--x11/keylaunch/Makefile4
-rw-r--r--x11/kkbswitch/Makefile4
-rw-r--r--x11/kmessage/Makefile4
-rw-r--r--x11/lablgtk/Makefile4
-rw-r--r--x11/lablgtk2/Makefile4
-rw-r--r--x11/lesstif/Makefile4
-rw-r--r--x11/libzvt/Makefile4
-rw-r--r--x11/multi-gnome-terminal/Makefile4
-rw-r--r--x11/openmotif/Makefile4
-rw-r--r--x11/p5-gtk2/Makefile4
-rw-r--r--x11/py-gtk2/Makefile4
-rw-r--r--x11/py-qt3-base/Makefile4
-rw-r--r--x11/py-qt3-modules/Makefile4
-rw-r--r--x11/py-qt3-qscintilla/Makefile4
-rw-r--r--x11/py-qt3-sip/Makefile4
-rw-r--r--x11/py-wxWidgets/Makefile4
-rw-r--r--x11/pygtk/Makefile4
-rw-r--r--x11/qt1/Makefile4
-rw-r--r--x11/qt2-libs/Makefile.common4
-rw-r--r--x11/qt3-libs/Makefile.common6
-rw-r--r--x11/qt3-qscintilla/Makefile4
-rw-r--r--x11/qtarch/Makefile4
-rw-r--r--x11/qwspritefield/Makefile4
-rw-r--r--x11/qwt/Makefile4
-rw-r--r--x11/rep-gtk/Makefile4
-rw-r--r--x11/vte/Makefile4
-rw-r--r--x11/wmweather/Makefile4
-rw-r--r--x11/wxhaskell/Makefile4
-rw-r--r--x11/xfce3/Makefile4
-rw-r--r--x11/xfstt/Makefile4
-rw-r--r--x11/xglobe/Makefile4
-rw-r--r--x11/xpad/Makefile4
-rw-r--r--x11/xplanet/Makefile4
-rw-r--r--x11/zenity/Makefile4
63 files changed, 127 insertions, 129 deletions
diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile
index a1f5cef82c7..71d95d25f83 100644
--- a/x11/XaoS/Makefile
+++ b/x11/XaoS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:04 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:46 jlam Exp $
#
DISTNAME= XaoS-3.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://xaos.theory.org/
COMMENT= Zoomable fractal rendering doodad
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS= make
+USE_TOOLS= gmake
USE_PKGLOCALEDIR= YES
USE_X11= YES
GNU_CONFIGURE= YES
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index 6595e3cb3a6..c8146336fe7 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/11 21:48:04 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/22 20:08:46 jlam Exp $
#
DISTNAME= XmHTML-1.1.7
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.xs4all.nl/~ripley/XmHTML/
COMMENT= Motif Widget capable of displaying HTML 3.2 conforming text
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
do-install:
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index b2ed2a22f6e..792a29d5b2c 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2005/04/11 21:48:04 tv Exp $
+# $NetBSD: Makefile,v 1.68 2005/05/22 20:08:46 jlam Exp $
DISTNAME= control-center-1.4.0.4
PKGREVISION= 10
@@ -13,7 +13,7 @@ BUILD_USES_MSGFMT= YES
USE_DIRS+= xdg-1.1
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile
index ef63d62280c..791e164cf99 100644
--- a/x11/ebuilder/Makefile
+++ b/x11/ebuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:48:05 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:46 jlam Exp $
#
DISTNAME= ebuilder-0.56d
@@ -12,7 +12,7 @@ COMMENT= GUI builder for the Qt library
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index b8c18513fb7..574a49e0b33 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/04/11 21:48:05 tv Exp $
+# $NetBSD: Makefile,v 1.46 2005/05/22 20:08:46 jlam Exp $
DISTNAME= fltk-1.1.6-source
PKGNAME= ${DISTNAME:S/-source//}
@@ -19,7 +19,7 @@ COMMENT= Fast Light Tool Kit for graphical user interfaces
WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
USE_LANGUAGES= c c++
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
TEST_TARGET= test
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index ebc187cc3ea..d6537516fba 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/26 20:00:06 drochner Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-desktop-2.10.1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= yes
USE_X11= yes
USE_LIBTOOL= yes
diff --git a/x11/gnome-gkrellm/Makefile b/x11/gnome-gkrellm/Makefile
index 931baf7aabf..12233f93f76 100644
--- a/x11/gnome-gkrellm/Makefile
+++ b/x11/gnome-gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:47 jlam Exp $
DISTNAME= gkrellm-gnome
PKGNAME= gnome-gkrellm-0.1
@@ -10,7 +10,7 @@ MAINTAINER= damon@NetBSD.org
HOMEPAGE= http://web.wt.net/~billw/gkrellm/Plugins.html
COMMENT= gkrellm gnome plugin
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 09057bd851f..01cd63333ae 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.109 2005/05/22 20:08:47 jlam Exp $
DISTNAME= gnome-libs-1.4.2
PKGREVISION= 4
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= YES
USE_DIRS+= gnome1-1.5
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index 7eb1b0c7b33..d337102e0df 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-mag-0.12.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME screen magnifier
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_X11= yes
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index e7f18e00da2..5a1b044f149 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/04/26 20:05:24 drochner Exp $
+# $NetBSD: Makefile,v 1.51 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-panel-2.10.1
@@ -12,7 +12,7 @@ COMMENT= GNOME2 panel application
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 13c9cd1f35a..c84ec1d3e95 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.50 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-session-2.10.0
@@ -18,7 +18,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
USE_PERL5= build
USE_LIBTOOL= yes
diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index c7b28a1470f..6b7679dcd9d 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/19 16:25:37 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-themes-extras-0.8.1
@@ -20,7 +20,7 @@ USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED
diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index 806b6e333c5..d345fecaffc 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/05/18 16:24:29 drochner Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-themes-2.10.1
@@ -13,7 +13,7 @@ COMMENT= Collection of themes and icons for GNOME 2
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5 theme-1.0
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 777154dd99e..0262354bd0a 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/05/19 21:11:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-applets-2.10.1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index ad8e8dab37b..cc7c578d146 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/04/26 20:07:45 drochner Exp $
+# $NetBSD: Makefile,v 1.44 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= control-center-2.10.1
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index cef230d192a..99140b77cf0 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-terminal-2.10.0
@@ -19,7 +19,7 @@ USE_PERL5= build
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
USE_LIBTOOL= YES
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index 6c7cf8d246e..e857d8d5a4c 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/19 21:09:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnopernicus-0.10.6
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Collection of accessibility apps for GNOME 2
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile
index fbea2bfe521..1bdc4c43ff4 100644
--- a/x11/gnustep-preferences/Makefile
+++ b/x11/gnustep-preferences/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= Preferences-1.2.0
@@ -13,7 +13,7 @@ HOMEPAGE= http://prefsapp.sourceforge.net/
COMMENT= Application for setting preferences for the GNUstep system
NO_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
MAKEFILE= GNUmakefile
diff --git a/x11/gtk+extra/Makefile b/x11/gtk+extra/Makefile
index 7fbaeb5f357..755699a7b26 100644
--- a/x11/gtk+extra/Makefile
+++ b/x11/gtk+extra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gtk+extra-0.99.17
@@ -11,7 +11,7 @@ HOMEPAGE= http://gtkextra.sourceforge.net/
COMMENT= Useful set of GTK+ widgets for creating GUIs
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/x11/gtk-thinice-engine/Makefile b/x11/gtk-thinice-engine/Makefile
index b29f83b7ba9..716c5b1c587 100644
--- a/x11/gtk-thinice-engine/Makefile
+++ b/x11/gtk-thinice-engine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:48:08 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gtk-thinice-engine-2.0.2
@@ -14,7 +14,7 @@ COMMENT= Simple, clean theme engine
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index fb69f2bac40..4c308930624 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.107 2005/05/22 20:08:48 jlam Exp $
DISTNAME= gtk+-1.2.10
PKGREVISION= 8
@@ -20,7 +20,7 @@ BUILD_USES_MSGFMT= yes
USE_DIRS+= xdg-1.1
USE_PERL5= build
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= gdk.pc.in
diff --git a/x11/gtk2-chtheme/Makefile b/x11/gtk2-chtheme/Makefile
index e699f3e8170..d4f02e23035 100644
--- a/x11/gtk2-chtheme/Makefile
+++ b/x11/gtk2-chtheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:48:08 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= gtk-chtheme-0.3.1
@@ -11,7 +11,7 @@ MAINTAINER= kirtai@users.sourceforge.net
HOMEPAGE= http://plasmasturm.org/programs/gtk-chtheme/
COMMENT= GTK+2 theme changer with preview
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
REPLACE_PERL= replace
USE_PERL5= build
diff --git a/x11/gtk2-engines-bluecurve/Makefile b/x11/gtk2-engines-bluecurve/Makefile
index 040517fa654..d7f7a7d311c 100644
--- a/x11/gtk2-engines-bluecurve/Makefile
+++ b/x11/gtk2-engines-bluecurve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:48:08 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= GTK2-Wonderland-Engine-1.0
@@ -14,7 +14,7 @@ COMMENT= Port of famous Bluecurve theme for GTK2+
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
WRKSRC= ${WRKDIR}/Bluecurve
diff --git a/x11/gtk2-theme-switch/Makefile b/x11/gtk2-theme-switch/Makefile
index 14d79c97d1b..1833b765d2f 100644
--- a/x11/gtk2-theme-switch/Makefile
+++ b/x11/gtk2-theme-switch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:48:08 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= gtk-theme-switch-2.0.0rc2
@@ -11,7 +11,7 @@ MAINTAINER= dotz@irc.pl
HOMEPAGE= http://www.muhri.net/
COMMENT= Allows quick & easy switching of GTK+ 2.x themes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 56290e3c31f..1219f61c1c3 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2005/05/08 09:07:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.83 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= gtk+-2.6.7
@@ -25,7 +25,7 @@ USE_DIRS+= xdg-1.1
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
PTHREAD_AUTO_VARS= yes
@@ -70,7 +70,7 @@ SUBST_FILES.pthread= gdk-pixbuf/Makefile.in
.if !empty(CC_VERSION:MSun)
CPPFLAGS+= -Xc
.elif ${OPSYS} == "IRIX" && !empty(CC_VERSION:Mgcc*)
-USE_GNU_TOOLS+= awk
+USE_TOOLS+= gawk
.endif
post-install:
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 5a276cea05f..b96da9e6516 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:48:08 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= gtkmm-2.2.12
@@ -12,7 +12,7 @@ COMMENT= C++ interface to Gtk+ v2
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= YES
USE_X11= YES
USE_LANGUAGES= c c++
diff --git a/x11/gtkmm24/Makefile b/x11/gtkmm24/Makefile
index bf4151dcf7a..7f55f46b062 100644
--- a/x11/gtkmm24/Makefile
+++ b/x11/gtkmm24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:48:08 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:48 jlam Exp $
DISTNAME= gtkmm-2.4.8
PKGNAME= gtkmm24-2.4.8
@@ -10,7 +10,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.gtkmm.org/
COMMENT= C++ interface to Gtk+ v2
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PERL5= yes
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index 049d5744d3a..f0d5e6f406e 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:48:08 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= gtksourceview-1.2.0
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_PERL5= build
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PKGCONFIG_OVERRIDE= gtksourceview-1.0.pc.in
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 09b543dd042..789d4e22d5f 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2005/04/19 10:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2005/05/22 20:08:48 jlam Exp $
DISTNAME= kdebase-${_KDE_VERSION}
PKGREVISION= 3
@@ -17,7 +17,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_DIRS+= xdg-1.2
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= awk
+USE_TOOLS+= gawk
CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
CONFIGURE_ARGS+= --with-ldap="${BUILDLINK_PREFIX.openldap}"
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index bc9df4b004d..59172d44c1c 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= keylaunch-1.3.0
@@ -11,7 +11,7 @@ COMMENT= X utility for binding commands to a hot key
WRKSRC= ${WRKDIR}/keylaunch
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/keylaunch ${PREFIX}/bin
diff --git a/x11/kkbswitch/Makefile b/x11/kkbswitch/Makefile
index 46387b2adad..012238fc67f 100644
--- a/x11/kkbswitch/Makefile
+++ b/x11/kkbswitch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= kkbswitch-1.4.3
@@ -9,7 +9,7 @@ MAINTAINER= ianzag@mail.ru
HOMEPAGE= http://kkbswitch.sourceforge.net/
COMMENT= Keyboard layout indicator for KDE 2 or 3
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/x11/kmessage/Makefile b/x11/kmessage/Makefile
index e3a4181e51f..d3434500d72 100644
--- a/x11/kmessage/Makefile
+++ b/x11/kmessage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:48 jlam Exp $
DISTNAME= kmessage-0.1
PKGREVISION= 5
@@ -9,7 +9,7 @@ MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://soliton.wins.uva.nl/~wijnhout/kmessage/
COMMENT= KMessage is an xmessage clone for KDE
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 0e9bdebf17a..5d348fbd684 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:48 jlam Exp $
DISTNAME= lablgtk-1.2.7
CATEGORIES= x11
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
COMMENT= GTK+ bindings for ocaml
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
BUILDLINK_DEPMETHOD.ocaml= full
diff --git a/x11/lablgtk2/Makefile b/x11/lablgtk2/Makefile
index 29ba7119a4c..dc40deb97a0 100644
--- a/x11/lablgtk2/Makefile
+++ b/x11/lablgtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= lablgtk-2.4.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/
COMMENT= GTK+ 2.x bindings for Objective Caml
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILDLINK_DEPMETHOD.ocaml= full
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index ca4f31cdfa7..fcf9110e1d3 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.80 2005/05/22 20:08:48 jlam Exp $
DISTNAME= lesstif-0.94.0
PKGREVISION= 1
@@ -13,7 +13,7 @@ COMMENT= API compatible clone of the OSF/Motif toolkit
CONFLICTS+= openmotif-[0-9]*
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-production --disable-debug --disable-verbose
diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile
index a4c0d4a37cc..07f0e180f95 100644
--- a/x11/libzvt/Makefile
+++ b/x11/libzvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= libzvt-2.0.1
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Virtual Terminal Widget Library for GNOME2
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libzvt/libzvt-2.0.pc.in
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 70718282bab..891c1a844ae 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:48 jlam Exp $
DISTNAME= multi-gnome-terminal-1.6.1
PKGREVISION= 7
@@ -11,7 +11,7 @@ COMMENT= Gnome tabbed terminal emulator
USE_DIRS+= xdg-1.1
USE_X11BASE= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= # defined
USE_LIBTOOL= # defined
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 9f218283892..54abffa038f 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/11 21:48:12 tv Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:48 jlam Exp $
PKGVER= 2.1.30
DISTNAME= openmotif${PKGVER}
@@ -44,7 +44,7 @@ PLIST_SUBST+= AVAILABLE=
# We must use GNU make on Linux
.if ${OPSYS} == "Linux"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.endif
INSTALLATION_DIRS= lib/X11/config man/man1 man/man3 man/man5
diff --git a/x11/p5-gtk2/Makefile b/x11/p5-gtk2/Makefile
index 193d1434475..de66a750c28 100644
--- a/x11/p5-gtk2/Makefile
+++ b/x11/p5-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:48:12 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:49 jlam Exp $
DISTNAME= Gtk2-1.042
PKGNAME= p5-gtk2-1.042
@@ -13,7 +13,7 @@ COMMENT= Perl bindings for GTK+ 2.0
DEPENDS+= p5-ExtUtils-Depends>=0.2:../../devel/p5-ExtUtils-Depends
DEPENDS+= p5-ExtUtils-PkgConfig>=1.03:../../devel/p5-ExtUtils-PkgConfig
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
PERL5_REQD= 5.8
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index e6efe092dd6..b62c0bfe4e0 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/13 11:11:29 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= pygtk-2.6.2
@@ -18,7 +18,7 @@ USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE+= pygtk-2.0.pc.in pygobject-2.0.pc.in
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PYTHON_VERSIONS_ACCEPTED= 24 23
diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile
index 80f3fd439b5..ae060e0ae5c 100644
--- a/x11/py-qt3-base/Makefile
+++ b/x11/py-qt3-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/02 15:36:53 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= PyQt-x11-gpl-3.14.1
@@ -12,7 +12,7 @@ COMMENT= Python binding for qt3
USE_X11= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
BUILDLINK_DEPENDS.qt3-tools= qt3-tools>=3.1.2nb2
diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile
index ad4054055f0..e820e477d12 100644
--- a/x11/py-qt3-modules/Makefile
+++ b/x11/py-qt3-modules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/02 15:36:53 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= PyQt-x11-gpl-3.14.1
@@ -12,7 +12,7 @@ COMMENT= Python binding for qt3
USE_X11= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
CONFIGURE_ARGS= -b ${PREFIX}/bin
diff --git a/x11/py-qt3-qscintilla/Makefile b/x11/py-qt3-qscintilla/Makefile
index 0ed27674b68..76db0b29929 100644
--- a/x11/py-qt3-qscintilla/Makefile
+++ b/x11/py-qt3-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/02 15:36:53 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= PyQt-x11-gpl-3.14.1
@@ -12,7 +12,7 @@ COMMENT= Python binding for qt3
USE_X11= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
CONFIGURE_ARGS= -b ${PREFIX}/bin
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
index 0ab7fcc98a5..3b26a5aead1 100644
--- a/x11/py-qt3-sip/Makefile
+++ b/x11/py-qt3-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/02 15:35:39 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= sip-4.2.1
@@ -17,7 +17,7 @@ BUILD_DEPENDS+= qt3-tools-3.*:../../x11/qt3-tools
USE_X11= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
CONFIGURE_ARGS= -b ${PREFIX}/bin
diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile
index f276f9f7f7e..61ab774a2b3 100644
--- a/x11/py-wxWidgets/Makefile
+++ b/x11/py-wxWidgets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:48:12 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= wxPythonSrc-2.4.2.4
@@ -12,7 +12,7 @@ HOMEPAGE= http://wxpython.org/
COMMENT= wxPython: Python bindings for wxWidgets
WRKSRC= ${WRKDIR}/wxPythonSrc-2.4.2.4/wxPython
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
# previous name of the package
CONFLICTS+= ${PYPKGPREFIX}-wxWindows-[0-9]*
diff --git a/x11/pygtk/Makefile b/x11/pygtk/Makefile
index 6b75a3dadbd..628332700ae 100644
--- a/x11/pygtk/Makefile
+++ b/x11/pygtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= pygtk-0.6.11
@@ -13,7 +13,7 @@ COMMENT= Python Bindings for the GTK Widget Set
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
PY_PATCHPLIST= yes
diff --git a/x11/qt1/Makefile b/x11/qt1/Makefile
index b3a18273e8a..5b6831cc153 100644
--- a/x11/qt1/Makefile
+++ b/x11/qt1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= qt-1.44
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.troll.no/products/qt.html
COMMENT= C++ X GUI toolkit
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index e8b82f7217a..b670b3e3a56 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile.common,v 1.22 2005/05/22 20:08:50 jlam Exp $
#
DISTNAME= qt-x11-${QTVERSION}
@@ -11,7 +11,7 @@ MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
WRKSRC= ${WRKDIR}/qt-${QTVERSION}
HAS_CONFIGURE= yes
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
CONFIGURE_ARGS+= -static -sm -no-thread \
-system-zlib -system-libpng \
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index e3cf1f37cf4..ac8de82814d 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.46 2005/05/17 15:34:46 reed Exp $
+# $NetBSD: Makefile.common,v 1.47 2005/05/22 20:08:50 jlam Exp $
#
DISTNAME= qt-x11-free-${QTVERSION}
CATEGORIES= x11
@@ -14,12 +14,10 @@ PATCHDIR= ${.CURDIR}/../../x11/qt3-libs/patches
HAS_CONFIGURE= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gawk gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= awk
-
QTPREFIX= ${PREFIX}/qt3
CONFIGURE_ARGS+= -prefix ${QTPREFIX}
diff --git a/x11/qt3-qscintilla/Makefile b/x11/qt3-qscintilla/Makefile
index ec85866625a..510f2d6f296 100644
--- a/x11/qt3-qscintilla/Makefile
+++ b/x11/qt3-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:50 jlam Exp $
#
DISTNAME= qscintilla-1.62-gpl-1.5
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/qt
# needs qmake
BUILD_DEPENDS+= qt3-tools-3.*:../../x11/qt3-tools
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
MAKE_ENV+= QTPREFIX=${QTDIR}
diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile
index ddeb38f0e32..b42d7d5f300 100644
--- a/x11/qtarch/Makefile
+++ b/x11/qtarch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:50 jlam Exp $
#
DISTNAME= qtarch-2.2-1
@@ -14,7 +14,7 @@ COMMENT= Graphical dialog editor for the Qt widget set
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/qtarch ${PREFIX}/bin
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index 66d96a27c24..31388d25d5c 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:50 jlam Exp $
DISTNAME= QwSpriteField1.6
PKGNAME= qwspritefield-1.6
@@ -13,7 +13,7 @@ CONFLICTS= kdesupport-1.0
WRKSRC= ${WRKDIR}/QwSpriteField
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
QW_INCLUDES= Pix.h QwCluster.h QwPublicList.h QwSpriteField.h
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index 6a797972499..6806f7b559c 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:50 jlam Exp $
DISTNAME= qwt-0.3.0
PKGREVISION= 2
@@ -10,7 +10,7 @@ HOMEPAGE= http://sourceforge.net/projects/qwt
COMMENT= Qt widget library for technical purposes
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
diff --git a/x11/rep-gtk/Makefile b/x11/rep-gtk/Makefile
index ca6d8fb5e07..16fba331212 100644
--- a/x11/rep-gtk/Makefile
+++ b/x11/rep-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.30 2005/05/22 20:08:51 jlam Exp $
DISTNAME= rep-gtk-0.15
PKGREVISION= 8
@@ -11,7 +11,7 @@ COMMENT= librep bindings for gtk (used by sawmill)
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
REPEXECDIR= libexec/rep/${MACHINE_GNU_PLATFORM}
INSTALL_ALIASES= ${PREFIX}/${REPEXECDIR}/install-aliases
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index 02b04684a45..4aec2b06dd4 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/18 16:19:05 drochner Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:51 jlam Exp $
#
DISTNAME= vte-0.11.13
@@ -16,7 +16,7 @@ USE_DIRS+= gnome2-1.2
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
CONFIGURE_ARGS+= --disable-gtk-doc
diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile
index e81852c2133..c9a45b535f3 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:48:14 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:52 jlam Exp $
#
DISTNAME= wmweather-2.4.2
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_X11= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --with-sysconfdir=${PKG_SYSCONFDIR}
diff --git a/x11/wxhaskell/Makefile b/x11/wxhaskell/Makefile
index 394fba65fdf..89b3b615067 100644
--- a/x11/wxhaskell/Makefile
+++ b/x11/wxhaskell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/22 08:43:21 augustss Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:52 jlam Exp $
DISTNAME= wxhaskell-src-0.9.4
PKGNAME= ${DISTNAME:S/-src//}
@@ -10,7 +10,7 @@ MAINTAINER= augustss@NetBSD.org
HOMEPAGE= http://wxhaskell.sourceforge.net/index.html
COMMENT= wxGTK binding for Haskell
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
diff --git a/x11/xfce3/Makefile b/x11/xfce3/Makefile
index aa3b4018e57..bbf0b783d65 100644
--- a/x11/xfce3/Makefile
+++ b/x11/xfce3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:48:15 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:52 jlam Exp $
DISTNAME= xfce-3.8.18
PKGREVISION= 5
@@ -15,7 +15,7 @@ USE_X11BASE= # defined
USE_PKGLOCALEDIR= # defined
USE_LIBTOOL= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= # defined
.if ${MACHINE_ARCH} == "alpha"
diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile
index 93ef421c5a3..313c1adb3bc 100644
--- a/x11/xfstt/Makefile
+++ b/x11/xfstt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/12/28 02:47:52 reed Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:52 jlam Exp $
#
DISTNAME= xfstt-1.6
@@ -12,7 +12,7 @@ COMMENT= TrueType font server for X11
USE_PKGINSTALL= YES
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
# There isn't really any l10n yet, only some preliminary i18n support.
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index f9ce36a5457..a1bce933a66 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:48:15 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:52 jlam Exp $
#
DISTNAME= xglobe-0.5
@@ -23,7 +23,7 @@ MAPS= LE.400.gif Brill.400.gif mggd.gif
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-install:
${INSTALL_DATA_DIR} ${X11PREFIX}/lib/xglobe
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index 5dc03284b35..4ac1ea13341 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:48:15 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:52 jlam Exp $
#
DISTNAME= xpad-1.12
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index 7a25e308549..5a50f281e53 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:48:16 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:52 jlam Exp $
DISTNAME= xplanet-1.1.2
CATEGORIES= x11
@@ -8,7 +8,7 @@ MAINTAINER= atatat@NetBSD.org
HOMEPAGE= http://xplanet.sourceforge.net/
COMMENT= Rotating rendered map of the Earth in X11 root window
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 475da8fbef1..22a9c006af1 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:48:17 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:52 jlam Exp $
#
DISTNAME= zenity-2.10.0
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0