[pkgsrc/trunk]: pkgsrc *: Move GCC_REQD above bsd.prefs.mk where possible.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4e4d478483ba
branches:  trunk
changeset: 343723:4e4d478483ba
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Sat Nov 09 20:01:14 2019 +0000

description:
*: Move GCC_REQD above bsd.prefs.mk where possible.

diffstat:

 audio/mixxx/Makefile            |  6 +++---
 databases/libcassandra/Makefile |  6 +-----
 databases/mongodb/Makefile      |  3 +--
 games/solarus/Makefile          |  4 +---
 misc/libreoffice/Makefile       |  7 +++----
 www/firefox52/mozilla-common.mk |  7 ++++---
 www/firefox60/mozilla-common.mk |  5 +++--
 www/firefox68/mozilla-common.mk |  5 +++--
 8 files changed, 19 insertions(+), 24 deletions(-)

diffs (195 lines):

diff -r 80b43bdd9fa1 -r 4e4d478483ba audio/mixxx/Makefile
--- a/audio/mixxx/Makefile      Sat Nov 09 19:31:14 2019 +0000
+++ b/audio/mixxx/Makefile      Sat Nov 09 20:01:14 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/10/20 11:10:47 nia Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/09 20:01:14 jperkin Exp $
 
 DISTNAME=      mixxx-2.2.2
 CATEGORIES=    audio
@@ -10,8 +10,6 @@
 COMMENT=       DJ mixing application
 LICENSE=       gnu-gpl-v2
 
-.include "../../mk/bsd.prefs.mk"
-
 USE_LANGUAGES= c c++11
 USE_TOOLS+=    pkg-config
 
@@ -20,6 +18,8 @@
 
 PLIST_SRCS+=   PLIST
 
+.include "../../mk/bsd.prefs.mk"
+
 SCONS_ARGS+=   -j${MAKE_JOBS:U1}
 
 # scons fails otherwise
diff -r 80b43bdd9fa1 -r 4e4d478483ba databases/libcassandra/Makefile
--- a/databases/libcassandra/Makefile   Sat Nov 09 19:31:14 2019 +0000
+++ b/databases/libcassandra/Makefile   Sat Nov 09 20:01:14 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2019/08/22 12:22:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.47 2019/11/09 20:01:14 jperkin Exp $
 #
 
 DISTNAME=              libcassandra-20101010
@@ -20,11 +20,7 @@
 # libthrift is not clean
 BUILDLINK_TRANSFORM+=  rm:-Wundef
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} != "DragonFly"
 GCC_REQD+=     4.4
-.endif
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
diff -r 80b43bdd9fa1 -r 4e4d478483ba databases/mongodb/Makefile
--- a/databases/mongodb/Makefile        Sat Nov 09 19:31:14 2019 +0000
+++ b/databases/mongodb/Makefile        Sat Nov 09 20:01:14 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2019/08/22 12:22:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.47 2019/11/09 20:01:14 jperkin Exp $
 
 DISTNAME=      mongodb-src-r4.0.6
 PKGNAME=       ${DISTNAME:S/src-r//}
@@ -50,7 +50,6 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-GCC_REQD+=     5.3.0
 CPPFLAGS+=     -fno-jump-tables  # XXX: still needed?
 INCL_PATH+=    ${BUILDLINK_PREFIX.mongo-c-driver}/include/libbson-1.0
 INCL_PATH+=    ${BUILDLINK_PREFIX.mongo-c-driver}/include/libmongoc-1.0
diff -r 80b43bdd9fa1 -r 4e4d478483ba games/solarus/Makefile
--- a/games/solarus/Makefile    Sat Nov 09 19:31:14 2019 +0000
+++ b/games/solarus/Makefile    Sat Nov 09 20:01:14 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2019/09/18 14:17:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2019/11/09 20:01:14 jperkin Exp $
 
 VERSION=       1.5.1
 DISTNAME=      solarus-${VERSION}-src
@@ -16,8 +16,6 @@
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
-.include "../../mk/bsd.prefs.mk"
-
 GCC_REQD+=     4.8
 LDFLAGS.SunOS+=        -lsocket -lnsl
 
diff -r 80b43bdd9fa1 -r 4e4d478483ba misc/libreoffice/Makefile
--- a/misc/libreoffice/Makefile Sat Nov 09 19:31:14 2019 +0000
+++ b/misc/libreoffice/Makefile Sat Nov 09 20:01:14 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.211 2019/11/03 17:04:23 rillig Exp $
+# $NetBSD: Makefile,v 1.212 2019/11/09 20:01:14 jperkin Exp $
 
 VERREL=                6.3.3
 VERRC=         2
@@ -29,6 +29,8 @@
 SUBST_FILES.font-path+=                external/pdfium/pkgsrc.patch.1
 SUBST_VARS.font-path+=         X11BASE
 
+GCC_REQD+=     7
+
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(MACHINE_PLATFORM:MNetBSD*)
@@ -36,7 +38,6 @@
        cd ${WRKSRC} && ${BUILD_MAKE_CMD} Executable_gengal && ${TOOLS_PLATFORM.paxctl} +m instdir/program/gengal.bin
 .endif
 
-GCC_REQD+=     7
 PYTHON_VERSIONS_INCOMPATIBLE=  27 37 38
 
 CHECK_SHLIBS_SUPPORTED=        no
@@ -128,8 +129,6 @@
 
 .include "options.mk"
 
-.include "../../mk/bsd.prefs.mk"
-
 # tar: Invalid header, starting valid header search.
 EXTRACT_USING=         gtar
 
diff -r 80b43bdd9fa1 -r 4e4d478483ba www/firefox52/mozilla-common.mk
--- a/www/firefox52/mozilla-common.mk   Sat Nov 09 19:31:14 2019 +0000
+++ b/www/firefox52/mozilla-common.mk   Sat Nov 09 20:01:14 2019 +0000
@@ -1,10 +1,13 @@
-# $NetBSD: mozilla-common.mk,v 1.4 2019/11/04 22:09:54 rillig Exp $
+# $NetBSD: mozilla-common.mk,v 1.5 2019/11/09 20:01:14 jperkin Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
 # used by www/firefox/Makefile
 # used by www/seamonkey/Makefile
 
+# GCC 4.6 is required to support nullptr.
+GCC_REQD+=             4.8
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@@ -29,8 +32,6 @@
 TOOLS_PLATFORM.tar=    ${TOOLS_PATH.bsdtar}
 USE_TOOLS+=            bsdtar
 .endif
-# GCC 4.6 is required to support nullptr.
-GCC_REQD+=             4.8
 .if ${MACHINE_ARCH} == "i386"
 # Fix for PR pkg/48152.
 CXXFLAGS+=             -march=i586
diff -r 80b43bdd9fa1 -r 4e4d478483ba www/firefox60/mozilla-common.mk
--- a/www/firefox60/mozilla-common.mk   Sat Nov 09 19:31:14 2019 +0000
+++ b/www/firefox60/mozilla-common.mk   Sat Nov 09 20:01:14 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.6 2019/11/04 22:09:54 rillig Exp $
+# $NetBSD: mozilla-common.mk,v 1.7 2019/11/09 20:01:15 jperkin Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -10,6 +10,8 @@
 USE_LANGUAGES+=                c99 c++
 UNLIMIT_RESOURCES+=    datasize
 
+GCC_REQD+=             4.9
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@@ -35,7 +37,6 @@
 TOOLS_PLATFORM.tar=    ${TOOLS_PATH.bsdtar}
 USE_TOOLS+=            bsdtar
 .endif
-GCC_REQD+=             4.9
 .if ${MACHINE_ARCH} == "i386"
 # Fix for PR pkg/48152.
 CXXFLAGS+=             -march=i586
diff -r 80b43bdd9fa1 -r 4e4d478483ba www/firefox68/mozilla-common.mk
--- a/www/firefox68/mozilla-common.mk   Sat Nov 09 19:31:14 2019 +0000
+++ b/www/firefox68/mozilla-common.mk   Sat Nov 09 20:01:14 2019 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: mozilla-common.mk,v 1.2 2019/11/04 22:09:55 rillig Exp $
+# $NetBSD: mozilla-common.mk,v 1.3 2019/11/09 20:01:15 jperkin Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
 # used by www/firefox/Makefile
 
+GCC_REQD+=             6.1
+
 .include "../../mk/bsd.prefs.mk"
 
 # Python 2.7 and Python 3.6 or later are required simultaneously.
@@ -51,7 +53,6 @@
 TOOLS_PLATFORM.tar=    ${TOOLS_PATH.bsdtar}
 USE_TOOLS+=            bsdtar
 .endif
-GCC_REQD+=             6.1
 .if !empty(MACHINE_PLATFORM:MNetBSD-[0-7]**-*) || \
        !empty(MACHINE_PLATFORM:MNetBSD-8.[0-8]*-*)
 USE_PKGSRC_GCC_RUNTIME=        yes