summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
Diffstat (limited to 'chat')
-rw-r--r--chat/bitlbee/Makefile4
-rw-r--r--chat/centericq/Makefile4
-rw-r--r--chat/ekg/Makefile4
-rw-r--r--chat/fisg/Makefile4
-rw-r--r--chat/gaim-encryption/Makefile4
-rw-r--r--chat/gaim-otr/Makefile4
-rw-r--r--chat/gaim/Makefile4
-rw-r--r--chat/gg2/Makefile4
-rw-r--r--chat/gnomeicu/Makefile4
-rw-r--r--chat/gossip/Makefile4
-rw-r--r--chat/gtkyahoo/Makefile4
-rw-r--r--chat/icqlib/Makefile4
-rw-r--r--chat/ircservices/Makefile6
-rw-r--r--chat/jabberd/Makefile4
-rw-r--r--chat/kadu/Makefile4
-rw-r--r--chat/kmess/Makefile4
-rw-r--r--chat/loudmouth/Makefile4
-rw-r--r--chat/micq/Makefile4
-rw-r--r--chat/mu-conference/Makefile4
-rw-r--r--chat/navi2ch/Makefile4
-rw-r--r--chat/ninja/Makefile4
-rw-r--r--chat/psi/Makefile4
-rw-r--r--chat/quirc/Makefile4
-rw-r--r--chat/ser/Makefile4
-rw-r--r--chat/silc-client/Makefile4
-rw-r--r--chat/xaric/Makefile4
-rw-r--r--chat/xchat-systray-integration/Makefile4
-rw-r--r--chat/xchat/Makefile.common5
-rw-r--r--chat/xchat2/Makefile.common4
29 files changed, 58 insertions, 61 deletions
diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile
index 9a92589047d..84cb1a81c59 100644
--- a/chat/bitlbee/Makefile
+++ b/chat/bitlbee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= bitlbee-0.91
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.bitlbee.org/
COMMENT= IRC to other chat networks gateway
HAS_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --prefix=${PREFIX}
diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile
index 2d9b9f1dc81..f4905eb9cde 100644
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.50 2005/05/22 20:07:42 jlam Exp $
#
DISTNAME= centericq-4.20.0
@@ -12,7 +12,7 @@ HOMEPAGE= http://konst.org.ua/eng/software/centericq/info.html
COMMENT= Instant Messenger interface supporting many protocols
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile
index f00f6a69ecf..3f1d84d8320 100644
--- a/chat/ekg/Makefile
+++ b/chat/ekg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/21 08:53:11 adam Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/22 20:07:42 jlam Exp $
DISTNAME= ekg-1.6rc1
PKGNAME= ekg-1.6
@@ -11,7 +11,7 @@ HOMEPAGE= http://dev.null.pl/ekg/
COMMENT= Experimental Gadu-Gadu Client (Polish instant messaging system)
USE_GNU_READLINE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_NCURSES= yes
GNU_CONFIGURE= yes
diff --git a/chat/fisg/Makefile b/chat/fisg/Makefile
index 6fee10d87fb..4df783ee88d 100644
--- a/chat/fisg/Makefile
+++ b/chat/fisg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:42 jlam Exp $
DISTNAME= fisg-0.2.0
CATEGORIES= chat textproc
@@ -9,6 +9,6 @@ HOMEPAGE= http://www.tnsp.org/fisg.php
COMMENT= Fast IRC statistics generator
WRKSRC= ${WRKDIR}/${DISTNAME}/src
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim-encryption/Makefile b/chat/gaim-encryption/Makefile
index 1655574481c..98f00b559fe 100644
--- a/chat/gaim-encryption/Makefile
+++ b/chat/gaim-encryption/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:42 jlam Exp $
DISTNAME= gaim-encryption-2.34
CATEGORIES= chat security
@@ -10,7 +10,7 @@ COMMENT= Plugin for gaim to add TLS/SSL via nss/nspr
BUILD_USES_MSGFMT= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/chat/gaim-otr/Makefile b/chat/gaim-otr/Makefile
index 1cfe6e69d97..717e83f8696 100644
--- a/chat/gaim-otr/Makefile
+++ b/chat/gaim-otr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:42 jlam Exp $
DISTNAME= gaim-otr-2.0.1
CATEGORIES= chat security
@@ -8,7 +8,7 @@ MAINTAINER= nathanw@NetBSD.org
HOMEPAGE= http://www.cypherpunks.ca/otr/
COMMENT= Plugin for gaim to add OTR (Off-The-Record) encryption
-USE_GNU_TOOLS= make
+USE_TOOLS= gmake
.include "../../chat/libotr/buildlink3.mk"
.include "../../security/libgcrypt/buildlink3.mk"
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index cdcfa5c868b..a3776d0e51a 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2005/05/12 10:32:18 salo Exp $
+# $NetBSD: Makefile,v 1.86 2005/05/22 20:07:42 jlam Exp $
DISTNAME= gaim-1.3.0
CATEGORIES= chat x11
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= yes
CONFLICTS+= gaim-gnome-[0-9]*
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/chat/gg2/Makefile b/chat/gg2/Makefile
index 67fb38a0f74..344993bbcf4 100644
--- a/chat/gg2/Makefile
+++ b/chat/gg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:42 jlam Exp $
DISTNAME= gg2-2.2.5
CATEGORIES= chat
@@ -11,7 +11,7 @@ COMMENT= Instant messenger software for Poland; Jabber plugin included
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
LIBS+= -lm
PKGCONFIG_OVERRIDE+= lib/gg2_core.pc.in
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 6b8eff646a3..038d02f30e6 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:42 jlam Exp $
DISTNAME= gnomeicu-0.99.5
CATEGORIES= chat gnome
@@ -11,7 +11,7 @@ COMMENT= GNOME ICQ client
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index 024659e0cea..14b99cc9a37 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.33 2005/05/22 20:07:42 jlam Exp $
#
DISTNAME= gossip-0.8
@@ -14,7 +14,7 @@ BUILD_DEPENDS= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
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/chat/gtkyahoo/Makefile b/chat/gtkyahoo/Makefile
index 9890309682e..fa92738c30f 100644
--- a/chat/gtkyahoo/Makefile
+++ b/chat/gtkyahoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:42 jlam Exp $
DISTNAME= gtkyahoo-0.18.2
PKGREVISION= 3
@@ -12,7 +12,7 @@ COMMENT= GTK+ client for Yahoo! Messenger
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
-USE_GNU_TOOLS+= lex
+USE_TOOLS+= lex
USE_X11= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-libyahoo="${BUILDLINK_PREFIX.libyahoo}"
diff --git a/chat/icqlib/Makefile b/chat/icqlib/Makefile
index 6aa84fb381b..838c42d4b7a 100644
--- a/chat/icqlib/Makefile
+++ b/chat/icqlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:13:14 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:42 jlam Exp $
DISTNAME= icqlib-1.0.0
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= magick@NetBSD.org
HOMEPAGE= http://kicq.sourceforge.net/icqlib.shtml
COMMENT= Implementation of the icq protocol
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/chat/ircservices/Makefile b/chat/ircservices/Makefile
index 84d259bef54..f2c9f9623c4 100644
--- a/chat/ircservices/Makefile
+++ b/chat/ircservices/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:42 jlam Exp $
#
DISTNAME= ircservices-5.0.49
@@ -14,9 +14,7 @@ COMMENT= Services for IRC networks
HAS_CONFIGURE= YES
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
-
-USE_GNU_TOOLS+= grep sed
+USE_TOOLS+= gmake grep gsed
USE_PERL5= build
RCD_SCRIPTS= ircservices
diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile
index 2d0181703fd..78c22f4b3dd 100644
--- a/chat/jabberd/Makefile
+++ b/chat/jabberd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:42 jlam Exp $
#
DISTNAME= jabber-1.4.2
@@ -17,7 +17,7 @@ CONFLICTS= jabberd2-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
HAS_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --enable-ssl
diff --git a/chat/kadu/Makefile b/chat/kadu/Makefile
index 68788735e85..9f632d9382a 100644
--- a/chat/kadu/Makefile
+++ b/chat/kadu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/21 08:56:21 adam Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:42 jlam Exp $
DISTNAME= kadu-0.4.0
CATEGORIES= chat
@@ -9,7 +9,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.kadu.net/
COMMENT= Chat client for Gadu-Gadu network (Poland)
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-existing-libgadu=${BUILDLINK_PREFIX.ekg}
diff --git a/chat/kmess/Makefile b/chat/kmess/Makefile
index c5ebe16821d..31088769185 100644
--- a/chat/kmess/Makefile
+++ b/chat/kmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:42 jlam Exp $
#
DISTNAME= kmess-1.1
@@ -13,7 +13,7 @@ COMMENT= MSN Messenger Client for KDE3
BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
.include "../../audio/arts/buildlink3.mk"
diff --git a/chat/loudmouth/Makefile b/chat/loudmouth/Makefile
index e1d7e6eb2bc..0c3ca2424f5 100644
--- a/chat/loudmouth/Makefile
+++ b/chat/loudmouth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:42 jlam Exp $
DISTNAME= loudmouth-0.17.2
PKGREVISION= 1
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://loudmouth.imendio.org/
COMMENT= Lightweight Jabber client library
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/chat/micq/Makefile b/chat/micq/Makefile
index 676c2d4df39..6426255821a 100644
--- a/chat/micq/Makefile
+++ b/chat/micq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:43 jlam Exp $
DISTNAME= micq-0.4.10.3
PKGREVISION= 2
@@ -11,7 +11,7 @@ MAINTAINER= shell@NetBSD.org
HOMEPAGE= http://www.micq.org/
COMMENT= Text-mode ICQ client
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/chat/mu-conference/Makefile b/chat/mu-conference/Makefile
index 9b68477fa1a..1e4ca41e239 100644
--- a/chat/mu-conference/Makefile
+++ b/chat/mu-conference/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= mu-conference-0.6.0
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/jcr-0.1.2
SUBWRKSRC= ${WRKSRC}/${DISTNAME}/src
XMLCONFIG= ${WRKDIR}/${DISTNAME}/muc-jcr.xml
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
PKG_SYSCONFSUBDIR= jabberd
diff --git a/chat/navi2ch/Makefile b/chat/navi2ch/Makefile
index 52acd0c3348..32d4e295a9f 100644
--- a/chat/navi2ch/Makefile
+++ b/chat/navi2ch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/11/30 08:46:53 uebayasi Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:43 jlam Exp $
DISTNAME= navi2ch-1.7.5
CATEGORIES= chat
@@ -11,7 +11,7 @@ COMMENT= 2ch BBS browser for Emacs
.include "../../mk/emacs.mk"
GNU_CONFIGURE= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.if ${EMACS_FLAVOR} == "emacs"
CONFIGURE_ARGS+=--with-emacs
CONFIGURE_ARGS+=--with-lispdir=${EMACS_LISPPREFIX}/navi2ch
diff --git a/chat/ninja/Makefile b/chat/ninja/Makefile
index 3f3423c0fe1..7fbffe71ad2 100644
--- a/chat/ninja/Makefile
+++ b/chat/ninja/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= ninja-1.5.8.1
@@ -10,7 +10,7 @@ HOMEPAGE= http://ninja.qoop.org/
COMMENT= Another IRC client based on ircII
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_DEFS+= USE_INET6
diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index d7e48202e29..a43cea5c880 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:43 jlam Exp $
PSI_VERSION= 0.9.3
DISTNAME= psi-${PSI_VERSION}
@@ -20,7 +20,7 @@ COMMENT= PSI Jabber Client
DEPENDS+= qca-tls>=1.0:../../security/qca-tls
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
HAS_CONFIGURE= yes
diff --git a/chat/quirc/Makefile b/chat/quirc/Makefile
index 2ea51cc7d00..b7dfa5e9c89 100644
--- a/chat/quirc/Makefile
+++ b/chat/quirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= quirc-0.9.84
@@ -11,7 +11,7 @@ HOMEPAGE= http://quirc.org/
COMMENT= Stable and powerful graphical IRC client
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}
diff --git a/chat/ser/Makefile b/chat/ser/Makefile
index 6c0e0a798f8..71ef20b5291 100644
--- a/chat/ser/Makefile
+++ b/chat/ser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= ser-0.8.10_src
@@ -13,7 +13,7 @@ COMMENT= SIP express router
WRKSRC= ${WRKDIR}/ser-0.8.10
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q}
MAKE_ENV+= BUILDLINK_PREFIX.mysql-client=${BUILDLINK_PREFIX.mysql-client:Q}
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
index 7ab6862cdba..1d69bf4c7f0 100644
--- a/chat/silc-client/Makefile
+++ b/chat/silc-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= ${SILC_CLIENT_DISTNAME}
@@ -18,7 +18,7 @@ COMMENT= Client for the Secure Internet Live Conferencing (SILC)
USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= libtool */libtool */*/*/libtool
diff --git a/chat/xaric/Makefile b/chat/xaric/Makefile
index ef1df34185c..c1e578158da 100644
--- a/chat/xaric/Makefile
+++ b/chat/xaric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:06 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= xaric-0.12.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.xaric.org/
COMMENT= IRC client similar to BitchX and ircII
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --enable-optimize
diff --git a/chat/xchat-systray-integration/Makefile b/chat/xchat-systray-integration/Makefile
index 4edff7c7193..fe60c7326bd 100644
--- a/chat/xchat-systray-integration/Makefile
+++ b/chat/xchat-systray-integration/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:06 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:07:43 jlam Exp $
DISTNAME= xchat-systray-integration-2.4.5-src
PKGNAME= ${DISTNAME:S/-src//}
@@ -12,7 +12,7 @@ COMMENT= Systray icon plugin for X-Chat
DEPENDS= xchat>=2.0:../../chat/xchat2
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
# We build a shared object, so ensure that the object files are PIC.
CFLAGS+= -fPIC
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index ad52655ebf8..47f56505d45 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2005/04/11 21:45:06 tv Exp $
+# $NetBSD: Makefile.common,v 1.37 2005/05/22 20:07:43 jlam Exp $
DISTNAME= xchat-1.8.11
PKGREVISION= 11
@@ -21,9 +21,8 @@ PLIST_SRC= ${.CURDIR}/../xchat/PLIST
USE_DIRS+= gnome1-1.5
USE_PKGLOCALEDIR= YES
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake grep
USE_PERL5= YES
-USE_GNU_TOOLS+= grep
CONFIGURE_ARGS+= --enable-python
BUILD_DEFS+= USE_INET6 USE_SOCKS
diff --git a/chat/xchat2/Makefile.common b/chat/xchat2/Makefile.common
index 07332c75b22..beb26c1884e 100644
--- a/chat/xchat2/Makefile.common
+++ b/chat/xchat2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/04/11 21:45:06 tv Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= xchat-2.4.1
@@ -13,7 +13,7 @@ DISTINFO_FILE= ${.CURDIR}/../../chat/xchat2/distinfo
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pkgconfig/buildlink3.mk"