Tue Jul 5 00:19:59 2016 UTC ()
Avoid GCC_REQD= in favour of GCC_REQD+=

The latter allows users to override the value with a newer version.


(maya)
diff -r1.120 -r1.121 pkgsrc/audio/musicpd/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/include-what-you-use/Makefile
diff -r1.6 -r1.7 pkgsrc/emulators/emulationstation/Makefile
diff -r1.58 -r1.59 pkgsrc/emulators/mame/Makefile
cvs diff -r1.120 -r1.121 pkgsrc/audio/musicpd/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/musicpd/Makefile 2016/06/19 20:34:38 1.120
+++ pkgsrc/audio/musicpd/Makefile 2016/07/05 00:19:59 1.121
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1# $NetBSD: Makefile,v 1.120 2016/06/19 20:34:38 wiz Exp $ 1# $NetBSD: Makefile,v 1.121 2016/07/05 00:19:59 maya Exp $
2 2
3DISTNAME= mpd-0.19.16 3DISTNAME= mpd-0.19.16
4PKGNAME= ${DISTNAME:S/mpd/musicpd/} 4PKGNAME= ${DISTNAME:S/mpd/musicpd/}
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= http://www.musicpd.org/download/mpd/0.19/ 6MASTER_SITES= http://www.musicpd.org/download/mpd/0.19/
7#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/} 7#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://musicpd.org/ 11HOMEPAGE= http://musicpd.org/
12COMMENT= Remote controllable audio player 12COMMENT= Remote controllable audio player
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15CONFLICTS= mpd-[0-9]* 15CONFLICTS= mpd-[0-9]*
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= pkg-config 19USE_TOOLS+= pkg-config
20USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
21 21
22# See ${WRKSRC}/src/Compiler.h: mpd requires gcc>=4.6 22# See ${WRKSRC}/src/Compiler.h: mpd requires gcc>=4.6
23GCC_REQD= 4.6 23GCC_REQD+= 4.6
24 24
25# MacOS X audio output is no longer enabled by default. 25# MacOS X audio output is no longer enabled by default.
26CONFIGURE_ARGS.Darwin+= --enable-osx 26CONFIGURE_ARGS.Darwin+= --enable-osx
27 27
28CPPFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ 28CPPFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
29 29
30.include "options.mk" 30.include "options.mk"
31 31
32EGDIR= ${PREFIX}/share/examples/mpd 32EGDIR= ${PREFIX}/share/examples/mpd
33CONF_FILES= ${EGDIR}/mpd.conf ${PKG_SYSCONFDIR}/mpd.conf 33CONF_FILES= ${EGDIR}/mpd.conf ${PKG_SYSCONFDIR}/mpd.conf
34RCD_SCRIPTS= mpd 34RCD_SCRIPTS= mpd
35 35
36FILES_SUBST+= DEVOSSAUDIO=${DEVOSSAUDIO:Q} 36FILES_SUBST+= DEVOSSAUDIO=${DEVOSSAUDIO:Q}
cvs diff -r1.3 -r1.4 pkgsrc/devel/include-what-you-use/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/include-what-you-use/Makefile 2016/03/14 14:36:39 1.3
+++ pkgsrc/devel/include-what-you-use/Makefile 2016/07/05 00:19:59 1.4
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.3 2016/03/14 14:36:39 tnn Exp $ 1# $NetBSD: Makefile,v 1.4 2016/07/05 00:19:59 maya Exp $
2 2
3DISTNAME= include-what-you-use-0.5.src 3DISTNAME= include-what-you-use-0.5.src
4PKGREVISION= 1 4PKGREVISION= 1
5PKGNAME= ${DISTNAME:.src=} 5PKGNAME= ${DISTNAME:.src=}
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://include-what-you-use.org/downloads/ 7MASTER_SITES= http://include-what-you-use.org/downloads/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://include-what-you-use.org/downloads/ 10HOMEPAGE= http://include-what-you-use.org/downloads/
11COMMENT= Analyze \#includes in C and C++ source files 11COMMENT= Analyze \#includes in C and C++ source files
12#LICENSE= # TODO: (see mk/license.mk) 12#LICENSE= # TODO: (see mk/license.mk)
13 13
14WRKSRC= ${WRKDIR}/include-what-you-use 14WRKSRC= ${WRKDIR}/include-what-you-use
15USE_CMAKE= yes 15USE_CMAKE= yes
16CMAKE_ARGS= -DIWYU_LLVM_ROOT_PATH:PATH=${BUILDLINK_PREFIX.clang} 16CMAKE_ARGS= -DIWYU_LLVM_ROOT_PATH:PATH=${BUILDLINK_PREFIX.clang}
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18GCC_REQD= 4.8 18GCC_REQD+= 4.8
19 19
20REPLACE_PYTHON= *.py 20REPLACE_PYTHON= *.py
21 21
22.include "../../lang/clang/buildlink3.mk" 22.include "../../lang/clang/buildlink3.mk"
23.include "../../lang/python/application.mk" 23.include "../../lang/python/application.mk"
24.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/emulators/emulationstation/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/emulationstation/Makefile 2016/03/05 11:28:28 1.6
+++ pkgsrc/emulators/emulationstation/Makefile 2016/07/05 00:19:59 1.7
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.6 2016/03/05 11:28:28 jperkin Exp $ 1# $NetBSD: Makefile,v 1.7 2016/07/05 00:19:59 maya Exp $
2 2
3DISTNAME= abba19584636c28cd98e3810e857f493cb63d06c 3DISTNAME= abba19584636c28cd98e3810e857f493cb63d06c
4PKGNAME= emulationstation-2.0.0_rc1_20150210 4PKGNAME= emulationstation-2.0.0_rc1_20150210
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= emulators games 6CATEGORIES= emulators games
7MASTER_SITES= https://github.com/Aloshi/EmulationStation/archive/ 7MASTER_SITES= https://github.com/Aloshi/EmulationStation/archive/
8EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.emulationstation.org/ 11HOMEPAGE= http://www.emulationstation.org/
12COMMENT= Themeable multi-system emulator frontend 12COMMENT= Themeable multi-system emulator frontend
13 13
14LICENSE= mit 14LICENSE= mit
15 15
16USE_CMAKE= yes 16USE_CMAKE= yes
17USE_LANGUAGES+= c c++ 17USE_LANGUAGES+= c c++
18GCC_REQD= 4.7 # C++11 18GCC_REQD+= 4.7 # C++11
19 19
20.include "../../mk/compiler.mk" 20.include "../../mk/compiler.mk"
21.if !empty(PKGSRC_COMPILER:Mclang) 21.if !empty(PKGSRC_COMPILER:Mclang)
22CXXFLAGS+= -std=c++11 22CXXFLAGS+= -std=c++11
23.endif 23.endif
24 24
25WRKSRC= ${WRKDIR}/EmulationStation-${DISTNAME} 25WRKSRC= ${WRKDIR}/EmulationStation-${DISTNAME}
26 26
27INSTALLATION_DIRS= bin share/doc/emulationstation 27INSTALLATION_DIRS= bin share/doc/emulationstation
28 28
29SUBST_CLASSES+= fceu 29SUBST_CLASSES+= fceu
30SUBST_STAGE.fceu= post-patch 30SUBST_STAGE.fceu= post-patch
31SUBST_MESSAGE.fceu= Adjusting config file path to retroarch backend 31SUBST_MESSAGE.fceu= Adjusting config file path to retroarch backend
cvs diff -r1.58 -r1.59 pkgsrc/emulators/mame/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/mame/Makefile 2016/06/30 18:05:55 1.58
+++ pkgsrc/emulators/mame/Makefile 2016/07/05 00:19:59 1.59
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1# $NetBSD: Makefile,v 1.58 2016/06/30 18:05:55 wiz Exp $ 1# $NetBSD: Makefile,v 1.59 2016/07/05 00:19:59 maya Exp $
2 2
3DISTNAME= mame-0.175 3DISTNAME= mame-0.175
4CATEGORIES= emulators 4CATEGORIES= emulators
5MASTER_SITES= ${MASTER_SITE_GITHUB:=mamedev/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=mamedev/}
6GITHUB_TAG= ${DISTNAME:S/-//S/.//} 6GITHUB_TAG= ${DISTNAME:S/-//S/.//}
7 7
8MAINTAINER= wiz@NetBSD.org 8MAINTAINER= wiz@NetBSD.org
9HOMEPAGE= http://www.mamedev.org/ 9HOMEPAGE= http://www.mamedev.org/
10COMMENT= Multiple Arcade Machine Emulator 10COMMENT= Multiple Arcade Machine Emulator
11LICENSE= modified-bsd AND gnu-gpl-v2 11LICENSE= modified-bsd AND gnu-gpl-v2
12 12
13DOCDIR= share/doc/mame 13DOCDIR= share/doc/mame
14SHAREDIR= share/mame 14SHAREDIR= share/mame
15INSTALLATION_DIRS= bin ${DOCDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man6 15INSTALLATION_DIRS= bin ${DOCDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man6
16INSTALLATION_DIRS+= ${SHAREDIR}/artwork/bgfx/border_blur 16INSTALLATION_DIRS+= ${SHAREDIR}/artwork/bgfx/border_blur
17INSTALLATION_DIRS+= ${SHAREDIR}/artwork/bgfx/chains ${SHAREDIR}/hash 17INSTALLATION_DIRS+= ${SHAREDIR}/artwork/bgfx/chains ${SHAREDIR}/hash
18 18
19RESTRICTED= selling is not allowed 19RESTRICTED= selling is not allowed
20NO_SRC_ON_CDROM= ${RESTRICTED} 20NO_SRC_ON_CDROM= ${RESTRICTED}
21NO_BIN_ON_CDROM= ${RESTRICTED} 21NO_BIN_ON_CDROM= ${RESTRICTED}
22 22
23DEPENDS+= liberation-ttf-[0-9]*:../../fonts/liberation-ttf 23DEPENDS+= liberation-ttf-[0-9]*:../../fonts/liberation-ttf
24 24
25USE_LANGUAGES= c99 c++ 25USE_LANGUAGES= c99 c++
26# 4.9 is enough, but doesn't build with SSP support on NetBSD 26# 4.9 is enough, but doesn't build with SSP support on NetBSD
27GCC_REQD= 5.3 27GCC_REQD+= 5.3
28USE_TOOLS+= bsdtar gmake pkg-config 28USE_TOOLS+= bsdtar gmake pkg-config
29UNLIMIT_RESOURCES+= datasize 29UNLIMIT_RESOURCES+= datasize
30MAKE_FILE= makefile 30MAKE_FILE= makefile
31EXTRACT_USING= bsdtar 31EXTRACT_USING= bsdtar
32# 0.141 has too many conversion warnings 32# 0.141 has too many conversion warnings
33MAKE_ENV= NOWERROR=1 33MAKE_ENV= NOWERROR=1
34 34
35.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
36 36
37.if ${OPSYS} == "NetBSD" 37.if ${OPSYS} == "NetBSD"
38# also needs kvm and I didn't find the right place to add it in the build system 38# also needs kvm and I didn't find the right place to add it in the build system
39MAKE_ENV+= LDOPTS="-Wl,-R${BUILDLINK_PREFIX.flac}/lib -L${BUILDLINK_PREFIX.flac}/lib -lpthread -lkvm" 39MAKE_ENV+= LDOPTS="-Wl,-R${BUILDLINK_PREFIX.flac}/lib -L${BUILDLINK_PREFIX.flac}/lib -lpthread -lkvm"
40.else 40.else