From ef741f8a1a08d590450d8e8035fe7387b1bd573a Mon Sep 17 00:00:00 2001 From: grant Date: Thu, 22 Jan 2004 07:49:20 +0000 Subject: replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make. --- chat/bitlbee/Makefile | 4 ++-- chat/centericq/Makefile | 4 ++-- chat/ekg/Makefile | 4 ++-- chat/everybuddy/Makefile.common | 4 ++-- chat/fisg/Makefile | 4 ++-- chat/gabber/Makefile | 4 ++-- chat/gaim-gtk1/Makefile.common | 4 ++-- chat/gaim/Makefile | 4 ++-- chat/gnomeicu/Makefile | 4 ++-- chat/gossip/Makefile | 4 ++-- chat/icqlib/Makefile | 4 ++-- chat/ircservices/Makefile | 4 ++-- chat/jabberd/Makefile | 4 ++-- chat/kmess/Makefile | 4 ++-- chat/kopete/Makefile | 4 ++-- chat/kyim/Makefile | 4 ++-- chat/liece/Makefile | 4 ++-- chat/micq/Makefile | 4 ++-- chat/navi2ch/Makefile | 4 ++-- chat/ninja/Makefile | 4 ++-- chat/psi-ssl/Makefile | 4 ++-- chat/psi/Makefile | 4 ++-- chat/quirc/Makefile | 4 ++-- chat/ser/Makefile | 4 ++-- chat/silc-client/Makefile | 4 ++-- chat/xaric/Makefile | 4 ++-- chat/xchat/Makefile.common | 4 ++-- chat/xchat2/Makefile | 4 ++-- comms/fidogate/Makefile | 4 ++-- comms/gsmlib/Makefile | 4 ++-- comms/jpilot-syncmal/Makefile | 4 ++-- comms/malsync/Makefile | 4 ++-- comms/minicom/Makefile | 4 ++-- comms/p5-pilot-link/Makefile | 4 ++-- comms/pilot-link/Makefile | 4 ++-- comms/plp/Makefile | 4 ++-- comms/scmxx/Makefile | 4 ++-- converters/autoconvert/Makefile | 4 ++-- converters/cn2jp/Makefile | 4 ++-- converters/macfork/Makefile | 4 ++-- converters/wv/Makefile | 4 ++-- converters/xlhtml/Makefile | 4 ++-- cross/avr-binutils/Makefile | 4 ++-- cross/avr-gcc/Makefile | 4 ++-- cross/avr-gdb/Makefile | 4 ++-- cross/h8300-hms-binutils/Makefile | 4 ++-- cross/h8300-hms-gcc/Makefile | 4 ++-- cross/i386-mingw32/Makefile | 4 ++-- cross/mipsEEel-netbsd/Makefile | 4 ++-- 49 files changed, 98 insertions(+), 98 deletions(-) diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile index 8b6fe2ede8f..404ac03f24d 100644 --- a/chat/bitlbee/Makefile +++ b/chat/bitlbee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/12/31 13:02:42 xtraeme Exp $ +# $NetBSD: Makefile,v 1.7 2004/01/22 07:49:20 grant Exp $ # DISTNAME= bitlbee-0.83 @@ -11,7 +11,7 @@ COMMENT= IRC to other chat networks gateway USE_BUILDLINK2= yes HAS_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_PKGINSTALL= yes CONFIGURE_ARGS+= --prefix=${PREFIX} diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile index 6d7e964d9e5..96b17f8b17e 100644 --- a/chat/centericq/Makefile +++ b/chat/centericq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2003/12/14 04:14:04 xtraeme Exp $ +# $NetBSD: Makefile,v 1.34 2004/01/22 07:49:20 grant Exp $ # DISTNAME= centericq-4.9.9 @@ -13,7 +13,7 @@ COMMENT= Instant Messenger interface for ICQ2000, Yahoo!, MSN and Jabber USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_GCC_SHLIB= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_NCURSES= yes GNU_CONFIGURE= yes diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile index 47162c17223..20e8e004a64 100644 --- a/chat/ekg/Makefile +++ b/chat/ekg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2003/12/08 16:32:52 adam Exp $ +# $NetBSD: Makefile,v 1.22 2004/01/22 07:49:20 grant Exp $ # DISTNAME= ekg-1.4 @@ -11,7 +11,7 @@ HOMEPAGE= http://dev.null.pl/ekg/ COMMENT= Experimental Gadu-Gadu Client (Polish instant messaging system) USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_GNU_READLINE= YES USE_LIBTOOL= YES USE_NCURSES= YES # KEY_RESIZE, ncurses internals diff --git a/chat/everybuddy/Makefile.common b/chat/everybuddy/Makefile.common index 9f8d52552cb..b31f9469a06 100644 --- a/chat/everybuddy/Makefile.common +++ b/chat/everybuddy/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2003/09/02 18:20:34 seb Exp $ +# $NetBSD: Makefile.common,v 1.12 2004/01/22 07:49:20 grant Exp $ DISTNAME= everybuddy-0.2.0 CATEGORIES= chat @@ -10,7 +10,7 @@ COMMENT= Universal Instant Messaging Client DEPENDS+= gnome1-dirs>=1.0:../../misc/gnome1-dirs -USE_GMAKE= YES +USE_GNU_TOOLS+= make GNU_CONFIGURE= YES USE_BUILDLINK2= yes diff --git a/chat/fisg/Makefile b/chat/fisg/Makefile index 0ff93eca451..324647ae480 100644 --- a/chat/fisg/Makefile +++ b/chat/fisg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/01/20 12:09:35 agc Exp $ +# $NetBSD: Makefile,v 1.3 2004/01/22 07:49:20 grant Exp $ DISTNAME= fisg-0.2.0 CATEGORIES= chat textproc @@ -10,6 +10,6 @@ COMMENT= Fast IRC statistics generator WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make .include "../../mk/bsd.pkg.mk" diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile index c4407eb3e0b..fa29d4614e0 100644 --- a/chat/gabber/Makefile +++ b/chat/gabber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/01/03 18:49:35 reed Exp $ +# $NetBSD: Makefile,v 1.27 2004/01/22 07:49:20 grant Exp $ DISTNAME= gabber-0.8.8 PKGREVISION= 3 @@ -11,7 +11,7 @@ COMMENT= Gnome Jabber Client USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_X11BASE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/chat/gaim-gtk1/Makefile.common b/chat/gaim-gtk1/Makefile.common index c570936bbe2..3095d63744d 100644 --- a/chat/gaim-gtk1/Makefile.common +++ b/chat/gaim-gtk1/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2003/07/17 21:25:44 grant Exp $ +# $NetBSD: Makefile.common,v 1.6 2004/01/22 07:49:20 grant Exp $ # DISTNAME= gaim-0.59.8 @@ -19,7 +19,7 @@ PLIST_SRC= ${.CURDIR}/../gaim-gtk1/PLIST.common DEPENDS+= gnome1-dirs>=1.0:../../misc/gnome1-dirs -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_X11BASE= YES USE_PKGLOCALEDIR= YES diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index f24078356fa..c47ecb2bb98 100644 --- a/chat/gaim/Makefile +++ b/chat/gaim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2004/01/11 20:54:07 jmmv Exp $ +# $NetBSD: Makefile,v 1.50 2004/01/22 07:49:20 grant Exp $ # DISTNAME= gaim-0.75 @@ -17,7 +17,7 @@ CONFLICTS+= gaim-gnome-[0-9]* GNU_CONFIGURE= YES USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES USE_X11= YES diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile index abf65cd70bb..670cd7be57c 100644 --- a/chat/gnomeicu/Makefile +++ b/chat/gnomeicu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/01/03 18:49:35 reed Exp $ +# $NetBSD: Makefile,v 1.18 2004/01/22 07:49:20 grant Exp $ DISTNAME= gnomeicu-0.96 PKGREVISION= 9 @@ -14,7 +14,7 @@ USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES USE_X11BASE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make .include "../../databases/gdbm/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile index 8d988d37cb6..5dbdde5def9 100644 --- a/chat/gossip/Makefile +++ b/chat/gossip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:35 reed Exp $ +# $NetBSD: Makefile,v 1.12 2004/01/22 07:49:20 grant Exp $ # DISTNAME= gossip-0.6 @@ -16,7 +16,7 @@ BUILD_DEPENDS= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser BUILD_USES_MSGFMT= yes USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes diff --git a/chat/icqlib/Makefile b/chat/icqlib/Makefile index 81c90b8ad0b..b3a9ac26d78 100644 --- a/chat/icqlib/Makefile +++ b/chat/icqlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/17 21:25:51 grant Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/22 07:49:20 grant Exp $ DISTNAME= icqlib-1.0.0 CATEGORIES= chat @@ -8,7 +8,7 @@ MAINTAINER= magick@NetBSD.org HOMEPAGE= http://kicq.sourceforge.net/icqlib.shtml COMMENT= Implementation of the icq protocol -USE_GMAKE= yes +USE_GNU_TOOLS+= make GNU_CONFIGURE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/chat/ircservices/Makefile b/chat/ircservices/Makefile index 4beb18a5245..d943f206fdb 100644 --- a/chat/ircservices/Makefile +++ b/chat/ircservices/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/08/08 08:32:37 grant Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/22 07:49:20 grant Exp $ # DISTNAME= ircservices-5.0.16 @@ -13,7 +13,7 @@ COMMENT= Services for IRC networks HAS_CONFIGURE= YES USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_GNU_TOOLS= grep USE_PERL5= build diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile index d638481deed..2a3fb5d6004 100644 --- a/chat/jabberd/Makefile +++ b/chat/jabberd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/12/23 10:16:20 xtraeme Exp $ +# $NetBSD: Makefile,v 1.2 2004/01/22 07:49:20 grant Exp $ # DISTNAME= jabberd-1.4.3 @@ -13,7 +13,7 @@ CONFLICTS= jabberd2-[0-9]*:../../wip/jabberd2 USE_BUILDLINK2= yes HAS_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_PKGINSTALL= yes CONFIGURE_ARGS+= --enable-ssl diff --git a/chat/kmess/Makefile b/chat/kmess/Makefile index 24918697fc3..1e60b1266e7 100644 --- a/chat/kmess/Makefile +++ b/chat/kmess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:35 reed Exp $ +# $NetBSD: Makefile,v 1.12 2004/01/22 07:49:20 grant Exp $ # DISTNAME= kmess-1.1 @@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes .include "../../audio/arts/buildlink2.mk" diff --git a/chat/kopete/Makefile b/chat/kopete/Makefile index 470d5fa7db6..e1a19ab5214 100644 --- a/chat/kopete/Makefile +++ b/chat/kopete/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/03 15:56:32 jmmv Exp $ +# $NetBSD: Makefile,v 1.11 2004/01/22 07:49:20 grant Exp $ # DISTNAME= kopete-0.7.4 @@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes USE_BUILDLINK2= yes USE_LIBTOOL= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/chat/kyim/Makefile b/chat/kyim/Makefile index c07ae962dab..dabc3222805 100644 --- a/chat/kyim/Makefile +++ b/chat/kyim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/03 18:49:35 reed Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/22 07:49:20 grant Exp $ DISTNAME= kyim-1.0 PKGREVISION= 3 @@ -11,7 +11,7 @@ HOMEPAGE= http://kyim.sourceforge.net/ COMMENT= KDE Yahoo! client USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make GNU_CONFIGURE= YES CPPFLAGS+= -DHAVE_STDARG_H=1 diff --git a/chat/liece/Makefile b/chat/liece/Makefile index 55f2b4ad480..3a636b25d6e 100644 --- a/chat/liece/Makefile +++ b/chat/liece/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/08/09 10:33:29 seb Exp $ +# $NetBSD: Makefile,v 1.7 2004/01/22 07:49:20 grant Exp $ DISTNAME= liece-1.4.10 CATEGORIES= chat @@ -13,13 +13,13 @@ DEPENDS= ${PKGNAME_PREFIX}apel>=10.3:../../devel/apel .include "../../mk/emacs.mk" HAS_CONFIGURE= # defined +USE_GNU_TOOLS+= make .if ${EMACS_FLAVOR} == "emacs" CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN} .else CONFIGURE_ARGS+=--with-xemacs=${EMACS_BIN} .endif CONFIGURE_ARGS+=--with-lispdir=${EMACS_LISPPREFIX} -USE_GMAKE= # defined INFO_FILES= liece.info diff --git a/chat/micq/Makefile b/chat/micq/Makefile index 84b04295b68..dc733c1bb3d 100644 --- a/chat/micq/Makefile +++ b/chat/micq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/07/21 16:34:32 martti Exp $ +# $NetBSD: Makefile,v 1.15 2004/01/22 07:49:20 grant Exp $ DISTNAME= micq-0.4.10.3 PKGREVISION= 1 @@ -12,7 +12,7 @@ HOMEPAGE= http://www.micq.org/ COMMENT= Text-mode ICQ client USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make GNU_CONFIGURE= YES .include "../../devel/gettext-lib/buildlink2.mk" diff --git a/chat/navi2ch/Makefile b/chat/navi2ch/Makefile index ec3a87fc8d9..d80fb477ca5 100644 --- a/chat/navi2ch/Makefile +++ b/chat/navi2ch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/10/04 02:10:06 toshii Exp $ +# $NetBSD: Makefile,v 1.7 2004/01/22 07:49:20 grant Exp $ DISTNAME= navi2ch-1.7.1 CATEGORIES= chat @@ -11,6 +11,7 @@ COMMENT= 2ch BBS browser for Emacs .include "../../mk/emacs.mk" GNU_CONFIGURE= # defined +USE_GNU_TOOLS+= make .if ${EMACS_FLAVOR} == "emacs" CONFIGURE_ARGS+=--with-emacs CONFIGURE_ARGS+=--with-icondir=${PREFIX}/share/navi2ch/icons @@ -19,7 +20,6 @@ CONFIGURE_ARGS+=--with-lispdir=${EMACS_LISPPREFIX}/navi2ch CONFIGURE_ARGS+=--with-xemacs CONFIGURE_ARGS+=--with-packagedir=${EMACS_LISPPREFIX} .endif -USE_GMAKE= # defined INFO_FILES= navi2ch.info diff --git a/chat/ninja/Makefile b/chat/ninja/Makefile index 81849dba04d..d5b2d46b6d1 100644 --- a/chat/ninja/Makefile +++ b/chat/ninja/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/08/28 20:05:15 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2004/01/22 07:49:20 grant Exp $ # DISTNAME= ninja-1.5.8.1 @@ -11,7 +11,7 @@ COMMENT= Another IRC client based on ircII USE_BUILDLINK2= YES GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make .if defined(USE_INET6) && ${USE_INET6} == "YES" CONFIGURE_ARGS+= --enable-ipv6 diff --git a/chat/psi-ssl/Makefile b/chat/psi-ssl/Makefile index 2ec65f22a95..d20fdea1222 100644 --- a/chat/psi-ssl/Makefile +++ b/chat/psi-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/12 10:38:03 cjep Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/22 07:49:21 grant Exp $ DISTNAME= qssl-2.0 PKGNAME= psi-ssl-2.0 @@ -12,7 +12,7 @@ HOMEPAGE= http://psi.affinix.com/ COMMENT= PSI Jabber Client - SSL plugin USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_X11= yes diff --git a/chat/psi/Makefile b/chat/psi/Makefile index 25ae670cb45..91c892f2a87 100644 --- a/chat/psi/Makefile +++ b/chat/psi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/11/18 17:54:48 xtraeme Exp $ +# $NetBSD: Makefile,v 1.15 2004/01/22 07:49:20 grant Exp $ DISTNAME= psi-0.9 PKGREVISION= 3 @@ -13,7 +13,7 @@ COMMENT= PSI Jabber Client DEPENDS+= psi-ssl>=2.0:../../chat/psi-ssl USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_X11= yes HAS_CONFIGURE= yes diff --git a/chat/quirc/Makefile b/chat/quirc/Makefile index c624ca18f18..2f614325f6a 100644 --- a/chat/quirc/Makefile +++ b/chat/quirc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/08/28 20:05:15 xtraeme Exp $ +# $NetBSD: Makefile,v 1.3 2004/01/22 07:49:21 grant Exp $ # DISTNAME= quirc-0.9.82 @@ -11,7 +11,7 @@ COMMENT= Stable and powerful graphical IRC client USE_BUILDLINK2= YES GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_X11= YES .include "../../x11/tk/buildlink2.mk" diff --git a/chat/ser/Makefile b/chat/ser/Makefile index 631c6add75c..e989ed5c5aa 100644 --- a/chat/ser/Makefile +++ b/chat/ser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/01/10 19:00:41 kristerw Exp $ +# $NetBSD: Makefile,v 1.8 2004/01/22 07:49:21 grant Exp $ # DISTNAME= ser-0.8.10_src @@ -14,7 +14,7 @@ COMMENT= SIP express router WRKSRC= ${WRKDIR}/ser-0.8.10 USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make MAKE_ENV+= BUILDLINK_PREFIX.pthread="${BUILDLINK_PREFIX.pthread}" diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile index 965a6ca0b0a..0e08dd76b1b 100644 --- a/chat/silc-client/Makefile +++ b/chat/silc-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2004/01/14 17:09:26 salo Exp $ +# $NetBSD: Makefile,v 1.32 2004/01/22 07:49:21 grant Exp $ # DISTNAME= ${SILC_CLIENT_DISTNAME} @@ -19,7 +19,7 @@ COMMENT= Client for the Secure Internet Live Conferencing (SILC) USE_BUILDLINK2= YES USE_PKGINSTALL= YES GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_LIBTOOL= YES SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/irssi/libtool \ ${WRKSRC}/lib/silcmath/mpi/libtool diff --git a/chat/xaric/Makefile b/chat/xaric/Makefile index 9a97049b0d8..bdd8b50f975 100644 --- a/chat/xaric/Makefile +++ b/chat/xaric/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/08/28 20:05:16 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2004/01/22 07:49:21 grant Exp $ # DISTNAME= xaric-0.12.1 @@ -12,7 +12,7 @@ COMMENT= IRC client similar to BitchX and ircII USE_BUILDLINK2= YES GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make CONFIGURE_ARGS+= --enable-optimize diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common index 7cc662576ce..e86b03f30cc 100644 --- a/chat/xchat/Makefile.common +++ b/chat/xchat/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2004/01/03 18:49:35 reed Exp $ +# $NetBSD: Makefile.common,v 1.23 2004/01/22 07:49:21 grant Exp $ DISTNAME= xchat-1.8.11 PKGREVISION= 4 @@ -22,7 +22,7 @@ PLIST_SRC= ${.CURDIR}/../xchat/PLIST USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES USE_X11BASE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_PERL5= YES USE_GNU_TOOLS+= grep CONFIGURE_ARGS+= --enable-python diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile index a57df177bf3..12bbe468fa7 100644 --- a/chat/xchat2/Makefile +++ b/chat/xchat2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/01/04 17:26:20 xtraeme Exp $ +# $NetBSD: Makefile,v 1.21 2004/01/22 07:49:21 grant Exp $ # DISTNAME= xchat-2.0.7 @@ -18,7 +18,7 @@ CONFLICTS= xchat-gnome-[0-9]* GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_LIBTOOL= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= YES USE_X11= YES diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile index c35671a4151..71dcea01f3a 100644 --- a/comms/fidogate/Makefile +++ b/comms/fidogate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2003/08/09 10:34:46 seb Exp $ +# $NetBSD: Makefile,v 1.29 2004/01/22 07:51:12 grant Exp $ # DISTNAME= fidogate-4.4.5 @@ -11,7 +11,7 @@ COMMENT= FidoNet (FTN) <-> Internet mail and news gateway USE_BUILDLINK2= yes USE_PKGINSTALL= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make MAKE_ENV= DEBUG="${CFLAGS} -Werror" BUILDLINK_SETENV.CC= CC="cc ${_STRIPFLAG_CC}" diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile index 19edd8bc53f..5d0dc896957 100644 --- a/comms/gsmlib/Makefile +++ b/comms/gsmlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/07/17 21:26:43 grant Exp $ +# $NetBSD: Makefile,v 1.10 2004/01/22 07:51:12 grant Exp $ # DISTNAME= gsmlib-1.9 @@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= yes ONLY_FOR_PLATFORM= NetBSD-1.[6-9]* -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile index 188553dec58..ba73ed2a2c0 100644 --- a/comms/jpilot-syncmal/Makefile +++ b/comms/jpilot-syncmal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/01/12 10:39:06 cjep Exp $ +# $NetBSD: Makefile,v 1.21 2004/01/22 07:51:12 grant Exp $ DISTNAME= jpilot-syncmal_0.71.2 PKGNAME= jpilot-syncmal-0.71.2 @@ -14,7 +14,7 @@ BUILDLINK_DEPMETHOD.jpilot= full USE_BUILDLINK2= # defined USE_X11= # defined -USE_GMAKE= # defined +USE_GNU_TOOLS+= make USE_LIBTOOL= # defined SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/comms/malsync/Makefile b/comms/malsync/Makefile index fd34f7850d8..8318e15af37 100644 --- a/comms/malsync/Makefile +++ b/comms/malsync/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/20 12:10:01 agc Exp $ +# $NetBSD: Makefile,v 1.12 2004/01/22 07:51:12 grant Exp $ # DISTNAME= ${PKGNAME_NOREV:S/-/_/}.src @@ -13,7 +13,7 @@ COMMENT= Utility to synchronize Palm Pilots to the AvantGo.com service WRKSRC= ${WRKDIR}/malsync USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make MAKE_ENV+= PILOT_LINK_DIR=${BUILDLINK_PREFIX.pilot-link-libs} CPPFLAGS+= -D__unix__=1 diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile index 97a21356f6d..25a7fd39f49 100644 --- a/comms/minicom/Makefile +++ b/comms/minicom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2004/01/20 12:10:01 agc Exp $ +# $NetBSD: Makefile,v 1.38 2004/01/22 07:51:12 grant Exp $ DISTNAME= minicom-1.83.1.src PKGNAME= ${DISTNAME:S/.src//} @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}/src USE_BUILDLINK2= yes USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make NO_CONFIGURE= yes PKG_SYSCONFSUBDIR= minicom diff --git a/comms/p5-pilot-link/Makefile b/comms/p5-pilot-link/Makefile index 29ceddf3000..07e191e07e6 100644 --- a/comms/p5-pilot-link/Makefile +++ b/comms/p5-pilot-link/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2003/07/21 16:35:15 martti Exp $ +# $NetBSD: Makefile,v 1.20 2004/01/22 07:51:12 grant Exp $ # .include "../../comms/pilot-link/Makefile.common" @@ -11,7 +11,7 @@ COMMENT= Perl bindings for pilot-link BUILDLINK_DEPENDS.pilot-link-libs= pilot-link-libs>=${PILOT_LINK_VERS} USE_X11= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_BUILDLINK2= YES CONFIGURE_ARGS+= --with-perl=${PERL5} diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile index 8b2d18fd11a..739a72d1ca7 100644 --- a/comms/pilot-link/Makefile +++ b/comms/pilot-link/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/01/12 09:46:04 cjep Exp $ +# $NetBSD: Makefile,v 1.33 2004/01/22 07:51:12 grant Exp $ # .include "../../comms/pilot-link/Makefile.common" @@ -10,7 +10,7 @@ COMMENT= Tools to talk to the 3Com Pilot PDA BUILDLINK_DEPENDS.pilot-link-libs= pilot-link-libs>=${PILOT_LINK_VERS} USE_X11= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_BUILDLINK2= YES USE_GNU_READLINE= YES diff --git a/comms/plp/Makefile b/comms/plp/Makefile index 10d735e1380..21fa6635718 100644 --- a/comms/plp/Makefile +++ b/comms/plp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/07/17 21:26:57 grant Exp $ +# $NetBSD: Makefile,v 1.14 2004/01/22 07:51:12 grant Exp $ DISTNAME= plp_1_8 PKGNAME= plp-1.8 @@ -11,7 +11,7 @@ COMMENT= Tools to talk to the PSION organiser USE_BUILDLINK2= # defined USE_GCC_SHLIB= # defined -USE_GMAKE= # defined +USE_GNU_TOOLS+= make USE_LIBTOOL= # defined do-install: diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile index c639fc1e2f4..cbab1aece4d 100644 --- a/comms/scmxx/Makefile +++ b/comms/scmxx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2003/09/08 14:17:19 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2004/01/22 07:51:12 grant Exp $ # DISTNAME= scmxx-0.6.4 @@ -14,7 +14,7 @@ USE_BUILDLINK2= yes CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_DIR} GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scmxx diff --git a/converters/autoconvert/Makefile b/converters/autoconvert/Makefile index a494c8ddc54..b1e27c7c8b0 100644 --- a/converters/autoconvert/Makefile +++ b/converters/autoconvert/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/07/17 21:27:06 grant Exp $ +# $NetBSD: Makefile,v 1.4 2004/01/22 07:52:43 grant Exp $ DISTNAME= autoconvert-0.3.13 CATEGORIES= converters @@ -10,7 +10,7 @@ COMMENT= Intelligent Chinese encoding converter USE_BUILDLINK2= yes USE_LIBTOOL= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/autoconvert diff --git a/converters/cn2jp/Makefile b/converters/cn2jp/Makefile index f6b28528333..fb707fded7a 100644 --- a/converters/cn2jp/Makefile +++ b/converters/cn2jp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/20 12:10:29 agc Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/22 07:52:43 grant Exp $ DISTNAME= cn2jp1.4b PKGNAME= cn2jp-1.4b @@ -11,7 +11,7 @@ COMMENT= Library for code translation between Chinese and Japanese WRKSRC= ${WRKDIR}/cn2jp USE_LIBTOOL= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make NO_CONFIGURE= yes diff --git a/converters/macfork/Makefile b/converters/macfork/Makefile index 7c61ac74c3e..8b3317b60f9 100644 --- a/converters/macfork/Makefile +++ b/converters/macfork/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/01/20 12:10:29 agc Exp $ +# $NetBSD: Makefile,v 1.8 2004/01/22 07:52:43 grant Exp $ DISTNAME= macfork-1.0 CATEGORIES= converters @@ -11,7 +11,7 @@ COMMENT= Tool for extracting data from Macintosh resource forks WRKSRC= ${WRKDIR}/macfork USE_BUILDLINK2= # defined USE_GCC_SHLIB= # defined -USE_GMAKE= # defined +USE_GNU_TOOLS+= make DOCDIR= ${PREFIX}/share/doc/macfork diff --git a/converters/wv/Makefile b/converters/wv/Makefile index 00aaf2a0cac..a18123bbe8d 100644 --- a/converters/wv/Makefile +++ b/converters/wv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2003/12/13 23:45:12 xtraeme Exp $ +# $NetBSD: Makefile,v 1.33 2004/01/22 07:52:43 grant Exp $ # DISTNAME= wv-1.0.0 @@ -10,7 +10,7 @@ HOMEPAGE= http://wvware.sourceforge.net/ COMMENT= Library and executables to access Microsoft Word files USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_X11= yes diff --git a/converters/xlhtml/Makefile b/converters/xlhtml/Makefile index 67f796036e2..e1549940129 100644 --- a/converters/xlhtml/Makefile +++ b/converters/xlhtml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/01/20 12:10:29 agc Exp $ +# $NetBSD: Makefile,v 1.5 2004/01/22 07:52:43 grant Exp $ # DISTNAME= xlhtml.0.5.1 @@ -14,6 +14,6 @@ COMMENT= Microsoft xls/ppt to HTML converter WRKSRC= ${WRKDIR}/xlhtml USE_BUILDLINK2= YES GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make .include "../../mk/bsd.pkg.mk" diff --git a/cross/avr-binutils/Makefile b/cross/avr-binutils/Makefile index 1f2b01dddd7..5ef1d252dfd 100644 --- a/cross/avr-binutils/Makefile +++ b/cross/avr-binutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/09/19 12:34:26 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2004/01/22 07:54:07 grant Exp $ # FreeBSD Id: ports/devel/avr-binutils/Makefile,v 1.9 2003/03/07 06:00:08 ade Exp DISTNAME= binutils-2.13.2.1 @@ -12,7 +12,7 @@ COMMENT= GNU binutils for Atmel AVR 8-bit RISC microcontrollers USE_BZIP2= yes USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes USE_MAKEINFO= YES diff --git a/cross/avr-gcc/Makefile b/cross/avr-gcc/Makefile index 30040d7a80e..d0c6a2add0f 100644 --- a/cross/avr-gcc/Makefile +++ b/cross/avr-gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/01/03 01:18:28 heinz Exp $ +# $NetBSD: Makefile,v 1.5 2004/01/22 07:54:07 grant Exp $ # FreeBSD Id: ports/devel/avr-gcc/Makefile,v 1.24 2003/05/11 19:32:20 joerg Exp DISTNAME= gcc-3.3.2003.05.11 @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes USE_BUILDLINK2= yes USE_PERL5_BUILD= yes USE_BZIP2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_BISON= yes USE_PKGLOCALEDIR= yes diff --git a/cross/avr-gdb/Makefile b/cross/avr-gdb/Makefile index acf78f61496..a7728f60f80 100644 --- a/cross/avr-gdb/Makefile +++ b/cross/avr-gdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/10/21 14:19:37 wennmach Exp $ +# $NetBSD: Makefile,v 1.5 2004/01/22 07:54:07 grant Exp $ # FreeBSD Id: ports/devel/avr-gdb/Makefile,v 1.2 2003/03/07 06:00:08 ade Exp DISTNAME= gdb-5.3 @@ -10,7 +10,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEWARE:=gdb/releases/} MAINTAINER= karlj@mdstud.chalmers.se COMMENT= GNU gdb for Atmel AVR 8-bit RISC microcontrollers -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_BUILDLINK2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --target=avr --program-prefix=avr diff --git a/cross/h8300-hms-binutils/Makefile b/cross/h8300-hms-binutils/Makefile index 1efb9e72962..ae8e031176d 100644 --- a/cross/h8300-hms-binutils/Makefile +++ b/cross/h8300-hms-binutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/20 12:10:55 agc Exp $ +# $NetBSD: Makefile,v 1.7 2004/01/22 07:54:07 grant Exp $ DISTNAME= binutils-2.12.1 PKGNAME= cross-h8300-hms-binutils-2.12.1 @@ -14,7 +14,7 @@ H8300_PREFIX= ${PREFIX}/libexec/cross-h8300-hms WRKSRC= ${WRKDIR}/objdir USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_MAKEINFO= yes HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${H8300_PREFIX} diff --git a/cross/h8300-hms-gcc/Makefile b/cross/h8300-hms-gcc/Makefile index c42d5e01002..120c383bfda 100644 --- a/cross/h8300-hms-gcc/Makefile +++ b/cross/h8300-hms-gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/20 12:10:55 agc Exp $ +# $NetBSD: Makefile,v 1.10 2004/01/22 07:54:07 grant Exp $ DISTNAME= gcc-core-3.1 PKGNAME= cross-h8300-hms-gcc-3.1 @@ -21,7 +21,7 @@ H8300_PREFIX= ${LOCALBASE}/libexec/cross-h8300-hms WRKSRC= ${WRKDIR}/objdir USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${H8300_PREFIX} CONFIGURE_ARGS+= --infodir=${H8300_PREFIX}/gcc diff --git a/cross/i386-mingw32/Makefile b/cross/i386-mingw32/Makefile index 8f693e32057..4af8577d175 100644 --- a/cross/i386-mingw32/Makefile +++ b/cross/i386-mingw32/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/01/20 12:10:55 agc Exp $ +# $NetBSD: Makefile,v 1.17 2004/01/22 07:54:07 grant Exp $ DISTNAME= cross-${TARGET_ARCH}-1.2 PKGREVISION= 3 @@ -24,7 +24,7 @@ CROSS_DISTFILES+= mingw-runtime-1.2-src.tar.gz MINGW_WRKSRC= ${WRKDIR}/mingw-runtime-1.2 CROSS_DISTFILES+= w32api-1.2-src.tar.gz W32_WRKSRC= ${WRKDIR}/w32api-1.2 -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_PERL5= build WRKSRC= ${WRKDIR} # for the patch target diff --git a/cross/mipsEEel-netbsd/Makefile b/cross/mipsEEel-netbsd/Makefile index b2bbae659d0..251c71bef4e 100644 --- a/cross/mipsEEel-netbsd/Makefile +++ b/cross/mipsEEel-netbsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/07/17 21:27:59 grant Exp $ +# $NetBSD: Makefile,v 1.9 2004/01/22 07:54:07 grant Exp $ DISTNAME= cross-${TARGET_ARCH}-${DISTVERSION} TARGET_ARCH= mipsEEel-netbsd @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org COMMENT= Cross-compiler for NetBSD/PlayStation2 kernel BZCAT= /usr/bin/bzcat -USE_GMAKE= yes +USE_GNU_TOOLS+= make # We don't use CROSSBASE because the binutils are not the same as binutils # for other cross compilers. -- cgit v1.2.3