CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Jonathan Perkin" <jperkin%netbsd.org@localhost>
Date: Sat, 9 Nov 2019 20:01:15 +0000

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Sat Nov  9 20:01:15 UTC 2019

Modified Files:
        pkgsrc/audio/mixxx: Makefile
        pkgsrc/databases/libcassandra: Makefile
        pkgsrc/databases/mongodb: Makefile
        pkgsrc/games/solarus: Makefile
        pkgsrc/misc/libreoffice: Makefile
        pkgsrc/www/firefox52: mozilla-common.mk
        pkgsrc/www/firefox60: mozilla-common.mk
        pkgsrc/www/firefox68: mozilla-common.mk

Log Message:
*: Move GCC_REQD above bsd.prefs.mk where possible.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/mixxx/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/databases/libcassandra/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/databases/mongodb/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/games/solarus/Makefile
cvs rdiff -u -r1.211 -r1.212 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/firefox52/mozilla-common.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/firefox60/mozilla-common.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/firefox68/mozilla-common.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/mixxx/Makefile
diff -u pkgsrc/audio/mixxx/Makefile:1.8 pkgsrc/audio/mixxx/Makefile:1.9
--- pkgsrc/audio/mixxx/Makefile:1.8     Sun Oct 20 11:10:47 2019
+++ pkgsrc/audio/mixxx/Makefile Sat Nov  9 20:01:14 2019
@@ -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 @@ HOMEPAGE=     https://mixxx.org/
 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 @@ GCC_REQD+=    4.9
 
 PLIST_SRCS+=   PLIST
 
+.include "../../mk/bsd.prefs.mk"
+
 SCONS_ARGS+=   -j${MAKE_JOBS:U1}
 
 # scons fails otherwise

Index: pkgsrc/databases/libcassandra/Makefile
diff -u pkgsrc/databases/libcassandra/Makefile:1.46 pkgsrc/databases/libcassandra/Makefile:1.47
--- pkgsrc/databases/libcassandra/Makefile:1.46 Thu Aug 22 12:22:57 2019
+++ pkgsrc/databases/libcassandra/Makefile      Sat Nov  9 20:01:14 2019
@@ -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 @@ USE_TOOLS+=          perl
 # 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"

Index: pkgsrc/databases/mongodb/Makefile
diff -u pkgsrc/databases/mongodb/Makefile:1.46 pkgsrc/databases/mongodb/Makefile:1.47
--- pkgsrc/databases/mongodb/Makefile:1.46      Thu Aug 22 12:22:57 2019
+++ pkgsrc/databases/mongodb/Makefile   Sat Nov  9 20:01:14 2019
@@ -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 @@ PYTHON_VERSIONS_ACCEPTED=     27
 
 .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

Index: pkgsrc/games/solarus/Makefile
diff -u pkgsrc/games/solarus/Makefile:1.40 pkgsrc/games/solarus/Makefile:1.41
--- pkgsrc/games/solarus/Makefile:1.40  Wed Sep 18 14:17:11 2019
+++ pkgsrc/games/solarus/Makefile       Sat Nov  9 20:01:14 2019
@@ -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 @@ WRKSRC=               ${WRKDIR}/solarus-${VERSION}
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
-.include "../../mk/bsd.prefs.mk"
-
 GCC_REQD+=     4.8
 LDFLAGS.SunOS+=        -lsocket -lnsl
 

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.211 pkgsrc/misc/libreoffice/Makefile:1.212
--- pkgsrc/misc/libreoffice/Makefile:1.211      Sun Nov  3 17:04:23 2019
+++ pkgsrc/misc/libreoffice/Makefile    Sat Nov  9 20:01:14 2019
@@ -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_MESSAGE.font-path=      Use pkgsrc font
 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 @@ pre-build:
        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 @@ DISTFILES+=         ${md2}
 
 .include "options.mk"
 
-.include "../../mk/bsd.prefs.mk"
-
 # tar: Invalid header, starting valid header search.
 EXTRACT_USING=         gtar
 

Index: pkgsrc/www/firefox52/mozilla-common.mk
diff -u pkgsrc/www/firefox52/mozilla-common.mk:1.4 pkgsrc/www/firefox52/mozilla-common.mk:1.5
--- pkgsrc/www/firefox52/mozilla-common.mk:1.4  Mon Nov  4 22:09:54 2019
+++ pkgsrc/www/firefox52/mozilla-common.mk      Sat Nov  9 20:01:14 2019
@@ -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 @@ test:
 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

Index: pkgsrc/www/firefox60/mozilla-common.mk
diff -u pkgsrc/www/firefox60/mozilla-common.mk:1.6 pkgsrc/www/firefox60/mozilla-common.mk:1.7
--- pkgsrc/www/firefox60/mozilla-common.mk:1.6  Mon Nov  4 22:09:54 2019
+++ pkgsrc/www/firefox60/mozilla-common.mk      Sat Nov  9 20:01:15 2019
@@ -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_TOOLS+=           pkg-config perl gmake autoc
 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 @@ test:
 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

Index: pkgsrc/www/firefox68/mozilla-common.mk
diff -u pkgsrc/www/firefox68/mozilla-common.mk:1.2 pkgsrc/www/firefox68/mozilla-common.mk:1.3
--- pkgsrc/www/firefox68/mozilla-common.mk:1.2  Mon Nov  4 22:09:55 2019
+++ pkgsrc/www/firefox68/mozilla-common.mk      Sat Nov  9 20:01:15 2019
@@ -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 @@ test:
 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

Prev by Date: CVS commit: pkgsrc/fonts/harfbuzz
Next by Date: CVS commit: pkgsrc/mk
Previous by Thread: CVS commit: pkgsrc/fonts/harfbuzz
Next by Thread: CVS commit: pkgsrc/mk
Indexes:

Home | Main Index | Thread Index | Old Index