switch COMPILER from the old, confusing shortcuts to the more explicit format

2017-11-16 23:20:37 +00:00 · 2017-11-16 23:20:37 +00:00 · 11e3dd67b3
commit 11e3dd67b3
parent d3fccf836d
180 changed files with 360 additions and 360 deletions
--- a/audio/clementine/Makefile
+++ b/audio/clementine/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2017/11/16 23:20:37 naddy Exp $

 COMMENT =	Qt4-based featureful music player

@ -31,7 +31,7 @@ WANTLIB += protobuf qca qjson tag>=5.0 usb-1.0 xml2 ${COMPILER_LIBCXX}
 WANTLIB += plist

 MODULES =		devel/cmake devel/gettext x11/qt4
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 BUILD_DEPENDS =		devel/boost \
 			devel/cmake>=2.8.10.2p3 \
--- a/audio/mpd/Makefile
+++ b/audio/mpd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.112 2017/11/02 19:22:40 jca Exp $
+# $OpenBSD: Makefile,v 1.113 2017/11/16 23:20:37 naddy Exp $

 BROKEN-hppa =		no atomic ops
 COMMENT =		Music Player Daemon
@ -22,7 +22,7 @@ WANTLIB =		FLAC audiofile avcodec avformat avutil \

 MASTER_SITES =		http://www.musicpd.org/download/mpd/${VER:R}/

-COMPILER =		clang
+COMPILER =		base-clang ports-clang

 BUILD_DEPENDS =		devel/boost

--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2017/09/14 16:21:15 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.67 2017/11/16 23:20:37 naddy Exp $

 BROKEN-alpha =		error: looser throw specifier for 'virtual OutOfBounds::~OutOfBounds()'
 BROKEN-hppa =		bindings.h:85:4: error: type 'Binding' is not a direct base of 'Binding'
@ -34,7 +34,7 @@ LIB_DEPENDS =		audio/libmpdclient>=2.4 \
 			devel/readline \
 			net/curl

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 FAKE_FLAGS =		docdir="${PREFIX}/share/examples/ncmpcpp/"

--- a/audio/pavucontrol/Makefile
+++ b/audio/pavucontrol/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2017/11/16 18:39:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2017/11/16 23:20:37 naddy Exp $

 # XXX check if still needed at next update
 CXXFLAGS +=		-std=c++11
@ -17,7 +17,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 MODULES =		textproc/intltool

 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 USE_GMAKE =		Yes

--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.87 2017/09/19 11:50:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.88 2017/11/16 23:20:37 naddy Exp $

 # XXX
 # sndio: what to do with (channel) map
@ -34,7 +34,7 @@ MASTER_SITES=		http://freedesktop.org/software/pulseaudio/releases/
 MODULES=		textproc/intltool

 # C++11; no associated WANTLIB: only checked by configure but never used
-COMPILER=		gcc
+COMPILER=		base-clang ports-gcc

 USE_GMAKE=		Yes

--- a/converters/unoconv/Makefile
+++ b/converters/unoconv/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2017/07/27 11:09:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2017/11/16 23:20:37 naddy Exp $

 PKG_ARCH=		*

@ -21,7 +21,7 @@ MODULES=		lang/python
 # see FILESDIR/unoconv.in
 # should really be the following, but using the module is easier
 # RUN_DEPENDS +=	STEM->=4.9,<4.10:lang/gcc/4.9,-libs
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 NO_BUILD=		Yes
 NO_TEST=		Yes
--- a/databases/mongodb/Makefile
+++ b/databases/mongodb/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2017/11/16 23:20:37 naddy Exp $

 PORTROACH =	limitw:1,even
 USE_WXNEEDED =	Yes
@ -33,7 +33,7 @@ MODULES =	devel/scons \
 # XXX should come from scons module, but broken when gcc module also used:
 NO_CCACHE =	Yes

-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 MODPY_VERSION =	${MODPY_DEFAULT_VERSION_2}
 MODSCONS_ENV =	CC="${CC}" \
 		CXX="${CXX}" \
--- a/devel/appstream-glib/Makefile
+++ b/devel/appstream-glib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2017/11/10 07:29:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.34 2017/11/16 23:20:37 naddy Exp $

 COMMENT=		library for AppStream metadata

@ -30,7 +30,7 @@ MODULES=		devel/meson \
 MODGNOME_TOOLS=		docbook gobject-introspection

 # C11
-COMPILER=		clang
+COMPILER=		base-clang ports-clang
 COMPILER_LANGS=		c

 BUILD_DEPENDS=		devel/gperf
--- a/devel/atk2mm/Makefile
+++ b/devel/atk2mm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2017/07/27 09:34:37 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2017/11/16 23:20:37 naddy Exp $

 COMMENT=		C++ binding for the ATK library

@ -25,7 +25,7 @@ WANTLIB += ${COMPILER_LIBCXX}
 MODULES=		devel/gettext \
 			x11/gnome
 # c++11
-COMPILER =		gcc 
+COMPILER =		base-clang ports-gcc

 LIB_DEPENDS=		devel/glib2mm \
 			devel/atk
--- a/devel/cbmc/Makefile
+++ b/devel/cbmc/Makefile
@ -1,4 +1,4 @@
-#$OpenBSD: Makefile,v 1.7 2017/07/26 22:45:17 sthen Exp $
+#$OpenBSD: Makefile,v 1.8 2017/11/16 23:20:37 naddy Exp $

 COMMENT =	Bounded Model Checker for C and C++ programs

@ -23,7 +23,7 @@ WANTLIB += c m ${COMPILER_LIBCXX}
 DISTFILES =	${DISTNAME}${EXTRACT_SUFX} minisat2_2.2.1.orig.tar.gz:0
 MASTER_SITES0 =	${MASTER_SITE_DEBIAN:=main/m/minisat2/}

-COMPILER =	clang
+COMPILER =	base-clang ports-clang

 BUILD_DEPENDS =	devel/bison

--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2017/10/23 17:10:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.43 2017/11/16 23:20:37 naddy Exp $

 BROKEN-alpha=	sqvm.cpp:394:1: internal compiler error: Segmentation fault
 BROKEN-arm=	wxwidgets va_list c++ mangling requires gcc < 4.4
@ -61,7 +61,7 @@ RUN_DEPENDS=	devel/desktop-file-utils \
 		x11/gtk+3,-guic

 # XXX <command-line>:0: internal compiler error: Segmentation fault
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 AUTOCONF_VERSION=	2.69
 AUTOMAKE_VERSION=	1.15
--- a/devel/cpp-hocon/Makefile
+++ b/devel/cpp-hocon/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/10/12 06:26:20 sebastia Exp $
+# $OpenBSD: Makefile,v 1.12 2017/11/16 23:20:37 naddy Exp $

 COMMENT =		C++ parser for the HOCON configuration language

@ -22,7 +22,7 @@ WANTLIB += boost_program_options-mt boost_system-mt boost_thread-mt
 WANTLIB += leatherman_locale leatherman_util


-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 CXXFLAGS +=		-pthread

--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2017/10/09 00:58:36 gsoares Exp $
+# $OpenBSD: Makefile,v 1.49 2017/11/16 23:20:37 naddy Exp $

 COMMENT =		C/C++ static checker

@ -34,7 +34,7 @@ MAKE_FLAGS =		BIN=${PREFIX}/bin SRCDIR=build \
 			LDFLAGS="-L${PREFIX}/lib -lpcre -lexecinfo"

 MODULES =		lang/python
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 MODPY_RUNDEP =		No
 CONFIGURE_STYLE =	none

--- a/devel/glib2mm/Makefile
+++ b/devel/glib2mm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.91 2017/10/26 08:51:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.92 2017/11/16 23:20:37 naddy Exp $

 # g++3 chokes on the code
 NOT_FOR_ARCHS=		${GCC3_ARCHS}
@ -32,7 +32,7 @@ WANTLIB += ${COMPILER_LIBCXX}
 MODULES=		x11/gnome

 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 # clang-format
 BUILD_DEPENDS=		devel/llvm
--- a/devel/keystone/Makefile
+++ b/devel/keystone/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2017/10/29 17:56:04 jca Exp $
+# $OpenBSD: Makefile,v 1.8 2017/11/16 23:20:37 naddy Exp $

 COMMENT =	multi-platform, multi-architecture assembler framework

@ -26,7 +26,7 @@ MODULES =	devel/cmake \
 MODPY_RUNDEP =	No

 # atomics
-COMPILER =	clang
+COMPILER =	base-clang ports-clang


 CONFIGURE_ARGS = -DBUILD_SHARED_LIBS=ON
--- a/devel/leatherman/Makefile
+++ b/devel/leatherman/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2017/10/12 06:28:17 sebastia Exp $
+# $OpenBSD: Makefile,v 1.17 2017/11/16 23:20:38 naddy Exp $

 COMMENT =		collection of C++ and CMake utility libraries

@ -24,7 +24,7 @@ MAINTAINER =		Sebastian Reitenbach <sebastia@openbsd.org>
 # Apachev2
 PERMIT_PACKAGE_CDROM =	Yes

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 MODULES =		devel/cmake lang/python
 MODPY_BUILDDEP =	No
 MODPY_ADJ_FILES =	scripts/cpplint.py
--- a/devel/libgit2/libgit2/Makefile
+++ b/devel/libgit2/libgit2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2017/07/23 10:08:27 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2017/11/16 23:20:38 naddy Exp $

 BROKEN-hppa =		no atomic ops
 COMMENT=		the Git library, take 2
@ -15,7 +15,7 @@ MODULES=		devel/cmake \
 MODPY_RUNDEP=		No

 # for atomic builtins
-COMPILER=		gcc
+COMPILER=		base-clang ports-gcc
 COMPILER_LANGS=		c
 MODGCC4_ARCHS=		arm

--- a/devel/libmtp/Makefile
+++ b/devel/libmtp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2017/11/07 18:14:48 jasper Exp $
+# $OpenBSD: Makefile,v 1.39 2017/11/16 23:20:38 naddy Exp $

 COMMENT=		Media Transfer Protocol (MTP) implementation

@ -17,7 +17,7 @@ WANTLIB += c gcrypt gpg-error iconv intl pthread usb-1.0
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libmtp/}

 # avoid "libmtp.so.7.0: undefined reference to `.L2085'"
-COMPILER=		gcc
+COMPILER=		base-clang ports-gcc
 COMPILER_LANGS=		c
 MODGCC4_ARCHS=		mips64 mips64el

--- a/devel/libsigc++-2/Makefile
+++ b/devel/libsigc++-2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2017/07/27 09:09:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.41 2017/11/16 23:20:38 naddy Exp $

 COMMENT=		callback framework for C++

@ -22,7 +22,7 @@ WANTLIB += ${COMPILER_LIBCXX} m
 MODULES=		x11/gnome

 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=		M4='m4 -g'
--- a/devel/pangomm/Makefile
+++ b/devel/pangomm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2017/10/23 17:10:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.34 2017/11/16 23:20:38 naddy Exp $

 COMMENT =		C++ interface for pango

@ -27,7 +27,7 @@ WANTLIB += ${COMPILER_LIBCXX}
 MODULES =		x11/gnome

 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 LIB_DEPENDS =		devel/glib2mm \
 			devel/pango \
--- a/devel/qt-creator/Makefile
+++ b/devel/qt-creator/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2017/10/21 20:04:15 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.31 2017/11/16 23:20:38 naddy Exp $

 #Qt5Webkit
 USE_WXNEEDED =		Yes
@ -54,7 +54,7 @@ MODQMAKE_ARGS =		USE_SYSTEM_BOTAN=1

 # qtcreator.sh is created with custom LINK?= in Makefile
 MODQT5_USE_GCC4_MODULE =	No
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 BUILD_DEPENDS =	x11/qt5/qtquickcontrols \
 		x11/qt5/qtscript
--- a/devel/stp/Makefile
+++ b/devel/stp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/08/21 07:03:10 jca Exp $
+# $OpenBSD: Makefile,v 1.12 2017/11/16 23:20:38 naddy Exp $

 COMMENT=	decision procedure for bit-vectors and arrays

@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM=	Yes

 WANTLIB += ${COMPILER_LIBCXX} boost_program_options-mt c m minisat

-COMPILER=	gcc
+COMPILER=	base-clang ports-gcc

 MODULES=	devel/cmake \
 		lang/python
--- a/devel/vte3/Makefile
+++ b/devel/vte3/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.87 2017/11/15 19:47:04 jasper Exp $
+# $OpenBSD: Makefile,v 1.88 2017/11/16 23:20:38 naddy Exp $

 COMMENT=		terminal emulation library

@ -32,7 +32,7 @@ WANTLIB += ${COMPILER_LIBCXX}

 MODULES=		x11/gnome

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 BUILD_DEPENDS=		devel/gperf
 # src/box_drawing_generate.sh
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.117 2017/11/12 18:16:22 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.118 2017/11/16 23:20:38 naddy Exp $

 # XXX error: 'nullptr' was not declared in this scope
 CXXFLAGS +=	-std=c++11
@ -43,7 +43,7 @@ MASTER_SITES=   http://www.abisource.com/downloads/abiword/${VERSION}/source/

 MODULES=	lang/python

-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 .if ${MACHINE_ARCH} == "hppa"
 CFLAGS +=	-O0
--- a/editors/ktikz/Makefile
+++ b/editors/ktikz/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2017/07/27 09:55:44 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2017/11/16 23:20:38 naddy Exp $

 COMMENT =		editor for the TikZ language

@ -31,7 +31,7 @@ MODQMAKE_ARGS=          DESKTOPDIR=${LOCALBASE}/share/applications \
 			QCOLLECTIONGENERATORCOMMAND=${LOCALBASE}/lib/qt4/bin/qcollectiongenerator

 # c++-11 reqwuired for poppler
-COMPILER=		gcc
+COMPILER=		base-clang ports-gcc

 MAKE_ENV =		MAKEOBJDIR=.
 WRKDIST =		${WRKDIR}/ktikz
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.174 2017/11/09 19:44:12 landry Exp $
+# $OpenBSD: Makefile,v 1.175 2017/11/16 23:20:38 naddy Exp $

 USE_WXNEEDED=	Yes

@ -164,7 +164,7 @@ BUILD_DEPENDS+=	archivers/zip \
 # and librsvg is only dlopen()ed if found
 BUILD_DEPENDS +=	x11/gnome/librsvg

-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 MODULES+=	lang/python

--- a/editors/subtitleeditor/Makefile
+++ b/editors/subtitleeditor/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2017/11/16 07:58:43 jasper Exp $
+# $OpenBSD: Makefile,v 1.55 2017/11/16 23:20:38 naddy Exp $

 COMMENT=		GTK+ subtitles editor

@ -49,7 +49,7 @@ RUN_DEPENDS=		devel/desktop-file-utils \
 MODULES=		textproc/intltool

 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 USE_GMAKE=		Yes

--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2017/07/27 09:55:44 sthen Exp $
+# $OpenBSD: Makefile,v 1.37 2017/11/16 23:20:38 naddy Exp $

 COMMENT=		LaTeX development environment
 DISTNAME=		texmaker-4.5
@ -21,7 +21,7 @@ WANTLIB += Xext Xi Xinerama Xrender c fontconfig freetype hunspell-1.6
 WANTLIB += m poppler-qt4 pthread z

 # c++-11 for required for poppler
-COMPILER=		gcc
+COMPILER=		base-clang ports-gcc

 MODULES=		devel/qmake x11/qt4
 MODQMAKE_ARGS=		DESKTOPDIR=${LOCALBASE}/share/applications \
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2017/07/27 09:55:44 sthen Exp $
+# $OpenBSD: Makefile,v 1.39 2017/11/16 23:20:38 naddy Exp $

 COMMENT-main =		easy to use LaTeX and ConTeXt editor
 COMMENT-python =	Python scripting for TeXworks
@ -37,7 +37,7 @@ MODQMAKE_PROJECTS =	plugins-src/TWLuaPlugin/TWLuaPlugin.pro \
 			TeXworks.pro

 # c++-11 required for poppler
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 WANTLIB += ${COMPILER_LIBCXX}
 WANTLIB += ICE QtDBus QtGui QtScript QtScriptTools QtXml SM X11
--- a/emulators/desmume/Makefile
+++ b/emulators/desmume/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2017/07/26 22:45:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2017/11/16 23:20:38 naddy Exp $

 USE_WXNEEDED =	Yes

@ -41,7 +41,7 @@ MODULES =	devel/gettext \
 		textproc/intltool


-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 CONFIGURE_STYLE =	gnu

--- a/emulators/emulationstation/Makefile
+++ b/emulators/emulationstation/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2017/08/30 15:09:12 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.6 2017/11/16 23:20:38 naddy Exp $

 COMMENT =		flexible keyboardless emulator frontend

@ -22,7 +22,7 @@ REVISION =		0

 MODULES =		devel/cmake

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 CXXFLAGS +=	-std=c++11 -Wno-inconsistent-missing-override

--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2017/11/14 06:46:20 jeremy Exp $
+# $OpenBSD: Makefile,v 1.23 2017/11/16 23:20:38 naddy Exp $

 BROKEN-hppa =	../../include/mednafen/state.h:21:7: error: 'exception_ptr' in namespace 'std' does not name a type
 COMMENT =	emulates numerous game consoles
@ -22,7 +22,7 @@ WANTLIB += SDL c m pthread sndfile sndio usbhid z
 WANTLIB += FLAC ogg vorbis vorbisenc ${COMPILER_LIBCXX}

 USE_GMAKE =	Yes
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 LIB_DEPENDS =	audio/libsndfile \
 		devel/sdl
--- a/emulators/mgba/Makefile
+++ b/emulators/mgba/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2017/10/05 08:32:12 bentley Exp $
+# $OpenBSD: Makefile,v 1.21 2017/11/16 23:20:38 naddy Exp $

 COMMENT-main =		Game Boy Color/Advance emulator
 COMMENT-qt =		Game Boy Color/Advance emulator with GUI
@ -38,7 +38,7 @@ GH_PROJECT =		mgba
 GH_TAGNAME =		$V

 MODULES =		devel/cmake
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 LIB_DEPENDS-main =	archivers/libzip \
 			graphics/ImageMagick \
 			graphics/ffmpeg \
--- a/emulators/mupen64plus/video-glide64mk2/Makefile
+++ b/emulators/mupen64plus/video-glide64mk2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2017/07/26 22:45:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2017/11/16 23:20:38 naddy Exp $

 COMMENT =		n64 emulator video plugin
 REVISION =		4
@ -6,7 +6,7 @@ REVISION =		4
 # GPLv2+
 PERMIT_PACKAGE_CDROM =	Yes

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 WANTLIB =		GL SDL2 boost_filesystem boost_system c m png pthread z ${COMPILER_LIBCXX}
 LIB_DEPENDS =		devel/boost devel/sdl2 graphics/png
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2017/11/11 23:58:26 bentley Exp $
+# $OpenBSD: Makefile,v 1.25 2017/11/16 23:20:38 naddy Exp $

 BROKEN-powerpc =CPUCore.cc:2347: error: insn does not satisfy its constraints
 BROKEN-hppa =	OOM when building src/cpu/CPUCore.cc
@ -29,7 +29,7 @@ MAKE_ENV +=	INSTALL_BASE=${PREFIX}/share/openmsx \
 		INSTALL_SHARE_DIR=${PREFIX}/share/openmsx \
 		INSTALL_DOC_DIR=${PREFIX}/share/doc/openmsx

-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 LIB_DEPENDS =	audio/libvorbis \
 		converters/libiconv \
 		devel/sdl-ttf \
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.171 2017/10/23 17:10:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.172 2017/11/16 23:20:38 naddy Exp $

 USE_WXNEEDED=	Yes

@ -27,7 +27,7 @@ WANTLIB=	SDL2 X11 atk-1.0 bz2 c cairo cairo-gobject curl drm epoxy \
 		${COMPILER_LIBCXX}

 # Using TLS emulation layer
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 MODULES=	lang/python

--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2017/07/26 22:45:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.38 2017/11/16 23:20:38 naddy Exp $

 COMMENT =	emulates the Super Nintendo Entertainment System
 BROKEN-alpha =	ICE/failure on filter/hq2x.cpp
@ -34,7 +34,7 @@ LIB_DEPENDS =	devel/sdl \
 MODULES =	devel/gettext \
 		textproc/intltool \

-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 USE_GMAKE =	Yes

--- a/emulators/vbam/Makefile
+++ b/emulators/vbam/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2017/07/27 09:55:44 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2017/11/16 23:20:38 naddy Exp $

 # XXX check if still needed at next update
 CXXFLAGS +=		-std=c++11 -fpermissive
@ -34,7 +34,7 @@ MODULES =		devel/cmake \
 			devel/gettext

 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 RUN_DEPENDS =		devel/desktop-file-utils \
 			x11/gtk+3,-guic
--- a/emulators/xnp2/Makefile
+++ b/emulators/xnp2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2017/11/16 23:20:38 naddy Exp $

 COMMENT =		PC-9801 emulator

@ -23,7 +23,7 @@ EXTRACT_SUFX =		.tar.bz2

 MODULES =		devel/gettext 

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 LIB_DEPENDS =		devel/sdl2-mixer \
 			devel/libusb1 \
--- a/emulators/xroar/Makefile
+++ b/emulators/xroar/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2017/11/05 11:14:38 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2017/11/16 23:20:38 naddy Exp $

 COMMENT =		Dragon and CoCo emulator

@ -21,7 +21,7 @@ WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pangox-1.0 pthread sndfile z

 MASTER_SITES =		http://www.6809.org.uk/xroar/dl/

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 COMPILER_LANGS =	c

 LIB_DEPENDS =		audio/libsndfile \
--- a/games/0ad/base/Makefile
+++ b/games/0ad/base/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2017/10/29 10:10:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2017/11/16 23:20:38 naddy Exp $

 COMMENT =		historical real-time strategy game

@ -35,7 +35,7 @@ RUN_DEPENDS =		devel/desktop-file-utils \
 			games/0ad/data=${V}
 MODULES =		lang/python

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 MODPY_RUNDEP =		No
 MODPY_ADJ_FILES =	../../../libraries/source/cxxtest-4.4/bin/cxxtestgen
--- a/games/bastet/Makefile
+++ b/games/bastet/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2017/11/02 22:46:27 bentley Exp $
+# $OpenBSD: Makefile,v 1.11 2017/11/16 23:20:38 naddy Exp $

 # Block.s: Assembler messages:
 # Block.s:73: Error: junk `(%rip)' after expression
@ -22,7 +22,7 @@ PERMIT_PACKAGE_CDROM =	Yes

 WANTLIB =	boost_program_options c ncurses m ${COMPILER_LIBCXX}

-COMPILER =	clang
+COMPILER =	base-clang ports-clang

 LIB_DEPENDS =	devel/boost

--- a/games/corsixth/Makefile
+++ b/games/corsixth/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/07/31 22:14:44 bcallah Exp $
+# $OpenBSD: Makefile,v 1.2 2017/11/16 23:20:38 naddy Exp $

 ONLY_FOR_ARCHS =	${CXX11_ARCHS}

@ -24,7 +24,7 @@ WANTLIB += ${COMPILER_LIBCXX} SDL2 SDL2_mixer avcodec avformat
 WANTLIB += avutil c freetype m swresample swscale ${MODLUA_WANTLIB}

 # base clang or ports gcc
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 MODULES =	devel/cmake \
 		lang/lua
--- a/games/dhewm3/Makefile
+++ b/games/dhewm3/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/27 09:55:44 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2017/11/16 23:20:38 naddy Exp $

 ONLY_FOR_ARCHS =	amd64 i386

@ -24,7 +24,7 @@ REVISION =		0

 MODULES =		devel/cmake

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 LIB_DEPENDS =		devel/sdl2 \
 			audio/openal \
--- a/games/dunelegacy/Makefile
+++ b/games/dunelegacy/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2017/11/03 17:24:49 kirby Exp $
+# $OpenBSD: Makefile,v 1.9 2017/11/16 23:20:38 naddy Exp $

 COMMENT =		improved opensource version of Dune 2

@ -19,7 +19,7 @@ WANTLIB =		SDL2 SDL2_mixer c enet m pthread ${COMPILER_LIBCXX}
 MASTER_SITES = 		${MASTER_SITE_SOURCEFORGE:=dunelegacy/}
 EXTRACT_SUFX =		.tar.bz2

-COMPILER = 		gcc
+COMPILER = 		base-clang ports-gcc

 LIB_DEPENDS =		devel/sdl2-mixer \
 			net/enet
--- a/games/eduke32/Makefile
+++ b/games/eduke32/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2017/08/04 22:33:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2017/11/16 23:20:38 naddy Exp $

 COMMENT =	Enhanced Duke Nukem 3D engine
 RDATE =		20160610
@ -44,7 +44,7 @@ RUN_DEPENDS =	games/duke3ddata

 MASTER_SITES =	http://dukeworld.duke4.net/eduke32/synthesis/${RDATE}-${RTAG}/

-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 # make sure we can see compilation output, respect CC/CXX, don't strip!
 MAKE_ENV =	PRETTY_OUTPUT=0 \
--- a/games/extremetuxracer/Makefile
+++ b/games/extremetuxracer/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2017/07/27 09:55:44 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2017/11/16 23:20:38 naddy Exp $

 COMMENT =		downhill racing game
 BROKEN-alpha =		cc1plus: error: unrecognized command line option '-std=c++11'
@ -25,7 +25,7 @@ WANTLIB += ${COMPILER_LIBCXX}
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=extremetuxracer/}
 EXTRACT_SUFX =		.tar.xz

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 BUILD_DEPENDS =		archivers/unzip
 RUN_DEPENDS =		devel/desktop-file-utils
 LIB_DEPENDS =		multimedia/sfml
--- a/games/flightgear/base/Makefile
+++ b/games/flightgear/base/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2017/07/26 22:45:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2017/11/16 23:20:38 naddy Exp $

 COMMENT =		modern, open-source flight simulator

@ -18,7 +18,7 @@ WANTLIB += z ${COMPILER_LIBCXX}
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=flightgear/}

 MODULES =	devel/cmake
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 BUILD_DEPENDS =	devel/boost \
 		devel/plib
--- a/games/galois/Makefile
+++ b/games/galois/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/26 22:45:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2017/11/16 23:20:38 naddy Exp $

 COMMENT =	free multi-dimensional Tetris-like game
 DISTNAME =	galois-0.4
@ -22,7 +22,7 @@ MASTER_SITES =	${MASTER_SITE_SAVANNAH:=galois/source/}
 MODULES =	devel/gettext

 # c++11
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 LIB_DEPENDS =	textproc/libxml++>=2.40.0 \
 		x11/gtk2mm
--- a/games/lugaru/Makefile
+++ b/games/lugaru/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2017/08/03 08:53:34 bentley Exp $
+# $OpenBSD: Makefile,v 1.8 2017/11/16 23:20:38 naddy Exp $

 COMMENT =	third-person rabbit combat action game

@ -22,7 +22,7 @@ EXTRACT_SUFX =		.tar.xz

 MODULES =		devel/cmake

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 RUN_DEPENDS =		devel/desktop-file-utils \
 			x11/gtk+3,-guic
 LIB_DEPENDS =		audio/libvorbis \
--- a/games/openmw/Makefile
+++ b/games/openmw/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2017/11/09 16:36:55 pascal Exp $
+# $OpenBSD: Makefile,v 1.13 2017/11/16 23:20:38 naddy Exp $

 ONLY_FOR_ARCHS =	amd64 i386

@ -29,7 +29,7 @@ GH_PROJECT =		openmw
 GH_TAGNAME =		openmw-$V

 MODULES =		devel/cmake x11/qt5
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 BUILD_DEPENDS = 	sysutils/e2fsprogs
 LIB_DEPENDS =		audio/openal \
 			devel/bullet \
--- a/games/openxcom/Makefile
+++ b/games/openxcom/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2017/07/26 22:45:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2017/11/16 23:20:38 naddy Exp $

 BROKEN-alpha =	OOM on XcomRuleset.cpp
 BROKEN-hppa =	OOM on Engine/Scalers/hq4x.cpp
@ -22,7 +22,7 @@ MASTER_SITES =		${HOMEPAGE}/wp-content/uploads/downloads/2014/06/

 MODULES =		devel/cmake

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 RUN_DEPENDS =		audio/timidity \
 			devel/desktop-file-utils \
--- a/games/pingus/Makefile
+++ b/games/pingus/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2017/07/26 22:45:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2017/11/16 23:20:38 naddy Exp $

 COMMENT=	free Lemmings-like game

@ -19,7 +19,7 @@ WANTLIB += SDL_mixer>=3 SDL_image>=2 boost_signals ${COMPILER_LIBCXX}

 MODULES=	devel/scons

-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 LIB_DEPENDS=	converters/libiconv \
 		devel/sdl-mixer \
--- a/games/residualvm/Makefile
+++ b/games/residualvm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/26 22:45:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2017/11/16 23:20:38 naddy Exp $

 COMMENT =		interpreter for some LucasArts 3D games

@ -32,7 +32,7 @@ RUN_DEPENDS =		devel/desktop-file-utils \

 # GCC 4.2.1 miscompiles this on at least ppc, so play safe and
 # just use a newer compiler everywhere.
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 SEPARATE_BUILD =	Yes
 USE_GMAKE =		Yes
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.73 2017/07/26 22:45:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.74 2017/11/16 23:20:38 naddy Exp $

 COMMENT=	graphical adventure game interpreter
 V=		1.9.0
@ -23,7 +23,7 @@ BUILD_DEPENDS=	devel/nasm

 # GCC 4.2.1 miscompiles this on at least ppc, so play safe and
 # just use a newer compiler everywhere.
-COMPILER=	gcc
+COMPILER=	base-clang ports-gcc

 RUN_DEPENDS=	devel/desktop-file-utils
 LIB_DEPENDS=	audio/libmad \
--- a/games/solarus/solarus/Makefile
+++ b/games/solarus/solarus/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2017/07/26 22:45:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2017/11/16 23:20:38 naddy Exp $

 V =		1.5.3
 COMMENT =	open-source Zelda-like 2D game engine
@ -23,7 +23,7 @@ MODULES +=	devel/cmake \
 		lang/lua \
 		x11/qt5

-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 LIB_DEPENDS =	audio/libmodplug \
 		audio/libvorbis \
--- a/games/stone-soup/Makefile
+++ b/games/stone-soup/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2017/09/10 11:13:53 kirby Exp $
+# $OpenBSD: Makefile,v 1.32 2017/11/16 23:20:38 naddy Exp $

 BROKEN-hppa =	ICE on dgn-shoals.cc:638
 BROKEN-arm=	tilegen.elf loops burning cpu
@ -31,7 +31,7 @@ MAKE_FLAGS = 	CC="${CC}" GCC="${GCC}" GXX="${CXX}" \
 		NO_YACC=1 V=1

 MAKE_ENV +=	MODLUA_DEP_VERSION=${MODLUA_DEP_VERSION}
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 MODULES = 	lang/lua
 MODLUA_VERSION = 	5.1
 WANTLIB = 	c m ${MODLUA_WANTLIB} sqlite3 ${COMPILER_LIBCXX}
--- a/games/sumwars/Makefile
+++ b/games/sumwars/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/26 22:45:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2017/11/16 23:20:38 naddy Exp $

 ONLY_FOR_ARCHS =	amd64 i386

@ -34,7 +34,7 @@ MODULES =		devel/cmake \
 			lang/lua
 MODLUA_VERSION =	5.2

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 LIB_DEPENDS =		x11/cegui \
 			audio/freealut \
 			audio/libvorbis \
--- a/games/supertux/Makefile
+++ b/games/supertux/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2017/08/12 20:15:34 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.13 2017/11/16 23:20:38 naddy Exp $

 COMMENT =		jump 'n' run game

@ -25,7 +25,7 @@ MASTER_SITES =		https://github.com/SuperTux/supertux/releases/download/v${V}/
 MAKE_ENV +=		CXXFLAGS="${CXXFLAGS}"

 MODULES +=		devel/cmake
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 RUN_DEPENDS =		devel/desktop-file-utils
 LIB_DEPENDS =		devel/sdl2-image \
 			graphics/glew \
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2017/07/26 22:45:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2017/11/16 23:20:38 naddy Exp $

 ONLY_FOR_ARCHS =	amd64 i386 powerpc

@ -26,7 +26,7 @@ MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=supertuxkart/SuperTuxKart/}
 EXTRACT_SUFX =		.tar.xz

 MODULES =		devel/cmake
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 RUN_DEPENDS =		devel/desktop-file-utils
 LIB_DEPENDS =		audio/openal>=0.0.8p7 \
--- a/games/tome4/Makefile
+++ b/games/tome4/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2017/11/11 11:24:42 kirby Exp $
+# $OpenBSD: Makefile,v 1.9 2017/11/16 23:20:38 naddy Exp $

 COMMENT-main =	graphical sdl rogue-like game
 COMMENT-data =	data for Tales of Maj'Eyal
@ -39,7 +39,7 @@ RUN_DEPENDS-main =	games/tome4,-data
 LIB_DEPENDS-data =
 WANTLIB-data =

-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 COMPILER_LANGS =	c


--- a/games/ufoai/base/Makefile
+++ b/games/ufoai/base/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2017/07/27 09:55:44 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2017/11/16 23:20:38 naddy Exp $

 COMMENT-main =		squad-based tactical strategy game
 COMMENT-editor = 	UFO:AI map editor
@ -29,7 +29,7 @@ WANTLIB-editor += gtk-x11-2.0 gtkglext-x11-1.0 gtksourceview-2.0
 WANTLIB-editor += openal pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB-editor += pangox-1.0 vorbisfile xml2 ${cWANTLIB}

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 BUILD_DEPENDS = 	devel/gettext-tools
 RUN_DEPENDS = 		games/ufoai/data \
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2017/11/12 22:29:05 bentley Exp $
+# $OpenBSD: Makefile,v 1.38 2017/11/16 23:20:38 naddy Exp $

 ONLY_FOR_ARCHS=	amd64 i386

@ -21,7 +21,7 @@ WANTLIB += intl m ogg openal physfs png pthread theora vorbis
 WANTLIB += vorbisfile z ${COMPILER_LIBCXX}

 MODULES=	x11/qt5
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 LIB_DEPENDS=	audio/libogg \
 		audio/libvorbis \
--- a/geo/osm2pgsql/Makefile
+++ b/geo/osm2pgsql/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2017/11/16 23:20:38 naddy Exp $

 COMMENT =		OSM data to PostgreSQL converter
 #https://github.com/openstreetmap/osm2pgsql/issues/634
@ -39,7 +39,7 @@ TEST_DEPENDS =		databases/py-psycopg2	\
 			geo/postgis		\
 			databases/postgresql,-contrib

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 MODPY_ADJ_FILES =	tests/regression-test.py

--- a/geo/pgrouting/Makefile
+++ b/geo/pgrouting/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2017/10/28 17:37:30 landry Exp $
+# $OpenBSD: Makefile,v 1.19 2017/11/16 23:20:38 naddy Exp $

 COMMENT =	geospatial routing extension for PostgreSQL

@ -19,7 +19,7 @@ WANTLIB +=	CGAL boost_system-mt boost_thread-mt gmp m pthread
 WANTLIB +=	boost_atomic-mt boost_chrono-mt boost_date_time-mt ${COMPILER_LIBCXX}

 MODULES =	databases/postgresql devel/cmake
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 LIB_DEPENDS =	math/cgal
 RUN_DEPENDS =	geo/postgis
--- a/geo/qgis/Makefile
+++ b/geo/qgis/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.76 2017/10/30 13:56:46 landry Exp $
+# $OpenBSD: Makefile,v 1.77 2017/11/16 23:20:38 naddy Exp $

 COMMENT =	desktop geographical information system

@ -28,7 +28,7 @@ MODULES =	devel/cmake \
 		lang/python


-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 BUILD_DEPENDS =	x11/py-qt4>=4.8.4 \
 		security/qca,-ossl \
--- a/geo/viking/Makefile
+++ b/geo/viking/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2017/07/27 09:55:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.36 2017/11/16 23:20:38 naddy Exp $

 COMMENT =	GPS track manager

@ -25,7 +25,7 @@ EXTRACT_SUFX = .tar.bz2

 MODULES =	devel/gettext textproc/intltool x11/gnome

-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 MODGCC4_ARCHS =	amd64 i386 powerpc sparc64

 CONFIGURE_STYLE =	gnu
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.83 2017/11/09 17:00:28 pascal Exp $
+# $OpenBSD: Makefile,v 1.84 2017/11/16 23:20:38 naddy Exp $

 ONLY_FOR_ARCHS = amd64 i386

@ -29,7 +29,7 @@ MODULES =	devel/cmake \
 		lang/python \


-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 MODPY_VERSION =	${MODPY_DEFAULT_VERSION_3}

--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2017/10/23 17:10:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.36 2017/11/16 23:20:38 naddy Exp $

 PORTROACH=		limitw:1,even

@ -32,7 +32,7 @@ LIB_DEPENDS=		graphics/cairo \
 			devel/libsigc++-2

 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 USE_GMAKE=		Yes

--- a/graphics/cfdg/Makefile
+++ b/graphics/cfdg/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2017/07/27 09:55:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2017/11/16 23:20:38 naddy Exp $

 COMMENT =	Context Free Design Grammar

@ -26,7 +26,7 @@ BUILD_DEPENDS =	devel/bison

 LIB_DEPENDS =	graphics/png

-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 USE_GMAKE =	Yes

--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.77 2017/07/26 22:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.78 2017/11/16 23:20:38 naddy Exp $

 ONLY_FOR_ARCHS=	i386 amd64

@ -35,7 +35,7 @@ MODULES=	devel/cmake \
 		textproc/intltool
 MODLUA_VERSION=	5.2
 # TLS emulation
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 BUILD_DEPENDS=	sysutils/coreutils
 RUN_DEPENDS=	devel/desktop-file-utils \
--- a/graphics/enblend-enfuse/Makefile
+++ b/graphics/enblend-enfuse/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2017/07/26 22:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.36 2017/11/16 23:20:38 naddy Exp $

 ONLY_FOR_ARCHS = ${GCC4_ARCHS} ${CLANG_ARCHS}
 .if (${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "arm64")
@ -25,7 +25,7 @@ WANTLIB += jpeg lcms2 m png pthread tiff vigraimpex z ${COMPILER_LIBCXX}

 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=enblend/}

-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 BUILD_DEPENDS =	devel/help2man\
 		math/gnuplot \
 		print/texlive/base \
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2017/07/26 22:45:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.56 2017/11/16 23:20:39 naddy Exp $

 BROKEN-hppa =	run dep on enblend-enfuse which will not build on hppa

@ -62,7 +62,7 @@ LIB_DEPENDS =		devel/boost>=1.58 \
 			x11/wxWidgets>=2.8.12p7

 MODULES =		devel/cmake lang/python
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 CONFIGURE_ENV =		MANDIR=man
 CONFIGURE_ARGS +=	-DBUILD_HSI=ON
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.65 2017/10/23 17:10:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.66 2017/11/16 23:20:39 naddy Exp $

 COMMENT =	SVG vector drawing application

@ -33,7 +33,7 @@ MODULES=	textproc/intltool \
 		lang/python \
 		lang/ruby

-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 # We are just substituting paths at build time
 MODPY_BUILDDEP =	No
--- a/graphics/libgexiv2/Makefile
+++ b/graphics/libgexiv2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2017/07/27 09:55:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.27 2017/11/16 23:20:39 naddy Exp $

 COMMENT=		GObject wrapper around exiv2

@ -28,7 +28,7 @@ MODGNOME_TOOLS=		gobject-introspection vala
 MODPY_VERSION=		${MODPY_DEFAULT_VERSION_3}

 # C++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 CXXFLAGS +=		-std=c++11

 LIB_DEPENDS=		devel/glib2 \
--- a/graphics/libgxps/Makefile
+++ b/graphics/libgxps/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2017/10/23 17:10:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2017/11/16 23:20:39 naddy Exp $

 COMMENT=		GObject library for handling and rendering XPS documents

@ -27,7 +27,7 @@ MODULES=		x11/gnome

 # XXX <unknown>:: Fatal: GXPS: Namespace is empty
 # https://bugzilla.gnome.org/show_bug.cgi?id=767910
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 COMPILER_LANGS =	c

 MODGNOME_TOOLS=		docbook gobject-introspection
--- a/graphics/libraw/Makefile
+++ b/graphics/libraw/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2017/10/04 20:47:23 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.29 2017/11/16 23:20:39 naddy Exp $

 BROKEN-hppa =		undefined reference to __sync_fetch_and_add_4

@ -22,7 +22,7 @@ WANTLIB += c jasper jpeg lcms2 m pthread ${COMPILER_LIBCXX}

 MASTER_SITES =		https://www.libraw.org/data/

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 # for atomic builtins (__sync_fetch_and_add_4)
 MODGCC4_ARCHS =		arm

--- a/graphics/maim/Makefile
+++ b/graphics/maim/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2017/08/24 09:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2017/11/16 23:20:39 naddy Exp $

 V =		5.4.65
 REVISION =	0
@ -19,7 +19,7 @@ WANTLIB += Xrandr Xrender c icuuc jpeg m png slopy z

 MODULES =		devel/cmake

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 BUILD_DEPENDS =		graphics/glm

--- a/graphics/mandelbulber/Makefile
+++ b/graphics/mandelbulber/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/27 09:55:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2017/11/16 23:20:39 naddy Exp $

 COMMENT =		3D fractal renderer

@ -27,7 +27,7 @@ LIB_DEPENDS =		graphics/png \

 RUN_DEPENDS =		devel/desktop-file-utils

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 NO_TEST =		Yes

--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2017/10/23 17:10:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.33 2017/11/16 23:20:39 naddy Exp $

 BROKEN =	undefined reference to '_ZN6icu_5613UnicodeStringC1EOS0_'

@ -36,7 +36,7 @@ MODULES =	devel/gettext \
 		lang/python

 # clang doesnt ship cstdint ?
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 MODGCC4_ARCHS =	amd64 i386 powerpc sparc64

 TEST_DEPENDS =	shells/bash \
--- a/graphics/nomacs/Makefile
+++ b/graphics/nomacs/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/27 09:55:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2017/11/16 23:20:39 naddy Exp $

 COMMENT =		small and fast Qt image viewer

@ -26,7 +26,7 @@ WANTLIB += ${COMPILER_LIBCXX}
 MODULES =		devel/cmake \
 			x11/qt5 \

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 RUN_DEPENDS =		devel/desktop-file-utils

--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2017/07/26 22:45:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2017/11/16 23:20:39 naddy Exp $

 BROKEN-powerpc =	undefined reference to __atomic_fetch_add_8

@ -34,7 +34,7 @@ MODULES =		devel/cmake \
 			lang/python \
 			x11/qt4 \

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 BUILD_DEPENDS =		textproc/txt2man

--- a/graphics/pdf2djvu/Makefile
+++ b/graphics/pdf2djvu/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2017/09/05 20:23:43 juanfra Exp $
+# $OpenBSD: Makefile,v 1.23 2017/11/16 23:20:39 naddy Exp $

 COMMENT =		creates DjVu files from PDF files

@ -23,7 +23,7 @@ MASTER_SITES =		https://github.com/jwilk/pdf2djvu/releases/download/${V}/ \

 EXTRACT_SUFX =		.tar.xz

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 LIB_DEPENDS =		devel/gettext\
 			graphics/djvulibre \
--- a/graphics/simgear/Makefile
+++ b/graphics/simgear/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2017/08/21 17:55:37 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.14 2017/11/16 23:20:39 naddy Exp $

 COMMENT =		library set for simulations, games and visualizations

@ -24,7 +24,7 @@ WANTLIB += GL GLU OpenThreads curl expat m openal osg osgDB osgGA osgParticle
 WANTLIB += osgSim osgText osgUtil osgViewer pthread z ${COMPILER_LIBCXX}

 MODULES =		devel/cmake
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 BUILD_DEPENDS =		devel/boost
 LIB_DEPENDS =		graphics/openscenegraph \
 			audio/openal
--- a/graphics/slop/Makefile
+++ b/graphics/slop/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2017/08/24 09:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2017/11/16 23:20:39 naddy Exp $

 GH_ACCOUNT =	naelstrof
 GH_PROJECT =	slop
@ -20,7 +20,7 @@ WANTLIB += c icuuc m

 MODULES =		devel/cmake

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 BUILD_DEPENDS +=	graphics/glm

--- a/graphics/tesseract/tesseract/Makefile
+++ b/graphics/tesseract/tesseract/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2017/10/23 17:10:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2017/11/16 23:20:39 naddy Exp $

 COMMENT=	OCR Engine developed at HP Labs

@ -16,7 +16,7 @@ WANTLIB += png pthread ${LIBCXX} tiff webp xcb xcb-render
 WANTLIB += xcb-shm z

 # c++11: needed to build the training tools
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 ALL_TARGET=		training

--- a/graphics/ttfautohint/Makefile
+++ b/graphics/ttfautohint/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2017/08/31 11:21:13 jasper Exp $
+# $OpenBSD: Makefile,v 1.9 2017/11/16 23:20:39 naddy Exp $

 COMMENT=		automated hinting process based on FreeType's autohinter #'

@ -17,7 +17,7 @@ MASTER_SITES =		http://download.savannah.gnu.org/releases/freetype/

 MODULES =		devel/gettext

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 WANTLIB += c freetype glib-2.0 graphite2 harfbuzz m pcre pthread
 WANTLIB += z ${COMPILER_LIBCXX}
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2017/07/26 22:45:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2017/11/16 23:20:39 naddy Exp $

 COMMENT =		image processing and analysis library
 ONLY_FOR_ARCHS =	${CXX11_ARCHS}
@ -24,7 +24,7 @@ WANTLIB += Half Iex IlmImf IlmThread Imath boost_atomic-mt boost_chrono-mt
 WANTLIB += boost_date_time-mt boost_system-mt boost_thread-mt
 WANTLIB += fftw3 jpeg m png pthread tiff z ${COMPILER_LIBCXX}

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 MODULES =		devel/cmake
 BUILD_DEPENDS = 	math/fftw3,float
--- a/lang/guile2/Makefile
+++ b/lang/guile2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2017/07/30 06:51:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2017/11/16 23:20:39 naddy Exp $

 # When updating, check that x11/gnome/aisleriot MODGNOME_CPPFLAGS references the
 # proper guile2 includes directory
@ -27,7 +27,7 @@ WANTLIB += unistring
 MASTER_SITES=		${MASTER_SITE_GNU:=guile/}

 # internal compiler error: in unify_nodes, at tree-ssa-structalias.c:1231
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 COMPILER_LANGS =	c

 USE_GMAKE=		Yes
--- a/lang/pypy/Makefile
+++ b/lang/pypy/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2017/05/31 08:08:16 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2017/11/16 23:20:39 naddy Exp $

 ONLY_FOR_ARCHS =	amd64

@ -58,7 +58,7 @@ SUPDISTFILES =		${BOOTSTRAP-amd64}:0
 MODULES +=		lang/python lang/tcl x11/tk
 MODPY_VERSION =		2.7

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 COMPILER_LANGS =	c

 USE_GMAKE =		Yes
--- a/lang/racket-minimal/Makefile
+++ b/lang/racket-minimal/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2017/10/31 15:53:28 juanfra Exp $
+# $OpenBSD: Makefile,v 1.42 2017/11/16 23:20:39 naddy Exp $

 USE_WXNEEDED =		Yes

@ -36,7 +36,7 @@ MASTER_SITES =		https://mirror.racket-lang.org/installers/${V}/ \
 EXTRACT_SUFX =		.tgz

 # "places" and "futures" require TLS.
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 COMPILER_LANGS =	c
 MODGCC4_ARCHS =		arm

--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.114 2017/10/31 07:45:04 giovanni Exp $
+# $OpenBSD: Makefile,v 1.115 2017/11/16 23:20:39 naddy Exp $

 COMMENT-main=		imap server for maildir format mailboxes
 COMMENT-pop3=		pop3 server for maildir format mailboxes
@ -20,7 +20,7 @@ MAINTAINER=		Giovanni Bechis <giovanni@openbsd.org>
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 WANTLIB=		c courierauth courierauthcommon courierauthsasl gdbm
 WANTLIB+=		iconv intl idn m pcre ${COMPILER_LIBCXX}
--- a/mail/courier-unicode/Makefile
+++ b/mail/courier-unicode/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2017/08/04 23:05:01 giovanni Exp $
+# $OpenBSD: Makefile,v 1.10 2017/11/16 23:20:39 naddy Exp $

 SHARED_LIBS +=  courier-unicode		1.0 # 2.0

@ -17,7 +17,7 @@ MAINTAINER =		Giovanni Bechis <giovanni@openbsd.org>
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 WANTLIB +=		iconv m ${COMPILER_LIBCXX}
 LIB_DEPENDS =		converters/libiconv

--- a/mail/lumail/Makefile
+++ b/mail/lumail/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2017/07/26 22:45:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2017/11/16 23:20:39 naddy Exp $

 PORTROACH =		limit:^0

@ -21,7 +21,7 @@ WANTLIB +=		sigc-2.0 ${COMPILER_LIBCXX}
 MODULES =		lang/lua

 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 LIB_DEPENDS +=		${MODLUA_LIB_DEPENDS} \
 			devel/glib2mm \
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.70 2017/11/13 15:35:24 naddy Exp $
+# $OpenBSD: Makefile,v 1.71 2017/11/16 23:20:39 naddy Exp $

 COMMENT-main=		mail delivery agent with filtering abilities
 COMMENT-utils=		quota tools for the Courier mail suite
@ -25,7 +25,7 @@ MULTI_PACKAGES=		-main -utils
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 CONFIGURE_STYLE=	autoconf no-autoheader
 AUTOCONF_VERSION=	2.69
--- a/mail/mimetic/Makefile
+++ b/mail/mimetic/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/27 09:55:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2017/11/16 23:20:39 naddy Exp $

 COMMENT =		C++ MIME library

@ -17,7 +17,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB +=		m
 WANTLIB += ${COMPILER_LIBCXX}

-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc

 AUTOCONF_VERSION =	2.64
 AUTOMAKE_VERSION =	1.11
--- a/mail/mozilla-thunderbird/Makefile
+++ b/mail/mozilla-thunderbird/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.256 2017/10/23 17:10:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.257 2017/11/16 23:20:39 naddy Exp $

 COMMENT-main =		Mozilla e-mail, rss and usenet client
 COMMENT-lightning =	Mozilla Thunderbird calendar extension
@ -34,7 +34,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 MODULES =	www/mozilla devel/gettext lang/python
 MODPY_RUNDEP =	No

-COMPILER =	clang
+COMPILER =	base-clang ports-clang
 MODCLANG_ARCHS =	amd64 i386

 MOZILLA_USE_BUNDLED_LIBEVENT =	Yes
--- a/mail/rmilter/Makefile
+++ b/mail/rmilter/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2017/07/28 10:42:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2017/11/16 23:20:39 naddy Exp $

 COMMENT=	milter for rspamd (also supports clamav, rate-limiting, etc)

@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes

 WANTLIB += c crypto glib-2.0 intl m milter opendkim pcre pthread ssl

-COMPILER=	gcc
+COMPILER=	base-clang ports-gcc
 COMPILER_LANGS=	c

 MODULES+=	devel/cmake
--- a/math/ginac/Makefile
+++ b/math/ginac/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2017/07/26 22:45:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2017/11/16 23:20:39 naddy Exp $

 COMMENT=	GiNaC is Not a Computer Algebra System (CAS)

@ -21,7 +21,7 @@ WANTLIB=	c m ncurses readline ${LIBCXX} gmp cln

 MODULES =	lang/python

-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc

 LIB_DEPENDS=	devel/cln

--- a/misc/gtk3mm-documentation/Makefile
+++ b/misc/gtk3mm-documentation/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2017/07/27 17:02:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2017/11/16 23:20:39 naddy Exp $

 COMMENT=		documentation for gtk3mm

@ -20,7 +20,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 MODULES=		x11/gnome

 # c++14
-COMPILER =		clang
+COMPILER =		base-clang ports-clang

 PKG_ARCH=		*

--- a/Show More
+++ b/Show More