diff options
74 files changed, 148 insertions, 149 deletions
diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile index 82a60a1c0e1..a841d58d071 100644 --- a/archivers/arj/Makefile +++ b/archivers/arj/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/12/05 18:08:33 kristerw Exp $ +# $NetBSD: Makefile,v 1.5 2004/01/22 07:18:43 grant Exp $ # FreeBSD Id: ports/archivers/arj/Makefile,v 1.2 2002/09/17 05:17:29 ijliao Exp DISTNAME= arj-3.10b @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://arj.sourceforge.net/ COMMENT= Open-source ARJ -USE_GMAKE= yes +USE_GNU_TOOLS+= make GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ${WRKSRC}/gnu/configure CONFIG_GUESS_OVERRIDE= ${WRKSRC}/gnu/config.guess diff --git a/archivers/cabextract/Makefile b/archivers/cabextract/Makefile index 1e90238559a..e76aa32e477 100644 --- a/archivers/cabextract/Makefile +++ b/archivers/cabextract/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/12/24 09:53:47 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2004/01/22 07:18:43 grant Exp $ # DISTNAME= cabextract-0.6 @@ -11,6 +11,6 @@ COMMENT= Microsoft cabinet (.CAB) file extractor USE_BUILDLINK2= yes GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make .include "../../mk/bsd.pkg.mk" diff --git a/archivers/cxunzip/Makefile b/archivers/cxunzip/Makefile index c7525ff5566..64ce30608f9 100644 --- a/archivers/cxunzip/Makefile +++ b/archivers/cxunzip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/03 18:49:33 reed Exp $ +# $NetBSD: Makefile,v 1.11 2004/01/22 07:18:43 grant Exp $ DISTNAME= cxunzip-0.98 PKGREVISION= 1 @@ -12,7 +12,7 @@ COMMENT= Cloned Xunzip is a GNOME zip-archive uncompressing program USE_BUILDLINK2= yes USE_X11= yes GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make #USE_LIBTOOL= yes .include "../../x11/gnome-libs/buildlink2.mk" diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile index 3897c917013..76b9c320d9c 100644 --- a/archivers/dact/Makefile +++ b/archivers/dact/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/21 16:24:37 martti Exp $ +# $NetBSD: Makefile,v 1.7 2004/01/22 07:18:43 grant Exp $ # DISTNAME= dact-0.8.3 @@ -12,7 +12,7 @@ COMMENT= Dynamic adaptive compression tool USE_BUILDLINK2= YES GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 21cf8ef02ee..a1bd5eb66db 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/01/05 21:59:46 xtraeme Exp $ +# $NetBSD: Makefile,v 1.15 2004/01/22 07:18:43 grant Exp $ # DISTNAME= file-roller-2.4.2 @@ -14,7 +14,7 @@ DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs GNU_CONFIGURE= yes USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_PERL5= build USE_PKGLOCALEDIR= yes diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile index 10d6123fc32..f1ecf8a4d5e 100644 --- a/archivers/ha/Makefile +++ b/archivers/ha/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/01/20 12:07:06 agc Exp $ +# $NetBSD: Makefile,v 1.17 2004/01/22 07:18:43 grant Exp $ # FreeBSD Id: Makefile,v 1.9 1997/08/10 22:31:19 fenner Exp # @@ -17,7 +17,7 @@ USE_BUILDLINK2= yes MAKEFILE= makefile.nix MAKE_FLAGS= CC="${CC}" ALL_TARGET= ha -USE_GMAKE= yes +USE_GNU_TOOLS+= make do-install: cd ${WRKSRC}; ${INSTALL_PROGRAM} ha ${PREFIX}/bin diff --git a/archivers/star/Makefile b/archivers/star/Makefile index 8406835a34c..b2cd77c2719 100644 --- a/archivers/star/Makefile +++ b/archivers/star/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/07/21 16:24:41 martti Exp $ +# $NetBSD: Makefile,v 1.9 2004/01/22 07:18:44 grant Exp $ # DISTNAME= star-1.4.3 @@ -9,7 +9,7 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/star.html COMMENT= The fastest tar like archiver for UNIX -USE_GMAKE= # defined +USE_GNU_TOOLS+= make MAKE_FLAGS+= INS_BASE=${PREFIX} pre-build: diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile index 687638aee58..cfe22e7a7b1 100644 --- a/archivers/unace/Makefile +++ b/archivers/unace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/07/17 21:21:40 grant Exp $ +# $NetBSD: Makefile,v 1.10 2004/01/22 07:18:44 grant Exp $ # DISTNAME= unace-1.2b @@ -11,7 +11,7 @@ HOMEPAGE= http://www.winace.com/ COMMENT= Extract, list and test files in ACE archives USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make ALL_TARGET= clean unace diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile index 55e8f5d3b1a..5b0c6b4fae2 100644 --- a/archivers/upx/Makefile +++ b/archivers/upx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/01/20 12:07:07 agc Exp $ +# $NetBSD: Makefile,v 1.3 2004/01/22 07:18:44 grant Exp $ DISTNAME= upx-1.24-src PKGNAME= ${DISTNAME:S/-src//} @@ -13,7 +13,7 @@ DEPENDS+= ucl>=1.01:../../devel/ucl WRKSRC= ${WRKDIR}/${PKGNAME} -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_PERL5= build do-build: diff --git a/archivers/xmill/Makefile b/archivers/xmill/Makefile index 55a9102067e..0b193e16442 100644 --- a/archivers/xmill/Makefile +++ b/archivers/xmill/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/20 12:07:07 agc Exp $ +# $NetBSD: Makefile,v 1.9 2004/01/22 07:18:44 grant Exp $ DISTNAME= xmill-0-7 PKGNAME= xmill-0.7 @@ -15,7 +15,7 @@ BUILD_DEPENDS= unzip-[0-9]*:../../archivers/unzip EXTRACT_CMD= ${LOCALBASE}/bin/unzip -aq ${DOWNLOADED_DISTFILE} WRKSRC= ${WRKDIR} -USE_GMAKE= #defined +USE_GNU_TOOLS+= make MAKEFILE= makefile RESTRICTED= "Redistribution not permitted" diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index 9deeee99f72..d6b28e754f5 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/01/20 12:07:41 agc Exp $ +# $NetBSD: Makefile,v 1.22 2004/01/22 07:14:59 grant Exp $ DISTNAME= audacity-src-1.0.0-2 PKGNAME= audacity-1.0.0.2 @@ -16,7 +16,7 @@ BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip WRKSRC= ${WRKDIR}/audacity-src-1.0.0 USE_BUILDLINK2= # defined USE_X11= # defined -USE_GMAKE= # defined +USE_GNU_TOOLS+= make GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --without-xaudio diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile index 2bf5f8dd7d9..35cd14a0ac6 100644 --- a/audio/cdparanoia/Makefile +++ b/audio/cdparanoia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/11/03 22:43:37 kim Exp $ +# $NetBSD: Makefile,v 1.12 2004/01/22 07:14:59 grant Exp $ # DISTNAME= cdparanoia-III-alpha9.8 @@ -13,7 +13,7 @@ COMMENT= CDDA reading utility with extra data verification features ONLY_FOR_PLATFORM= FreeBSD-*-* NetBSD-*-* Linux-*-* -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_LIBTOOL= YES GNU_CONFIGURE= YES diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile index 2f148d87bd8..b41031996b6 100644 --- a/audio/cmp3/Makefile +++ b/audio/cmp3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/01/20 12:07:41 agc Exp $ +# $NetBSD: Makefile,v 1.15 2004/01/22 07:15:00 grant Exp $ # DISTNAME= cmp3-2.0pre5 @@ -15,7 +15,7 @@ DEPENDS+= mpg123-[0-9]*:../../audio/mpg123 WRKSRC= ${WRKDIR}/cmp3 USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_NCURSES= # MAX_FORM_COMMAND do-install: diff --git a/audio/csound-bath/Makefile b/audio/csound-bath/Makefile index 88907e0107d..8902c9a6efc 100644 --- a/audio/csound-bath/Makefile +++ b/audio/csound-bath/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/01/20 12:07:41 agc Exp $ +# $NetBSD: Makefile,v 1.16 2004/01/22 07:15:00 grant Exp $ # DISTNAME= Csound4.23 @@ -18,7 +18,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED} WRKSRC= ${WRKDIR} DIST_SUBDIR= csound CONFLICTS= csound-dev-4* -USE_GMAKE= yes +USE_GNU_TOOLS+= make pre-patch: ${CP} ${FILESDIR}/rtNetBSD.c ${FILESDIR}/rtNetBSD.h ${WRKSRC} diff --git a/audio/csound-dev/Makefile b/audio/csound-dev/Makefile index 8d407badcad..2a07f3a8757 100644 --- a/audio/csound-dev/Makefile +++ b/audio/csound-dev/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:47 jmmv Exp $ +# $NetBSD: Makefile,v 1.3 2004/01/22 07:15:00 grant Exp $ # DISTNAME= Csound-4.24.1 @@ -18,7 +18,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED} NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64 # many LP64 problems DIST_SUBDIR= csound -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_BUILDLINK2= yes CONFLICTS= csound-bath* diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile index b93e9df2711..e60eb6858a8 100644 --- a/audio/darkice/Makefile +++ b/audio/darkice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/01/09 17:23:44 xtraeme Exp $ +# $NetBSD: Makefile,v 1.2 2004/01/22 07:15:00 grant Exp $ # DISTNAME= darkice-0.13.2 @@ -11,7 +11,7 @@ COMMENT= IceCast, IceCast2 and ShoutCast live audio streamer USE_BUILDLINK2= yes GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_PKGINSTALL= yes CONFIGURE_ARGS+= --with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile index 50758336fc9..344d35ebadb 100644 --- a/audio/easytag/Makefile +++ b/audio/easytag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2003/12/08 14:41:38 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2004/01/22 07:15:00 grant Exp $ # DISTNAME= easytag-0.30 @@ -15,7 +15,7 @@ DEPENDS+= gnome1-dirs>=1.0:../../misc/gnome1-dirs BUILD_USES_MSGFMT= yes # xgettext, really GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_X11= yes USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile index 3fb2b93b151..dca9bbd3ea1 100644 --- a/audio/faad2/Makefile +++ b/audio/faad2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/20 12:07:41 agc Exp $ +# $NetBSD: Makefile,v 1.11 2004/01/22 07:15:00 grant Exp $ # DISTNAME= faad2-1.1 @@ -16,7 +16,7 @@ NO_BIN_ON_CDROM=${RESTRICTED} WRKSRC= ${WRKDIR}/faad2 USE_BUILDLINK2= YES USE_GCC_SHLIB= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_LIBTOOL= YES AUTOMAKE_REQD= 1.4 diff --git a/audio/festival/Makefile b/audio/festival/Makefile index 0a1c480d81a..74127b2e87c 100644 --- a/audio/festival/Makefile +++ b/audio/festival/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/01/20 12:07:41 agc Exp $ +# $NetBSD: Makefile,v 1.30 2004/01/22 07:15:00 grant Exp $ DISTNAME= festival-1.4.1 PKGREVISION= 1 @@ -19,7 +19,7 @@ COMMENT= Festival is an advanced multi-lingual speech synthesis system WRKSRC= ${WRKDIR} USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_X11= yes SPEECHTOOLS= ${WRKSRC}/speech_tools diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 033e79d0f5e..d6235ff9d84 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/01/20 12:07:42 agc Exp $ +# $NetBSD: Makefile,v 1.16 2004/01/22 07:15:00 grant Exp $ # DISTNAME= flac-1.1.0 @@ -18,7 +18,7 @@ BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_XMMS_CONFIG="no" diff --git a/audio/gmodplay/Makefile b/audio/gmodplay/Makefile index a3528a94f24..863df5b376c 100644 --- a/audio/gmodplay/Makefile +++ b/audio/gmodplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/12/24 09:53:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.13 2004/01/22 07:15:00 grant Exp $ DISTNAME= gmodplay-0.08 PKGREVISION= 3 @@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \ *-*-vax USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make # for libslang and ossaudio CFLAGS+= -DAUDIO_DEV="\"\\\"$(DEVOSSAUDIO)\\\"\"" diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index d1716853f98..f9ff49be3e5 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/01/03 18:49:34 reed Exp $ +# $NetBSD: Makefile,v 1.29 2004/01/22 07:15:00 grant Exp $ DISTNAME= gnome-media-1.2.3 PKGREVISION= 9 @@ -18,7 +18,7 @@ USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES USE_X11BASE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CONFIGURE_ENV+= XGETTEXT="${LOCALBASE}/bin/xgettext" diff --git a/audio/gnome-speech/Makefile b/audio/gnome-speech/Makefile index bffabb0b863..b6ef35164fe 100644 --- a/audio/gnome-speech/Makefile +++ b/audio/gnome-speech/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/12/30 17:53:27 xtraeme Exp $ +# $NetBSD: Makefile,v 1.2 2004/01/22 07:15:00 grant Exp $ # DISTNAME= gnome-speech-0.2.8 @@ -14,7 +14,7 @@ DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs BUILD_USES_MSGFMT= yes USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_X11= yes diff --git a/audio/gnome2-media/Makefile b/audio/gnome2-media/Makefile index 3cc378343d8..82c8306f95a 100644 --- a/audio/gnome2-media/Makefile +++ b/audio/gnome2-media/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/03 18:49:34 reed Exp $ +# $NetBSD: Makefile,v 1.11 2004/01/22 07:15:00 grant Exp $ DISTNAME= gnome-media-2.4.1.1 PKGREVISION= 1 @@ -17,7 +17,7 @@ USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_X11= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_PERL5= build LIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/audio/gogo/Makefile b/audio/gogo/Makefile index 7de2506371b..a42d66d14d6 100644 --- a/audio/gogo/Makefile +++ b/audio/gogo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/11/16 19:04:02 veego Exp $ +# $NetBSD: Makefile,v 1.9 2004/01/22 07:15:00 grant Exp $ # DISTNAME= gogo239b @@ -15,7 +15,7 @@ BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm ONLY_FOR_PLATFORM= *-*-i386 -USE_GMAKE= YES +USE_GNU_TOOLS+= make RESTRICTED= 'Source based on patent protected Fraunhofer code' NO_SRC_ON_FTP= ${RESTRICTED} diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile index 7c707d96097..7147f9f0eed 100644 --- a/audio/id3ed/Makefile +++ b/audio/id3ed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/10/29 16:31:46 gavan Exp $ +# $NetBSD: Makefile,v 1.18 2004/01/22 07:15:00 grant Exp $ # DISTNAME= id3ed-1.10.4 @@ -11,7 +11,7 @@ COMMENT= Edit id3 description tags in mpeg3 files USE_BUILDLINK2= YES GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_GCC_SHLIB= YES USE_GNU_READLINE= # uses rl_startup_hook diff --git a/audio/lame/Makefile b/audio/lame/Makefile index b45d07af7bf..1f9b1b894e0 100644 --- a/audio/lame/Makefile +++ b/audio/lame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/01/20 15:46:12 adam Exp $ +# $NetBSD: Makefile,v 1.33 2004/01/22 07:15:00 grant Exp $ # DISTNAME= lame-${VERS} @@ -15,7 +15,7 @@ VERS= 3.95.1 LICENSE= fee-based-commercial-use USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile index 1bc9171e745..6d63b6db84e 100644 --- a/audio/libmikmod/Makefile +++ b/audio/libmikmod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/01/20 12:07:42 agc Exp $ +# $NetBSD: Makefile,v 1.26 2004/01/22 07:15:00 grant Exp $ DISTNAME= libmikmod_3.1.10 PKGNAME= libmikmod-3.1.10 @@ -9,7 +9,7 @@ MAINTAINER= kuebart@mathematik.uni-ulm.de HOMEPAGE= http://mikmod.raphnet.net/ COMMENT= MikMod Sound Library -USE_GMAKE= # defined +USE_GNU_TOOLS+= make GNU_CONFIGURE= # defined USE_LIBTOOL= # defined USE_BUILDLINK2= # defined diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile index c0717cd1699..bcf1af0c528 100644 --- a/audio/libsidplay/Makefile +++ b/audio/libsidplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/10/29 16:57:32 gavan Exp $ +# $NetBSD: Makefile,v 1.13 2004/01/22 07:15:00 grant Exp $ # DISTNAME= libsidplay-1.36.57 @@ -13,7 +13,7 @@ COMMENT= Sidplay Library CONFLICTS= sidplay-1.36.* GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_BUILDLINK2= yes USE_GCC_SHLIB= yes diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile index 56e82553fe4..d9e392de642 100644 --- a/audio/mikmod/Makefile +++ b/audio/mikmod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/01/17 19:45:37 kristerw Exp $ +# $NetBSD: Makefile,v 1.33 2004/01/22 07:15:00 grant Exp $ # DISTNAME= mikmod-3.1.6-a @@ -11,7 +11,7 @@ MAINTAINER= mycroft@NetBSD.ORG HOMEPAGE= http://mikmod.raphnet.net/ COMMENT= MOD player for UNI IT XM S3M MOD MTM STM DSM MED FAR ULT 669 files -USE_GMAKE= yes +USE_GNU_TOOLS+= make GNU_CONFIGURE= yes USE_BUILDLINK2= yes diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile index a273cc715a1..760ec96dd7b 100644 --- a/audio/mp3blaster/Makefile +++ b/audio/mp3blaster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2003/12/08 14:41:38 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2004/01/22 07:15:00 grant Exp $ DISTNAME= mp3blaster-3.2.0 PKGREVISION= 1 @@ -11,7 +11,7 @@ COMMENT= MP3 console curses-based player PTHREAD_OPTS= require USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make GNU_CONFIGURE= yes CONFIGURE_ARGS+="--with-cxxflags=${CXXFLAGS}" \ diff --git a/audio/mp3check/Makefile b/audio/mp3check/Makefile index 824dd9ebb36..04cb868ce50 100644 --- a/audio/mp3check/Makefile +++ b/audio/mp3check/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/17 21:22:54 grant Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/22 07:15:00 grant Exp $ DISTNAME= mp3check-0.8.0 CATEGORIES= audio @@ -8,7 +8,7 @@ MAINTAINER= tron@NetBSD.org HOMEPAGE= http://www.0vermann.de/soft/mp3check/mp3check.html COMMENT= Check MP3 files for consistency -#USE_GMAKE= YES +#USE_GNU_TOOLS+= make GNU_CONFIGURE= YES ALL_TARGET= mp3check diff --git a/audio/musicbrainz/Makefile b/audio/musicbrainz/Makefile index 2e06a0803af..d218aef7f91 100644 --- a/audio/musicbrainz/Makefile +++ b/audio/musicbrainz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/21 16:30:42 martti Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/22 07:15:00 grant Exp $ DISTNAME= libmusicbrainz-2.0.0 PKGNAME= ${DISTNAME:S/lib//} @@ -9,7 +9,7 @@ MAINTAINER= rxg@NetBSD.org HOMEPAGE= http://www.musicbrainz.org/ COMMENT= Second generation incarnation of the CD Index -USE_GMAKE= YES +USE_GNU_TOOLS+= make GNU_CONFIGURE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/audio/openal/Makefile b/audio/openal/Makefile index ec7e882b7c2..2c81b91371f 100644 --- a/audio/openal/Makefile +++ b/audio/openal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/01/20 12:07:43 agc Exp $ +# $NetBSD: Makefile,v 1.8 2004/01/22 07:15:00 grant Exp $ # DISTNAME= openal-20030724 @@ -14,7 +14,7 @@ COMMENT= 3D positional spatialized sound library WRKSRC= ${WRKDIR}/${DISTNAME}/linux GNU_CONFIGURE= YES USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_MAKEINFO= YES INFO_FILES= openal.info diff --git a/audio/rio500/Makefile b/audio/rio500/Makefile index 7aa31b1c237..41e1cd65a80 100644 --- a/audio/rio500/Makefile +++ b/audio/rio500/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/07/17 21:23:11 grant Exp $ +# $NetBSD: Makefile,v 1.11 2004/01/22 07:15:00 grant Exp $ # DISTNAME= rio500-0.7 @@ -11,7 +11,7 @@ HOMEPAGE= http://rio500.sourceforge.net/ COMMENT= Utilities to manage your Diamond Rio 500 MP3 player USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-devicepath=/dev --with-deviceentry=urio0 diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile index e2aac81c155..b2f1081a9bd 100644 --- a/audio/rosegarden/Makefile +++ b/audio/rosegarden/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/10/24 02:01:56 xtraeme Exp $ +# $NetBSD: Makefile,v 1.12 2004/01/22 07:15:00 grant Exp $ DISTNAME= rosegarden-2.1pl4 PKGNAME= rosegarden-2.1.4 @@ -11,7 +11,7 @@ COMMENT= Notation editor & MIDI sequencer USE_BUILDLINK2= YES GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make MAKE_ENV+= GCC=yes USE_X11BASE= YES diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile index 9e9d119d2c0..6d1438cce0d 100644 --- a/audio/sidplay/Makefile +++ b/audio/sidplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/07/21 16:30:45 martti Exp $ +# $NetBSD: Makefile,v 1.12 2004/01/22 07:15:00 grant Exp $ # DISTNAME= sidplay-base-1.0.9 @@ -13,7 +13,7 @@ COMMENT= Tools for playing sidtunes USE_BUILDLINK2= yes GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make .include "../../audio/libsidplay/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile index ee3dc7b7a90..91b0ae41510 100644 --- a/audio/spiralloops/Makefile +++ b/audio/spiralloops/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/12/24 09:53:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2004/01/22 07:15:00 grant Exp $ # DISTNAME= SpiralLoops-2.0.0 @@ -17,7 +17,7 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \ USE_BUILDLINK2= yes USE_X11= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make GNU_CONFIGURE= yes MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" CXXFLAGS+= -DDEVOSSAUDIO="\"\\\"$(DEVOSSAUDIO)\\\"\"" diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile index 7787cef0ae7..49811c8824c 100644 --- a/audio/spiralsynth/Makefile +++ b/audio/spiralsynth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/12/24 09:53:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2004/01/22 07:15:01 grant Exp $ # DISTNAME= SpiralSynth-0.1.7 @@ -17,7 +17,7 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \ USE_BUILDLINK2= yes USE_X11= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make GNU_CONFIGURE= yes MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" CXXFLAGS+= -DDEVOSSAUDIO="\"\\\"$(DEVOSSAUDIO)\\\"\"" diff --git a/audio/streamtuner-local/Makefile b/audio/streamtuner-local/Makefile index 495de2deaca..7de44e38da8 100644 --- a/audio/streamtuner-local/Makefile +++ b/audio/streamtuner-local/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:34 reed Exp $ +# $NetBSD: Makefile,v 1.9 2004/01/22 07:15:01 grant Exp $ # DISTNAME= streamtuner-local-0.2.1 @@ -13,7 +13,7 @@ COMMENT= Streamtuner plugin providing access to your local MP3 repository USE_BUILDLINK2= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_X11= YES SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile index 2438e594d95..f62ad5ab39b 100644 --- a/audio/streamtuner/Makefile +++ b/audio/streamtuner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:34 reed Exp $ +# $NetBSD: Makefile,v 1.12 2004/01/22 07:15:01 grant Exp $ # DISTNAME= streamtuner-${DIST_VER} @@ -14,7 +14,7 @@ DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs BUILD_USES_MSGFMT= yes USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_X11= yes diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile index a03e13224f8..866ee3edadf 100644 --- a/audio/sweep/Makefile +++ b/audio/sweep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/12/08 14:41:38 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2004/01/22 07:15:01 grant Exp $ # DISTNAME= sweep-0.8.2 @@ -16,7 +16,7 @@ BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= YES USE_X11= YES diff --git a/audio/toolame/Makefile b/audio/toolame/Makefile index e67e6be2dd6..9ee9c74091a 100644 --- a/audio/toolame/Makefile +++ b/audio/toolame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/21 16:30:48 martti Exp $ +# $NetBSD: Makefile,v 1.5 2004/01/22 07:15:01 grant Exp $ # DISTNAME= toolame-02l @@ -13,7 +13,7 @@ COMMENT= Optimized MPEG 1/2 layer 2 audio encoder LICENSE= fee-based-commercial-use USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make TOOLAME_ARCH?= diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile index 894877fb572..2f112214e52 100644 --- a/audio/tremor-tools/Makefile +++ b/audio/tremor-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/12 10:36:49 cjep Exp $ +# $NetBSD: Makefile,v 1.7 2004/01/22 07:15:01 grant Exp $ DISTNAME= vorbis-tools-1.0 PKGNAME= tremor-tools-1.0.0.8 @@ -18,7 +18,7 @@ CONFLICTS= vorbis-[0-9]* USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \ --with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \ diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile index 0636148598f..ab253d23697 100644 --- a/audio/tremor/Makefile +++ b/audio/tremor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/20 12:07:43 agc Exp $ +# $NetBSD: Makefile,v 1.9 2004/01/22 07:15:01 grant Exp $ DISTNAME= tremor_snapshot_030406 PKGNAME= tremor-1.0.2 @@ -14,7 +14,7 @@ COMMENT= Fixed point decoding library for the Ogg Vorbis audio encoding format WRKSRC= ${WRKDIR}/Tremor AUTOMAKE_REQD= 1.4 GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_LIBTOOL= yes #LIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile index eed4e514c85..c6d56a8d923 100644 --- a/audio/wmusic/Makefile +++ b/audio/wmusic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/13 13:50:30 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2004/01/22 07:15:01 grant Exp $ DISTNAME= wmusic-1.4.7 PKGREVISION= 2 @@ -12,7 +12,7 @@ COMMENT= WindowMaker dockable remote for xmms USE_BUILDLINK2= yes USE_X11= yes GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make do-install: @${INSTALL_PROGRAM} ${WRKSRC}/src/wmusic ${PREFIX}/bin diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile index 482c923d550..141a2ab6e35 100644 --- a/audio/xamp/Makefile +++ b/audio/xamp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/20 12:07:43 agc Exp $ +# $NetBSD: Makefile,v 1.14 2004/01/22 07:15:01 grant Exp $ # FreeBSD: ports/audio/xamp/Makefile,v 1.5 1999/08/25 04:36:22 obrien Exp # @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/xamp-0.8/xamp-0.8g DIST_SUBDIR= xamp GNU_CONFIGURE= yes CONFIGURE_ENV+= CXXFLAGS="${CFLAGS}" -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_X11BASE= yes EVAL_PREFIX+= QT1DIR=qt1 diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile index 5e8c5af0643..0e8efef6574 100644 --- a/audio/xmms-flac/Makefile +++ b/audio/xmms-flac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/12/24 09:53:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/22 07:15:01 grant Exp $ # DISTNAME= flac-1.1.0 @@ -12,7 +12,7 @@ HOMEPAGE= http://flac.sourceforge.net/ COMMENT= FLAC XMMS plugin USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make GNU_CONFIGURE= yes USE_LIBTOOL= yes diff --git a/audio/xmms-madspin/Makefile b/audio/xmms-madspin/Makefile index fde183f8562..42e7c9c5f55 100644 --- a/audio/xmms-madspin/Makefile +++ b/audio/xmms-madspin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/07/17 21:24:13 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/01/22 07:15:01 grant Exp $ # DISTNAME= madspin-0.05 @@ -15,7 +15,7 @@ USE_BUILDLINK2= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES -USE_GMAKE= yes +USE_GNU_TOOLS+= make .include "../../audio/xmms/buildlink2.mk" .include "../../x11/gtk/buildlink2.mk" diff --git a/audio/xmms-neato/Makefile b/audio/xmms-neato/Makefile index 72794ee444a..3bf67b98795 100644 --- a/audio/xmms-neato/Makefile +++ b/audio/xmms-neato/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/07/17 21:24:14 grant Exp $ +# $NetBSD: Makefile,v 1.12 2004/01/22 07:15:01 grant Exp $ # DISTNAME= neato @@ -13,7 +13,7 @@ COMMENT= Circle effect XMMS plugin USE_BUILDLINK2= yes USE_X11= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make GNU_CONFIGURE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile index 1cc31a6a223..5175ace0c4e 100644 --- a/audio/xmp/Makefile +++ b/audio/xmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/01/28 22:03:05 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2004/01/22 07:15:01 grant Exp $ # FreeBSD: ports/audio/xmp/Makefile,v 1.5 2000/04/08 21:24:59 mharo Exp # @@ -20,7 +20,7 @@ CONFIGURE_ARGS+=--disable-alsa \ --sysconfdir=${PKG_SYSCONFDIR} USE_X11= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make EGDIR= ${PREFIX}/share/examples/xmp CONF_FILES= ${EGDIR}/xmp-modules.conf ${PKG_SYSCONFDIR}/xmp-modules.conf diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile index b461592786f..a97a985e76b 100644 --- a/audio/xsidplay/Makefile +++ b/audio/xsidplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/01/20 12:07:43 agc Exp $ +# $NetBSD: Makefile,v 1.26 2004/01/22 07:15:01 grant Exp $ # DISTNAME= xsidplay-1_5_4 @@ -19,7 +19,7 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_X11BASE= yes GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} CONFIGURE_ARGS+= --with-qt-dir=${QTDIR} diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile index c82b1c544cd..59be12c0610 100644 --- a/audio/yamt/Makefile +++ b/audio/yamt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:34 reed Exp $ +# $NetBSD: Makefile,v 1.10 2004/01/22 07:15:01 grant Exp $ DISTNAME= yamt-0.5 PKGREVISION= 4 @@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= yes USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_X11BASE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make GNU_CONFIGURE= yes .include "../../x11/gnome-libs/buildlink2.mk" diff --git a/benchmarks/benchfft/Makefile b/benchmarks/benchfft/Makefile index 2e85bf2fbcb..8f90fead61b 100644 --- a/benchmarks/benchfft/Makefile +++ b/benchmarks/benchfft/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2003/10/26 14:54:54 mrauch Exp $ +# $NetBSD: Makefile,v 1.16 2004/01/22 07:19:25 grant Exp $ DISTNAME= benchfft-2.0 CATEGORIES= benchmarks math @@ -12,7 +12,7 @@ COMMENT= Benchmark your machine with a number of FFT algorithims GNU_CONFIGURE= yes USE_BUILDLINK2= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make USE_FORTRAN= yes USE_LIBTOOL= yes diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile index 3a3a973c047..0fa2243d7a7 100644 --- a/benchmarks/httperf/Makefile +++ b/benchmarks/httperf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/09/19 18:06:34 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/22 07:19:25 grant Exp $ # DISTNAME= httperf-0.6 @@ -11,7 +11,7 @@ COMMENT= Popular web server benchmarking program LICENSE= no-commercial-use -USE_GMAKE= yes +USE_GNU_TOOLS+= make .include "../../mk/bsd.prefs.mk" diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile index 184be049c5d..96d62ca6b74 100644 --- a/benchmarks/lmbench/Makefile +++ b/benchmarks/lmbench/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/11/14 23:08:51 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2004/01/22 07:19:25 grant Exp $ DISTNAME= lmbench-2alpha11 PKGNAME= lmbench-2.11a @@ -11,7 +11,7 @@ HOMEPAGE= http://www.bitmover.com/lm/lmbench/ COMMENT= Complete benchmark that gives a large amount of information USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make ALL_TARGET= build MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} diff --git a/biology/chemtool/Makefile b/biology/chemtool/Makefile index e1a94686766..ff3c1e65527 100644 --- a/biology/chemtool/Makefile +++ b/biology/chemtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2003/08/30 21:10:11 jtb Exp $ +# $NetBSD: Makefile,v 1.20 2004/01/22 07:20:07 grant Exp $ DISTNAME= chemtool-1.6 CATEGORIES= biology @@ -12,7 +12,7 @@ USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_X11= yes GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/chemtool diff --git a/biology/nut/Makefile b/biology/nut/Makefile index 0a860081eb0..93acf019812 100644 --- a/biology/nut/Makefile +++ b/biology/nut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/12/25 14:46:17 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2004/01/22 07:20:07 grant Exp $ DISTNAME= nut-9.5 CATEGORIES= biology @@ -9,7 +9,7 @@ HOMEPAGE= http://www.lafn.org/~av832/ COMMENT= Record what you eat and analyze your meals ALL_TARGET= nut -USE_GMAKE= yes +USE_GNU_TOOLS+= make do-install: ${INSTALL_PROGRAM} ${WRKSRC}/nut ${PREFIX}/bin diff --git a/cad/acs/Makefile b/cad/acs/Makefile index dc365bf5ff3..96cd7d08026 100644 --- a/cad/acs/Makefile +++ b/cad/acs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/07/21 16:32:08 martti Exp $ +# $NetBSD: Makefile,v 1.9 2004/01/22 07:21:54 grant Exp $ # DISTNAME= acs-0.29 @@ -9,7 +9,7 @@ MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://www.geda.seul.org/tools/acs/index.html COMMENT= General purpose circuit simulator -USE_GMAKE= YES +USE_GNU_TOOLS+= make do-build: cd ${WRKSRC}/src && ${MAKE_PROGRAM} ${LOWER_OPSYS} diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile index 1a1c99f6827..fae75fa7888 100644 --- a/cad/boolean/Makefile +++ b/cad/boolean/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/01/10 14:25:42 recht Exp $ +# $NetBSD: Makefile,v 1.15 2004/01/22 07:21:54 grant Exp $ # DISTNAME= boolean @@ -18,7 +18,7 @@ REL= 6.4 BUILD_DEPENDS+= cmake>=1.6.6:../../devel/cmake USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make # the zip archive messes up the case of these files which breaks # cmake. diff --git a/cad/covered-current/Makefile b/cad/covered-current/Makefile index c203dd1301c..cb87ae31980 100644 --- a/cad/covered-current/Makefile +++ b/cad/covered-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/12/30 17:21:55 cjep Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/22 07:21:54 grant Exp $ # DISTNAME= covered-${SNAPDATE} @@ -18,7 +18,7 @@ CONFLICTS+= covered-[0-9]* SNAPDATE= 20021214 GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make TEST_DIRS= ${WRKSRC}/diags/regress TEST_TARGET= #defined diff --git a/cad/covered/Makefile b/cad/covered/Makefile index 98e70b1e744..00e8fe97232 100644 --- a/cad/covered/Makefile +++ b/cad/covered/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/12/09 01:20:36 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.4 2004/01/22 07:21:54 grant Exp $ # DISTNAME= covered-0.2.2 @@ -18,7 +18,7 @@ CONFLICTS+= covered-current-[0-9]* USE_PERL5= YES REPLACE_PERL= diags/verilog/check_test GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make TEST_DIRS= ${WRKSRC}/diags/regress TEST_TARGET= iverilog diff --git a/cad/geda-examples/Makefile b/cad/geda-examples/Makefile index 8f0a52a6510..02744454018 100644 --- a/cad/geda-examples/Makefile +++ b/cad/geda-examples/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.3 2004/01/22 07:21:54 grant Exp $ # DISTNAME= geda-examples-${PKGVERSION} @@ -18,7 +18,7 @@ DIST_SUBDIR= geda PKGVERSION= 20030901 GNU_CONFIGURE= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/geda diff --git a/cad/geda-symbols/Makefile b/cad/geda-symbols/Makefile index 0af0f073406..8c5912e2a1e 100644 --- a/cad/geda-symbols/Makefile +++ b/cad/geda-symbols/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/10/29 23:14:22 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.14 2004/01/22 07:21:54 grant Exp $ # DISTNAME= geda-symbols-${PKGVERSION} @@ -18,7 +18,6 @@ DIST_SUBDIR= geda PKGVERSION= 20030901 GNU_CONFIGURE= YES -USE_GMAKE= YES -USE_GNU_TOOLS+= sed +USE_GNU_TOOLS+= make sed .include "../../mk/bsd.pkg.mk" diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile index 87e281d5c00..5e9a8f42e0a 100644 --- a/cad/gerbv/Makefile +++ b/cad/gerbv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/12/30 17:21:55 cjep Exp $ +# $NetBSD: Makefile,v 1.18 2004/01/22 07:21:54 grant Exp $ # DISTNAME= gerbv-0.15 @@ -12,7 +12,7 @@ COMMENT= Gerber file viewer CONFIGURE_ARGS+= --enable-exportpng GNU_CONFIGURE= YES USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make .include "../../graphics/gdk-pixbuf/buildlink2.mk" .include "../../graphics/png/buildlink2.mk" diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile index c3b84794ca4..62a58690630 100644 --- a/cad/gnetlist/Makefile +++ b/cad/gnetlist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/01/03 18:49:34 reed Exp $ +# $NetBSD: Makefile,v 1.24 2004/01/22 07:21:54 grant Exp $ # DISTNAME= geda-gnetlist-${PKGVERSION} @@ -25,7 +25,7 @@ CONFLICTS+= gEDA<19991011 GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_BUILDLINK2= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile index f60b2a0858a..218386578ac 100644 --- a/cad/gnucap/Makefile +++ b/cad/gnucap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/11/08 00:54:22 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.8 2004/01/22 07:21:54 grant Exp $ # DISTNAME= gnucap-0.33 @@ -10,7 +10,7 @@ HOMEPAGE= http://www.geda.seul.org/tools/acs/index.html COMMENT= General purpose circuit simulator USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_GNU_READLINE= YES do-build: diff --git a/cad/ipal-current/Makefile b/cad/ipal-current/Makefile index 731f8ce6e1a..1823a6813a2 100644 --- a/cad/ipal-current/Makefile +++ b/cad/ipal-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/07/17 21:25:09 grant Exp $ +# $NetBSD: Makefile,v 1.15 2004/01/22 07:21:55 grant Exp $ # DISTNAME= ipal-20001210 @@ -15,7 +15,7 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison GNU_CONFIGURE= YES USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make CFLAGS+= -fPIC diff --git a/cad/magic/Makefile b/cad/magic/Makefile index 93d6052295c..ca52bcad79f 100644 --- a/cad/magic/Makefile +++ b/cad/magic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/07/17 21:25:10 grant Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/22 07:21:55 grant Exp $ # DISTNAME= magic-7.1 @@ -10,7 +10,7 @@ MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://vlsi.cornell.edu/magic/ COMMENT= Integrated circuit layout system -USE_GMAKE= YES +USE_GNU_TOOLS+= make USE_X11= YES USE_BUILDLINK2= YES MAKE_ENV+= MAGIC_HOME=${PREFIX} diff --git a/cad/pcb-current/Makefile b/cad/pcb-current/Makefile index ea171e6822e..3d4cb51647c 100644 --- a/cad/pcb-current/Makefile +++ b/cad/pcb-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/08/17 03:59:08 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.2 2004/01/22 07:21:55 grant Exp $ # DISTNAME= pcb-${SNAPDATE} @@ -17,7 +17,7 @@ CONFLICTS+= pcb-[0-9]* SNAPDATE= 20030815 GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make # install to X11BASE until cad/gnetlist is taught to handle pcb installing # to X11BASE and pcb-current installing to LOCALBASE. Alternatively, once diff --git a/cad/transcalc/Makefile b/cad/transcalc/Makefile index f6f30460170..6f1b84a67f1 100644 --- a/cad/transcalc/Makefile +++ b/cad/transcalc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/01/03 18:49:35 reed Exp $ +# $NetBSD: Makefile,v 1.7 2004/01/22 07:21:55 grant Exp $ # DISTNAME= transcalc-0.13 @@ -13,7 +13,7 @@ COMMENT= Transmission line analysis/synthesis GNU_CONFIGURE= YES USE_BUILDLINK2= YES -USE_GMAKE= YES +USE_GNU_TOOLS+= make .include "../../x11/gtk/buildlink2.mk" .include "../../graphics/imlib/buildlink2.mk" diff --git a/cad/verilog-current/Makefile b/cad/verilog-current/Makefile index 60d88455ac8..b683daad9ef 100644 --- a/cad/verilog-current/Makefile +++ b/cad/verilog-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2003/08/25 11:21:50 drochner Exp $ +# $NetBSD: Makefile,v 1.36 2004/01/22 07:21:55 grant Exp $ # DISTNAME= verilog-${SNAPDATE} @@ -20,7 +20,7 @@ CONFLICTS+= verilog-[0-9]* SNAPDATE= 20030815 USE_BUILDLINK2= yes GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make # # for ipal.h #CPPFLAGS+= -I${LOCALBASE}/include diff --git a/cad/verilog/Makefile b/cad/verilog/Makefile index 9fe4b4b932e..61dce1ae0a3 100644 --- a/cad/verilog/Makefile +++ b/cad/verilog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/01/02 14:00:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.16 2004/01/22 07:21:55 grant Exp $ # DISTNAME= verilog-0.7 @@ -17,7 +17,7 @@ BUILD_DEPENDS+= gperf>=2.7.2:../../devel/gperf CONFLICTS+= verilog-current-[0-9]* GNU_CONFIGURE= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make # # for ipal.h #CPPFLAGS+= -I${LOCALBASE}/include diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile index 8846c862366..b28023eaace 100644 --- a/cad/vipec/Makefile +++ b/cad/vipec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2003/12/30 17:21:55 cjep Exp $ +# $NetBSD: Makefile,v 1.34 2004/01/22 07:21:55 grant Exp $ # DISTNAME= ViPEC-3.1.3 @@ -13,7 +13,7 @@ BUILD_DEPENDS+= tmake-*:../../devel/tmake USE_BUILDLINK2= yes USE_X11= yes -USE_GMAKE= yes +USE_GNU_TOOLS+= make UNLIMIT_RESOURCES+= datasize CONFLICTS+= vipec-[0-9]* |