GCC_REQD should be appended to, not set.

Fixes issues where a newer GCC has been chosen by the user but the GCC_REQD
was forcing an older (and broken) one to be pulled regardless.

8 files changed, 16 insertions, 16 deletions

diff --git a/archivers/xz/Makefile b/archivers/xz/Makefile
index 82fba39a65d..4c0a110b882 100644
--- a/archivers/xz/Makefile
+++ b/archivers/xz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/07/04 23:30:47 adam Exp $
+# $NetBSD: Makefile,v 1.17 2014/02/19 09:44:56 jperkin Exp $
 
 DISTNAME=	xz-5.0.5
 CATEGORIES=	archivers
@@ -14,7 +14,7 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE=	src/liblzma/liblzma.pc.in
 
-GCC_REQD=		3.0
+GCC_REQD+=		3.0
 
 CONFLICTS=	lzma-[0-9]* lzma-utils-[0-9]* lzmalib-[0-9]*
 
diff --git a/devel/msgpack/Makefile b/devel/msgpack/Makefile
index 5ff555cb935..1330994c24b 100644
--- a/devel/msgpack/Makefile
+++ b/devel/msgpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/01/23 09:34:03 obache Exp $
+# $NetBSD: Makefile,v 1.6 2014/02/19 09:44:56 jperkin Exp $
 #
 
 DISTNAME=	msgpack-0.5.8
@@ -16,7 +16,7 @@ USE_LIBTOOL=	yes
 
 PKGCONFIG_OVERRIDE=	msgpack.pc.in
 
-GCC_REQD=	4.1
+GCC_REQD+=	4.1
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 1e4f64b9e28..bc3a67861c3 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2014/02/12 23:17:59 tron Exp $
+# $NetBSD: Makefile,v 1.44 2014/02/19 09:44:56 jperkin Exp $
 
 DISTNAME=	darktable-1.2.3
 PKGREVISION=	2
@@ -41,7 +41,7 @@ LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/darktable
 .include "../../mk/bsd.fast.prefs.mk"
 .if ${MACHINE_ARCH} == "i386"
 # SSE alignment issues
-GCC_REQD=	4.2
+GCC_REQD+=	4.2
 CFLAGS+=	-mstackrealign -msse2 -march=i686
 .endif
 
diff --git a/inputmethod/mozc-server/Makefile.common b/inputmethod/mozc-server/Makefile.common
index f3df1276426..74cd0404b10 100644
--- a/inputmethod/mozc-server/Makefile.common
+++ b/inputmethod/mozc-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2014/01/25 10:30:11 wiz Exp $
+# $NetBSD: Makefile.common,v 1.7 2014/02/19 09:44:56 jperkin Exp $
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
 # used by inputmethod/mozc-server/Makefile
@@ -25,7 +25,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=  33 # py-gyp
 
 USE_LANGUAGES=	c c++
 # nullptr requires -std=c++11, and -std=c++11 requires gcc 4.7 or later
-GCC_REQD=	4.7
+GCC_REQD+=	4.7
 CXXFLAGS+=	-std=c++11
 
 USE_TOOLS+=	gmake pkg-config
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index b5fa4d63068..32166dcd569 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2014/02/16 10:04:11 sno Exp $
+# $NetBSD: Makefile,v 1.40 2014/02/19 09:44:56 jperkin Exp $
 
 DISTNAME=	libvpx_1.3.0.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--disable-unit-tests
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 . if ${PKGSRC_COMPILER} == "gcc" && (${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS")
 # PR pkg/48508: GCC 4.4 or later is required to compile ssse3 code on NetBSD & Solaris.
-GCC_REQD=	4.4
+GCC_REQD+=	4.4
 . endif
 
 BUILD_DEPENDS+=		yasm-[0-9]*:../../devel/yasm
diff --git a/net/aria2/Makefile b/net/aria2/Makefile
index f8226e0017a..a95da47903a 100644
--- a/net/aria2/Makefile
+++ b/net/aria2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2014/02/12 23:18:18 tron Exp $
+# $NetBSD: Makefile,v 1.49 2014/02/19 09:44:56 jperkin Exp $
 #
 
 DISTNAME=	aria2-1.18.2
@@ -14,7 +14,7 @@ LICENSE=	gnu-gpl-v2
 
 # Minimum requirement is 4.6.4, but lang/gcc46 is 4.6.3, then use 4.7
 # See https://github.com/tatsuhiro-t/aria2/issues/144
-GCC_REQD=	4.7
+GCC_REQD+=	4.7
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
diff --git a/parallel/openmpi/options.mk b/parallel/openmpi/options.mk
index 9d78d5a2321..ec4f8b39a33 100644
--- a/parallel/openmpi/options.mk
+++ b/parallel/openmpi/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2013/07/19 03:52:29 manu Exp $
+# $NetBSD: options.mk,v 1.6 2014/02/19 09:44:56 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openmpi
 PKG_SUPPORTED_OPTIONS=	debug f90
@@ -11,7 +11,7 @@ CONFIGURE_ARGS+=	--enable-debug
 
 
 .if !empty(PKG_OPTIONS:Mf90)
-GCC_REQD=		4.7
+GCC_REQD+=		4.7
 GCCDIR=			${PREFIX}/gcc47
 CONFIGURE_ARGS+=	--enable-mpi-f90
 CONFIGURE_ENV+=		FC=${GCCDIR}/bin/gfortran
diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile
index 898e90007d1..1ad5a6c2642 100644
--- a/sysutils/grub2/Makefile
+++ b/sysutils/grub2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/06/04 22:17:06 tron Exp $
+# $NetBSD: Makefile,v 1.5 2014/02/19 09:44:56 jperkin Exp $
 #
 
 DISTNAME=		grub-2.00
@@ -39,7 +39,7 @@ USE_PKGLOCALEDIR=	yes
 #
 # Additionnaly, help2man is required to generate the manual pages.
 #
-GCC_REQD=		4.4
+GCC_REQD+=		4.4
 FLEX_REQD=		2.5.35
 BUILD_DEPENDS+=		help2man>=1.36:../../converters/help2man