From dbb999066b7985e5517325648c9067f6e5b2bc03 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 1 Feb 2004 01:43:28 +0000 Subject: In the new compiler selection framework, GCC_REQD is appended to, not overridden. --- audio/libogg/Makefile | 4 ++-- audio/libvorbis/Makefile | 4 ++-- biology/rasmol/Makefile | 4 ++-- cad/fastcap/Makefile | 4 ++-- cad/fasthenry/Makefile | 4 ++-- chat/gabber/Makefile | 4 ++-- devel/ddd/Makefile | 4 ++-- devel/glib/Makefile | 4 ++-- devel/gmp/Makefile | 4 ++-- devel/gnome-objc/Makefile | 4 ++-- editors/lyx-qt/Makefile.common | 4 ++-- editors/xemacs-current/Makefile | 4 ++-- emulators/stella/Makefile | 4 ++-- emulators/vba/Makefile | 4 ++-- games/angband-tty/Makefile | 4 ++-- games/angband-x11/Makefile | 4 ++-- games/zoom/Makefile | 4 ++-- graphics/ImageMagick/Makefile | 6 +++--- graphics/aalib/Makefile.common | 4 ++-- graphics/aqsis/Makefile | 4 ++-- graphics/ncview/Makefile | 4 ++-- graphics/netpbm/Makefile | 4 ++-- graphics/ogle/Makefile | 4 ++-- graphics/ogle_gui/Makefile | 4 ++-- lang/gpc/Makefile | 4 ++-- math/scilab/Makefile | 4 ++-- meta-pkgs/xfce4/Makefile.common | 4 ++-- misc/koffice/Makefile | 4 ++-- misc/openoffice/Makefile | 4 ++-- multimedia/mplayer-share/Makefile.depends | 4 ++-- net/djbdns/Makefile | 4 ++-- net/ettercap/Makefile | 4 ++-- net/ucspi-tcp/Makefile | 4 ++-- news/inn/Makefile | 4 ++-- print/ghostscript-esp/Makefile.common | 4 ++-- print/ghostscript-gnu/Makefile.common | 4 ++-- print/ghostscript-nox11/Makefile.common | 6 +++--- security/sfs/Makefile | 4 ++-- wm/windowmaker/Makefile | 4 ++-- x11/kdelibs2/Makefile | 4 ++-- x11/qt3-libs/Makefile | 4 ++-- x11/xephem/Makefile | 4 ++-- x11/xphoon/Makefile | 4 ++-- x11/xscreensaver/Makefile.common | 4 ++-- 44 files changed, 90 insertions(+), 90 deletions(-) diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile index a04a137e673..ffb27e32b73 100644 --- a/audio/libogg/Makefile +++ b/audio/libogg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/01/10 05:42:50 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2004/02/01 01:43:28 jlam Exp $ DISTNAME= libogg-1.1 CATEGORIES= devel audio @@ -15,7 +15,7 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 PLIST_SUBST+= DISTNAME=${DISTNAME} diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile index 50ceceb9b4c..e26a523c6b2 100644 --- a/audio/libvorbis/Makefile +++ b/audio/libvorbis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2003/12/08 14:39:39 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2004/02/01 01:43:28 jlam Exp $ DISTNAME= libvorbis-1.0.1 CATEGORIES= devel audio @@ -13,7 +13,7 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 PKGCONFIG_OVERRIDE+= ${WRKSRC}/vorbis.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/vorbisenc.pc.in diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile index 4fea9283ffd..37e9cc6e73f 100644 --- a/biology/rasmol/Makefile +++ b/biology/rasmol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/01/24 20:55:42 kristerw Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/01 01:43:28 jlam Exp $ DISTNAME= RasMol_2.7.1 PKGNAME= rasmol-2.7.1 @@ -19,7 +19,7 @@ MAKE_ENV+= DEPTHDEF="${DEPTHDEF}" .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .endif .if defined(RASMOL_DEPTH) diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile index db5f5de6024..d54cdc7bd64 100644 --- a/cad/fastcap/Makefile +++ b/cad/fastcap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/01/25 17:03:27 kristerw Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/01 01:43:28 jlam Exp $ # DISTNAME= fastcap-2.0-15Jul92 @@ -25,7 +25,7 @@ CONFIGURE_SCRIPT= ./config CONFIGURE_ARGS= 4 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .endif do-install: diff --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile index b90a4dee5e8..746e7f95fc7 100644 --- a/cad/fasthenry/Makefile +++ b/cad/fasthenry/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/01/25 17:20:34 kristerw Exp $ +# $NetBSD: Makefile,v 1.20 2004/02/01 01:43:28 jlam Exp $ # DISTNAME= fasthenry-3.0-12Nov96 @@ -40,7 +40,7 @@ MAKE_ENV+= LIBS="${LIBS}" .endif .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .endif .include "../../mk/bsd.pkg.mk" diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile index fa29d4614e0..48c95172155 100644 --- a/chat/gabber/Makefile +++ b/chat/gabber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/01/22 07:49:20 grant Exp $ +# $NetBSD: Makefile,v 1.28 2004/02/01 01:43:28 jlam Exp $ DISTNAME= gabber-0.8.8 PKGREVISION= 3 @@ -16,7 +16,7 @@ USE_X11BASE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-xmms --disable-sigctest diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index 561c13cc0e1..f580d691774 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2004/01/22 08:24:28 grant Exp $ +# $NetBSD: Makefile,v 1.56 2004/02/01 01:43:28 jlam Exp $ # DISTNAME= ddd-3.3.7 @@ -16,7 +16,7 @@ USE_GNU_TOOLS+= make TEST_TARGET= check INFO_FILES= ddd-themes.info ddd.info -GCC_REQD= 3.0 +GCC_REQD+= 3.0 CONFIGURE_ARGS+= --with-ncurses=no CONFIGURE_ENV+= COMPFACE="${FALSE}" diff --git a/devel/glib/Makefile b/devel/glib/Makefile index ed2bfdc1549..0836be17e29 100644 --- a/devel/glib/Makefile +++ b/devel/glib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2004/01/05 20:57:52 jlam Exp $ +# $NetBSD: Makefile,v 1.65 2004/02/01 01:43:28 jlam Exp $ # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp # @@ -41,7 +41,7 @@ CONFIGURE_ENV+= glib_cv_rtldglobal_broken=no .endif .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .endif GLIB_VERSION= ${DISTNAME:S/glib-//} diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile index d738897f575..8632b8dde3d 100644 --- a/devel/gmp/Makefile +++ b/devel/gmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/01/19 13:15:52 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2004/02/01 01:43:28 jlam Exp $ # DISTNAME= gmp-4.1.2 @@ -27,7 +27,7 @@ TEST_TARGET= check .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" # The configure script thinks gcc 2.95 for ARM is too buggy to use. -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .endif .include "../../mk/bsd.pkg.mk" diff --git a/devel/gnome-objc/Makefile b/devel/gnome-objc/Makefile index 8ee3bd2eed5..0c314e6a3db 100644 --- a/devel/gnome-objc/Makefile +++ b/devel/gnome-objc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/01/03 18:49:38 reed Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/01 01:43:28 jlam Exp $ # DISTNAME= gnome-objc-1.0.40 @@ -22,7 +22,7 @@ CONFIGURE_ENV+= OBJC="${CC}" USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .include "../../x11/gnome-libs/buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common index 6fd0b5c53f9..6b8295efaf3 100644 --- a/editors/lyx-qt/Makefile.common +++ b/editors/lyx-qt/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2004/01/22 08:30:30 grant Exp $ +# $NetBSD: Makefile.common,v 1.12 2004/02/01 01:43:29 jlam Exp $ # DISTNAME= lyx-1.3.3 @@ -28,7 +28,7 @@ USE_LIBTOOL= YES USE_PERL5= YES USE_PKGLOCALEDIR= YES USE_X11= YES -GCC_REQD= 2.95 +GCC_REQD+= 2.95 LIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile index 91e797d97f1..23c68978980 100644 --- a/editors/xemacs-current/Makefile +++ b/editors/xemacs-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/01/25 12:44:34 kristerw Exp $ +# $NetBSD: Makefile,v 1.35 2004/02/01 01:43:29 jlam Exp $ DISTNAME= xemacs-21.5.16 PKGREVISION= 1 @@ -16,7 +16,7 @@ PLIST_SUBST+= EMACSVER=xemacs-21.5-b16 MESSAGE_SUBST+= EMACSVER=xemacs-21.5-b16 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .endif .include "../../mk/bsd.prefs.mk" diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile index d4cb219b600..0d000763104 100644 --- a/emulators/stella/Makefile +++ b/emulators/stella/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/01/28 05:36:26 kristerw Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/01 01:43:29 jlam Exp $ DISTNAME= stella-1.1-src PKGNAME= stella-1.1 @@ -16,7 +16,7 @@ MAKEFILE= makefile ALL_TARGET= unix-x .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .endif MAKE_ENV= CXXFLAGS="${CXXFLAGS} -fno-rtti" diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile index 3e8a48799eb..8853915e1fb 100644 --- a/emulators/vba/Makefile +++ b/emulators/vba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/01/22 08:36:04 grant Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/01 01:43:29 jlam Exp $ DISTNAME= VisualBoyAdvance-src-1.6a PKGNAME= vba-1.6.0.1 @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-c-core CONFIGURE_ARGS+= --without-mmx -GCC_REQD= 3.0.0 +GCC_REQD+= 3.0.0 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/TestEmu ${PREFIX}/bin diff --git a/games/angband-tty/Makefile b/games/angband-tty/Makefile index 1b15697c04e..8fe26f3b4a4 100644 --- a/games/angband-tty/Makefile +++ b/games/angband-tty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/01/25 16:22:15 kristerw Exp $ +# $NetBSD: Makefile,v 1.21 2004/02/01 01:43:29 jlam Exp $ # DISTNAME= angband-283 @@ -23,7 +23,7 @@ ALL_TARGET= angband SPOILERFILE= angband-spoilers.tar.gz .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .endif do-install: diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile index 9ddaac48b2d..98a1c8e9c39 100644 --- a/games/angband-x11/Makefile +++ b/games/angband-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/01/25 16:22:15 kristerw Exp $ +# $NetBSD: Makefile,v 1.30 2004/02/01 01:43:29 jlam Exp $ # DISTNAME= angband-3.0.3 @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-setgid=games --prefix=${PREFIX} .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .endif # add spoiler files and clean up a bit diff --git a/games/zoom/Makefile b/games/zoom/Makefile index bc618981d8b..86e3568fd66 100644 --- a/games/zoom/Makefile +++ b/games/zoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/01/24 13:30:57 grant Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/01 01:43:29 jlam Exp $ # DISTNAME= zoom-1.0.1 @@ -24,7 +24,7 @@ USE_GNU_TOOLS+= make USE_PERL5= build .if ${MACHINE_ARCH} == "alpha" -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .endif UNLIMIT_RESOURCES+= datasize diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index aeb3b120e69..2e830f3cffd 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.107 2004/01/03 18:49:41 reed Exp $ +# $NetBSD: Makefile,v 1.108 2004/02/01 01:43:29 jlam Exp $ .include "Makefile.common" @@ -22,7 +22,7 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= Magick++/lib/ImageMagick++.pc.in PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 PLIST_SUBST+= IM_MAJOR_VER=${IM_MAJOR_VER} PLIST_SUBST+= IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER} @@ -30,7 +30,7 @@ PLIST_SUBST+= IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER} .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .endif # Avoid compiler bug on "mipsel" (cobalt?) diff --git a/graphics/aalib/Makefile.common b/graphics/aalib/Makefile.common index 5445808ebff..487f3fa4eac 100644 --- a/graphics/aalib/Makefile.common +++ b/graphics/aalib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2004/01/27 00:53:10 heinz Exp $ +# $NetBSD: Makefile.common,v 1.15 2004/02/01 01:43:29 jlam Exp $ DISTNAME= aalib-${DIST_VERS} CATEGORIES+= graphics @@ -21,7 +21,7 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CONFIGURE_ARGS+= --with-curses-driver=no .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .endif .if !target(post-patch) diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile index 12ecd45ebaa..52ece6ea077 100644 --- a/graphics/aqsis/Makefile +++ b/graphics/aqsis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/01/24 15:46:42 grant Exp $ +# $NetBSD: Makefile,v 1.13 2004/02/01 01:43:29 jlam Exp $ # DISTNAME= aqsis-0.6.4 @@ -17,7 +17,7 @@ USE_GNU_TOOLS+= make USE_X11= yes USE_BUILDLINK2= yes -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 USE_GCC_SHLIB= yes .include "../../devel/libargparse/buildlink2.mk" diff --git a/graphics/ncview/Makefile b/graphics/ncview/Makefile index 8c59b1dbe7b..7be65c509d8 100644 --- a/graphics/ncview/Makefile +++ b/graphics/ncview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/01/24 11:36:33 kristerw Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/01 01:43:29 jlam Exp $ DISTNAME= ncview-1.92d CATEGORIES= graphics @@ -18,7 +18,7 @@ CONFIGURE_ARGS+= --with-udunits_incdir=${BUILDLINK_PREFIX.udunits}/include CONFIGURE_ARGS+= --with-udunits_libdir=${BUILDLINK_PREFIX.udunits}/lib .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .endif .include "../../devel/netcdf/buildlink2.mk" diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 20532478a0d..f22df7763dc 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.89 2004/01/26 09:54:43 tron Exp $ +# $NetBSD: Makefile,v 1.90 2004/02/01 01:43:29 jlam Exp $ DISTNAME= netpbm-10.11.8 PKGREVISION= 1 @@ -28,7 +28,7 @@ STAGEDIR= ${WRKDIR}/staging .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .endif .if ${OPSYS} == SunOS diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile index b0d83a10c57..7854bc6241f 100644 --- a/graphics/ogle/Makefile +++ b/graphics/ogle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/01/28 14:39:36 recht Exp $ +# $NetBSD: Makefile,v 1.33 2004/02/01 01:43:29 jlam Exp $ DISTNAME= ogle-0.9.2 PKGREVISION= 1 @@ -26,7 +26,7 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" #CONFIGURE_ARGS+= --enable-obsdaudio #CONFIGURE_ARGS+= --disable-sunaudio -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .include "../../audio/liba52/buildlink2.mk" .include "../../audio/libmad/buildlink2.mk" diff --git a/graphics/ogle_gui/Makefile b/graphics/ogle_gui/Makefile index 872fe26fe5c..375a3e6a51e 100644 --- a/graphics/ogle_gui/Makefile +++ b/graphics/ogle_gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/01/24 15:46:44 grant Exp $ +# $NetBSD: Makefile,v 1.26 2004/02/01 01:43:29 jlam Exp $ DISTNAME= ogle_gui-0.9.2 PKGREVISION= 2 @@ -17,7 +17,7 @@ USE_GNU_TOOLS+= make GNU_CONFIGURE= yes CONFIGURE_ARGS+= --bindir=${PREFIX}/lib/ogle -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile index 254f27f4112..5473a3a9335 100644 --- a/lang/gpc/Makefile +++ b/lang/gpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/01/24 13:51:14 grant Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/01 01:43:29 jlam Exp $ DISTNAME= gpc-2.1 PKGREVISION= 3 @@ -26,7 +26,7 @@ PLIST_SRC= PLIST .include "../../mk/bsd.prefs.mk" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .if ${OPSYS} == "NetBSD" CFLAGS+= -DNETBSD_NATIVE diff --git a/math/scilab/Makefile b/math/scilab/Makefile index cd315148fc6..8ed7b517899 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2004/01/25 15:21:35 kristerw Exp $ +# $NetBSD: Makefile,v 1.47 2004/02/01 01:43:29 jlam Exp $ # DISTNAME= ${SCIBASE}.src @@ -79,7 +79,7 @@ post-install: ${LN} -s ${LIBTOOL} ${PREFIX}/lib/${SCIBASE}/libtool .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .endif # the "SCI=0 && unset SCI" is done because some of the tests really will diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common index 68ced3106d1..5809c2bc175 100644 --- a/meta-pkgs/xfce4/Makefile.common +++ b/meta-pkgs/xfce4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2004/01/23 12:11:48 martti Exp $ +# $NetBSD: Makefile.common,v 1.8 2004/02/01 01:43:29 jlam Exp $ MASTER_SITES= http://www.xfce.org/archive/xfce-4.0.3.1/src/ \ http://linux.imp.mx/xfce4/xfce_4.0.3.1/src/ @@ -19,7 +19,7 @@ GNU_CONFIGURE= # defined USE_GNU_TOOLS+= make .if ${MACHINE_ARCH} == "alpha" -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .endif MESSAGE_SRC?= ${.CURDIR}/../../fonts/fontconfig/MESSAGE diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index 66daca0ee34..9df09f674ca 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/01/28 08:43:11 markd Exp $ +# $NetBSD: Makefile,v 1.35 2004/02/01 01:43:29 jlam Exp $ DISTNAME= koffice-1.3 CATEGORIES= misc kde @@ -19,7 +19,7 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 PTHREAD_OPTS+= require diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index 91d9b2d72fb..fb417a6ea84 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2004/01/24 14:11:10 grant Exp $ +# $NetBSD: Makefile,v 1.45 2004/02/01 01:43:29 jlam Exp $ DISTNAME= openoffice-0.0.0.641 PKGREVISION= 2 @@ -20,7 +20,7 @@ USE_BUILDLINK2= yes .include "../../mk/bsd.prefs.mk" # OpenOffice requires gcc 2.95.2 or better. -GCC_REQD= 2.95.2 +GCC_REQD+= 2.95.2 BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison BUILD_DEPENDS+= {standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh diff --git a/multimedia/mplayer-share/Makefile.depends b/multimedia/mplayer-share/Makefile.depends index c632b30a1f5..fa025022a44 100644 --- a/multimedia/mplayer-share/Makefile.depends +++ b/multimedia/mplayer-share/Makefile.depends @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.depends,v 1.3 2004/01/28 14:39:37 recht Exp $ +# $NetBSD: Makefile.depends,v 1.4 2004/02/01 01:43:29 jlam Exp $ # DEPENDS+= mplayer-share>=${MPLAYER_PKG_VERSION}:../../multimedia/mplayer-share -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux" . include "../../audio/cdparanoia/buildlink2.mk" diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile index 73373a2949e..4eda1fb44a3 100644 --- a/net/djbdns/Makefile +++ b/net/djbdns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2003/09/24 03:28:12 schmonz Exp $ +# $NetBSD: Makefile,v 1.28 2004/02/01 01:43:29 jlam Exp $ # FreeBSD Id: ports/net/djbdns/Makefile,v 1.4 2000/09/28 18:18:41 nbm Exp # @@ -38,7 +38,7 @@ INSTALL_TARGET= setup check MANVERSION= 20021211 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .endif post-extract: diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile index c14692551a1..88620f4aa6c 100644 --- a/net/ettercap/Makefile +++ b/net/ettercap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/01/23 23:38:13 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2004/02/01 01:43:29 jlam Exp $ DISTNAME= ettercap-0.6.b CATEGORIES= security net @@ -25,7 +25,7 @@ BUILD_DIRS= ${WRKSRC} ${WRKSRC}/plugins INSTALL_DIRS= ${WRKSRC} ${WRKSRC}/plugins .if ${MACHINE_ARCH} == "alpha" -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .endif post-buildlink: diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile index 2ac3ec82211..eb6ef8e0546 100644 --- a/net/ucspi-tcp/Makefile +++ b/net/ucspi-tcp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2003/09/17 19:40:55 grant Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/01 01:43:30 jlam Exp $ # FreeBSD Id: ports/sysutils/ucspi-tcp/Makefile,v 1.12 2000/07/10 01:41:24 steve Exp DISTNAME= ucspi-tcp-0.88 @@ -21,7 +21,7 @@ ALL_TARGET= it INSTALL_TARGET= setup check .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .endif post-configure: diff --git a/news/inn/Makefile b/news/inn/Makefile index fe202a35459..13ece9ab285 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2004/01/24 20:41:01 kristerw Exp $ +# $NetBSD: Makefile,v 1.53 2004/02/01 01:43:30 jlam Exp $ DISTNAME= inn-${INN_VERSION} PKGREVISION= 1 @@ -85,7 +85,7 @@ CONFIGURE_ARGS+= --with-sendmail=/usr/sbin/sendmail .endif .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .endif post-patch: diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common index 09200ce16cf..96f4ffff913 100644 --- a/print/ghostscript-esp/Makefile.common +++ b/print/ghostscript-esp/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2004/01/24 14:58:00 grant Exp $ +# $NetBSD: Makefile.common,v 1.15 2004/02/01 01:43:30 jlam Exp $ DISTNAME= espgs-${GS_VERS}-source BASEGS_VERS= 7.07 @@ -53,7 +53,7 @@ PLIST_SRC= ${.CURDIR}/../ghostscript-esp/PLIST .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .endif .if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4") diff --git a/print/ghostscript-gnu/Makefile.common b/print/ghostscript-gnu/Makefile.common index ce01e8869eb..e336fbfb16e 100644 --- a/print/ghostscript-gnu/Makefile.common +++ b/print/ghostscript-gnu/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2004/01/24 14:58:00 grant Exp $ +# $NetBSD: Makefile.common,v 1.12 2004/02/01 01:43:30 jlam Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 7.05 @@ -43,7 +43,7 @@ PLIST_SRC= ${.CURDIR}/../../print/ghostscript-gnu/PLIST .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .endif .if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4") diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common index a77a57b07d6..4633f1be391 100644 --- a/print/ghostscript-nox11/Makefile.common +++ b/print/ghostscript-nox11/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.51 2004/01/24 14:58:00 grant Exp $ +# $NetBSD: Makefile.common,v 1.52 2004/02/01 01:43:30 jlam Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 6.01 @@ -136,9 +136,9 @@ ALL_TARGET= std .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .elif ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .endif .if defined(ZOULARISBASE) diff --git a/security/sfs/Makefile b/security/sfs/Makefile index dd90409b076..9564f619481 100644 --- a/security/sfs/Makefile +++ b/security/sfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/11/24 14:15:36 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2004/02/01 01:43:30 jlam Exp $ # DISTNAME= sfs-0.7.2 @@ -22,7 +22,7 @@ USE_PKGINSTALL= yes USE_BUILDLINK2= yes USE_PERL5= yes -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 PKG_USERS= sfs:sfs::Self-certifying\\ file\\ system:/ PKG_GROUPS= sfs diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index 5d9382d79c4..b8bd3cd4b39 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2004/01/07 02:21:17 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2004/02/01 01:43:30 jlam Exp $ DISTNAME= WindowMaker-0.80.2 PKGNAME= windowmaker-0.80.2 @@ -32,7 +32,7 @@ INSTALL_TARGET= install-strip .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .endif PKG_SYSCONFSUBDIR= WindowMaker diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index eba14e9d82e..3c46fac4b7b 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2004/01/23 21:50:52 jmmv Exp $ +# $NetBSD: Makefile,v 1.61 2004/02/01 01:43:30 jlam Exp $ DISTNAME= kdelibs-2.2.2 PKGREVISION= 10 @@ -100,7 +100,7 @@ USE_PKGSRC_GCC= # defined .endif .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .endif .include "../../archivers/bzip2/buildlink2.mk" diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index 2480bc9a8c7..2ff62512ef0 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2003/12/19 15:43:31 skrll Exp $ +# $NetBSD: Makefile,v 1.22 2004/02/01 01:43:30 jlam Exp $ # LIBQT= ${WRKSRC}/lib/libqt-mt.la @@ -9,7 +9,7 @@ PKGNAME= qt3-libs-${QTVERSION} COMMENT= C++ X GUI toolkit USE_BUILDLINK2= yes -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 ALL_TARGET= sub-plugins diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile index c7b334ee799..21a0067644e 100644 --- a/x11/xephem/Makefile +++ b/x11/xephem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/01/24 13:25:17 kristerw Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/01 01:43:30 jlam Exp $ DISTNAME= xephem-3.5.2 PKGREVISION= 1 @@ -24,7 +24,7 @@ BUILD_DIRS= ${LIBSRC1} ${LIBSRC2} ${WRKSRC} INSTALL_DIRS= ${WRKSRC} .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .endif post-install: diff --git a/x11/xphoon/Makefile b/x11/xphoon/Makefile index 9e5be7978bd..d8e1781308b 100644 --- a/x11/xphoon/Makefile +++ b/x11/xphoon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/01/24 13:30:27 kristerw Exp $ +# $NetBSD: Makefile,v 1.13 2004/02/01 01:43:30 jlam Exp $ # DISTNAME= xphoon.tar @@ -22,7 +22,7 @@ MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS} .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .endif .if ${OPSYS} == "NetBSD" diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 742403e9b34..0632f64a853 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.66 2004/01/27 18:56:23 kristerw Exp $ +# $NetBSD: Makefile.common,v 1.67 2004/02/01 01:43:30 jlam Exp $ # DISTNAME= xscreensaver-4.14 @@ -61,7 +61,7 @@ CFLAGS+= -fno-strict-aliasing .endif .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 2.95.3 +GCC_REQD+= 2.95.3 .endif .include "../../devel/gettext-lib/buildlink2.mk" -- cgit v1.2.3