diff --git a/audio/clementine/Makefile b/audio/clementine/Makefile
index 2233efe31f9..427d3c1c10f 100644
--- 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 \
diff --git a/audio/mpd/Makefile b/audio/mpd/Makefile
index df7b1dec0e7..9da0b9d5405 100644
--- 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
 
diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index daa895f0135..eb62f0d31f4 100644
--- 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/"
 
diff --git a/audio/pavucontrol/Makefile b/audio/pavucontrol/Makefile
index 4c70a1244cc..75934e2f246 100644
--- 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
 
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 63f14ebba41..3709ffc1555 100644
--- 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
 
diff --git a/converters/unoconv/Makefile b/converters/unoconv/Makefile
index 4f3b8eb4170..86c3e9c5009 100644
--- 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
diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile
index 438328d9771..a0454df8f51 100644
--- 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}" \
diff --git a/devel/appstream-glib/Makefile b/devel/appstream-glib/Makefile
index 1d65b861a2e..a20e0668335 100755
--- 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
diff --git a/devel/atk2mm/Makefile b/devel/atk2mm/Makefile
index a0779493c40..ae83f7201ff 100644
--- 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
diff --git a/devel/cbmc/Makefile b/devel/cbmc/Makefile
index c4a7627a55a..791c630ebe4 100644
--- 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
 
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index 6158361a3dc..c1a386f5645 100755
--- 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
diff --git a/devel/cpp-hocon/Makefile b/devel/cpp-hocon/Makefile
index 67dc43d1d43..a5cb75ef1c6 100644
--- 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
 
diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 88109bd4ad3..2fa0365b6d4 100644
--- 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
 
diff --git a/devel/glib2mm/Makefile b/devel/glib2mm/Makefile
index 6982b1ea8a3..dd65fe316d5 100644
--- 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
diff --git a/devel/keystone/Makefile b/devel/keystone/Makefile
index a2670e4e415..0f33128b185 100644
--- 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
diff --git a/devel/leatherman/Makefile b/devel/leatherman/Makefile
index cb97ed27737..a834c09215e 100644
--- 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
diff --git a/devel/libgit2/libgit2/Makefile b/devel/libgit2/libgit2/Makefile
index 57b96ad1bc3..2512ecc48a2 100644
--- 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
 
diff --git a/devel/libmtp/Makefile b/devel/libmtp/Makefile
index c197ce0bd76..7f579179fd3 100644
--- 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
 
diff --git a/devel/libsigc++-2/Makefile b/devel/libsigc++-2/Makefile
index a29ad9035c5..94f62c7b7ee 100644
--- 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'
diff --git a/devel/pangomm/Makefile b/devel/pangomm/Makefile
index 2d74d755887..af71c297ab2 100644
--- 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 \
diff --git a/devel/qt-creator/Makefile b/devel/qt-creator/Makefile
index 9a076869b07..31367fc76e5 100644
--- 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
diff --git a/devel/stp/Makefile b/devel/stp/Makefile
index e34c96cb71c..e6b245e4265 100644
--- 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
diff --git a/devel/vte3/Makefile b/devel/vte3/Makefile
index 9e2fe74afb8..1905c01d871 100644
--- 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
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 08c7e04bf10..6a6159fa4d9 100644
--- 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
diff --git a/editors/ktikz/Makefile b/editors/ktikz/Makefile
index 0fdf719cd36..99c8fe00bae 100644
--- 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
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index d3b8e199a7a..35819ff7ee1 100644
--- 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
 
diff --git a/editors/subtitleeditor/Makefile b/editors/subtitleeditor/Makefile
index 283ac9ba444..a6da15e8b45 100644
--- 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
 
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 8365ad2b494..031bc4a30d4 100644
--- 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 \
diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
index 3c12ebcb51d..d883310b9c3 100644
--- 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
diff --git a/emulators/desmume/Makefile b/emulators/desmume/Makefile
index 6b50631b843..90235b288ee 100644
--- 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
 
diff --git a/emulators/emulationstation/Makefile b/emulators/emulationstation/Makefile
index 7eeb25b932d..83f34eb2dd7 100644
--- 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
 
diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile
index db26fef0ec1..be3ced9102a 100644
--- 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
diff --git a/emulators/mgba/Makefile b/emulators/mgba/Makefile
index 29981fed685..b3aed2feb1e 100644
--- 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 \
diff --git a/emulators/mupen64plus/video-glide64mk2/Makefile b/emulators/mupen64plus/video-glide64mk2/Makefile
index a727931183a..a7bb0fce2fa 100644
--- 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
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index c629572733a..1b89b3a52ef 100644
--- 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 \
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 470882f429b..c9ed0ac4a48 100644
--- 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
 
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 6bb9e1177fe..747c1d66fc4 100644
--- 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
 
diff --git a/emulators/vbam/Makefile b/emulators/vbam/Makefile
index 48cc5440c4f..2430a781340 100644
--- 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
diff --git a/emulators/xnp2/Makefile b/emulators/xnp2/Makefile
index 14859e702db..5023320ac58 100644
--- 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 \
diff --git a/emulators/xroar/Makefile b/emulators/xroar/Makefile
index 51baec4c870..a53685b89a7 100644
--- 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 \
diff --git a/games/0ad/base/Makefile b/games/0ad/base/Makefile
index 839c0073d5f..cbd21c8e223 100644
--- 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
diff --git a/games/bastet/Makefile b/games/bastet/Makefile
index 906cb1d3ff9..e5ba4a82607 100644
--- 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
 
diff --git a/games/corsixth/Makefile b/games/corsixth/Makefile
index f7e5efdd73f..9f00ce57ab6 100644
--- 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
diff --git a/games/dhewm3/Makefile b/games/dhewm3/Makefile
index be93374d2b8..f6a5f77040a 100644
--- 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 \
diff --git a/games/dunelegacy/Makefile b/games/dunelegacy/Makefile
index 912cf14ce97..44826dc693d 100644
--- 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
diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile
index 9286b54591e..88c133b09bf 100644
--- 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 \
diff --git a/games/extremetuxracer/Makefile b/games/extremetuxracer/Makefile
index a1c1c5e7a14..2121d545722 100644
--- 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
diff --git a/games/flightgear/base/Makefile b/games/flightgear/base/Makefile
index f620a8862d6..f3a920d39ae 100644
--- 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
diff --git a/games/galois/Makefile b/games/galois/Makefile
index 320edfd3d91..c6a29233d01 100644
--- 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
diff --git a/games/lugaru/Makefile b/games/lugaru/Makefile
index 5325b8aa1cd..65a252173cc 100644
--- 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 \
diff --git a/games/openmw/Makefile b/games/openmw/Makefile
index 955148d2865..4222b757eb6 100644
--- 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 \
diff --git a/games/openxcom/Makefile b/games/openxcom/Makefile
index f33dc0bb53e..3515287286b 100644
--- 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 \
diff --git a/games/pingus/Makefile b/games/pingus/Makefile
index 2367e04fc03..dafa475f123 100644
--- 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 \
diff --git a/games/residualvm/Makefile b/games/residualvm/Makefile
index c66ed900202..983060688c3 100644
--- 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
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index f7f3c61038c..bef44b67b09 100644
--- 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 \
diff --git a/games/solarus/solarus/Makefile b/games/solarus/solarus/Makefile
index 122cd99d3cc..2f862cda1bc 100644
--- 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 \
diff --git a/games/stone-soup/Makefile b/games/stone-soup/Makefile
index ead185b733c..cce2e99c9af 100644
--- 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}
diff --git a/games/sumwars/Makefile b/games/sumwars/Makefile
index f7994770d30..e4c334860d3 100644
--- 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 \
diff --git a/games/supertux/Makefile b/games/supertux/Makefile
index 44329577007..19988c068d8 100644
--- 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 \
diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index d2815995e70..a08b80fb504 100644
--- 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 \
diff --git a/games/tome4/Makefile b/games/tome4/Makefile
index 79ca13ed13e..a8fd5ba31d8 100644
--- 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
 
 
diff --git a/games/ufoai/base/Makefile b/games/ufoai/base/Makefile
index bae1984935d..c89bc4afc01 100644
--- 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 \
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index dfbf2c503bb..bf862d4d2a8 100644
--- 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 \
diff --git a/geo/osm2pgsql/Makefile b/geo/osm2pgsql/Makefile
index cf179fc4962..6fe23375025 100644
--- 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
 
diff --git a/geo/pgrouting/Makefile b/geo/pgrouting/Makefile
index 074a6f5222f..c2793be176a 100644
--- 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
diff --git a/geo/qgis/Makefile b/geo/qgis/Makefile
index da9704224f9..c8024af3eec 100644
--- 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 \
diff --git a/geo/viking/Makefile b/geo/viking/Makefile
index 4ce8162d4b0..199878d881c 100644
--- 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
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 0ecd1ad8381..1ceff27d510 100644
--- 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}
 
diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index 8e9dee1086a..64b90bcdd6f 100644
--- 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
 
diff --git a/graphics/cfdg/Makefile b/graphics/cfdg/Makefile
index 1c60bbb2767..aae1d18fa60 100644
--- 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
 
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 79da00a7c82..838b83b5d6c 100644
--- 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 \
diff --git a/graphics/enblend-enfuse/Makefile b/graphics/enblend-enfuse/Makefile
index 9ce3407758a..f44683e27b7 100644
--- 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 \
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 1569bcf1dd2..99195f37b5b 100644
--- 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
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 73159152772..c642c00e9e6 100644
--- 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
diff --git a/graphics/libgexiv2/Makefile b/graphics/libgexiv2/Makefile
index 66b566af653..cb9f07821d2 100644
--- 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 \
diff --git a/graphics/libgxps/Makefile b/graphics/libgxps/Makefile
index cfe0b67ef1e..d1d90984e04 100644
--- 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
diff --git a/graphics/libraw/Makefile b/graphics/libraw/Makefile
index 52e3e3b40b8..aa4489510d9 100644
--- 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
 
diff --git a/graphics/maim/Makefile b/graphics/maim/Makefile
index 81334a67d80..96d5207dce7 100644
--- 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
 
diff --git a/graphics/mandelbulber/Makefile b/graphics/mandelbulber/Makefile
index c536eedceb8..3fe0a9d0d71 100644
--- 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
 
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index a17400f6107..05bffd0dfd4 100644
--- 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 \
diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile
index 5e12db6d39b..5e5d12a9e69 100644
--- 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
 
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index ecad5e85c68..0c1fdf56f8c 100644
--- 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
 
diff --git a/graphics/pdf2djvu/Makefile b/graphics/pdf2djvu/Makefile
index 61ce1c89d3f..d97ca9490a9 100644
--- 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 \
diff --git a/graphics/simgear/Makefile b/graphics/simgear/Makefile
index 3230e075edf..476988f85db 100644
--- 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
diff --git a/graphics/slop/Makefile b/graphics/slop/Makefile
index 6a7d1fc0bb6..2678c93e442 100644
--- 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
 
diff --git a/graphics/tesseract/tesseract/Makefile b/graphics/tesseract/tesseract/Makefile
index d47e1bf9d56..c54fcab110b 100644
--- 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
 
diff --git a/graphics/ttfautohint/Makefile b/graphics/ttfautohint/Makefile
index c4df94f6bdd..c7595736eb3 100644
--- 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}
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index c642226e5cd..8dd89638b7d 100644
--- 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
diff --git a/lang/guile2/Makefile b/lang/guile2/Makefile
index ad792f24f9e..a8e2e37cd3e 100644
--- 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
diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile
index ee638061882..0fe65b5cee8 100644
--- 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
diff --git a/lang/racket-minimal/Makefile b/lang/racket-minimal/Makefile
index 0fe62b127a5..3d38780d0a9 100644
--- 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
 
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 202b4d57641..6eae2acdf17 100644
--- 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}
diff --git a/mail/courier-unicode/Makefile b/mail/courier-unicode/Makefile
index bfbef7ed6ca..ec2d73e74d8 100644
--- 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
 
diff --git a/mail/lumail/Makefile b/mail/lumail/Makefile
index 2398a5a46a0..2b1de355bf4 100644
--- 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 \
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index ac4f8ff8149..a11e8718063 100644
--- 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
diff --git a/mail/mimetic/Makefile b/mail/mimetic/Makefile
index 8a7e809b5a1..d2d23e70d1e 100644
--- 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
diff --git a/mail/mozilla-thunderbird/Makefile b/mail/mozilla-thunderbird/Makefile
index a06e0f9590d..e609b57e2dc 100644
--- 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
diff --git a/mail/rmilter/Makefile b/mail/rmilter/Makefile
index bd940f56182..bed69564e6f 100644
--- 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
diff --git a/math/ginac/Makefile b/math/ginac/Makefile
index aad96ce63bb..b39c8b10f1c 100644
--- 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
 
diff --git a/misc/gtk3mm-documentation/Makefile b/misc/gtk3mm-documentation/Makefile
index 48686a9854d..0e7d3727275 100644
--- 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=		*
 
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index e47d244e74a..800871b869f 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2017/07/26 22:45:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.32 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT=	Google VP8/VP9 video codec
 
@@ -19,7 +19,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c m pthread ${LIBCXX}
 
-COMPILER =	clang
+COMPILER =	base-clang ports-clang
 MODCLANG_ARCHS =	amd64 i386
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
diff --git a/multimedia/qt-gstreamer/Makefile b/multimedia/qt-gstreamer/Makefile
index cc714611878..48d34013075 100644
--- a/multimedia/qt-gstreamer/Makefile
+++ b/multimedia/qt-gstreamer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/26 22:45:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT =	Qt bindings to GStreamer 1.x
 
@@ -30,7 +30,7 @@ MASTER_SITES =		http://gstreamer.freedesktop.org/src/qt-gstreamer/
 EXTRACT_SUFX =		.tar.xz
 
 MODULES =		devel/cmake x11/qt4
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 BUILD_DEPENDS =		devel/boost
 LIB_DEPENDS =		multimedia/gstreamer1/core \
diff --git a/multimedia/sfml/Makefile b/multimedia/sfml/Makefile
index 35cf6e63deb..ef07d46fcdd 100644
--- a/multimedia/sfml/Makefile
+++ b/multimedia/sfml/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2017/07/27 09:55:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT =		simple and fast multimedia library
 
@@ -30,7 +30,7 @@ MASTER_SITES =		http://www.sfml-dev.org/download/sfml/${V}/
 
 MODULES =		devel/cmake
 
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 LIB_DEPENDS =		audio/openal \
 			graphics/jpeg \
diff --git a/multimedia/synfig/Makefile b/multimedia/synfig/Makefile
index 6cb7fffb560..35e75b54ea5 100644
--- a/multimedia/synfig/Makefile
+++ b/multimedia/synfig/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2017/10/23 17:10:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT =		2D animation software
 REVISION =		8
@@ -32,7 +32,7 @@ MASTER_SITES=		http://download.tuxfamily.org/synfig/releases/${V}/
 MODULES =		devel/gettext
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 BUILD_DEPENDS =		devel/etl>=0.04.19
 LIB_DEPENDS =		archivers/xz \
diff --git a/multimedia/synfigstudio/Makefile b/multimedia/synfigstudio/Makefile
index 92126918715..c3aab27f49f 100644
--- a/multimedia/synfigstudio/Makefile
+++ b/multimedia/synfigstudio/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2017/10/23 17:10:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT =		2D animation software studio
 BROKEN-alpha =		[keyframe_lock_past_on_icon.png] Bus error (core dumped)
@@ -38,7 +38,7 @@ MODULES =		devel/gettext \
 			textproc/intltool
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 BUILD_DEPENDS =		devel/etl>=0.04.19
 RUN_DEPENDS =		devel/desktop-file-utils \
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 8bdf40e4ecc..182ae6383c6 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2017/08/10 12:01:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.44 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT=	free H.264/MPEG-4 AVC encoder
 
@@ -21,7 +21,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 WANTLIB=	c m pthread
 
-COMPILER=	clang
+COMPILER=	base-clang ports-clang
 COMPILER_LANGS=	c
 MODCLANG_ARCHS=	amd64 i386
 
diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
index 4089496eca0..464b5211120 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2017/07/26 22:45:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.31 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT=	free H.265/HEVC encoder
 
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIST}/source
 
 MODULES=	devel/cmake
 
-COMPILER =	clang
+COMPILER =	base-clang ports-clang
 MODCLANG_ARCHS=	amd64 i386
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 4fafdee6444..2c4183cce88 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.134 2017/10/23 17:10:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.135 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT=	multimedia decoding library
 
@@ -32,7 +32,7 @@ WANTLIB += z
 XINEAPI_REV=	2.6
 SUBST_VARS+=	XINEAPI_REV
 
-COMPILER=	clang
+COMPILER=	base-clang ports-clang
 COMPILER_LANGS=	c
 MODCLANG_ARCHS=	amd64 i386
 
diff --git a/net/bro/Makefile b/net/bro/Makefile
index 73f215fc546..dff2d1a6acb 100644
--- a/net/bro/Makefile
+++ b/net/bro/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2017/10/19 10:05:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.42 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT=		network analysis and security monitoring framework
 
@@ -23,7 +23,7 @@ MASTER_SITES=		https://www.bro.org/downloads/
 MODULES=		lang/python
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 MODPY_ADJ_FILES=	aux/broctl/bin/broctl.in \
 			aux/broctl/bin/stats-to-csv \
diff --git a/net/dnsdist/Makefile b/net/dnsdist/Makefile
index d5405bf722c..7f17741251d 100644
--- a/net/dnsdist/Makefile
+++ b/net/dnsdist/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2017/09/06 08:59:44 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT=		highly DNS-, DoS- and abuse-aware loadbalancer
 
@@ -31,7 +31,7 @@ CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LIBEDIT_CFLAGS=' '
 SYSCONFDIR=		${BASESYSCONFDIR}/dnsdist
 
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 MODULES+=		lang/lua
 MODLUA_VERSION=		5.3
diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile
index 5102cbb295d..bc6780b19ae 100644
--- a/net/filezilla/Makefile
+++ b/net/filezilla/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2017/10/23 17:11:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.52 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT=	fast FTP and SFTP GUI client with a lot of features
 BROKEN-hppa=	serverpath.h:17:19: error: variable 'CServerPath final' has initializer but incomplete type
@@ -33,7 +33,7 @@ WANTLIB += wx_gtk2_html wx_gtk2_xrc xcb xcb-render xcb-shm z
 
 MODULES=	devel/gettext
 
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 
 LIB_DEPENDS=	databases/sqlite3 \
 		devel/harfbuzz \
diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index 1af462e1e3b..4d963d4ba6e 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2017/07/17 23:15:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.27 2017/11/16 23:20:39 naddy Exp $
 
 PORTROACH=	limit:^3\.
 
@@ -56,7 +56,7 @@ TEST_IS_INTERACTIVE=Yes # doesn't exit properly
 MODULES=	lang/python
 
 # thread-local storage
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 COMPILER_LANGS =	c
 
 MULTI_PACKAGES= -main -freetds -iodbc -ldap -memcached -mysql -pgsql -python
diff --git a/net/gdnsd/Makefile b/net/gdnsd/Makefile
index d9233a262b6..9fa00218cc0 100644
--- a/net/gdnsd/Makefile
+++ b/net/gdnsd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2017/08/10 20:14:56 jung Exp $
+# $OpenBSD: Makefile,v 1.18 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT=		geographically-aware, authoritative-only DNS server
 
@@ -22,7 +22,7 @@ MASTER_SITES=		https://github.com/gdnsd/gdnsd/releases/download/v$V/
 
 USE_GMAKE=		Yes
 # TLS
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 COMPILER_LANGS =	c
 
 BUILD_DEPENDS=		devel/ragel
diff --git a/net/icinga/core2/Makefile b/net/icinga/core2/Makefile
index 13d27b15c0c..5e8943f341b 100644
--- a/net/icinga/core2/Makefile
+++ b/net/icinga/core2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.69 2017/11/13 15:38:08 sthen Exp $
+# $OpenBSD: Makefile,v 1.70 2017/11/16 23:20:39 naddy Exp $
 
 BROKEN-arm =	needs atomic ops; __sync_add_and_fetch_4
 BROKEN-hppa =	needs atomic ops; __sync_add_and_fetch_4
@@ -47,7 +47,7 @@ WANTLIB += yajl ${COMPILER_LIBCXX}
 
 MODULES =		devel/cmake
 
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 PSEUDO_FLAVORS =	test
 FLAVOR ?=
diff --git a/net/knot/Makefile b/net/knot/Makefile
index eba1b5d9c41..c8ae60afd10 100644
--- a/net/knot/Makefile
+++ b/net/knot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2017/08/22 10:14:10 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT =		authoritative DNS server
 
@@ -27,7 +27,7 @@ MASTER_SITES =		https://secure.nic.cz/files/knot-dns/
 EXTRACT_SUFX =		.tar.xz
 
 # Needs TLS emulation, and atomic builtins on arm
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 COMPILER_LANGS =	c
 
 BUILD_DEPENDS =		devel/bison
diff --git a/net/owncloudclient/Makefile b/net/owncloudclient/Makefile
index 36062aaa92e..d59f832d7d6 100644
--- a/net/owncloudclient/Makefile
+++ b/net/owncloudclient/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2017/11/08 09:55:16 kirby Exp $
+# $OpenBSD: Makefile,v 1.28 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT =		owncloud sync client
 
@@ -26,7 +26,7 @@ EXTRACT_SUFX =		.tar.xz
 
 MODULES =		devel/cmake x11/qt5
 
-COMPILER = 		gcc
+COMPILER = 		base-clang ports-gcc
 
 RUN_DEPENDS =		devel/desktop-file-utils \
 			x11/gtk+3,-guic
diff --git a/net/packetq/Makefile b/net/packetq/Makefile
index c6c4e6bf15f..d25eae523ad 100644
--- a/net/packetq/Makefile
+++ b/net/packetq/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2017/11/10 11:39:38 fcambus Exp $
+# $OpenBSD: Makefile,v 1.6 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT =	run SQL queries directly on PCAP files
 
@@ -17,7 +17,7 @@ WANTLIB +=	${COMPILER_LIBCXX} c m z
 
 MASTER_SITES =	https://www.dns-oarc.net/files/packetq/
 
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 
 CONFIGURE_STYLE = gnu
 
diff --git a/net/powerdns/Makefile b/net/powerdns/Makefile
index ceb8697241e..c96c9a9b108 100644
--- a/net/powerdns/Makefile
+++ b/net/powerdns/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.56 2017/07/26 22:45:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.57 2017/11/16 23:20:39 naddy Exp $
 
 BROKEN-hppa =		undefined reference to '__sync_fetch_and_add_4'
 
@@ -28,7 +28,7 @@ MULTI_PACKAGES=		-main -mysql -pgsql -ldap
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 WANTLIB += m pthread ${COMPILER_LIBCXX}
 #WANTLIB += ${MODGCC4_CPPWANTLIB}
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 503f4fe385a..94c8882884a 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.119 2017/10/23 17:11:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.120 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT-main=	BitTorrent command line and daemon client
 COMMENT-gtk=	BitTorrent client with GTK+ interface
@@ -26,7 +26,7 @@ ONLY_FOR_ARCHS-qt=	${MODGCC4_ARCHS} ${CLANG_ARCHS}
 # keep in sync with lang/gcc/${MODGCC4_VERSION}/Makefile
 MODGCC4_ARCHS=  amd64 arm hppa i386 mips64 mips64el powerpc sparc64
 
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 COMPILER_LANGS =	c
 
 
diff --git a/net/znc/Makefile b/net/znc/Makefile
index 7ccd0e2a0d4..60fc9def2aa 100644
--- a/net/znc/Makefile
+++ b/net/znc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2017/07/27 09:55:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.35 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT=	advanced IRC bouncer
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=	c crypto m pthread ssl z
 WANTLIB += ${COMPILER_LIBCXX}
 
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 
 
 MAKE_FLAGS=	VERBOSE=1
diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
index e6aca32e0b9..d2a93b7813d 100644
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.129 2017/10/23 17:11:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.130 2017/11/16 23:20:39 naddy Exp $
 
 BROKEN-alpha=	ICE in cupsfilters/image-jpeg.c:316
 BROKEN-hppa=	ICE on filter/pdftopdf/qpdf_pdftopdf.cc:147
@@ -30,7 +30,7 @@ WANTLIB += ${COMPILER_LIBCXX}
 MASTER_SITES=	http://www.openprinting.org/download/cups-filters/
 
 # cc1plus: error: unrecognized command line option "-std=c++0x"
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 
 .if ${MACHINE_ARCH} == "hppa"
 CFLAGS +=	-O0
diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 9efbe5c3169..f88219786d8 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.129 2017/11/04 21:28:36 landry Exp $
+# $OpenBSD: Makefile,v 1.130 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT-main=	PDF rendering library
 COMMENT-qt4=	qt4 interface to PDF rendering library
@@ -46,7 +46,7 @@ MULTI_PACKAGES=-main -qt4 -qt5 -utils
 .include <bsd.port.arch.mk>
 
 # c++-11
-COMPILER=	gcc
+COMPILER=	base-clang ports-gcc
 
 cWANTLIB=	expat freetype fontconfig jpeg m pthread tiff z
 
diff --git a/productivity/ledger/Makefile b/productivity/ledger/Makefile
index 2ff99444dad..17acb766dfa 100644
--- a/productivity/ledger/Makefile
+++ b/productivity/ledger/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2017/07/26 22:45:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT =		command line double-entry accounting ledger
 
@@ -24,7 +24,7 @@ WANTLIB += c gmp m mpfr pthread ${COMPILER_LIBCXX}
 
 MODULES =		devel/cmake \
 			lang/python
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 BUILD_DEPENDS =		devel/utfcpp
 LIB_DEPENDS =		devel/boost \
diff --git a/productivity/taskd/Makefile b/productivity/taskd/Makefile
index d716572f3e9..c186afdcaee 100644
--- a/productivity/taskd/Makefile
+++ b/productivity/taskd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/26 22:45:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT =	lightweight server providing access to task data
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE_CDROM =		Yes
 
 MODULES =	devel/cmake
 
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 
 WANTLIB += c gnutls m pthread ${COMPILER_LIBCXX}
 
diff --git a/productivity/taskwarrior/Makefile b/productivity/taskwarrior/Makefile
index e525ffe74ed..2e64cdb66be 100644
--- a/productivity/taskwarrior/Makefile
+++ b/productivity/taskwarrior/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2017/07/26 22:45:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2017/11/16 23:20:39 naddy Exp $
 
 COMMENT =	command line todo list manager
 
@@ -16,7 +16,7 @@ MASTER_SITES =	${HOMEPAGE}download/
 PERMIT_PACKAGE_CDROM =		Yes
 
 # Needs C++11; linker issues with clang
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 MODULES =		devel/cmake \
 			lang/lua \
 			lang/python
diff --git a/productivity/workrave/Makefile b/productivity/workrave/Makefile
index f8cff32d274..6e0b43b6410 100644
--- a/productivity/workrave/Makefile
+++ b/productivity/workrave/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2017/10/23 17:11:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.47 2017/11/16 23:20:40 naddy Exp $
 
 # XXX check if still needed at next update
 CXXFLAGS +=		-std=c++11
@@ -47,7 +47,7 @@ MODULES=		devel/gettext \
 			textproc/intltool
 
 # c++11 (although only for building against libsigc++)
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 USE_GMAKE=		Yes
 
diff --git a/security/botan2/Makefile b/security/botan2/Makefile
index 0c29aa39415..4ccd8dc9fe4 100644
--- a/security/botan2/Makefile
+++ b/security/botan2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2017/10/09 20:05:07 bluhm Exp $
+# $OpenBSD: Makefile,v 1.11 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =	crypto and TLS for C++11
 
@@ -28,7 +28,7 @@ EXTRACT_SUFX =		.tgz
 MODULES =		lang/python
 MODPY_RUNDEP =		No
 
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 LIB_DEPENDS =		archivers/bzip2 \
 			archivers/xz
 
diff --git a/security/pcsc-lite/Makefile b/security/pcsc-lite/Makefile
index d825839cde8..4974077cd6f 100644
--- a/security/pcsc-lite/Makefile
+++ b/security/pcsc-lite/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2017/08/11 10:06:01 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.41 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT=	resource manager for PC/SC
 
@@ -26,7 +26,7 @@ WANTLIB=		c pthread usb-1.0
 MODULES+=		lang/python
 
 # thread-local storage
-COMPILER=		gcc
+COMPILER=		base-clang ports-gcc
 COMPILER_LANGS=		c
 
 LIB_DEPENDS=		devel/libusb1
diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile
index 03ae33c6a39..cb13ecd8cc3 100644
--- a/sysutils/facter/Makefile
+++ b/sysutils/facter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2017/11/01 10:12:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.50 2017/11/16 23:20:40 naddy Exp $
 
 # XXXTODO: Subpackage facter.jar for use with puppetserver
 COMMENT =		collect and display system facts
@@ -20,7 +20,7 @@ MASTER_SITES =		https://downloads.puppetlabs.com/facter/
 MODULES +=		devel/cmake \
 			lang/ruby
 
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 WANTLIB += boost_atomic-mt boost_chrono-mt boost_date_time-mt
 WANTLIB += boost_filesystem-mt boost_locale-mt
diff --git a/sysutils/gource/Makefile b/sysutils/gource/Makefile
index 86226a11c7f..598c04338c7 100644
--- a/sysutils/gource/Makefile
+++ b/sysutils/gource/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2017/09/10 00:18:19 gonzalo Exp $
+# $OpenBSD: Makefile,v 1.16 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =	software version control visualization tool
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 MASTER_SITES =	https://github.com/acaudwell/Gource/releases/download/${DISTNAME}/
 
 CONFIGURE_STYLE =	gnu noman
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 
 WANTLIB += GL GLEW GLU SDL2 SDL2_image boost_filesystem boost_system
diff --git a/sysutils/grive2/Makefile b/sysutils/grive2/Makefile
index 15965401b95..84efeffa2a3 100644
--- a/sysutils/grive2/Makefile
+++ b/sysutils/grive2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2017/07/26 22:45:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =	third-party client for Google Drive
 
@@ -25,7 +25,7 @@ WANTLIB += expat gcrypt gpg-error iberty m pthread yajl z ${COMPILER_LIBCXX}
 
 MODULES =	devel/cmake
 
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 
 CXXFLAGS +=	-I${LOCALBASE}/include
 
diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile
index 4c2c80c86e5..4bf7cee9d1f 100644
--- a/sysutils/gsmartcontrol/Makefile
+++ b/sysutils/gsmartcontrol/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2017/07/27 10:05:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2017/11/16 23:20:40 naddy Exp $
 
 # XXX check if still needed at next update
 CXXFLAGS +=		-std=c++11
@@ -25,7 +25,7 @@ WANTLIB += ${COMPILER_LIBCXX}
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gsmartcontrol/}
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 RUN_DEPENDS=		devel/desktop-file-utils \
 			sysutils/smartmontools \
diff --git a/sysutils/simple-mtpfs/Makefile b/sysutils/simple-mtpfs/Makefile
index 1a5338817f1..cb3d35282cf 100644
--- a/sysutils/simple-mtpfs/Makefile
+++ b/sysutils/simple-mtpfs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2017/07/26 22:45:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT=		MTP device filesystem
 
@@ -19,7 +19,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += c fuse m mtp pthread usb-1.0 ${COMPILER_LIBCXX}
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 CONFIGURE_STYLE=	gnu
 
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 0f19b53cc6a..3dcfb46691d 100755
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2017/08/21 14:33:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.38 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT=		generic spell checking library
 
@@ -28,7 +28,7 @@ WANTLIB += aspell c glib-2.0 gmodule-2.0 hunspell-1.6 iconv intl
 WANTLIB += m pcre pthread ${LIBCXX}
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 LIB_DEPENDS=		devel/glib2 \
 			textproc/aspell/core \
diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile
index e950c1356ec..363b8b5eb69 100644
--- a/textproc/highlight/Makefile
+++ b/textproc/highlight/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2017/10/25 05:12:57 benoit Exp $
+# $OpenBSD: Makefile,v 1.52 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =		convert source code to markup formats
 
@@ -27,7 +27,7 @@ BUILD_DEPENDS =		devel/boost
 LIB_DEPENDS =		${MODLUA_LIB_DEPENDS}
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 MAKE_FILE =		makefile
 MAKE_FLAGS =		CXX=${CXX} \
diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile
index 74f22a9a9df..51d635062cd 100644
--- a/textproc/libxml++/Makefile
+++ b/textproc/libxml++/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2017/07/27 10:05:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.37 2017/11/16 23:20:40 naddy Exp $
 
 PORTROACH=		limit:^2
 
@@ -28,7 +28,7 @@ MODULES=		devel/gettext \
 			x11/gnome
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 LIB_DEPENDS=		devel/glib2mm \
 			textproc/libxml
diff --git a/textproc/libxml++3/Makefile b/textproc/libxml++3/Makefile
index b9704cb4d9c..55669c00e67 100644
--- a/textproc/libxml++3/Makefile
+++ b/textproc/libxml++3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2017/07/27 10:05:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT=		C++ wrapper for the libxml XML parser library
 
@@ -26,7 +26,7 @@ WANTLIB += ${COMPILER_LIBCXX}
 MODULES=		x11/gnome
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 LIB_DEPENDS=		devel/glib2mm \
 			textproc/libxml
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index da6e75aae93..dd0299a6348 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2017/07/26 22:45:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.45 2017/11/16 23:20:40 naddy Exp $
 
 ONLY_FOR_ARCHS-java =	i386 amd64
 
@@ -42,7 +42,7 @@ MODULES =		lang/python
 MODPY_ADJ_FILES =	bindings/python-examples/tests.py
 
 # -std=c++03
-COMPILER =		clang
+COMPILER =		base-clang ports-clang
 
 MULTI_PACKAGES =	-main -java -python
 PSEUDO_FLAVORS =	no_java
diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile
index 49ba6683b2e..ed0f4710bc7 100644
--- a/textproc/pdfgrep/Makefile
+++ b/textproc/pdfgrep/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2017/07/27 10:05:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =		tool to search text in PDF files
 
@@ -14,7 +14,7 @@ MAINTAINER =		Reinhold Straub <demarchie@web.de>
 # GPLv2+
 PERMIT_PACKAGE_CDROM =	Yes
 
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 # uses pledge()
 WANTLIB +=		c m pthread poppler-cpp pcre gcrypt gpg-error
diff --git a/textproc/podofo/Makefile b/textproc/podofo/Makefile
index c716d90b004..b5ff6379cb8 100644
--- a/textproc/podofo/Makefile
+++ b/textproc/podofo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/27 10:05:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT=	library and tools to modify and parse PDF documents
 
@@ -23,7 +23,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=podofo/}
 
 MODULES=	devel/cmake 
 
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 
 LIB_DEPENDS=	devel/libidn \
 		graphics/jpeg \
diff --git a/textproc/py-ICU/Makefile b/textproc/py-ICU/Makefile
index eff089f3a03..107d26a7417 100644
--- a/textproc/py-ICU/Makefile
+++ b/textproc/py-ICU/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2017/08/24 09:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT=		Python extension wrapping the ICU C++ API
 
@@ -24,7 +24,7 @@ MODPY_SETUPTOOLS=	Yes
 FLAVORS=		python3
 FLAVOR?=
 
-COMPILER=		gcc
+COMPILER=		base-clang ports-gcc
 
 LIB_DEPENDS=		textproc/icu4c
 
diff --git a/textproc/the_silver_searcher/Makefile b/textproc/the_silver_searcher/Makefile
index 06720758df8..14de086ba0c 100644
--- a/textproc/the_silver_searcher/Makefile
+++ b/textproc/the_silver_searcher/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2017/09/07 13:31:21 fcambus Exp $
+# $OpenBSD: Makefile,v 1.30 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =	code searching tool, with a focus on speed (ag)
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += c lzma pcre pthread z
 
 # TLS
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 COMPILER_LANGS =	c
 
 MASTER_SITES =	http://geoff.greer.fm/ag/releases/
diff --git a/textproc/vislcg3/Makefile b/textproc/vislcg3/Makefile
index 1107ee7fb05..663cc4c140c 100644
--- a/textproc/vislcg3/Makefile
+++ b/textproc/vislcg3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2017/08/24 09:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2017/11/16 23:20:40 naddy Exp $
 
 # icu4c namespace problem when mixing gcc 4.2 and a c++11 compiler:
 # undefined reference to `_ZN6icu_5713UnicodeStringC1EOS0_'
@@ -27,7 +27,7 @@ EXTRACT_SUFX =		.tar.bz2
 
 MODULES =		devel/cmake
 
-COMPILER =		clang
+COMPILER =		base-clang ports-clang
 BUILD_DEPENDS =		devel/boost
 LIB_DEPENDS =		textproc/icu4c
 
diff --git a/textproc/zathura/core/Makefile b/textproc/zathura/core/Makefile
index 11af54e72bc..143cbd8c44f 100644
--- a/textproc/zathura/core/Makefile
+++ b/textproc/zathura/core/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2017/07/28 10:50:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2017/11/16 23:20:40 naddy Exp $
 
 V =			0.3.7
 COMMENT =		document viewer for PDF and other formats with a vi-like UI
@@ -35,7 +35,7 @@ FAKE_FLAGS =	PREFIX=${TRUEPREFIX}
 
 USE_GMAKE =	Yes
 
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 COMPILER_LANGS = c
 
 TEST_DEPENDS =	devel/check
diff --git a/www/aria2/Makefile b/www/aria2/Makefile
index ea4bbcb06d1..a3a3c2c387b 100644
--- a/www/aria2/Makefile
+++ b/www/aria2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2017/11/11 04:15:30 gonzalo Exp $
+# $OpenBSD: Makefile,v 1.53 2017/11/16 23:20:40 naddy Exp $
 
 BROKEN-alpha =	MetalinkParserStateV4Impl.cc:219:1: internal compiler error: Segmentation fault
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 MASTER_SITES =		https://github.com/aria2/aria2/releases/download/release-${V}/
 
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 LIB_DEPENDS =		databases/sqlite3 \
 			devel/gettext \
diff --git a/www/cclive/Makefile b/www/cclive/Makefile
index 9f30f6b4d77..c2ac9b2ec8d 100644
--- a/www/cclive/Makefile
+++ b/www/cclive/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2017/11/16 23:20:40 naddy Exp $
 
 # XXX check if still needed at next update
 CXXFLAGS +=		-std=c++11
@@ -28,7 +28,7 @@ MODULES =		devel/gettext
 # XXX should use lua module
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 LIB_DEPENDS =		devel/boost \
 			devel/glib2mm \
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 224e8d74227..35f76b91998 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.162 2017/11/04 16:44:10 jasper Exp $
+# $OpenBSD: Makefile,v 1.163 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT=	GNOME web browser based on webkit
 
@@ -39,7 +39,7 @@ MODULES=	devel/dconf \
 		devel/meson \
 		x11/gnome
 
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 COMPILER_LANGS =	c
 
 MODGNOME_TOOLS=	desktop-file-utils gtk-update-icon-cache yelp
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 59f19227c6f..ad180eb649a 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2017/11/14 20:12:26 landry Exp $
+# $OpenBSD: Makefile,v 1.67 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =	Firefox web browser, Extended Support Release
 ONLY_FOR_ARCHS =	amd64 i386
@@ -22,7 +22,7 @@ MODULES =	www/mozilla lang/python
 
 MODPY_RUNDEP =	No
 
-COMPILER = 	clang
+COMPILER = 	base-clang ports-clang
 MODCLANG_ARCHS =	amd64 i386
 
 # firefox >= 44 doesnt build with base libevent
diff --git a/www/luakit/Makefile b/www/luakit/Makefile
index 2df3d6410f1..1f709add7ed 100644
--- a/www/luakit/Makefile
+++ b/www/luakit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2017/08/12 19:28:43 abieber Exp $
+# $OpenBSD: Makefile,v 1.21 2017/11/16 23:20:40 naddy Exp $
 
 BROKEN-powerpc = help2man: can't get `--help' info from ./luakit
 
@@ -22,7 +22,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 USE_GMAKE =		Yes
 
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 
 WANTLIB += ${COMPILER_LIBCXX}
 WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
diff --git a/www/mozilla-firefox/Makefile b/www/mozilla-firefox/Makefile
index a5398f5e751..1c958b25241 100644
--- a/www/mozilla-firefox/Makefile
+++ b/www/mozilla-firefox/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.332 2017/11/14 20:08:59 landry Exp $
+# $OpenBSD: Makefile,v 1.333 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =	Mozilla web browser
 ONLY_FOR_ARCHS =	amd64 i386
@@ -24,7 +24,7 @@ MODULES =	www/mozilla lang/python
 
 MODPY_RUNDEP =	No
 
-COMPILER =	clang
+COMPILER =	base-clang ports-clang
 MODCLANG_ARCHS =	amd64 i386
 
 # firefox >= 44 doesnt build with base libevent
diff --git a/www/newsbeuter/Makefile b/www/newsbeuter/Makefile
index 5c58fb43e5d..3817e406bdb 100644
--- a/www/newsbeuter/Makefile
+++ b/www/newsbeuter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2017/09/17 17:04:52 tj Exp $
+# $OpenBSD: Makefile,v 1.15 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =		open-source RSS/Atom feed reader for text terminals
 DISTNAME =		newsbeuter-2.9
@@ -15,7 +15,7 @@ WANTLIB += sqlite3 stfl xml2 ${COMPILER_LIBCXX}
 
 MASTER_SITES =		https://newsbeuter.org/downloads/
 
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 BUILD_DEPENDS =		devel/gettext-tools
 
diff --git a/www/phantomjs/Makefile b/www/phantomjs/Makefile
index e6551c636e5..3f7e0b5ef04 100644
--- a/www/phantomjs/Makefile
+++ b/www/phantomjs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2017/11/09 16:50:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2017/11/16 23:20:40 naddy Exp $
 
 USE_WXNEEDED =		Yes
 
@@ -23,7 +23,7 @@ MAINTAINER =		Francisco de Borja Lopez Rio <borja@codigo23.net>
 # BSD, but statically linked to patched LGPL'ed qt5 and webkit
 PERMIT_PACKAGE_CDROM =	Yes
 
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 MODULES =		devel/gettext lang/python lang/ruby
 
 WANTLIB +=		${COMPILER_LIBCXX} X11 Xau Xdmcp c crypto \
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index aeeb19f5655..ea99b7eda68 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.211 2017/11/14 20:46:56 landry Exp $
+# $OpenBSD: Makefile,v 1.212 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT-main =		Mozilla application suite
 COMMENT-lightning =	Mozilla Seamonkey calendar extension
@@ -29,7 +29,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 MODULES =	www/mozilla lang/python
 MODPY_RUNDEP =	No
 
-COMPILER =		clang
+COMPILER =		base-clang ports-clang
 MODCLANG_ARCHS =	amd64 i386
 
 # gecko >= 44 doesnt build with base libevent
diff --git a/www/squid/Makefile b/www/squid/Makefile
index f8f66729242..54ad5ca2d54 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.202 2017/09/22 21:30:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.203 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT-main=	WWW and FTP proxy cache and accelerator
 COMMENT-ldap=	LDAP authentication/ACL support for Squid
@@ -31,7 +31,7 @@ MASTER_SITES=	${HOMEPAGE}Versions/v${V:C/^([0-9]).*/\1/}/${V:C/([0-9.]{3}).*/\1/
 		http://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/archive/${V:C/([0-9.]{3}).*/\1/}/
 
 # C++11
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 
 LIB_DEPENDS+=	security/gnutls
 BUILD_DEPENDS+=	devel/cppunit
diff --git a/www/tor-browser/browser/Makefile b/www/tor-browser/browser/Makefile
index ea1af838d35..44176aacbdb 100644
--- a/www/tor-browser/browser/Makefile
+++ b/www/tor-browser/browser/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2017/10/21 20:18:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2017/11/16 23:20:40 naddy Exp $
 # Some of this comes from www/firefox-esr as apropos, since Tor
 # browser is a fork of ESR.  It is a good idea to look at that
 # Makefile when editing this one (ESR versions not always the same).
@@ -35,7 +35,7 @@ MODULES =		www/mozilla lang/python
 
 MODPY_RUNDEP =		No
 
-COMPILER =		clang
+COMPILER =		base-clang ports-clang
 MODCLANG_ARCHS =	amd64 i386
 
 MOZILLA_USE_BUNDLED_NSS =	Yes
diff --git a/www/webkit/Makefile b/www/webkit/Makefile
index 663cb47a660..56e77b5f273 100644
--- a/www/webkit/Makefile
+++ b/www/webkit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.156 2017/11/05 10:23:48 landry Exp $
+# $OpenBSD: Makefile,v 1.157 2017/11/16 23:20:40 naddy Exp $
 
 USE_WXNEEDED =	Yes
 
@@ -32,7 +32,7 @@ MODULES =	lang/python \
 		lang/ruby \
 		x11/gnome
 
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 # cant use clang = needs <chrono> header in StdLib ?
 
 MAKE_FILE =		GNUmakefile
diff --git a/www/webkitgtk4/Makefile b/www/webkitgtk4/Makefile
index 406537a778f..dff5cff71bb 100644
--- a/www/webkitgtk4/Makefile
+++ b/www/webkitgtk4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.69 2017/11/10 16:16:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.70 2017/11/16 23:20:40 naddy Exp $
 
 # patches/patch-Source_JavaScriptCore_javascriptcoregtk_pc_in
 # patches/patch-Source_WebKit_gtk_webkit2gtk-web-extension_pc_in
@@ -49,7 +49,7 @@ MODULES =		devel/cmake \
 			lang/ruby \
 			x11/gnome
 
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 MODRUBY_RUNDEP =	No
 MODPY_RUNDEP =		No
diff --git a/x11/cegui/Makefile b/x11/cegui/Makefile
index 9282e947ea5..55f978c6fdb 100644
--- a/x11/cegui/Makefile
+++ b/x11/cegui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2017/07/26 22:45:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =		widgets library for graphics engines
 
@@ -34,7 +34,7 @@ EXTRACT_SUFX =		.tar.bz2
 
 MODULES =		devel/cmake
 
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 BUILD_DEPENDS =		graphics/glm
 LIB_DEPENDS =		x11/ogre \
diff --git a/x11/dbusmenu-qt/Makefile b/x11/dbusmenu-qt/Makefile
index 8bba16dd59a..15183c870e4 100644
--- a/x11/dbusmenu-qt/Makefile
+++ b/x11/dbusmenu-qt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/27 10:15:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =	D-Bus menu implementation for Qt
 V =		0.9.3
@@ -20,7 +20,7 @@ MASTER_SITES =	http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbusmenu-qt/
 EXTRACT_SUFX =	.orig.tar.gz
 
 MODULES =	devel/cmake
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 
 FLAVORS =	qt5
 FLAVOR ?=
diff --git a/x11/fsv/Makefile b/x11/fsv/Makefile
index 7ecb358e41c..e1d7d751166 100644
--- a/x11/fsv/Makefile
+++ b/x11/fsv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2017/10/23 17:11:03 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2017/11/16 23:20:40 naddy Exp $
 
 # XXX check if still needed at next update
 #CXXFLAGS +=		-std=c++11
@@ -36,7 +36,7 @@ EXTRACT_SUFX=		.tar.bz2
 MODULES=		devel/gettext
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 LIB_DEPENDS=		graphics/ftgl \
 			x11/gtkglarea \
diff --git a/x11/girara/Makefile b/x11/girara/Makefile
index d818370aa0a..11e508870f9 100644
--- a/x11/girara/Makefile
+++ b/x11/girara/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/05/31 08:08:17 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =	user interface library from pwmt
 DISTNAME =	girara-0.2.7
@@ -23,7 +23,7 @@ LIB_DEPENDS =	x11/gtk+3 \
 		devel/libnotify
 
 # c11
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 COMPILER_LANGS =	c
 
 USE_GMAKE =	Yes
diff --git a/x11/gnome/aisleriot/Makefile b/x11/gnome/aisleriot/Makefile
index bb24cb6f439..dad32d48a76 100644
--- a/x11/gnome/aisleriot/Makefile
+++ b/x11/gnome/aisleriot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2017/10/31 07:35:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =		suite of solitaire card games
 
@@ -35,7 +35,7 @@ MODGCONF2_SCHEMAS_DIR =	aisleriot
 CFLAGS += -Wno-strict-prototypes
 
 # need to matche lang/guile2
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 COMPILER_LANGS =	c
 
 LIB_DEPENDS =		audio/libcanberra,-gtk3 \
diff --git a/x11/gnome/recipes/Makefile b/x11/gnome/recipes/Makefile
index a53f5544f0c..52365ef1898 100644
--- a/x11/gnome/recipes/Makefile
+++ b/x11/gnome/recipes/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2017/11/12 14:22:20 jasper Exp $
+# $OpenBSD: Makefile,v 1.27 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =		recipe manager for GNOME
 
@@ -14,7 +14,7 @@ MODULES =		devel/dconf \
 			devel/meson \
 			x11/gnome
 
-COMPILER =		clang
+COMPILER =		base-clang ports-clang
 COMPILER_LANGS =	c
 
 WANTLIB += c cairo canberra gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
diff --git a/x11/gnome/system-monitor/Makefile b/x11/gnome/system-monitor/Makefile
index 04b3887264a..2b597be1958 100644
--- a/x11/gnome/system-monitor/Makefile
+++ b/x11/gnome/system-monitor/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.75 2017/11/03 11:22:37 jasper Exp $
+# $OpenBSD: Makefile,v 1.76 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT=		sytem monitor for GNOME
 
@@ -26,7 +26,7 @@ MODULES=		devel/dconf \
 			x11/gnome
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 LIB_DEPENDS=		devel/libgtop2>=2.38.0 \
 			x11/gnome/librsvg \
diff --git a/x11/gnustep/gnustep.port.mk b/x11/gnustep/gnustep.port.mk
index 23adad3d5cf..15fcc962dc3 100644
--- a/x11/gnustep/gnustep.port.mk
+++ b/x11/gnustep/gnustep.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: gnustep.port.mk,v 1.29 2017/05/31 08:08:18 espie Exp $
+# $OpenBSD: gnustep.port.mk,v 1.30 2017/11/16 23:20:40 naddy Exp $
 
 # until tested on others
 ONLY_FOR_ARCHS ?=	alpha i386 amd64 macppc
@@ -11,7 +11,7 @@ MAKE_FILE ?=	GNUmakefile
 BUILD_DEPENDS +=		x11/gnustep/make
 MODGNUSTEP_RUN_DEPENDS +=	x11/gnustep/make
 
-COMPILER =		clang
+COMPILER =		base-clang ports-clang
 MODCLANG_ARCHS =	amd64 i386
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
diff --git a/x11/gnustep/libobjc2/Makefile b/x11/gnustep/libobjc2/Makefile
index e83c2e222f6..2d0e0b3e6ec 100644
--- a/x11/gnustep/libobjc2/Makefile
+++ b/x11/gnustep/libobjc2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2017/07/26 22:45:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =	GNUstep libobjc2 objective-c runtime
 BROKEN-hppa =	missing asm impl in block_trampolines.S
@@ -23,7 +23,7 @@ HOMEPAGE =	http://www.gnustep.org/
 MODULES =	devel/cmake 
 WANTLIB += 	m ${LIBCXX} pthread
 
-COMPILER =	clang
+COMPILER =	base-clang ports-clang
 MODCLANG_ARCHS =amd64 i386
 
 MAKE_ENV +=	CPPFLAGS+=${CPPFLAGS}
diff --git a/x11/gnustep/make/Makefile b/x11/gnustep/make/Makefile
index b3a08d73be2..cade785ec7c 100644
--- a/x11/gnustep/make/Makefile
+++ b/x11/gnustep/make/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2017/07/26 22:45:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.53 2017/11/16 23:20:40 naddy Exp $
 
 # WARNING: this port does NOT use the x11/gnustep MODULE
 
@@ -15,7 +15,7 @@ MASTER_SITES=	http://ftp.gnustep.org/pub/gnustep/core/
 BUILD_DEPENDS =	x11/gnustep/libobjc2
 RUN_DEPENDS=	archivers/gtar
 
-COMPILER =	clang
+COMPILER =	base-clang ports-clang
 MODCLANG_ARCHS =	amd64 i386
 
 USE_GMAKE=	Yes
diff --git a/x11/gtk2mm/Makefile b/x11/gtk2mm/Makefile
index 4ed3df5c709..d354af2fe56 100644
--- a/x11/gtk2mm/Makefile
+++ b/x11/gtk2mm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.68 2017/10/23 17:11:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.69 2017/11/16 23:20:40 naddy Exp $
 
 PORTROACH=		limit:^2
 
@@ -34,7 +34,7 @@ WANTLIB += xcb-render xcb-shm z
 MODULES=		x11/gnome
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 LIB_DEPENDS=		devel/atk2mm \
 			devel/pangomm \
diff --git a/x11/gtk3mm/Makefile b/x11/gtk3mm/Makefile
index 877402e6131..a466f76fbd1 100644
--- a/x11/gtk3mm/Makefile
+++ b/x11/gtk3mm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2017/11/15 16:36:48 jasper Exp $
+# $OpenBSD: Makefile,v 1.43 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT=		C++ interface for gtk3+
 
@@ -33,7 +33,7 @@ WANTLIB += z
 MODULES=		x11/gnome
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 LIB_DEPENDS=		devel/atk2mm \
 			devel/pangomm \
diff --git a/x11/gtkglextmm/Makefile b/x11/gtkglextmm/Makefile
index 434e491a388..bb128619afc 100644
--- a/x11/gtkglextmm/Makefile
+++ b/x11/gtkglextmm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2017/10/23 17:11:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2017/11/16 23:20:40 naddy Exp $
 
 # XXX check if still needed at next update
 CXXFLAGS +=		-std=c++11
@@ -33,7 +33,7 @@ WANTLIB += xcb-dri2 xcb-glx xcb-render xcb-shm z
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=gtkglext/}
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 LIB_DEPENDS =		x11/gtk2mm \
 			x11/gtkglext
diff --git a/x11/gtksourceviewmm3/Makefile b/x11/gtksourceviewmm3/Makefile
index ab6422c3507..187fdf00c40 100644
--- a/x11/gtksourceviewmm3/Makefile
+++ b/x11/gtksourceviewmm3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2017/10/23 17:11:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT=		C++ wrapper for gtksourceview3
 
@@ -34,7 +34,7 @@ MODULES=		devel/gettext \
 			x11/gnome
 
 # c++11
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 LIB_DEPENDS=		x11/gtk3mm \
 			x11/gtksourceview3
diff --git a/x11/herbstluftwm/Makefile b/x11/herbstluftwm/Makefile
index 1661b06679f..6e7e8d27d75 100644
--- a/x11/herbstluftwm/Makefile
+++ b/x11/herbstluftwm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2017/07/26 22:45:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =	manual tiling window manager
 DISTNAME =	herbstluftwm-0.7.0
@@ -16,7 +16,7 @@ WANTLIB += X11 Xext Xinerama c glib-2.0 intl m pthread ${COMPILER_LIBCXX}
 
 MASTER_SITES =	http://herbstluftwm.org/tarballs/
 
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 
 LIB_DEPENDS +=	devel/glib2
 
diff --git a/x11/kde4/cantor/Makefile b/x11/kde4/cantor/Makefile
index 9075bc0d937..acc0e3bcc0c 100644
--- a/x11/kde4/cantor/Makefile
+++ b/x11/kde4/cantor/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2017/07/27 11:57:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =	KDE mathematical applications
 DISTNAME =	cantor-${MODKDE4_VERSION}
@@ -26,7 +26,7 @@ WANTLIB += luajit-${MODLUA_DEFAULT_VERSION} gfortran
 # Makefile.inc, it's listed too late to influence modgcc, since
 # it's already been read
 MODULES =	devel/gettext lang/lua lang/python gcc4 # XXX fortran
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 MODGCC4_ARCHS =	*
 MODGCC4_LANGS =	fortran
 
diff --git a/x11/kde4/kde4.port.mk b/x11/kde4/kde4.port.mk
index 8b869b4a520..c801278a342 100644
--- a/x11/kde4/kde4.port.mk
+++ b/x11/kde4/kde4.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: kde4.port.mk,v 1.37 2017/05/31 08:08:18 espie Exp $
+# $OpenBSD: kde4.port.mk,v 1.38 2017/11/16 23:20:40 naddy Exp $
 
 # The version of KDE SC in x11/kde4
 _MODKDE4_STABLE =	4.14.3
@@ -112,7 +112,7 @@ MODKDE4_RESOURCES ?=	No
 
 .if ${MODKDE4_RESOURCES:L} == "no"
 MODKDE4_USE ?=		runtime
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 .else
 MODKDE4_USE ?=		libs
 .endif
diff --git a/x11/lemonbar/Makefile b/x11/lemonbar/Makefile
index 9f8e70befa2..48b8618c918 100644
--- a/x11/lemonbar/Makefile
+++ b/x11/lemonbar/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2017/05/31 08:08:18 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =	featherweight lemon-scented bar
 
@@ -19,7 +19,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += c xcb xcb-randr xcb-xinerama
 
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 COMPILER_LANGS =	c
 
 MAKE_ENV =		LDFLAGS="-L${X11BASE}/lib"
diff --git a/x11/libqaccessibilityclient/Makefile b/x11/libqaccessibilityclient/Makefile
index 16fb76c8036..1bb96c13a9d 100644
--- a/x11/libqaccessibilityclient/Makefile
+++ b/x11/libqaccessibilityclient/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/27 10:15:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT =		Qt-based library for writing accessibility apps
 DISTNAME =		libqaccessibilityclient-0.1.1
@@ -21,7 +21,7 @@ EXTRACT_SUFX =		.tar.bz2
 DIST_SUBDIR =		kde
 
 MODULES =		devel/cmake x11/qt4
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 
 CONFIGURE_ARGS =	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=Yes \
 			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=Yes
diff --git a/x11/mplayer/Makefile b/x11/mplayer/Makefile
index 46e9be8052b..336b5afceff 100644
--- a/x11/mplayer/Makefile
+++ b/x11/mplayer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.279 2017/08/26 07:41:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.280 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT=	movie player supporting many formats
 
@@ -26,7 +26,7 @@ WANTLIB=	EGL GL SDL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass \
 		swresample util x264 xvidcore z
 
 
-COMPILER =	clang
+COMPILER =	base-clang ports-clang
 MODCLANG_ARCHS=	amd64 i386
 COMPILER_LANGS =	c
 
diff --git a/x11/nitrogen/Makefile b/x11/nitrogen/Makefile
index 2731621ed9e..9313c93bb0a 100644
--- a/x11/nitrogen/Makefile
+++ b/x11/nitrogen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2017/09/15 20:37:58 jca Exp $
+# $OpenBSD: Makefile,v 1.22 2017/11/16 23:20:40 naddy Exp $
 
 COMMENT=		background browser and setter for X11
 
@@ -20,7 +20,7 @@ WANTLIB += pangoft2-1.0 pangomm-1.4 pthread sigc-2.0 z
 
 MASTER_SITES=		${HOMEPAGE}/files/
 
-COMPILER =		clang
+COMPILER =		base-clang ports-clang
 CXXFLAGS +=		-std=c++11
 
 LIB_DEPENDS=		devel/gettext \
diff --git a/x11/ogre/Makefile b/x11/ogre/Makefile
index a015f0a7c7e..ac381123644 100644
--- a/x11/ogre/Makefile
+++ b/x11/ogre/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2017/08/22 11:55:01 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2017/11/16 23:20:40 naddy Exp $
 
 BROKEN-hppa =		missing atomic ops
 BROKEN-alpha =		missing atomic ops
@@ -51,7 +51,7 @@ DISTFILES =		ogre-$V${EXTRACT_SUFX}{v${V:S/./-/g}${EXTRACT_SUFX}}
 CONFIGURE_ARGS +=	-DOGRE_INSTALL_SAMPLES=1
 
 MODULES =		devel/cmake
-COMPILER =		gcc
+COMPILER =		base-clang ports-gcc
 LIB_DEPENDS =		graphics/freeimage \
 			archivers/zziplib \
 			devel/boost
diff --git a/x11/pinot/Makefile b/x11/pinot/Makefile
index d5d3106df70..b4fdd51bca6 100644
--- a/x11/pinot/Makefile
+++ b/x11/pinot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.69 2017/10/23 17:11:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.70 2017/11/16 23:20:41 naddy Exp $
 
 COMMENT=	personal search and metasearch
 
@@ -29,7 +29,7 @@ WANTLIB += xml++-2.6 xml2 z assuan gpg-error gpgme-pthread
 MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=pinot-search/}
 
 # c++11
-COMPILER =	gcc
+COMPILER =	base-clang ports-gcc
 
 BUILD_DEPENDS=	devel/boost \
 		devel/desktop-file-utils \