diff --git a/archivers/fuse-zip/Makefile b/archivers/fuse-zip/Makefile
index 662d7804688..60ac1fd207d 100644
--- a/archivers/fuse-zip/Makefile
+++ b/archivers/fuse-zip/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2018/09/08 10:31:14 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =		navigate zip archives through FUSE
 
 DISTNAME =		fuse-zip-0.4.5
+REVISION =		0
 
 CATEGORIES =		archivers
 
@@ -15,6 +16,8 @@ WANTLIB =		${COMPILER_LIBCXX} bz2 c fuse m z zip
 
 MASTER_SITES =		https://bitbucket.org/agalanin/fuse-zip/downloads/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		archivers/libzip>=0.11.2
 
 MAKE_FLAGS =		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
diff --git a/archivers/innoextract/Makefile b/archivers/innoextract/Makefile
index c32169ae033..482dec7e871 100644
--- a/archivers/innoextract/Makefile
+++ b/archivers/innoextract/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2018/09/11 19:26:14 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=	unpack Inno Setup installers
 
 DISTNAME=	innoextract-1.7
+REVISION=	0
 
 CATEGORIES=	archivers
 HOMEPAGE=	https://constexpr.org/innoextract/
@@ -17,6 +18,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=	boost_filesystem-mt boost_iostreams-mt boost_program_options-mt
 WANTLIB+=	c iconv lzma m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	archivers/xz \
 		converters/libiconv \
 		devel/boost>=1.53.0p6
diff --git a/archivers/lzip/lzip/Makefile b/archivers/lzip/lzip/Makefile
index 16d8512699f..eab9a084dc0 100644
--- a/archivers/lzip/lzip/Makefile
+++ b/archivers/lzip/lzip/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2018/10/01 21:33:46 juanfra Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =		lossless data compressor
 
 DISTNAME =		lzip-1.20
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		http://lzip.nongnu.org/lzip.html
 
@@ -12,4 +12,6 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 .include <bsd.port.mk>
diff --git a/archivers/lzip/lziprecover/Makefile b/archivers/lzip/lziprecover/Makefile
index efc2e1c8392..dc4b0169693 100644
--- a/archivers/lzip/lziprecover/Makefile
+++ b/archivers/lzip/lziprecover/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2018/10/01 21:33:46 juanfra Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =		data recovery tool and decompressor for lzip files
 
 DISTNAME =		lziprecover-1.20
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		http://lzip.nongnu.org/lziprecover.html
 MASTER_SITES =		${MASTER_SITE_SAVANNAH:=lzip/lziprecover/}
@@ -13,4 +13,6 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 .include <bsd.port.mk>
diff --git a/archivers/lzip/plzip/Makefile b/archivers/lzip/plzip/Makefile
index 887dc75dc74..46adc4e863f 100644
--- a/archivers/lzip/plzip/Makefile
+++ b/archivers/lzip/plzip/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2018/10/01 21:33:47 juanfra Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =		multi-threaded data compressor based on lzlib
 
 DISTNAME =		plzip-1.7
-REVISION =		1
+REVISION =		2
 
 HOMEPAGE =		http://lzip.nongnu.org/plzip.html
 MASTER_SITES =		${MASTER_SITE_SAVANNAH:=lzip/plzip/}
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c lz m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		archivers/lzip/lzlib
 
 .include <bsd.port.mk>
diff --git a/archivers/lzip/tarlz/Makefile b/archivers/lzip/tarlz/Makefile
index 2c452b25a52..8b78e515076 100644
--- a/archivers/lzip/tarlz/Makefile
+++ b/archivers/lzip/tarlz/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2018/10/01 21:33:47 juanfra Exp $
+# $OpenBSD: Makefile,v 1.3 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =		archiver based on tar and lzip multimembers
 
 DISTNAME =		tarlz-0.5
+REVISION =		0
 
 HOMEPAGE =		http://lzip.nongnu.org/tarlz.html
 MASTER_SITES =		${MASTER_SITE_SAVANNAH:=lzip/tarlz/}
@@ -12,6 +13,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c lz m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		archivers/lzip/lzlib
 
 .include <bsd.port.mk>
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 1c9fdf15239..9d6c2740f91 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.44 2018/04/09 15:58:26 bket Exp $
+# $OpenBSD: Makefile,v 1.45 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT-main=	file archiver with high compression ratio
 COMMENT-rar=	rar modules for p7zip
 
 V=		16.02
-REVISION-main=	4
-REVISION-rar=	1
+REVISION-main=	5
+REVISION-rar=	2
 DISTNAME=	p7zip_${V}_src_all
 PKGNAME=	p7zip-${V}
 PKGNAME-main=	p7zip-${V}
@@ -27,6 +27,8 @@ WANTLIB=	m pthread ${COMPILER_LIBCXX}
 WANTLIB-main=	${WANTLIB} c
 WANTLIB-rar=	${WANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=p7zip/}
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/archivers/par2cmdline/Makefile b/archivers/par2cmdline/Makefile
index 53556d35ca8..bf91be1d6a4 100644
--- a/archivers/par2cmdline/Makefile
+++ b/archivers/par2cmdline/Makefile
@@ -1,9 +1,12 @@
-# $OpenBSD: Makefile,v 1.18 2018/08/10 10:19:18 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =	command line implementation of the PAR v2.0 specification
 
 V =		0.7.4
 DISTNAME =	par2cmdline-$V
+REVISION =	0
+
+MAINTAINER =	Mikolaj Kucharski <mikolaj@kucharski.name>
 
 CATEGORIES =	archivers
 
@@ -15,7 +18,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 # uses pledge()
 WANTLIB =	c m ${COMPILER_LIBCXX}
 
-MAINTAINER =	Mikolaj Kucharski <mikolaj@kucharski.name>
+COMPILER =		base-clang ports-gcc base-gcc
 
 MASTER_SITES =	${HOMEPAGE}releases/download/v$V/
 
diff --git a/archivers/pecl-rar/Makefile b/archivers/pecl-rar/Makefile
index c063169c384..e3f5c072d50 100644
--- a/archivers/pecl-rar/Makefile
+++ b/archivers/pecl-rar/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2018/04/26 15:08:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=	PHP support for rar archives
 
 DISTNAME=	rar-4.0.0
-REVISION=	0
+REVISION=	1
 CATEGORIES=	archivers
 
 # PHP
@@ -11,6 +11,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	lang/php/pecl
 CONFIGURE_STYLE= gnu
 
diff --git a/archivers/quazip/Makefile b/archivers/quazip/Makefile
index f6e989cd439..bb13b9af35b 100644
--- a/archivers/quazip/Makefile
+++ b/archivers/quazip/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.16 2017/07/28 11:23:44 naddy Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =	Qt/C++ wrapper for ZIP/UNZIP package
 DISTNAME =	quazip-0.7.3
-REVISION =	3
+REVISION =	4
 CATEGORIES =	archivers
 
 # keep those in sync
@@ -19,6 +19,8 @@ WANTLIB += ${COMPILER_LIBCXX} m z
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=quazip/}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake devel/qmake
 # qmake.port.mk is used for tests only
 MODQMAKE_PROJECTS =	qztest/qztest.pro
diff --git a/archivers/snappy/Makefile b/archivers/snappy/Makefile
index 3917959dc2b..8859d4cc829 100644
--- a/archivers/snappy/Makefile
+++ b/archivers/snappy/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2017/11/09 15:07:08 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =	fast compression/decompression library
 
 GH_TAGNAME =	1.1.7
 GH_PROJECT =	snappy
 GH_ACCOUNT =	google
+REVISION =	0
 
 SHARED_LIBS =	snappy	0.0	# 4.1
 
@@ -17,6 +18,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB +=		m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake
 
 CONFIGURE_ARGS +=	-DBUILD_SHARED_LIBS=ON \
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index 117ca35dae9..d392a3d5437 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.73 2018/10/18 13:56:48 naddy Exp $
+# $OpenBSD: Makefile,v 1.74 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=	extract, list, and test RAR archives
 
@@ -13,6 +13,7 @@ PKGNAME=	unrar-5.61
 EPOCH=		1
 DISTNAME=	unrarsrc-5.6.8
 CATEGORIES=	archivers
+REVISION=	0
 
 HOMEPAGE=	http://www.rarlab.com/
 
@@ -23,6 +24,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c crypto m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${HOMEPAGE}rar/
 
 WRKDIST=	${WRKDIR}/unrar
diff --git a/archivers/woff2/Makefile b/archivers/woff2/Makefile
index 9eaff897743..8a3edbdb958 100644
--- a/archivers/woff2/Makefile
+++ b/archivers/woff2/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2018/09/30 08:47:42 landry Exp $
+# $OpenBSD: Makefile,v 1.5 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=		Web Open Font Format 2.0 library
 
 GH_ACCOUNT=		google
 GH_PROJECT=		woff2
 GH_TAGNAME=		v1.0.2
+REVISION=		0
 
 SHARED_LIBS +=  woff2common               0.0 # 1.0
 SHARED_LIBS +=  woff2dec                  0.0 # 1.0
@@ -18,7 +19,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += ${COMPILER_LIBCXX} brotlidec brotlienc m
 
 # C++11
-COMPILER=		base-clang ports-gcc ports-clang
+COMPILER=		base-clang ports-gcc base-gcc
 MODULES=		devel/cmake
 
 LIB_DEPENDS=		archivers/brotli
diff --git a/archivers/zipios/Makefile b/archivers/zipios/Makefile
index 5e6d2f18dba..2e3f37cab63 100644
--- a/archivers/zipios/Makefile
+++ b/archivers/zipios/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2017/07/26 22:45:14 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=	java-like zip interface
 
 DISTNAME=	zipios++-0.1.5.9+cvs.2004.02.07
 PKGNAME=	zipios++-0.1.5.9
-REVISION =	4
+REVISION =	5
 CATEGORIES=	devel archivers
 MASTER_SITES=	https://distfiles.nl/
 MASTER_SITES0=	${MASTER_SITE_GNU:=automake/}
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		m ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=	gnu
 
 post-extract:
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index ce6f773ad8d..4d5abc46fda 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.44 2018/06/27 21:03:34 espie Exp $
+# $OpenBSD: Makefile,v 1.45 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=	free space simulator and planetarium
 
 DISTNAME=	celestia-1.6.1
-REVISION=	14
+REVISION=	15
 
 CATEGORIES=	astro x11
 
@@ -27,6 +27,8 @@ WANTLIB += png pthread ${COMPILER_LIBCXX} theora xcb xcb-dri2
 WANTLIB += xcb-glx xcb-render xcb-shm z
 WANTLIB += ${MODLUA_WANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	lang/lua
 BUILD_DEPENDS=	devel/gettext-tools
 LIB_DEPENDS=	devel/gettext \
diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile
index 98c2dbfa4e1..a859ed5367f 100644
--- a/audio/adplay/Makefile
+++ b/audio/adplay/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2018/05/11 16:16:23 fcambus Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =	console-based OPL2 audio player
 
 V =		1.8
 DISTNAME =	adplay-${V}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	audio
 
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB +=	${COMPILER_LIBCXX} SDL2 adplug binio c m samplerate
 WANTLIB +=	sndio usbhid
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	https://github.com/adplug/adplay-unix/releases/download/v${V}/
 
 EXTRACT_SUFX =	.tar.bz2
diff --git a/audio/adplug/Makefile b/audio/adplug/Makefile
index 37c6ec36887..86796146df0 100644
--- a/audio/adplug/Makefile
+++ b/audio/adplug/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2018/04/25 21:42:09 fcambus Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =	AdLib sound player library
 
 V =		2.3.1
 DISTNAME =	adplug-${V}
 SHARED_LIBS +=	adplug	1.0
+REVISION =	0
 
 CATEGORIES =	audio
 
@@ -17,6 +18,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB +=	binio c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	https://github.com/adplug/adplug/releases/download/adplug-${V}/
 
 EXTRACT_SUFX =	.tar.bz2
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index 7b4e873deb1..fa45b14c004 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.48 2018/06/27 21:03:34 espie Exp $
+# $OpenBSD: Makefile,v 1.49 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=	advanced music player
 
 VERSION=	1.0
 DISTNAME=	aqualung-${VERSION}
-REVISION=	4
+REVISION=	5
 EPOCH=		0
 CATEGORIES=	audio
 
@@ -27,6 +27,8 @@ WANTLIB += cdio_cdda cdio_paranoia modplug ${MODLUA_WANTLIB}
 
 MASTER_SITES=	https://github.com/jeremyevans/aqualung/releases/download/${VERSION}/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	lang/lua
 
 MODLUA_SA=	Yes
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index ffc832477f3..e688823875e 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.49 2018/07/01 18:33:35 espie Exp $
+# $OpenBSD: Makefile,v 1.50 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=	free audio editor
 
 V=		1.3.9
 DISTNAME=	audacity-minsrc-${V}
 PKGNAME=	audacity-${V}
-REVISION=	12
+REVISION=	13
 CATEGORIES=	audio
 
 EXTRACT_SUFX=	.tar.bz2
@@ -25,6 +25,8 @@ WANTLIB += FLAC>=8 FLAC++>=7 vorbis>=5 vorbisfile>=4 vorbisenc>=2
 WANTLIB += id3tag>=2 mad>=2 portaudio>=1 SoundTouch vamp-hostsdk>=1
 WANTLIB += tag
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=	archivers/zip \
 		devel/gettext-tools
 LIB_DEPENDS=	x11/wxWidgets>=2.8.6 \
diff --git a/audio/caps-plugins/Makefile b/audio/caps-plugins/Makefile
index 3133b1ce2be..76cd95f76b1 100644
--- a/audio/caps-plugins/Makefile
+++ b/audio/caps-plugins/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2018/04/15 14:30:15 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =		CAPS LADSPA plugins
 
 V =			0.9.24
 DISTNAME =		caps_${V}
-REVISION =		2
+REVISION =		3
 PKGNAME =		caps-plugins-${V}
 CATEGORIES =		audio
 EXTRACT_SUFX =		.tar.bz2
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://quitte.de/dsp/
 
 MAKE_FLAGS =		CC=${CXX} \
diff --git a/audio/chromaprint/Makefile b/audio/chromaprint/Makefile
index 9efa3ee39f5..cfc49b30036 100644
--- a/audio/chromaprint/Makefile
+++ b/audio/chromaprint/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =		audio fingerprint extraction library
 
@@ -6,7 +6,7 @@ DISTNAME =		chromaprint-1.1
 CATEGORIES =		audio devel
 HOMEPAGE =		https://acoustid.org/chromaprint/
 MASTER_SITES =		https://bitbucket.org/acoustid/chromaprint/downloads/
-REVISION =		0
+REVISION =		1
 
 SHARED_LIBS =		chromaprint               1.0 # 0.1
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += avcodec avformat avutil c m pthread ${COMPILER_LIBCXX} swresample
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake
 
 BUILD_DEPENDS =		audio/taglib \
diff --git a/audio/cmt/Makefile b/audio/cmt/Makefile
index 60174fbb56b..1e5465f1ca2 100644
--- a/audio/cmt/Makefile
+++ b/audio/cmt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=	computer music toolkit
 HOMEPAGE=	http://www.ladspa.org/
@@ -7,7 +7,7 @@ CATEGORIES=	audio devel
 DISTNAME=	cmt_src_1.15
 WRKDIST=	${WRKDIR}/cmt
 PKGNAME=	cmt-1.15
-REVISION =	5
+REVISION =	6
 EXTRACT_SUFX=	.tgz
 MASTER_SITES=	${HOMEPAGE:=download/}
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=	audio/ladspa
 
 WRKBUILD=	${WRKDIST}/src
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index 30fc1e82ab9..c989146a19f 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.38 2018/08/10 10:19:18 espie Exp $
+# $OpenBSD: Makefile,v 1.39 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =		DeaDBeeF is an audio player
 DISTNAME =		deadbeef-0.7.2
-REVISION =		9
+REVISION =		10
 CATEGORIES =		audio
 
 HOMEPAGE =		http://deadbeef.sourceforge.net/
@@ -23,6 +23,8 @@ WANTLIB += sndfile sndio speex ssl swresample vorbis vorbisenc
 WANTLIB += vorbisfile vpx wavpack x264 x265 xcb xcb-render xcb-shm
 WANTLIB += xvidcore z zip
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=deadbeef/}
 EXTRACT_SUFX =		.tar.bz2
 
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 2e2e47b69a0..1ff82c94ebc 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.64 2018/07/06 06:04:41 espie Exp $
+# $OpenBSD: Makefile,v 1.65 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=		tag editor for various audio file formats
 
 GNOME_PROJECT=		easytag
 GNOME_VERSION=		2.4.3
-REVISION=		5
+REVISION=		6
 
 CATEGORIES=		audio
 
@@ -21,6 +21,8 @@ WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread
 WANTLIB += speex ${COMPILER_LIBCXX} tag vorbis vorbisfile wavpack xcb xcb-render
 WANTLIB += xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/dconf \
 			x11/gnome
 
diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index ecc851387a5..d8e62c26899 100755
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.18 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=		compact speech synthesizer
 
 DISTNAME=		espeak-1.48.04-source
 EXTRACT_SUFX=		.zip
 PKGNAME=		${DISTNAME:S/-source//}
-REVISION=		0
+REVISION=		1
 
 SHARED_LIBS=		espeak 1.2
 
@@ -20,6 +20,8 @@ WANTLIB += c m portaudio pthread ${COMPILER_LIBCXX}
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=espeak/}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		audio/portaudio-svn
 
 USE_GMAKE=		Yes
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index f64e5564dba..f553f8b6142 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.56 2017/08/22 18:03:51 tj Exp $
+# $OpenBSD: Makefile,v 1.57 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=	free lossless audio codec
 
 DISTNAME=	flac-1.3.2
-REVISION =	1
+REVISION =	2
 CATEGORIES=	audio archivers
 HOMEPAGE=	https://www.xiph.org/flac/
 SHARED_LIBS +=  FLAC                 10.0     # 11.0
@@ -20,6 +20,8 @@ EXTRACT_SUFX=	.tar.xz
 
 WANTLIB=	c iconv m ogg ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	audio/libogg converters/libiconv
 
 .if ${MACHINE_ARCH} == "i386"
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index 35b50478047..ac186f44873 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.31 2018/06/27 21:03:35 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=		small and easy to use graphical MPD client
 
 DISTNAME=		gimmix-0.5.7.2
 CATEGORIES=		audio x11
-REVISION=		6
+REVISION=		7
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -21,6 +21,8 @@ WANTLIB += xml2 z
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gimmix.berlios/}
 EXTRACT_SUFX=		.tar.bz2
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		textproc/intltool
 
 CONFIGURE_STYLE=	gnu
diff --git a/audio/gmpc-plugins/Makefile b/audio/gmpc-plugins/Makefile
index fa66dacd1c4..b6cd3b681f9 100644
--- a/audio/gmpc-plugins/Makefile
+++ b/audio/gmpc-plugins/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.41 2017/10/23 17:10:37 sthen Exp $
+# $OpenBSD: Makefile,v 1.42 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =		bundle of plugins for gmpc
 
 VERSION =		11.8.16
 DISTNAME =		gmpc-plugins-${VERSION}
-REVISION =		9
+REVISION =		10
 
 CATEGORIES =		audio
 
@@ -25,6 +25,8 @@ WANTLIB += iconv intl lzma m mpd pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 png pthread sqlite3 ${COMPILER_LIBCXX}
 WANTLIB += tag tag_c xcb xcb-render xcb-shm xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		textproc/intltool
 
 LIB_DEPENDS =		audio/taglib \
diff --git a/audio/goattracker/Makefile b/audio/goattracker/Makefile
index 0703d8dea7f..06e8121fbc5 100644
--- a/audio/goattracker/Makefile
+++ b/audio/goattracker/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2018/09/02 06:10:47 fcambus Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =	crossplatform music editor for creating Commodore 64 music
 
 V =		2.74
 DISTNAME =	GoatTracker_${V}
 PKGNAME =	goattracker-${V}
+REVISION =	0
 
 CATEGORIES =	audio
 
@@ -21,6 +22,8 @@ WANTLIB +=	SDL c m pthread ${COMPILER_LIBCXX}
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=goattracker2/}GoatTracker%202/${V}/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =	devel/sdl
 
 WRKDIST =	${WRKDIR}/src
diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index deb791dcdf2..124913e59f6 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2018/06/29 22:16:08 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT =	music collection manager and player
 DISTNAME =	gogglesmm-0.12.7
 EXTRACT_SUFX =	.tar.xz
-REVISION =	12
+REVISION =	13
 CATEGORIES =	audio x11
 
 HOMEPAGE =	https://gogglesmm.github.io/
@@ -16,6 +16,8 @@ WANTLIB += tag xine
 
 MASTER_SITES =	http://www.linklevel.net/distfiles/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =	audio/taglib \
 		databases/sqlite3 \
 		devel/fox \
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 3cc8841cdcb..10babb86b46 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.64 2018/06/29 22:16:09 espie Exp $
+# $OpenBSD: Makefile,v 1.65 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=		front-end to external cd audio rippers and mp3 encoders
 
 DISTNAME=		grip-3.8.1
 CATEGORIES=		audio
-REVISION=		1
+REVISION=		2
 
 HOMEPAGE=		http://sourceforge.net/projects/grip/
 
@@ -24,6 +24,8 @@ WANTLIB += iconv id3 intl ltdl lzma m nghttp2 ogg pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pcre pixman-1 png popt ssl util vorbis
 WANTLIB += vorbisfile vte xcb xcb-render xcb-shm xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=grip/}
 
 MODULES=		x11/gnome
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index b4741f33896..a6d584f08bc 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2018/06/27 21:03:35 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=		software drum machine
 
 DISTNAME=		hydrogen-0.9.4
-REVISION=		6
+REVISION=		7
 CATEGORIES=		audio
 
 HOMEPAGE=		http://www.hydrogen-music.org/
@@ -16,6 +16,8 @@ WANTLIB += FLAC>=8 FLAC++>=7 jack archive lrdf
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hydrogen/}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		audio/libsndfile \
 			audio/flac \
 			audio/jack \
diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile
index f784118ff48..f3246c7a40a 100644
--- a/audio/id3ed/Makefile
+++ b/audio/id3ed/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2018/05/12 10:00:24 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=		interactive console id3 tag editor
 
 DISTNAME=		id3ed-1.10.4
-REVISION =		5
+REVISION =		6
 CATEGORIES=		audio
 
 HOMEPAGE=		http://code.fluffytapeworm.com/projects/id3ed/
@@ -15,6 +15,8 @@ WANTLIB=		c curses m readline ${COMPILER_LIBCXX}
 
 MASTER_SITES=		${HOMEPAGE}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 NO_TEST=		Yes
 CONFIGURE_STYLE=	gnu
 
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index 82fc6444230..15492d7c9cb 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.25 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=		library for manipulating ID3v1 and ID3v2 tags
 
 VERSION=		3.8
 DISTNAME=		id3lib-${VERSION}.3
-REVISION =		6
+REVISION =		7
 CATEGORIES=     	audio
 SHARED_LIBS +=	id3                  4.0      # .3.8
 
@@ -17,6 +17,8 @@ WANTLIB=		c m ${COMPILER_LIBCXX} z
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=id3lib/}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE=		Yes
 NO_TEST=		Yes
 CONFIGURE_STYLE=	gnu
diff --git a/audio/ladspa/Makefile b/audio/ladspa/Makefile
index fee11f702aa..55fd64ceba9 100644
--- a/audio/ladspa/Makefile
+++ b/audio/ladspa/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=	linux audio developer simple plugin API
 HOMEPAGE=	http://www.ladspa.org/
 CATEGORIES=	audio devel
 
 V=		1.13
-REVISION =	2
+REVISION =	3
 
 DISTNAME=	ladspa_sdk_${V}
 WRKDIST=	${WRKDIR}/ladspa_sdk
@@ -16,6 +16,10 @@ MASTER_SITES=	${HOMEPAGE:=download/}
 # LGPL
 PERMIT_PACKAGE_CDROM=	Yes
 
+WANTLIB=	c m ${COMPILER_LIBCXX}
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 WRKBUILD=	${WRKDIST}/src
 USE_GMAKE=	Yes
 MAKE_FILE=	makefile
@@ -23,7 +27,6 @@ ALL_TARGET=	targets
 MAKE_FLAGS=	LIBRARIES=-lm OPTS="${CFLAGS}"
 
 PROGRAMS=	analyseplugin applyplugin listplugins
-WANTLIB=	c m ${COMPILER_LIBCXX}
 
 do-install:
 .for i in ${PROGRAMS}
diff --git a/audio/libbs2b/Makefile b/audio/libbs2b/Makefile
index 4bc845135b5..1cc7eee5b37 100644
--- a/audio/libbs2b/Makefile
+++ b/audio/libbs2b/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.6 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:27:57 sthen Exp $
 
 COMMENT=	Bauer stereophonic-to-binaural DSP
-REVISION=	2
+REVISION=	3
 
 DISTNAME=	libbs2b-3.1.0
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += FLAC c m ogg sndfile ${COMPILER_LIBCXX} vorbis vorbisenc
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bs2b/}
 
 LIB_DEPENDS=	audio/libsndfile
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 9f1f1d7dfb2..84516014127 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2017/11/03 09:39:04 naddy Exp $
+# $OpenBSD: Makefile,v 1.52 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT-main=	implementation of the Freedesktop sound theme spec.
 COMMENT-gtk=	gtk+2 helper for libcanberra
@@ -12,9 +12,9 @@ PKGNAME-main=	${DISTNAME}
 PKGNAME-gtk=	libcanberra-gtk-${V}
 PKGNAME-gtk3=	libcanberra-gtk3-${V}
 
-REVISION-main=	3
-REVISION-gtk=	6
-REVISION-gtk3=	6
+REVISION-main=	4
+REVISION-gtk=	7
+REVISION-gtk3=	7
 
 SHARED_LIBS +=  canberra             2.0      # 2.5
 SHARED_LIBS +=  canberra-gtk3        1.8      # 1.8
@@ -53,6 +53,8 @@ WANTLIB-gtk3 += graphite2 gthread-2.0 gtk-3 harfbuzz iconv intl pango-1.0
 WANTLIB-gtk3 += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png xcb xcb-render
 WANTLIB-gtk3 += xcb-shm z ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MULTI_PACKAGES=		-main -gtk -gtk3
 
 SUBST_VARS=		V
diff --git a/audio/libcdio/Makefile b/audio/libcdio/Makefile
index 3eb30629356..621bba2b812 100644
--- a/audio/libcdio/Makefile
+++ b/audio/libcdio/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=	compact disk input and control library
 
 DISTNAME=	libcdio-0.80
-REVISION=	9
+REVISION=	10
 CATEGORIES=	audio devel
 MASTER_SITES=	${MASTER_SITE_GNU:=libcdio/}
 
@@ -19,8 +19,11 @@ HOMEPAGE=	https://www.gnu.org/software/libcdio/
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
+
 WANTLIB=	c cddb iconv m ncurses ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	audio/libcddb \
 		converters/libiconv
 
diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index 1a7cd88df2c..5b36abddde1 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =	Qt-based C++ library for the Last.fm webservices
 V =		1.0.9
 DISTNAME =	$V
 PKGNAME =	liblastfm-$V
 CATEGORIES =	audio devel net
-REVISION =	1
+REVISION =	2
 
 HOMEPAGE =	https://github.com/lastfm/liblastfm
 MAINTAINER =	Vadim Zhukov <zhuk@openbsd.org>
@@ -24,6 +24,8 @@ WRKDIST =	${WRKDIR}/${PKGNAME}
 WANTLIB =  lib/qt4/QtDBus lib/qt4/QtNetwork lib/qt4/QtSql lib/qt4/QtXml
 WANTLIB += fftw3f c m pthread samplerate ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =	audio/libsamplerate \
 		math/fftw3,float
 
diff --git a/audio/libmodplug/Makefile b/audio/libmodplug/Makefile
index 6fd4109b803..2ce8b285627 100644
--- a/audio/libmodplug/Makefile
+++ b/audio/libmodplug/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2017/11/03 15:04:01 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =		library for decoding mod-like music formats
 
 DISTNAME =		libmodplug-0.8.9.0
 CATEGORIES =		audio
+REVISION =		0
 
 HOMEPAGE =		http://modplug-xmms.sourceforge.net/
 
@@ -16,6 +17,8 @@ MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=modplug-xmms/}
 
 WANTLIB +=		m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 NO_TEST =		Yes
 
 CONFIGURE_STYLE =	gnu
diff --git a/audio/libmusicbrainz/Makefile b/audio/libmusicbrainz/Makefile
index 4e0af4b94fa..f55aa499d85 100644
--- a/audio/libmusicbrainz/Makefile
+++ b/audio/libmusicbrainz/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:27:58 sthen Exp $
 
 PORTROACH=		limit:^3
 
 COMMENT=		library for audio metadata lookup
 
 DISTNAME=		libmusicbrainz-3.0.3
-REVISION =		1
+REVISION =		2
 
 SHARED_LIBS=		musicbrainz3	0.0	# .6.1
 CATEGORIES=		audio
@@ -20,6 +20,8 @@ WANTLIB += discid m neon ${COMPILER_LIBCXX}
 MASTER_SITES=		ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
 			http://uk.musicbrainz.org/pub/musicbrainz/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/cmake
 
 BUILD_DEPENDS=		devel/cppunit
diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile
index 78f7ba78db6..5c52b8ecf56 100644
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:27:58 sthen Exp $
 
 PORTROACH=		limit:^5
 
@@ -7,7 +7,7 @@ COMMENT=		library for audio metadata lookup (v5)
 V=			5.0.1
 DISTNAME=		libmusicbrainz-${V}
 PKGNAME=		libmusicbrainz5-${V}
-REVISION =		4
+REVISION =		5
 
 SHARED_LIBS +=  musicbrainz5              0.0 # 0.0
 
@@ -22,6 +22,8 @@ WANTLIB += m neon ${COMPILER_LIBCXX}
 
 MASTER_SITES=		https://github.com/downloads/metabrainz/libmusicbrainz/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/cmake
 
 NO_TEST=		Yes
diff --git a/audio/libofa/Makefile b/audio/libofa/Makefile
index f39ba0ec0ed..0c011ef8f6c 100644
--- a/audio/libofa/Makefile
+++ b/audio/libofa/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2017/08/21 18:34:04 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =	Open Fingerprint Architecture library
 
 DISTNAME =	libofa-0.9.3
-REVISION =	8
+REVISION =	9
 CATEGORIES =	audio devel
 SHARED_LIBS +=	ofa	0.0
 
@@ -14,6 +14,8 @@ MASTER_SITES =	https://distfiles.nl/
 
 WANTLIB +=	m pthread ${COMPILER_LIBCXX} fftw3
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # needed to build the examples
 BUILD_DEPENDS =	net/curl \
 		devel/gettext
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index 7bd8db97bd5..b5bc0dd65b2 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=	C64 music player and SID chip emulator library
 
 DISTNAME=	libsidplay-1.36.57
-REVISION=	6
+REVISION=	7
 CATEGORIES=	audio
 SHARED_LIBS +=	sidplay              2.0      # .1.3
 
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB =		m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	https://www.distfiles.pl/
 EXTRACT_SUFX=	.tgz
 
diff --git a/audio/mac/Makefile b/audio/mac/Makefile
index 42e90ef5393..c7839f7104b 100644
--- a/audio/mac/Makefile
+++ b/audio/mac/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:27:58 sthen Exp $
 
 ONLY_FOR_ARCHS= amd64 arm i386
 
@@ -6,7 +6,7 @@ COMMENT=	Monkey's audio lossless codec
 
 DISTNAME=	mac-3.99-u4-b5
 PKGNAME=	mac-3.99.4.5
-REVISION =	3
+REVISION =	4
 SHARED_LIBS +=  mac                  0.0      # .2.0
 CATEGORIES=	audio
 
@@ -20,6 +20,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://bsd.cenkes.org/myports/
 
 
diff --git a/audio/mcp-plugins/Makefile b/audio/mcp-plugins/Makefile
index af7e61e727b..e7e9c2fdc41 100644
--- a/audio/mcp-plugins/Makefile
+++ b/audio/mcp-plugins/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =		MCP LADSPA plugins
 
 DISTNAME =		MCP-plugins-0.4.0
 PKGNAME =		${DISTNAME:L}
-REVISION =		2
+REVISION =		3
 CATEGORIES =		audio
 
 HOMEPAGE =		http://kokkinizita.net/linuxaudio/ladspa/index.html
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 EXTRACT_SUFX =		.tar.bz2
 
 MASTER_SITES =		http://kokkinizita.net/linuxaudio/downloads/
diff --git a/audio/milkytracker/Makefile b/audio/milkytracker/Makefile
index aab27fcf46a..e3ae4d77f6d 100644
--- a/audio/milkytracker/Makefile
+++ b/audio/milkytracker/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2018/06/29 22:16:09 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =	Fasttracker II inspired MOD tracker
 
@@ -7,7 +7,7 @@ GH_PROJECT =	MilkyTracker
 GH_TAGNAME =	v1.02.00
 
 PKGNAME =	${DISTNAME:L}
-REVISION =	2
+REVISION =	3
 
 CATEGORIES =	audio
 
@@ -20,6 +20,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB +=	SDL2 c m ${COMPILER_LIBCXX} z zzip
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =	devel/cmake
 
 BUILD_DEPENDS =	audio/jack
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index 34527a1c227..ffd2685bc75 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2018/05/12 13:55:24 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =	console audio player
 DISTNAME =	moc-2.5.2
@@ -7,7 +7,7 @@ HOMEPAGE =	http://moc.daper.net/
 MASTER_SITES =	http://ftp.daper.net/pub/soft/moc/stable/ \
 		https://distfiles.nl/
 EXTRACT_SUFX =	.tar.bz2
-REVISION =	1
+REVISION =	2
 
 # GPLv3+
 PERMIT_PACKAGE_CDROM = Yes
@@ -20,6 +20,8 @@ WANTLIB += ncurses nghttp2 ogg opus pthread samplerate sndfile sndio
 WANTLIB += speex ssl ${COMPILER_LIBCXX} swresample tag tag_c vorbis vorbisenc
 WANTLIB += vorbisfile vpx wavpack x264 x265 xvidcore z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # libvpx -> libavcodec -> mocp
 # see multimedia/gstreamer1/plugins-good/Makefile for details
 .if ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Mamd64}
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 9b243b52bf8..b449aab5310 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2017/08/15 18:39:48 jca Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=	text console audio player with an interactive interface
 
 DISTNAME=	mp3blaster-3.2.6
-REVISION=	1
+REVISION=	2
 CATEGORIES=	audio
 HOMEPAGE=	http://mp3blaster.sourceforge.net/
 MAINTAINER=	Brian Callahan <bcallah@openbsd.org>
@@ -15,6 +15,8 @@ WANTLIB=	c m ncurses ogg pthread sidplay sndio ${COMPILER_LIBCXX} vorbis vorbisf
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mp3blaster/}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	audio/libsidplay \
 		audio/libvorbis
 
diff --git a/audio/musique/Makefile b/audio/musique/Makefile
index 697e3072b8a..88bb9e385dd 100644
--- a/audio/musique/Makefile
+++ b/audio/musique/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2018/06/29 22:16:09 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =	graphical music player focused on a clean ui
 DISTNAME =	musique-1.4
 CATEGORIES =	audio
-REVISION =	6
+REVISION =	7
 
 HOMEPAGE =	http://flavio.tordini.org/musique/
 
@@ -16,6 +16,8 @@ WANTLIB += ICE QtDBus QtGui QtNetwork QtSql QtXml SM
 WANTLIB += X11 Xext Xi Xinerama Xrender c fontconfig
 WANTLIB += freetype m phonon pthread ${COMPILER_LIBCXX} tag
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =	devel/qmake x11/qt4
 
 LIB_DEPENDS =	audio/taglib
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 194c08cdb80..60cdc668f8a 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2018/06/27 21:03:36 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:27:58 sthen Exp $
 
 BROKEN-alpha =	arctar.c:384: internal compiler error: in extract_insn, at recog.c:2077
 
 COMMENT =	UNIX port of Open Cubic Player
 
 DISTNAME =	ocp-0.1.21
-REVISION =	2
+REVISION =	3
 CATEGORIES =	audio
 
 HOMEPAGE =	http://stian.cubic.org/project-ocp.php
@@ -20,6 +20,8 @@ WANTLIB +=	sidplay ${COMPILER_LIBCXX} vorbis vorbisfile z
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=opencubicplayer/}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =	devel/desktop-file-utils
 
 RUN_DEPENDS =	devel/desktop-file-utils
diff --git a/audio/paulstretch/Makefile b/audio/paulstretch/Makefile
index bd7156c572e..79e7a6148f5 100644
--- a/audio/paulstretch/Makefile
+++ b/audio/paulstretch/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2017/12/31 10:09:04 kirby Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =	program for extreme audio stretching
 DISTNAME =	paulstretch-2.2-2
-REVISION =	4
+REVISION =	5
 PKGNAME =	paulstretch-2.2.2
 EXTRACT_SUFX =	.tar.bz2
 CATEGORIES =	audio x11
@@ -18,6 +18,8 @@ WANTLIB += vorbisfile z Xcursor Xfixes
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=hypermammut/}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =	audio/libmad \
 		audio/libvorbis \
 		audio/libogg \
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 12fddcbc09c..4f8b8cd7c2a 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2018/06/27 21:03:36 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =		automatic audio files tagger using the MusicBrainz database
 
 MODPY_EGG_VERSION =	0.16
 DISTNAME =		picard-${MODPY_EGG_VERSION}
-REVISION =		4
+REVISION =		5
 
 CATEGORIES =		audio
 
@@ -21,6 +21,8 @@ WANTLIB += avcodec avformat m ofa pthread ${COMPILER_LIBCXX}
 MASTER_SITES =		http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
 			ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		lang/python
 
 MODPY_SETUPTOOLS =	Yes
diff --git a/audio/pms/Makefile b/audio/pms/Makefile
index bd2661628e5..516fc947222 100644
--- a/audio/pms/Makefile
+++ b/audio/pms/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2018/01/08 13:55:02 kirby Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=		curses based frontend for mpd
 
 DISTNAME=		pms-0.42
 EXTRACT_SUFX = 		.tar.bz2
 CATEGORIES=		audio
-REVISION =		7
+REVISION =		8
 
 HOMEPAGE=		https://ambientsound.github.io/pms/
 
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c glib-2.0 intl m ncursesw pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		devel/glib2
 
 MODULES=		textproc/intltool
diff --git a/audio/py-tagpy/Makefile b/audio/py-tagpy/Makefile
index f124a641c26..ea8563c5440 100644
--- a/audio/py-tagpy/Makefile
+++ b/audio/py-tagpy/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.25 2017/07/26 22:45:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=		Python bindings to TagLib audio file tag library
 
 MODPY_EGG_VERSION =	2013.1
 DISTNAME =		tagpy-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		7
+REVISION =		8
 
 CATEGORIES =		audio devel
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += boost_python${MODPY_MAJOR_VERSION:M3}-mt m pthread ${COMPILER_LIBCXX} tag ${MODPY_WANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODPY_PI =		Yes
 
 MODULES =		lang/python
diff --git a/audio/ruby-taglib/Makefile b/audio/ruby-taglib/Makefile
index c7125f71884..a966f487ff9 100644
--- a/audio/ruby-taglib/Makefile
+++ b/audio/ruby-taglib/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2018/06/13 22:26:52 jeremy Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =	reads and writes metadata/tags for many audio formats
 
 VERSION =	0.7.1
 DISTNAME =	taglib-ruby-${VERSION}
 PKGNAME =	taglib-${VERSION}
-REVISION =	2
+REVISION =	3
 CATEGORIES =	audio
 
 HOMEPAGE =	http://robinst.github.io/taglib-ruby/
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB = 		${COMPILER_LIBCXX} tag
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		lang/ruby
 
 CONFIGURE_STYLE =	ruby gem ext
diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index a18fb8b251e..5bbff402c3f 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2018/05/12 10:00:24 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=	Commodore 64 music player and SID chip emulator
 
 DISTNAME=	sidplay-base-1.0.9
 PKGNAME=	${DISTNAME:S/-base//}
-REVISION =	4
+REVISION =	5
 CATEGORIES=	audio
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		c m sidplay>=1 sndio ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	https://www.distfiles.pl/
 EXTRACT_SUFX=	.tgz
 
diff --git a/audio/soundtouch/Makefile b/audio/soundtouch/Makefile
index d6bb0474166..2e44a11f657 100644
--- a/audio/soundtouch/Makefile
+++ b/audio/soundtouch/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2018/08/03 07:07:44 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=	tempo/pitch audio processing library
 
 DISTNAME=	soundtouch-1.9.2
 SHARED_LIBS +=	SoundTouch	3.0      # .0.0
 CATEGORIES=	audio devel
-REVISION =	2
+REVISION =	3
 
 HOMEPAGE=	http://www.surina.net/soundtouch/
 
@@ -16,6 +16,8 @@ MASTER_SITES=	${HOMEPAGE}
 
 WANTLIB=	c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=	${MODGNU_AUTOCONF_DEPENDS} \
 		${MODGNU_AUTOMAKE_DEPENDS} \
 		devel/libtool
diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile
index 3c0d824a0ac..95f4284280f 100644
--- a/audio/taglib/Makefile
+++ b/audio/taglib/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.42 2018/05/16 20:37:14 sthen Exp $
+# $OpenBSD: Makefile,v 1.43 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=	managing meta-data of audio formats
 DISTNAME=	taglib-1.11.1
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	audio devel
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	${COMPILER_LIBCXX} m z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	https://taglib.github.io/releases/
 
 MODULES=	devel/cmake
diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile
index 0f9431306f6..e90de3ed40e 100644
--- a/audio/tagtool/Makefile
+++ b/audio/tagtool/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.39 2018/06/29 22:16:09 espie Exp $
+# $OpenBSD: Makefile,v 1.40 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=	Ogg Vorbis and MP3 files tagger
 
 DISTNAME=	tagtool-0.12.3
-REVISION=	25
+REVISION=	26
 CATEGORIES=	audio
 
 MAINTAINER=	Vlad Glagolev <stealth@sourcemage.org>
@@ -21,6 +21,8 @@ WANTLIB += glib-2.0 gobject-2.0 gtk-x11-2.0 id3 intl m ogg pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 vorbis vorbisfile xml2
 WANTLIB += z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	textproc/intltool
 
 LIB_DEPENDS=	audio/id3lib \
diff --git a/audio/tempest/Makefile b/audio/tempest/Makefile
index bd5ce0eb400..1c52eb649ef 100644
--- a/audio/tempest/Makefile
+++ b/audio/tempest/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.24 2018/05/12 10:00:24 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=	sends AM radio signals using a monitor
 
 VERSION=	1.0.5
 DISTNAME=	tempest_for_eliza-${VERSION}
 PKGNAME=	tempest-${VERSION}
-REVISION=	5
+REVISION=	6
 CATEGORIES=	audio
 
 HOMEPAGE=	http://www.erikyyy.de/tempest/
@@ -16,6 +16,8 @@ WANTLIB += SDL c m pthread ${COMPILER_LIBCXX}
 
 MASTER_SITES=	${HOMEPAGE}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 NO_TEST=	Yes
 
 RUN_DEPENDS=	audio/madplay \
diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile
index dc135251bcc..76252af83f7 100644
--- a/audio/vagalume/Makefile
+++ b/audio/vagalume/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.43 2018/06/29 22:16:09 espie Exp $
+# $OpenBSD: Makefile,v 1.44 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=		last.fm client for GNOME
 
 V=			0.8.2
 DISTNAME=		vagalume_$V.orig
 PKGNAME=		vagalume-$V
-REVISION=		23
+REVISION=		24
 CATEGORIES=		audio x11
 
 HOMEPAGE=		http://vagalume.igalia.com/
@@ -23,6 +23,8 @@ WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png
 WANTLIB += pthread ssl ${COMPILER_LIBCXX} xcb xcb-render xcb-shm xml2
 WANTLIB += z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		http://vagalume.igalia.com/files/source/
 
 WRKDIST=		${WRKDIR}/vagalume-$V
diff --git a/audio/vamp-plugin-sdk/Makefile b/audio/vamp-plugin-sdk/Makefile
index 108cd21b643..4f5b83c85d8 100644
--- a/audio/vamp-plugin-sdk/Makefile
+++ b/audio/vamp-plugin-sdk/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =		audio plugin API
 
 VERSION =		2.2.1
 DISTNAME =		vamp-plugin-sdk-${VERSION}
-REVISION =		3
+REVISION =		4
 CATEGORIES =		audio
 
 SHARED_LIBS +=		vamp-sdk	1.0
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=vamp/}
 
 MAKE_ENV +=		CXX=${CXX} \
diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile
index 96614271b53..bebc920f404 100644
--- a/audio/xcd/Makefile
+++ b/audio/xcd/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.35 2017/11/20 18:14:49 stu Exp $
+# $OpenBSD: Makefile,v 1.36 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =	Tcl/Tk CD player
 DISTNAME =	xcd-1.7
-REVISION =	6
+REVISION =	7
 CATEGORIES =	audio
 MAINTAINER =	Stuart Cassoff <stwo@users.sourceforge.net>
 
@@ -11,6 +11,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =	c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_FREEBSD_LOCAL:=cy/}
 
 MODULES =	x11/tk
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index 1c14da079aa..6b98e519630 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2018/07/18 19:36:37 naddy Exp $
+# $OpenBSD: Makefile,v 1.48 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =		audio player daemon with library management
 BROKEN-sparc64 =	waf build goes into an infinite loop
@@ -6,7 +6,7 @@ BROKEN-sparc64 =	waf build goes into an infinite loop
 V =			0.8
 DISTNAME =		xmms2-${V}DrO_o
 PKGNAME =		xmms2-${V}
-REVISION =		10
+REVISION =		11
 
 SHARED_LIBS +=		xmmsclient++		2.0 # 4.0.0
 SHARED_LIBS +=		xmmsclient++-glib	1.0 # 1.0.0
@@ -32,6 +32,8 @@ MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=xmms2/}
 
 EXTRACT_SUFX =		.tar.bz2
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		lang/python \
 			perl
 
diff --git a/benchmarks/bonnie++/Makefile b/benchmarks/bonnie++/Makefile
index 2b33629e78a..b02466b2c14 100644
--- a/benchmarks/bonnie++/Makefile
+++ b/benchmarks/bonnie++/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=	enhanced performance test of filesystem I/O
 
@@ -6,7 +6,7 @@ DISTNAME=	bonnie++-1.97.3
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.coker.com.au/bonnie++/experimental/
 EXTRACT_SUFX=	.tgz
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://www.coker.com.au/bonnie++/
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE=	Yes
 CONFIGURE_STYLE= autoconf dest
 AUTOCONF_VERSION= 2.67
diff --git a/benchmarks/sysbench/Makefile b/benchmarks/sysbench/Makefile
index 478330fac5c..97962e4e074 100644
--- a/benchmarks/sysbench/Makefile
+++ b/benchmarks/sysbench/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.21 2018/05/12 13:58:30 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =	modular, cross-platform and multi-threaded benchmark tool
 DISTNAME =	sysbench-0.4.8
-REVISION =	11
+REVISION =	12
 CATEGORIES =	benchmarks
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=sysbench/}
 
@@ -15,6 +15,8 @@ WANTLIB =		m c pthread
 
 MAINTAINER =		Jung Lee <moorang@gmail.com>
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =		textproc/docbook-xsl
 NO_TEST =		Yes
 
diff --git a/biology/nutdb/Makefile b/biology/nutdb/Makefile
index 28fe3331f10..efec09b9ab2 100644
--- a/biology/nutdb/Makefile
+++ b/biology/nutdb/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.37 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.38 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=	record and analyze your meals for nutrient composition
 
 V=		20.1
-REVISION=	1
+REVISION=	2
 DISTNAME=	nut-${V}
 PKGNAME=	nutdb-${V}
 CATEGORIES=	biology
@@ -17,6 +17,8 @@ WANTLIB += c fltk fontconfig m pthread ${COMPILER_LIBCXX}
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nut/}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 NO_TEST=	Yes
 
 LIB_DEPENDS=	x11/fltk
diff --git a/cad/abc/Makefile b/cad/abc/Makefile
index 9060fd0863f..131f8321cfc 100644
--- a/cad/abc/Makefile
+++ b/cad/abc/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2018/08/08 15:24:47 bcallah Exp $
+# $OpenBSD: Makefile,v 1.2 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =	system for sequential logic synthesis and verification
 DISTNAME =	abc-1.01.20180722
 CATEGORIES =	cad
+REVISION =	0
 
 GH_ACCOUNT =	berkeley-abc
 GH_PROJECT =	abc
@@ -16,6 +17,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} c curses m readline
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =	devel/cmake
 
 USE_GMAKE =	Yes
diff --git a/cad/fritzing/Makefile b/cad/fritzing/Makefile
index be23fe1217a..feb56871dfa 100644
--- a/cad/fritzing/Makefile
+++ b/cad/fritzing/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.31 2018/06/27 21:03:37 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=	interactive electronics designing software
 
 V=		0.9.2
-REVISION=	3
+REVISION=	4
 
 GH_ACCOUNT=	fritzing
 GH_PROJECT=	fritzing-app
@@ -25,6 +25,12 @@ MASTER_SITES0= https://github.com/fritzing/fritzing-parts/archive/${GH_TAGNAME}/
 # Rest: CreativeCommons:BY-SA
 PERMIT_PACKAGE_CDROM =	Yes
 
+WANTLIB += ICE QtGui QtNetwork QtSql QtSvg QtXml SM X11 Xext Xi
+WANTLIB += Xinerama Xrender c fontconfig freetype m pthread ${COMPILER_LIBCXX}
+WANTLIB += z lib/qt4/QtSerialPort
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=        devel/qmake x11/qt4
 NO_TEST=	Yes
 
@@ -41,10 +47,6 @@ post-extract:
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/phoenix.pro ${WRKSRC}/src/fapplication.cpp
 
-WANTLIB += ICE QtGui QtNetwork QtSql QtSvg QtXml SM X11 Xext Xi
-WANTLIB += Xinerama Xrender c fontconfig freetype m pthread ${COMPILER_LIBCXX}
-WANTLIB += z lib/qt4/QtSerialPort
-
 # -DLINUX_32 gets added to CFLAGS, though it's only used to figure out
 # if there is a newer version of the 32-bit Linux binary on the upstream
 # webpage. So it's safe to set it on all arches (for now).
diff --git a/cad/geda-gaf/Makefile b/cad/geda-gaf/Makefile
index 3a4027d50a9..865be83f85c 100644
--- a/cad/geda-gaf/Makefile
+++ b/cad/geda-gaf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2018/07/01 18:33:35 espie Exp $
+# $OpenBSD: Makefile,v 1.31 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =		suite of tools for electronic design automation
 DISTNAME =		geda-gaf-1.6.0
@@ -6,7 +6,7 @@ CATEGORIES =		cad
 HOMEPAGE =		http://geda.seul.org
 MAINTAINER =		Edd Barrett <edd@openbsd.org>
 
-REVISION =		16
+REVISION =		17
 
 SHARED_LIBS = 		geda	0.0	# 38.0
 
@@ -23,6 +23,8 @@ WANTLIB += xcb xcb-render xcb-shm z
 
 MASTER_SITES =		http://geda.seul.org/release/v1.6/1.6.0/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		devel/glib2 \
 			x11/gtk+2 \
 			lang/guile \
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index 85c07d95f91..41fddfb385e 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:27:58 sthen Exp $
 
 # gcc spins compiling d_mos7
 NOT_FOR_ARCHS=		m88k
@@ -6,7 +6,7 @@ NOT_FOR_ARCHS=		m88k
 COMMENT=		Gnu Circuit Analysis Package
 
 DISTNAME=		gnucap-0.35
-REVISION =		4
+REVISION =		5
 CATEGORIES=		cad
 
 HOMEPAGE=		http://www.gnucap.org/
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		c m ${COMPILER_LIBCXX} readline termcap
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${HOMEPAGE}dist/ \
 			http://www.geda.seul.org/dist/
 
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index 33313696750..81b6d53fafe 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.37 2018/07/01 18:33:35 espie Exp $
+# $OpenBSD: Makefile,v 1.38 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=		GTK+-based electronic waveform viewer
 
 DISTNAME=		gtkwave-3.3.91
 CATEGORIES=		cad
-REVISION=		2
+REVISION=		3
 
 HOMEPAGE=		http://gtkwave.sourceforge.net/
 
@@ -19,6 +19,8 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread z fribidi
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtkwave/}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=		devel/gperf
 
 RUN_DEPENDS=		devel/desktop-file-utils \
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index 7aab20d0db9..14f254886eb 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2018/07/01 18:33:35 espie Exp $
+# $OpenBSD: Makefile,v 1.33 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT-main=	schematic and PCB editing software
 COMMENT-docs=	documentation for the kicad library of components
@@ -10,8 +10,8 @@ PKGNAME=	kicad-${V:S/-//g}
 PKGNAME-main=	kicad-${V:S/-//g}
 PKGNAME-docs=	kicad-docs-${V:S/-//g}
 
-REVISION-main=	11
-REVISION-docs=	2
+REVISION-main=	12
+REVISION-docs=	3
 
 CATEGORIES=	cad
 
@@ -28,6 +28,8 @@ DISTFILES=	${DISTNAME}.zip ${DOCDIST}:0
 EXTRACT_ONLY=	${DISTNAME}.zip
 DIST_SUBDIR=	kicad
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MULTI_PACKAGES=	-main -docs
 
 MODULES=	devel/cmake
diff --git a/cad/necpp/Makefile b/cad/necpp/Makefile
index ec2530d0bae..3b22b8102c4 100644
--- a/cad/necpp/Makefile
+++ b/cad/necpp/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=	NEC2++ antenna simulator
 
 DISTNAME=	necpp-1.2.3
-REVISION =	5
+REVISION =	6
 CATEGORIES=    	cad hamradio
 
 HOMEPAGE=	http://elec.otago.ac.nz/w/index.php/Necpp
@@ -18,6 +18,8 @@ SHARED_LIBS=necpp 0.0
 
 WANTLIB=c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/necpp
 	${INSTALL_DATA} ${WRKSRC}/test_data/* ${PREFIX}/share/examples/necpp
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index 9019e3cbdbe..50a14e51402 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.24 2018/07/01 18:33:35 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =		the programmer's solid 3D CAD modeller#'
 BROKEN-sparc64=	SIGILL on src/cgalutils.cc with CGAL-4.6.3
 
 V =			2015.03-2
 DISTNAME =		openscad-${V:S/-/./}
-REVISION =		6
+REVISION =		7
 
 CATEGORIES =		cad
 
@@ -20,6 +20,8 @@ WANTLIB += boost_system-mt boost_thread-mt c fontconfig freetype glib-2.0
 WANTLIB += gmp harfbuzz iconv intl m mpfr opencsg pthread qscintilla2_qt4
 WANTLIB += ${COMPILER_LIBCXX} z lib/qt4/QtGui lib/qt4/QtOpenGL
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://files.openscad.org/
 DISTFILES =		openscad-${V}.src.tar.gz
 
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 594a90f02b4..03e8ce16600 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.30 2017/07/28 00:03:46 espie Exp $
+# $OpenBSD: Makefile,v 1.31 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=	Qt-based 2D CAD system
 
 V=		2.0.5.0
 DISTNAME=	qcad-${V}-1-community.src
 PKGNAME=	qcad-${V}
-REVISION=	5
+REVISION=	6
 CATEGORIES=	cad graphics
 
 HOMEPAGE=	http://www.ribbonsoft.com/qcad.html
@@ -19,6 +19,8 @@ WANTLIB=		X11 Xext c m pthread ${COMPILER_LIBCXX}
 
 MASTER_SITES=	http://www.ribbonsoft.com/archives/qcad/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	x11/qt3
 
 USE_GMAKE=	Yes
diff --git a/cad/qucs/Makefile b/cad/qucs/Makefile
index f138602924e..fb3d2504aa1 100644
--- a/cad/qucs/Makefile
+++ b/cad/qucs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:27:58 sthen Exp $
 
 PORTROACH=	limit:[0-9]\.[0-9]\.[0-9][0-9]$
 
@@ -6,7 +6,7 @@ COMMENT=	graphical circuit design and simulation tool
 BROKEN-hppa =	OOM on hicumL2V2p23.core.o
 
 DISTNAME=	qucs-0.0.16
-REVISION=	2
+REVISION=	3
 CATEGORIES=	cad
 
 HOMEPAGE=	http://qucs.sourceforge.net/
@@ -18,6 +18,8 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qucs/}
 
 WANTLIB += ICE SM X11 c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	x11/qt3
 
 USE_GMAKE=	Yes
diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 41f9afe9225..482df49a860 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.26 2018/09/13 13:53:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.27 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=	soundcard-based software modem for Amateur Radio use
 
 # skip alpha-test versions (x.x.x.x format version numbers)
 PORTROACH=	limit:^[0-9]+\.[0-9]+\.[0-9]+$$
 DISTNAME=	fldigi-4.0.18
+REVISION=	0
 
 CATEGORIES=	comms hamradio
 
@@ -19,6 +20,8 @@ WANTLIB += portaudio pthread samplerate sndfile ${COMPILER_LIBCXX} z
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fldigi/}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS=	devel/desktop-file-utils
 BUILD_DEPENDS=	textproc/asciidoc
 LIB_DEPENDS=	audio/libsamplerate \
diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile
index 53c5d167a9e..9c84ece34ea 100644
--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.42 2018/05/12 14:29:01 espie Exp $
+# $OpenBSD: Makefile,v 1.43 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT=	GNOME multimode HF terminal
 
 GNOME_PROJECT=	gmfsk
 GNOME_VERSION=	0.6
-REVISION=	26
+REVISION=	27
 CATEGORIES=	comms hamradio
 
 HOMEPAGE=	http://gmfsk.connect.fi/
@@ -28,6 +28,8 @@ WANTLIB += xcb-shm z
 MODULES=		x11/gnome \
 			devel/gconf2
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODGNOME_TOOLS +=	yelp
 
 USE_GMAKE=		No
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 16c8835e773..b6042fdd4a9 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2018/09/10 06:58:22 bentley Exp $
+# $OpenBSD: Makefile,v 1.2 2018/10/24 14:27:58 sthen Exp $
 
 COMMENT =	signal-processing toolkit for SDR (software-defined radio)
 
 DISTNAME =	gnuradio-3.7.13.4
+REVISION =	0
 
 SHARED_LIBS +=  gnuradio-analog           0.0 # 3.7
 SHARED_LIBS +=  gnuradio-atsc             0.0 # 3.7
@@ -46,6 +47,8 @@ WANTLIB += usb-1.0 zmq
 
 MASTER_SITES =	https://www.gnuradio.org/releases/gnuradio/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =	devel/cmake \
 		lang/python
 
diff --git a/comms/gpsk31/Makefile b/comms/gpsk31/Makefile
index 13c800d840a..a398ad24949 100644
--- a/comms/gpsk31/Makefile
+++ b/comms/gpsk31/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.29 2018/06/27 21:03:38 espie Exp $
+# $OpenBSD: Makefile,v 1.30 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=	gtk PSK31 send and receive
 
 DISTNAME=	gpsk31-0.3
-REVISION=	17
-CATEGORIES=    	comms hamradio
+REVISION=	18
+CATEGORIES=	comms hamradio
 
 HOMEPAGE=	http://www.qsl.net/pg4i/linux/gpsk31.html
 
@@ -24,6 +24,7 @@ WANTLIB += xcb-shm
 
 MASTER_SITES=		http://www.qsl.net/pg4i/download/
 
+COMPILER =		base-clang ports-gcc base-gcc
 
 AUTOCONF_VERSION=	2.59
 CONFIGURE_STYLE=	autoconf no-autoheader
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index c2575d4ae1c..dabb737ae59 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2018/05/15 11:02:50 espie Exp $
+# $OpenBSD: Makefile,v 1.39 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT-main=	radio/rotator control library
 COMMENT-python=	python bindings for hamlib
@@ -10,9 +10,9 @@ PKGNAME-main=	hamlib-${VERSION}
 PKGNAME-python=	hamlib-python-${VERSION}
 PKGNAME-tcl=	hamlib-tcl-${VERSION}
 CATEGORIES=	comms hamradio
-REVISION-main=	4
-REVISION-python=0
-REVISION-tcl=	1
+REVISION-main=	5
+REVISION-python=1
+REVISION-tcl=	2
 
 MULTI_PACKAGES=	-main -python -tcl
 
@@ -27,6 +27,8 @@ MODULES=	lang/python \
 # GPLv2/LGPLv2.1
 PERMIT_PACKAGE_CDROM=	Yes
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIBTOOL_FLAGS=		--tag=disable-static
 
 cWANTLIB=		ltdl m pthread usb usb-1.0
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index e51a6a27631..5291cbc437f 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.83 2018/09/04 12:46:09 espie Exp $
+# $OpenBSD: Makefile,v 1.84 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=		send/receive faxes and share modems
 DISTNAME=		hylafax-6.0.6
-REVISION =		12
+REVISION =		13
 CATEGORIES=		comms
 
 HOMEPAGE=		http://www.HylaFAX.org/
@@ -21,6 +21,8 @@ FLAVOR?=
 
 WANTLIB=		c iconv intl jbig m ${COMPILER_LIBCXX} tiff util z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=		print/ghostscript/gnu
 RUN_DEPENDS=		print/ghostscript/gnu \
 			mail/metamail
diff --git a/comms/owx/Makefile b/comms/owx/Makefile
index 909d46cd9a0..d1a03b07755 100644
--- a/comms/owx/Makefile
+++ b/comms/owx/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT =	tool for programming Wouxun transcievers
 
 DISTNAME =	owx-20110917
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	comms
 
@@ -18,6 +18,8 @@ WANTLIB =	c m ${COMPILER_LIBCXX}
 
 MASTER_SITES =	https://distfiles.nl/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MAKE_FLAGS =	CXX="${CXX}" PORTS_CXXFLAGS="${CXXFLAGS}"
 
 USE_GMAKE =	Yes
diff --git a/comms/qtserialport/Makefile b/comms/qtserialport/Makefile
index f3719d1e3f5..08508733911 100644
--- a/comms/qtserialport/Makefile
+++ b/comms/qtserialport/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2018/05/12 14:29:01 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT =		provides functions to access serial ports
 
@@ -8,7 +8,7 @@ V =			5.4.2
 DISTNAME =		qtserialport-v${V}
 PKGNAME =		${DISTNAME:S/v//}
 PKGSPEC =		qtserialport-<5.6
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		comms
 
@@ -22,6 +22,8 @@ MASTER_SITES =		https://deftly.net/
 # This lib is included in later versions of QT
 PERMIT_PACKAGE_CDROM =	Yes
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/qmake x11/qt4
 FAKE_FLAGS =		INSTALL_ROOT=${WRKINST}
 NO_TEST =		Yes
diff --git a/converters/html2text/Makefile b/converters/html2text/Makefile
index 4eeebf2461b..7493373b3c0 100644
--- a/converters/html2text/Makefile
+++ b/converters/html2text/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2018/05/15 11:05:43 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:27:59 sthen Exp $
 
 PORTROACH=		skipv:1.3.2
 
 COMMENT=		advanced HTML-to-text converter
 
 DISTNAME=		html2text-1.3.2a
-REVISION =		4
+REVISION =		5
 CATEGORIES=		converters textproc
 
 
@@ -19,6 +19,8 @@ WANTLIB += c m ${COMPILER_LIBCXX}
 MASTER_SITES=		http://www.mbayer.de/html2text/downloads/ \
 			ftp://ftp.ibiblio.org/pub/linux/apps/www/converters/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=	simple
 CONFIGURE_ENV=		CXX="${CXX}"
 
diff --git a/converters/k2pdfopt/Makefile b/converters/k2pdfopt/Makefile
index aab6c688863..b3879464aa8 100644
--- a/converters/k2pdfopt/Makefile
+++ b/converters/k2pdfopt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2018/04/23 11:59:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2018/10/24 14:27:59 sthen Exp $
 
 BROKEN =	has locally modified copied of MuPDF files; some of these have changed API in 1.12.0 causing breakage
 
@@ -9,7 +9,7 @@ DISTNAME =	k2pdfopt_v${V}_src
 PKGNAME =	k2pdfopt-${V}
 MASTER_SITES =	http://willus.com/k2pdfopt/src/
 EXTRACT_SUFX =	.zip
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	converters
 
@@ -24,6 +24,8 @@ MODULES =	devel/cmake
 WANTLIB +=	${COMPILER_LIBCXX} c freetype jbig2dec jpeg m png z \
 		djvulibre jasper lept mupdf openjpeg tesseract
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS +=	textproc/mupdf:patch \
 			graphics/leptonica:configure \
 			graphics/tesseract/tesseract:patch
diff --git a/converters/lastools/Makefile b/converters/lastools/Makefile
index efe0975de42..ef18cc0cf8e 100644
--- a/converters/lastools/Makefile
+++ b/converters/lastools/Makefile
@@ -1,18 +1,21 @@
-# $OpenBSD: Makefile,v 1.6 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT =	tools for LiDAR processing
 DISTNAME =	lastools-0.20170108
 GH_ACCOUNT =	LAStools
 GH_PROJECT =	LAStools
 GH_TAGNAME =	f00fa125075ea984993057c5916d746cb605835c
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	converters textproc devel
 
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM =	Yes
+
 WANTLIB += c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MAKE_FLAGS =	COMPILER="${CXX}" \
 		LINKER="${CXX}"
 
diff --git a/converters/libpst/Makefile b/converters/libpst/Makefile
index 064fbb08277..02829c15efb 100644
--- a/converters/libpst/Makefile
+++ b/converters/libpst/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2018/08/13 10:54:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.55 2018/10/24 14:27:59 sthen Exp $
 
 BROKEN-hppa=		linking .libs/python-libpst.o fails
 
@@ -11,6 +11,8 @@ SHARED_LIBS +=  pst                  3.0      # 5.14
 
 PKGNAME-main=		${DISTNAME}
 PKGNAME-python=		py-${DISTNAME}
+REVISION-main=		0
+REVISION-python=	0
 
 CATEGORIES=		converters mail
 
@@ -31,6 +33,8 @@ WANTLIB-main += tiff webp xml2 z m pthread ${COMPILER_LIBCXX} lzma
 WANTLIB-python += ${cWANTLIB} iconv
 WANTLIB-python += pst boost_python
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${HOMEPAGE}/packages/ \
 			https://distfiles.nl/
 
diff --git a/converters/pflogx/Makefile b/converters/pflogx/Makefile
index 44d1ff8fdd4..374007ea443 100644
--- a/converters/pflogx/Makefile
+++ b/converters/pflogx/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=		convert pf(4) logs to XML
 
 DISTNAME=		pflogx_086
 PKGNAME=		pflogx-0.86
-REVISION =		5
+REVISION =		6
 CATEGORIES=		converters
 
 HOMEPAGE=		http://akldev.free.fr/pflogx/
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB= 		c expat m pcap ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${HOMEPAGE}/releases/ \
 			https://distfiles.nl/
 
diff --git a/converters/wv2/Makefile b/converters/wv2/Makefile
index e102a605582..e93fcde12d9 100644
--- a/converters/wv2/Makefile
+++ b/converters/wv2/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.37 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.38 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=	library functions to access Microsoft Word/Excel files
 
-REVISION =	3
+REVISION =	4
 DISTNAME=	wv2-0.4.2
 SHARED_LIBS +=	wv2                  4.0      # .1.8
 CATEGORIES=	converters
@@ -14,6 +14,8 @@ HOMEPAGE=	http://wvware.sourceforge.net/
 # LGPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 WANTLIB += glib-2.0 gsf-1 iconv m ${COMPILER_LIBCXX} z
 
 MODULES=	devel/cmake
diff --git a/databases/db/v4/Makefile b/databases/db/v4/Makefile
index c0738f11f36..94252917b46 100644
--- a/databases/db/v4/Makefile
+++ b/databases/db/v4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.72 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.73 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT-java=	Java bindings for Berkeley DB, revision ${REV}
 
@@ -12,11 +12,11 @@ PKGSPEC-tcl =   db-tcl->=4,<5|db-tcl->=4v0,<5v0
 PKGNAME-java=	db-java-${VERSION}
 PKGNAME-tcl=	db-tcl-${VERSION}
 EPOCH-main=	0
-REVISION-main = 5
+REVISION-main = 6
 EPOCH-java=	0
 EPOCH-tcl=	0
-REVISION-java =	6
-REVISION-tcl =	2
+REVISION-java =	7
+REVISION-tcl =	3
 DBLIBDIR=	lib/db4
 
 # XXX LIBdb_VERSION is used by x11/gnome/libgda
@@ -25,6 +25,8 @@ SHARED_LIBS +=	db_cxx               6.0      # .0.0
 SHARED_LIBS +=	db_java              5.0      # .0.0
 SHARED_LIBS +=	db_tcl               6.0      # .0.0
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES0=	${HOMEPAGE}db/update/${VERSION}/
 # patch 2 has converted DOS line-endings; no other change
 # patches 1,3,4 are just mirrored
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 8e40c250728..04990b20bb4 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.245 2018/07/30 17:39:33 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.246 2018/10/24 14:27:59 sthen Exp $
 
 # XXX add libphonenumber support when a cpp release is out
 
@@ -6,6 +6,7 @@ COMMENT=		unified backend for PIM programs
 
 GNOME_PROJECT=		evolution-data-server
 GNOME_VERSION=		3.28.5
+REVISION=		0
 
 CATEGORIES=		databases productivity
 
@@ -34,6 +35,8 @@ WANTLIB += m nspr4 nss3 nssutil3 p11-kit pango-1.0 pangocairo-1.0
 WANTLIB += plc4 plds4 secret-1 smime3 soup-2.4 sqlite3 ssl3 webkit2gtk-4.0
 WANTLIB += xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/cmake \
 			devel/dconf \
 			lang/python \
diff --git a/databases/kyotocabinet/Makefile b/databases/kyotocabinet/Makefile
index ed710b95f41..cacdae92526 100755
--- a/databases/kyotocabinet/Makefile
+++ b/databases/kyotocabinet/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2018/01/20 14:03:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:27:59 sthen Exp $
 
 BROKEN-hppa=	undefined reference to __sync_fetch_and_add_8
 BROKEN-powerpc=	undefined reference to __sync_fetch_and_add_8
@@ -9,7 +9,7 @@ NOT_FOR_ARCHS=		${GCC3_ARCHS}
 COMMENT=	straightforward implementation of DBM
 
 DISTNAME=	kyotocabinet-1.2.76
-REVISION=	1
+REVISION=	2
 
 SHARED_LIBS +=	kyotocabinet 0.0 # 16.0
 
@@ -24,6 +24,8 @@ WANTLIB += c m pthread ${COMPILER_LIBCXX} z
 
 MASTER_SITES=	${HOMEPAGE}pkg/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE=	Yes
 
 CONFIGURE_STYLE=gnu
diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile
index 1749ac20062..c8ce06506e5 100644
--- a/databases/libdbi-drivers/Makefile
+++ b/databases/libdbi-drivers/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.34 2018/10/24 14:27:59 sthen Exp $
 
 V =			0.9.0
 COMMENT-main =		mysql driver for libdbi
@@ -13,11 +13,11 @@ PKGNAME-sqlite =	libdbi-drivers-sqlite-${V:S/-/./}
 PKGNAME-sqlite3 =	libdbi-drivers-sqlite3-${V:S/-/./}
 PKGNAME-freetds =	libdbi-drivers-freetds-${V:S/-/./}
 CATEGORIES =		databases
-REVISION-freetds =	0
-REVISION-main =		0
-REVISION-pgsql =	0
-REVISION-sqlite =	0
-REVISION-sqlite3 =	0
+REVISION-freetds =	1
+REVISION-main =		1
+REVISION-pgsql =	1
+REVISION-sqlite =	1
+REVISION-sqlite3 =	1
 
 HOMEPAGE =		http://libdbi-drivers.sourceforge.net/
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=libdbi-drivers/}
@@ -27,6 +27,8 @@ MULTI_PACKAGES =	-main -pgsql -sqlite -sqlite3 -freetds
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM =	Yes
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE =	gnu
 
 CONFIGURE_ARGS =	--disable-docs \
diff --git a/databases/libpqxx/Makefile b/databases/libpqxx/Makefile
index 0e12e6148dd..06d0978553e 100644
--- a/databases/libpqxx/Makefile
+++ b/databases/libpqxx/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=	C++ client API for PostgreSQL
 
 DISTNAME=	libpqxx-4.0.1
-REVISION =	1
+REVISION =	2
 CATEGORIES=	databases devel
 
 SHARED_LIBS =	pqxx                 2.0      # .0.0
@@ -17,6 +17,8 @@ WANTLIB += crypto m pq ssl ${COMPILER_LIBCXX}
 
 MASTER_SITES=	http://pqxx.org/download/software/libpqxx/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	databases/postgresql
 
 MODULES=	databases/postgresql lang/python
diff --git a/databases/mariadb/Makefile b/databases/mariadb/Makefile
index fb821cec8df..d78ba13ab17 100644
--- a/databases/mariadb/Makefile
+++ b/databases/mariadb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2018/10/16 14:41:14 sthen Exp $
+# $OpenBSD: Makefile,v 1.67 2018/10/24 14:27:59 sthen Exp $
 
 # archs with atomic ops
 ONLY_FOR_ARCHS-server=	alpha aarch64 amd64 arm i386 mips64 mips64el powerpc sparc64
@@ -14,8 +14,9 @@ PKGNAME-main=	mariadb-client-${VERSION}
 PKGNAME-server=	mariadb-server-${VERSION}
 PKGNAME-tests=	mariadb-tests-${VERSION}
 EPOCH=		1
-REVISION-server=1
-REVISION-tests=	0
+REVISION-server=2
+REVISION-tests=	1
+REVISION-main=	0
 
 CATEGORIES=	databases
 MASTER_SITES=	http://mariadb.mirror.iweb.com//${DISTNAME}/source/ \
@@ -37,6 +38,8 @@ WANTLIB-main=	curses readline ${WANTLIB}
 WANTLIB-server=	mysqlclient pcre ${WANTLIB}
 WANTLIB-tests=	mysqlclient pcre pcreposix ${WANTLIB}
 
+COMPILER =	base-clang ports-gcc base-gcc
+
 LOCALSTATEDIR=	${BASELOCALSTATEDIR}/mysql
 SOCKET_DIR=	/var/run/mysql
 SUBST_VARS=	SOCKET_DIR
@@ -51,6 +54,8 @@ LIB_DEPENDS-server=	${BASE_PKGPATH}>=10.0v1,<10.1v1 \
 LIB_DEPENDS-tests=	${BASE_PKGPATH}>=10.0v1,<10.1v1 \
 			devel/pcre
 
+COMPILER=	base-clang ports-gcc base-gcc
+
 CONFIGURE_ARGS+=-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
diff --git a/databases/mysqlcc/Makefile b/databases/mysqlcc/Makefile
index 00e7dc4f25a..c74e346da96 100644
--- a/databases/mysqlcc/Makefile
+++ b/databases/mysqlcc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=		GUI client for MySQL
 
@@ -6,7 +6,7 @@ VERSION=		1.0.2
 DISTNAME=		mysqlcc-${VERSION}-src
 PKGNAME=		mysqlcc-${VERSION}
 CATEGORIES=		databases
-REVISION=		0
+REVISION=		1
 
 HOMEPAGE=		http://mysqlcc.sourceforge.net/
 
@@ -21,6 +21,8 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mysqlcc/}
 MODULES=		x11/qt3
 LIB_DEPENDS=		databases/mariadb
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MAKE_ENV=		LOCALBASE=${LOCALBASE} HACK_CFLAGS="${CFLAGS}"
 MAKE_FLAGS=   		CC=${CC} CXX=${CXX} LINK=${CXX}
 
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 042909e4011..f864c1fe83b 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.164 2018/08/25 18:22:51 jca Exp $
+# $OpenBSD: Makefile,v 1.165 2018/10/24 14:27:59 sthen Exp $
 
 DPB_PROPERTIES =	parallel
 
@@ -8,11 +8,12 @@ COMMENT-server =	open-source LDAP software (server)
 DISTNAME =		openldap-2.4.46
 PKGNAME-main =		${DISTNAME:S/-/-client-/}
 PKGNAME-server =	${DISTNAME:S/-/-server-/}
-REVISION-server =	0
+REVISION-server =	1
 
 # overwrite -main pkgname/path to strip FLAVOR, aci only affects the server
 FULLPKGNAME-main =	${DISTNAME:S/-/-client-/}${FLAVOR_EXT:S/-aci//}
 FULLPKGPATH-main =	databases/openldap,-main${FLAVOR_EXT:S/-aci//:S/-/,/g}
+REVISION-main =		0
 
 SHARED_LIBS +=	lber                 12.0     # 12.6
 SHARED_LIBS +=	lber-2.4             12.0
@@ -42,6 +43,8 @@ MASTER_SITES =	http://mirror.switch.ch/ftp/mirror/OpenLDAP/openldap-release/ \
 MASTER_SITES0 =	https://spacehopper.org/mirrors/
 PATCHFILES =	openldap-2.4.45-mdb-tests.diff:0
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 EXTRACT_SUFX =		.tgz
 
 SEPARATE_BUILD =	Yes
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index 138a4fda830..ca4ca49dc97 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.38 2018/04/16 15:07:09 tb Exp $
+# $OpenBSD: Makefile,v 1.39 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=	administration and development platform for PostgreSQL
 
 V=		1.22.1
 DISTNAME=	pgadmin3-$V
 CATEGORIES=	databases devel
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://www.pgadmin.org/
 
@@ -18,6 +18,8 @@ WANTLIB=	c m pthread ${COMPILER_LIBCXX} crypto z
 
 MASTER_SITES=	https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v$V/src/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	x11/wxWidgets>=2.8.7 \
 		databases/postgresql \
 		textproc/libxml>=2.4.8 \
diff --git a/databases/postgresql-plv8/Makefile b/databases/postgresql-plv8/Makefile
index 75b66100a9f..29a2c31ef2b 100644
--- a/databases/postgresql-plv8/Makefile
+++ b/databases/postgresql-plv8/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2017/11/30 16:19:59 jeremy Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:27:59 sthen Exp $
 
 # v8 only works on these arches currently
 ONLY_FOR_ARCHS =	amd64 i386
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS =	amd64 i386
 COMMENT =		PostgreSQL V8 javascript procedural language
 
 VERSION =		1.4.2
-REVISION =		6
+REVISION =		7
 DISTNAME =		plv8-${VERSION}
 PKGNAME =		postgresql-${DISTNAME}
 
@@ -22,6 +22,8 @@ WANTLIB =		c m ${COMPILER_LIBCXX} pthread v8
 MASTER_SITES =		http://api.pgxn.org/dist/plv8/${VERSION}/
 EXTRACT_SUFX =		.zip
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =		${RUN_DEPENDS}
 LIB_DEPENDS =		lang/libv8
 RUN_DEPENDS =		postgresql-server->=10,<11:databases/postgresql,-server
diff --git a/databases/py-odbc/Makefile b/databases/py-odbc/Makefile
index 4b8528ae6ed..7bd7294aac8 100644
--- a/databases/py-odbc/Makefile
+++ b/databases/py-odbc/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.18 2017/07/26 22:45:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT =	ODBC bindings for Python
 
 MODPY_EGG_VERSION=3.0.10
 DISTNAME =	pyodbc-${MODPY_EGG_VERSION}
 PKGNAME =	${DISTNAME:S/py/py-/}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	databases
 
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += ${MODPY_WANTLIB}
 WANTLIB += iodbc m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODPY_PI =	Yes
 
 MODPY_SETUPTOOLS = Yes
diff --git a/databases/qt3-sqlite3-plugin/Makefile b/databases/qt3-sqlite3-plugin/Makefile
index 57b2fc08a8e..be6e835cbe0 100644
--- a/databases/qt3-sqlite3-plugin/Makefile
+++ b/databases/qt3-sqlite3-plugin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2017/07/26 22:45:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=	qt3 sqlite3 plugin
 CATEGORIES=	databases devel x11
@@ -9,7 +9,7 @@ MASTER_SITES=	http://kde-apps.org/CONTENT/content-files/
 V=		0.2
 DISTNAME=	23011-qt-sqlite3-$V
 PKGNAME=	qt3-sqlite3-$V
-REVISION=	8
+REVISION=	9
 
 WRKDIST=	${WRKDIR}/qt-sqlite3-${V}
 
@@ -20,6 +20,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += m pthread sqlite3 ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		databases/sqlite3
 NO_TEST=		Yes
 
diff --git a/databases/riak/Makefile b/databases/riak/Makefile
index 8464b9b162b..375ef2638df 100644
--- a/databases/riak/Makefile
+++ b/databases/riak/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.34 2018/09/04 12:46:10 espie Exp $
+# $OpenBSD: Makefile,v 1.35 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=			distributed data store
 DISTNAME=			riak-2.2.5
 CATEGORIES=			databases
 HOMEPAGE=			http://basho.com/
-REVISION=			0
+REVISION=			1
 
 MAINTAINER=			Jonathan Matthew <jmatthew@openbsd.org>
 
@@ -114,6 +114,8 @@ snappy_AUTOMAKE_VERSION = 1.11
 
 WANTLIB = c crypto m ncurses pthread ssl ${COMPILER_LIBCXX} util pam
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODERL_BUILD_DEPENDS=devel/rebar
 BUILD_DEPENDS+=	devel/autoconf/${snappy_AUTOCONF_VERSION} \
 		devel/automake/${snappy_AUTOMAKE_VERSION} \
diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile
index 560907d12db..b89d40527a3 100644
--- a/databases/sqliteman/Makefile
+++ b/databases/sqliteman/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.28 2018/06/29 22:16:10 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT =	gui for sqlite
 CATEGORIES =	databases x11
 
 DISTNAME =	sqliteman-1.2.2
-REVISION =	5
+REVISION =	6
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=sqliteman/}
 HOMEPAGE =	http://sourceforge.net/projects/sqliteman/
@@ -17,6 +17,8 @@ WANTLIB += pthread qscintilla2_qt4 ${COMPILER_LIBCXX}
 
 MODULES =		devel/cmake
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =	x11/qt4 \
 		editors/qscintilla
 
diff --git a/databases/strigi/Makefile b/databases/strigi/Makefile
index 86dff766cfe..9b435bd0277 100644
--- a/databases/strigi/Makefile
+++ b/databases/strigi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2018/04/16 21:25:42 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT =	document indexer
 CATEGORIES =	databases devel textproc sysutils
@@ -7,7 +7,7 @@ HOMEPAGE =	https://projects.kde.org/projects/kdesupport/strigi/
 
 # hand-rolled from strigi* submodules at quickgit.kde.org
 DISTNAME =	strigi-0.7.7pl1
-REVISION =	2
+REVISION =	3
 
 MASTER_SITES =	https://spacehopper.org/mirrors/ \
 		ftp://3ps.if.ua/pub/OpenBSD/distfiles/ \
@@ -38,6 +38,8 @@ WANTLIB =  lib/qt4/QtDBus lib/qt4/QtGui
 WANTLIB += bz2 c clucene-core clucene-shared dbus-1 exiv2 fam iconv m pthread
 WANTLIB += ${COMPILER_LIBCXX} xml2 z avcodec avformat avutil swscale
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake \
 			x11/qt4
 
diff --git a/databases/xapian-bindings/Makefile b/databases/xapian-bindings/Makefile
index 8aa570232f5..4f0139602da 100755
--- a/databases/xapian-bindings/Makefile
+++ b/databases/xapian-bindings/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2018/07/18 22:01:13 jeremy Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT-main=	perl bindings for Xapian
 COMMENT-python=	python bindings for Xapian
@@ -11,8 +11,9 @@ PKGNAME-main=	xapian-bindings-perl-${V}
 PKGNAME-python=	xapian-bindings-python-${V}
 PKGNAME-ruby=	ruby${MODRUBY_BINREV}-xapian-${V}
 
-REVISION-python=	0
-REVISION-ruby=		0
+REVISION-python=	1
+REVISION-ruby=		1
+REVISION-main=	0
 
 MODULES=	lang/python \
 		lang/ruby
@@ -30,7 +31,7 @@ MASTER_SITES=	http://oligarchy.co.uk/xapian/${V}/
 EXTRACT_SUFX=	.tar.xz
 
 # -std=gnu++11
-COMPILER=       base-clang ports-gcc ports-clang
+COMPILER=		base-clang ports-gcc base-gcc
 
 LIB_DEPENDS=		databases/xapian-core
 
diff --git a/databases/xapian-core/Makefile b/databases/xapian-core/Makefile
index 195265aa9e8..c3e2ff46f11 100755
--- a/databases/xapian-core/Makefile
+++ b/databases/xapian-core/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.30 2017/12/01 14:41:22 jca Exp $
+# $OpenBSD: Makefile,v 1.31 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=	search engine library
 
 V=		1.4.5
 PORTROACH=	limitw:1,even
 DISTNAME=	xapian-core-${V}
+REVISION=	0
 
 SHARED_LIBS +=  xapian	4.0	# .28.2
 
@@ -21,7 +22,7 @@ MASTER_SITES=	http://oligarchy.co.uk/xapian/${V}/
 EXTRACT_SUFX=	.tar.xz
 
 # -std=gnu++11
-COMPILER=       base-clang ports-gcc ports-clang
+COMPILER=       base-clang ports-gcc base-gcc
 
 LIB_DEPENDS=	sysutils/e2fsprogs>=1.42.7
 
diff --git a/devel/arm-none-eabi/gcc-linaro/Makefile b/devel/arm-none-eabi/gcc-linaro/Makefile
index 3607595a721..356970e5d09 100644
--- a/devel/arm-none-eabi/gcc-linaro/Makefile
+++ b/devel/arm-none-eabi/gcc-linaro/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2018/09/23 08:32:03 jsg Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:27:59 sthen Exp $
 
 BROKEN-powerpc=	libgcc/libgcc2.c:1999:1: internal compiler error: in create_edge, at cgraph.c:850
 
@@ -6,7 +6,7 @@ COMMENT=	gcc for ${CONFIG} cross-development, Linaro version
 
 VERSION=	6.3-2017.02
 DISTNAME=	gcc-linaro-${VERSION}
-REVISION=	2
+REVISION=	3
 EXTRACT_SUFX=	.tar.xz
 PKGNAME=	${CONFIG}-gcc-linaro-${VERSION:S/-/./g}
 
@@ -27,6 +27,8 @@ SUBST_VARS+=	VERSION CONFIG GCC_VERSION
 WANTLIB=	c m ${COMPILER_LIBCXX} gmp mpfr mpc
 DIST_SUBDIR=	gcc
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MAKE_GXX=	No
 MAKE_FORTRAN=	No
 MAKE_OBJC=	No
diff --git a/devel/atf/Makefile b/devel/atf/Makefile
index 4ad2c387a91..22801418eb8 100644
--- a/devel/atf/Makefile
+++ b/devel/atf/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2017/07/26 22:45:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT =		Automated Testing Framework
 DISTNAME =		atf-0.18
-REVISION =		2
+REVISION =		3
 
 SHARED_LIBS +=		atf-c++                   0.0 # 0.0
 SHARED_LIBS +=		atf-c                     0.0 # 0.0
@@ -19,6 +19,8 @@ WANTLIB += c m ${COMPILER_LIBCXX}
 
 MASTER_SITES =		https://github.com/jmmv/atf/releases/download/${DISTNAME}/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE =	gnu
 # Don't pickup bash
 CONFIGURE_ENV =		ATF_SHELL=/bin/sh
diff --git a/devel/atlas/Makefile b/devel/atlas/Makefile
index c59230804ed..957921b4630 100644
--- a/devel/atlas/Makefile
+++ b/devel/atlas/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.28 2017/07/26 22:45:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=	C++ reference implementation of the Atlas protocol
 
 VERSION=	0.4.3.1
 DISTNAME=	Atlas-C++-${VERSION}
 PKGNAME=	${DISTNAME:S/C++-//:L}
-REVISION =	7
+REVISION =	8
 SHARED_LIBS +=	Atlas                2.0      # .1.1
 SHARED_LIBS +=	AtlasObjects         2.0      # .1.1
 SHARED_LIBS +=	AtlasObjectsEntity   2.0      # .1.1
@@ -25,6 +25,7 @@ MASTER_SITES=	ftp://ftp.ecs.soton.ac.uk/pub/worldforge/acorn/0.4/src/ \
 
 WANTLIB+=	m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
 
 SEPARATE_BUILD=	Yes
 CONFIGURE_STYLE= gnu
diff --git a/devel/avr/gcc/Makefile b/devel/avr/gcc/Makefile
index 2965dfb3150..a751909c154 100644
--- a/devel/avr/gcc/Makefile
+++ b/devel/avr/gcc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.30 2018/09/13 11:13:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.31 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=	Atmel AVR 8-bit RISC microcontrollers' XGCC #'
 
 V=		5.4.0
-REVISION=	0
+REVISION=	1
 DISTNAME =	gcc-$V
 PKGNAME=	avr-gcc-${V}
 SHARED_LIBS +=  cc1plugin                 0.0 # 0.0
@@ -11,8 +11,11 @@ SHARED_LIBS +=  cc1                       0.0 # 0.0
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
+
 WANTLIB=		c gmp mpfr ${COMPILER_LIBCXX} m mpc
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES= 	${MASTER_SITE_GCC:=releases/gcc-$(V)/}
 EXTRACT_SUFX=	.tar.bz2
 DIST_SUBDIR=	gcc
diff --git a/devel/beediff/Makefile b/devel/beediff/Makefile
index 88b7a5a6347..0052d8f0260 100644
--- a/devel/beediff/Makefile
+++ b/devel/beediff/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2017/11/21 00:12:59 naddy Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=	graphical file comparator
 
 V=		1.9
 DISTNAME=	beediff_${V}_src
 PKGNAME=	beediff-${V}
-REVISION =	7
+REVISION =	8
 CATEGORIES=	textproc x11 devel
 
 HOMEPAGE=	http://www.beesoft.pl/index.php?id=beediff
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += X11 Xext c iconv intl m pthread ${COMPILER_LIBCXX}
 WANTLIB += lib/qt4/QtGui ICE SM Xi Xinerama Xrender fontconfig freetype
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 WRKDIST=	${WRKDIR}/beediff
 
 MODULES=	devel/qmake \
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 0967338d1a5..059863f83e4 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.68 2018/05/17 09:41:24 espie Exp $
+# $OpenBSD: Makefile,v 1.69 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT-main=	garbage collection and memory leak detection for C and C++
 COMMENT-atomic=	access to hardware provided atomic memory operations
@@ -10,8 +10,8 @@ DISTNAME=	gc-${VERSION}
 
 PKGNAME-atomic=	libatomic_ops-${LIBAO_VERSION}
 PKGNAME-main=	boehm-gc-${VERSION}
-REVISION-main=	1
-REVISION-atomic=1
+REVISION-main=	2
+REVISION-atomic=2
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		libatomic_ops-${LIBAO_VERSION}${EXTRACT_SUFX}
@@ -37,6 +37,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB-main += m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MAKE_ENV=	CP="cp" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_MAN="${INSTALL_MAN}"
diff --git a/devel/bouml/Makefile b/devel/bouml/Makefile
index edb5ed4e898..860a707dec1 100644
--- a/devel/bouml/Makefile
+++ b/devel/bouml/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2018/07/15 08:36:38 espie Exp $
+# $OpenBSD: Makefile,v 1.30 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT-main=		free UML builder with extensions
 COMMENT-docs=		bouml documentation
@@ -8,8 +8,8 @@ DISTNAME=		bouml_$V
 PKGNAME=		bouml-$V
 PKGNAME-main=		bouml-$V
 PKGNAME-docs=		bouml-docs-$V
-REVISION-main=		9
-REVISION-docs=		3
+REVISION-main=		10
+REVISION-docs=		4
 
 CATEGORIES=		devel x11
 
@@ -28,6 +28,8 @@ MULTI_PACKAGES= 	-main -docs
 
 WANTLIB =		X11 Xext c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS-main=	devel/desktop-file-utils \
 			x11/gtk+3,-guic
 
diff --git a/devel/ccrtp/Makefile b/devel/ccrtp/Makefile
index f5982d0cd04..b480b807bae 100644
--- a/devel/ccrtp/Makefile
+++ b/devel/ccrtp/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2017/07/26 22:45:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=	implementation of the Real-time Transport Protocol
 
 DISTNAME=	ccrtp-1.7.1
-REVISION =	5
+REVISION =	6
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=ccrtp/}
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += crypto ssl ccgnu2>=1 m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	devel/commoncpp
 
 CONFIGURE_STYLE= gnu
diff --git a/devel/cgdb/Makefile b/devel/cgdb/Makefile
index e2d8755ee98..ae59b86c2d2 100644
--- a/devel/cgdb/Makefile
+++ b/devel/cgdb/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2018/02/10 09:59:37 landry Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=	curses GDB interface
 
 DISTNAME=	cgdb-0.7.0
+REVISION=	0
 
 CATEGORIES=	devel
 
@@ -13,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	${COMPILER_LIBCXX} c curses ereadline m util
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	https://cgdb.me/files/
 
 LIB_DEPENDS=	devel/readline>=6.1p2
diff --git a/devel/cln/Makefile b/devel/cln/Makefile
index d5c6d74c18b..33b294ffce7 100644
--- a/devel/cln/Makefile
+++ b/devel/cln/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.25 2018/04/28 10:16:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.26 2018/10/24 14:27:59 sthen Exp $
 
 NOT_FOR_ARCHS =	arm mips64 mips64el sparc64 hppa
 
 COMMENT =	library for efficient computations
 
 DISTNAME =	cln-1.3.4
-REVISION =	2
+REVISION =	3
 SHARED_LIBS +=  cln                  3.0      # .6.4
 CATEGORIES =	devel
 
@@ -21,6 +21,8 @@ EXTRACT_SUFX =		.tar.bz2
 
 WANTLIB	+=		m ${COMPILER_LIBCXX} gmp
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		devel/gmp
 
 USE_GMAKE =		Yes
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 0eea436bf56..90c2adbb350 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.171 2018/07/13 03:00:16 jsg Exp $
+# $OpenBSD: Makefile,v 1.172 2018/10/24 14:27:59 sthen Exp $
 
 DPB_PROPERTIES =parallel
 
@@ -6,7 +6,7 @@ COMMENT =	portable build system
 
 VER =		3.10.2
 EPOCH =		0
-REVISION =	0
+REVISION =	1
 DISTNAME =	cmake-${VER}
 CATEGORIES =	devel
 
@@ -22,7 +22,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += ${COMPILER_LIBCXX} archive c curl curses expat form
 WANTLIB += jsoncpp m rhash uv z
 
-COMPILER =		base-clang ports-gcc ports-clang
+COMPILER =		base-clang ports-gcc base-gcc
 
 # XXX: Ninja is broken on m88k
 .if ${MACHINE_ARCH} != "m88k"
diff --git a/devel/codeworker/Makefile b/devel/codeworker/Makefile
index 48f9843a8ab..0fe4cc36a24 100644
--- a/devel/codeworker/Makefile
+++ b/devel/codeworker/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2017/08/21 19:48:23 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT =		universal parsing tool & source code generator
 
 V =			4.5.4
 PKGNAME =		codeworker-${V}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		devel
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=codeworker/} \
 			http://codeworker.free.fr/downloads/
 DISTNAME =		CodeWorker_SRC${V:S/./_/g}
diff --git a/devel/commoncpp/Makefile b/devel/commoncpp/Makefile
index b548ec44cbe..2d292f3c60e 100644
--- a/devel/commoncpp/Makefile
+++ b/devel/commoncpp/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2017/07/26 22:45:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=	GNU project portable class framework for C++
 
 VER=		1.7.3
 DISTNAME=	commoncpp2-${VER}
 PKGNAME=	commoncpp-${VER}
-REVISION=	8
+REVISION=	9
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=commoncpp/}
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	crypto ssl z m ${COMPILER_LIBCXX} pthread
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.61
 CONFIGURE_ARGS+= --without-nat \
diff --git a/devel/cpptest/Makefile b/devel/cpptest/Makefile
index 6857c2826f7..03704be629f 100644
--- a/devel/cpptest/Makefile
+++ b/devel/cpptest/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2017/07/26 22:45:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT =		unit testing framework
 
 DISTNAME =		cpptest-1.1.2
-REVISION =		2
+REVISION =		3
 
 SHARED_LIBS +=  cpptest                   0.0 # 0.7
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=cpptest/}
 
 CONFIGURE_STYLE =	gnu
diff --git a/devel/cppunit/Makefile b/devel/cppunit/Makefile
index 6b7133449af..70f6d18b1e5 100644
--- a/devel/cppunit/Makefile
+++ b/devel/cppunit/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2017/07/26 22:45:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:27:59 sthen Exp $
 
 COMMENT=	c++ unit testing framework
 DISTNAME=	cppunit-1.12.1
 SHARED_LIBS +=	cppunit              3.0      # .1.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cppunit/}
-REVISION =	3
+REVISION =	4
 
 HOMEPAGE=	http://cppunit.sourceforge.net/
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 USE_GMAKE=		Yes
 WANTLIB=		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-doxygen
 
diff --git a/devel/cryptopp/Makefile b/devel/cryptopp/Makefile
index 4fde43cabb4..9f96c93a771 100644
--- a/devel/cryptopp/Makefile
+++ b/devel/cryptopp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2018/01/21 20:25:48 juanfra Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT = 	C++ library of cryptographic algorithms
 CATEGORIES = 	devel security
@@ -7,7 +7,7 @@ HOMEPAGE = 	http://www.cryptopp.com/
 MASTER_SITES = 	${HOMEPAGE}
 DISTNAME = 	cryptopp565
 PKGNAME = 	cryptopp-5.6.5
-REVISION =      2
+REVISION =      3
 
 EXTRACT_SUFX = 	.zip
 WRKDIST = 	${WRKDIR}
@@ -20,6 +20,8 @@ PERMIT_PACKAGE_CDROM = 		Yes
 
 WANTLIB +=	m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 SHARED_LIBS = 	cryptopp	4.0
 
 USE_GMAKE = 	Yes
diff --git a/devel/csmith/Makefile b/devel/csmith/Makefile
index e4717ce53a8..95b19e1460c 100644
--- a/devel/csmith/Makefile
+++ b/devel/csmith/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2018/04/23 19:58:48 bcallah Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=	fuzzer for C compilers
 
 DISTNAME=	csmith-2.3.0
+REVISION=	0
 
 CATEGORIES=	devel
 
@@ -15,6 +16,8 @@ SHARED_LIBS +=  csmith                    0.0 # 0.0
 
 WANTLIB+=	c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 HOMEPAGE=	https://embed.cs.utah.edu/csmith/
 MASTER_SITES=	https://embed.cs.utah.edu/csmith/
 
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index af821642f1b..b2c56f73a90 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.76 2018/06/27 21:03:39 espie Exp $
+# $OpenBSD: Makefile,v 1.77 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=	Data Display Debugger, graphical front-end for GDB, etc
 
 DISTNAME=	ddd-3.3.12
-REVISION =	12
+REVISION =	13
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=ddd/}
 
@@ -16,6 +16,8 @@ WANTLIB=	ICE SM X11 Xaw Xau Xdmcp Xext Xmu Xpm Xt c m z ${COMPILER_LIBCXX} \
 		Xft Xrender expat fontconfig freetype iconv ncurses \
 		xcb jpeg png Xm
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS=	devel/desktop-file-utils
 LIB_DEPENDS=	converters/libiconv \
 		x11/motif
diff --git a/devel/doc++/Makefile b/devel/doc++/Makefile
index 3bcbf2b5da3..a272f7b3375 100644
--- a/devel/doc++/Makefile
+++ b/devel/doc++/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.32 2018/07/01 09:02:40 espie Exp $
+# $OpenBSD: Makefile,v 1.33 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=	documentation system for C, C++, IDL and Java
 
 DISTNAME=	doc++-3.4.10
-REVISION =	11
+REVISION =	12
 CATEGORIES=	devel
 
 HOMEPAGE=	http://docpp.sourceforge.net/
@@ -14,6 +14,8 @@ WANTLIB=		c intl m ${COMPILER_LIBCXX}
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=docpp/}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS=	print/ghostscript/gnu \
 		print/texlive/base
 
diff --git a/devel/doxygen-gui/Makefile b/devel/doxygen-gui/Makefile
index 7a4bc935c58..33499037528 100644
--- a/devel/doxygen-gui/Makefile
+++ b/devel/doxygen-gui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2018/01/21 10:33:03 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:28:00 sthen Exp $
 
 # Memory hog, stuck for days on the same file (configoptions.cpp) during build.
 # XXX check with different optimizer level? see doc/install.doc
@@ -10,6 +10,7 @@ COMMENT=	GUI front-end for doxygen
 VERSION=	1.8.14
 DISTNAME=	doxygen-${VERSION}.src
 PKGNAME=	doxygen-gui-${VERSION}
+REVISION=	0
 
 CATEGORIES=	devel textproc
 
@@ -22,6 +23,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += QtGui QtXml c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://ftp.stack.nl/pub/users/dimitri/ \
 		ftp://ftp.stack.nl/pub/users/dimitri/
 
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 47f7178f867..7c94ae061a8 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2018/01/21 10:33:03 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.46 2018/10/24 14:28:00 sthen Exp $
 
 # Memory hog, stuck for days on the same file (configoptions.cpp) during build.
 # XXX check with different optimizer level? see doc/install.doc
@@ -10,6 +10,7 @@ COMMENT=	source code documentation generator tool
 VERSION=	1.8.14
 DISTNAME=	doxygen-${VERSION}.src
 PKGNAME=	doxygen-${VERSION}
+REVISION=	0
 
 CATEGORIES=	devel textproc
 
@@ -22,6 +23,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c iconv m pthread ${COMPILER_LIBCXX} xapian z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://ftp.stack.nl/pub/users/dimitri/ \
 		ftp://ftp.stack.nl/pub/users/dimitri/
 
diff --git a/devel/flatzebra/Makefile b/devel/flatzebra/Makefile
index 6ca6511cdc2..8e322a49834 100644
--- a/devel/flatzebra/Makefile
+++ b/devel/flatzebra/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2017/07/26 22:45:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=	generic game engine library
 
 VERSION =	0.1.6
 DISTNAME=	flatzebra-${VERSION}
-REVISION=	1
+REVISION=	2
 
 SHARED_LIBS +=	flatzebra-0.1 2.0	# .2.0
 
@@ -19,6 +19,8 @@ WANTLIB += FLAC SDL SDL_image SDL_mixer iconv jpeg m mikmod ogg png
 WANTLIB += smpeg sndio ${COMPILER_LIBCXX} tiff usbhid vorbis vorbisfile z
 WANTLIB += pthread webp
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://sarrazip.com/dev/
 
 LIB_DEPENDS=	converters/libiconv \
diff --git a/devel/fox/Makefile b/devel/fox/Makefile
index f85f775e664..2f1f9d585d6 100644
--- a/devel/fox/Makefile
+++ b/devel/fox/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.34 2017/10/23 17:10:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.35 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT =	C++ toolkit for GUI
 CATEGORIES =	devel
 
 DISTNAME =	fox-1.6.50
-REVISION =	1
+REVISION =	2
 
 SHARED_LIBS +=	FOX-1.6              2.1      # .0.50
 SHARED_LIBS +=	CHART-1.6            1.1      # .0.50
@@ -39,4 +39,6 @@ WANTLIB += Xrandr Xrender Xxf86vm bz2 c drm expat fontconfig freetype
 WANTLIB += glapi jpeg m png pthread ${COMPILER_LIBCXX} tiff
 WANTLIB += xcb xcb-dri2 xcb-glx z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 .include <bsd.port.mk>
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 35807261cbf..534f6b09249 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.56 2018/07/11 19:45:58 jca Exp $
+# $OpenBSD: Makefile,v 1.57 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=	GNU debugger
 CATEGORIES=	devel
 
 DISTNAME=	gdb-7.12.1
-REVISION=	3
+REVISION=	4
 
 HOMEPAGE=	https://www.gnu.org/software/gdb/
 
@@ -21,19 +21,21 @@ MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/gdb
 
 WANTLIB = c expat kvm m ncurses pthread ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 #SEPARATE_BUILD = Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--program-prefix=e \
 		--disable-nls \
 		--without-guile \
 		--without-lzma \
-	 	--enable-target=all \
+		--enable-target=all \
 		--with-python=${MODPY_BIN}
 
 USE_GMAKE=	Yes
 
 MODULES +=	lang/python
-LIB_DEPENDS += 	${MODPY_LIB_DEPENDS}
+LIB_DEPENDS +=	${MODPY_LIB_DEPENDS}
 TEST_DEPENDS +=	devel/dejagnu
 MODPY_BUILDDEP = No
 
diff --git a/devel/gengetopt/Makefile b/devel/gengetopt/Makefile
index 918d7f5bed2..e5222bf4db8 100644
--- a/devel/gengetopt/Makefile
+++ b/devel/gengetopt/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2017/07/26 22:45:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:00 sthen Exp $
 
 V =		2.22.6
 COMMENT =	command line parser for c programs
 DISTNAME =	gengetopt-${V}
 CATEGORIES =	devel
-REVISION =	2
+REVISION =	3
 
 HOMEPAGE =	http://www.gnu.org/software/gengetopt/
 
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_GNU:=gengetopt/}
 
 CONFIGURE_STYLE = gnu
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 4737fca4e99..77c0561244b 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.85 2017/07/26 22:45:17 sthen Exp $
+# $OpenBSD: Makefile,v 1.86 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=	GNU gettext runtime libraries and programs
 
 DISTNAME=	gettext-0.19.8.1
-REVISION =	1
+REVISION =	2
 SHARED_LIBS +=  intl                 6.0      # 9.5
 SHARED_LIBS +=  asprintf             1.1      # unknown
 
@@ -23,6 +23,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 LIB_DEPENDS=	converters/libiconv
 WANTLIB=	c m iconv ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 WRKSRC=		${WRKDIST}/gettext-runtime
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--disable-csharp \
diff --git a/devel/gflags/Makefile b/devel/gflags/Makefile
index 308b767efba..13f0fca3ef6 100644
--- a/devel/gflags/Makefile
+++ b/devel/gflags/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2017/08/23 14:25:53 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT =		c++ commandline flags processing library
 
 GH_ACCOUNT =		gflags
 GH_PROJECT =		gflags
 GH_TAGNAME =		v2.2.1
+REVISION =		0
 
 SHARED_LIBS +=		gflags               1.0      # .0.0
 SHARED_LIBS +=		gflags_nothreads     1.0      # .0.0
@@ -18,6 +19,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake
 
 CONFIGURE_ARGS +=	-DBUILD_SHARED_LIBS=ON \
diff --git a/devel/glog/Makefile b/devel/glog/Makefile
index 2f78a497eff..a116148139f 100644
--- a/devel/glog/Makefile
+++ b/devel/glog/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.15 2018/05/17 09:45:58 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT =		C++ application-level logging library
 
 GH_ACCOUNT =		google
 GH_PROJECT =		glog
 GH_TAGNAME =		v0.3.5
-REVISION =		0
+REVISION =		1
 
 SHARED_LIBS +=		glog 1.0 # 0.2.1
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} gflags m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake
 
 LIB_DEPENDS =		devel/gflags
diff --git a/devel/gperf/Makefile b/devel/gperf/Makefile
index 51a8c493572..ea046c3a9cb 100644
--- a/devel/gperf/Makefile
+++ b/devel/gperf/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.34 2018/01/19 23:01:41 espie Exp $
+# $OpenBSD: Makefile,v 1.35 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT =	perfect hash functions, to help write parsers
 
 DISTNAME =	gperf-3.1
 CATEGORIES =   	devel
+REVISION =	0
 
 MAINTAINER =	Marc Espie <espie@openbsd.org>
 
@@ -14,6 +15,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_GNU:=gperf/}
 
 post-extract:
diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile
index fecd8ee7738..331f9428ec7 100644
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2018/08/03 07:07:44 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=		SOAP/REST Web Services and XML-Based apps toolkit
 
 V=			2.8.53
-REVISION=		0
+REVISION=		1
 DISTNAME=		gsoap_${V}
 PKGNAME=		gsoap-${V}
 EXTRACT_SUFX=		.zip
@@ -33,6 +33,8 @@ AUTOMAKE_VERSION=	1.11
 
 WANTLIB += c crypto m pthread ssl ${LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gsoap2/gSOAP/}
 
 CONFIGURE_STYLE=	gnu
diff --git a/devel/gtest/Makefile b/devel/gtest/Makefile
index da1c373c515..36712b2fb63 100644
--- a/devel/gtest/Makefile
+++ b/devel/gtest/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2018/07/10 15:43:51 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2018/10/24 14:28:00 sthen Exp $
 
 # http://build-failures.rhaalovely.net//alpha/2017-11-19/devel/gtest.log
 BROKEN-alpha =	googletest/test/gtest_unittest.cc:2730: error: unrecognizable insn:
@@ -10,7 +10,7 @@ GH_ACCOUNT=	google
 GH_PROJECT=	googletest
 GH_TAGNAME=	release-$V
 PKGNAME =	gtest-$V
-REVISION =	2
+REVISION =	3
 
 SHARED_LIBS +=	gmock		0.0   # .0.0
 SHARED_LIBS +=	gmock_main	0.0   # .0.0
@@ -33,6 +33,8 @@ SEPARATE_BUILD =	Yes
 
 WANTLIB =		m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES +=		devel/cmake
 CONFIGURE_ARGS =	-DBUILD_SHARED_LIBS=ON \
 			-Dgtest_build_tests=ON
diff --git a/devel/guilib/Makefile b/devel/guilib/Makefile
index d5a6221bfb0..e23fdb715c3 100644
--- a/devel/guilib/Makefile
+++ b/devel/guilib/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.41 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.42 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=	SDL C++ GUI widget library
 
 DISTNAME=	GUIlib-1.2.1
 PKGNAME=	${DISTNAME:L}
-REVISION=	2
+REVISION=	3
 
 SHARED_LIBS +=	GUI                  2.0      # .0.1
 
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM=   Yes
 
 WANTLIB += SDL iconv m pthread sndio ${COMPILER_LIBCXX} usbhid
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	converters/libiconv \
 		devel/sdl
 
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index e21597db496..bf39fc201b0 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2017/11/21 00:12:59 naddy Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=	helper library for networking and security applications
 
 # update the "release=XX" in DISTFILES, not just DISTNAME
 DISTNAME=	gwenhywfar-4.13.1
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}{download.php?package=01\&release=78\&file=01}
-REVISION=	8
+REVISION=	9
 
 SHARED_LIBS +=	gwenhywfar           1.3      # 73.1
 SHARED_LIBS +=	gwengui-gtk2         0.0      # unknown
@@ -31,6 +31,8 @@ WANTLIB += xcb-shm z
 
 MASTER_SITES=	http://www.aquamaniac.de/sites/download/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		x11/qt4
 BUILD_DEPENDS=		devel/gettext-tools
 LIB_DEPENDS=		graphics/png \
diff --git a/devel/jdk/1.8/Makefile b/devel/jdk/1.8/Makefile
index 76e97c81f4b..021fb9c3671 100644
--- a/devel/jdk/1.8/Makefile
+++ b/devel/jdk/1.8/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2018/09/04 12:46:11 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2018/10/24 14:28:00 sthen Exp $
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_WXNEEDED=	Yes
@@ -12,8 +12,8 @@ PKGNAME=	jdk-${V}
 PKGNAME-main=	jdk-${V}
 PKGNAME-jre=	jre-${V}
 EPOCH=		0
-REVISION-jre=	0
-REVISION-main=	0
+REVISION-jre=	1
+REVISION-main=	1
 
 DIST_SUBDIR=	jdk
 DISTNAME=	openjdk-8u172b11-bsd-port-20180529
@@ -48,6 +48,8 @@ SUPDISTFILES+=	openjdk8-bootjdk-i386-${BOOTJDK_DATE}.tar.gz:1  \
 		openjdk8-bootjdk-amd64-${BOOTJDK_DATE}.tar.gz:1 \
 		${APACHE_ANT}:2
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 .include <bsd.port.arch.mk>
 
 .if ${FLAVOR:Mnative_bootstrap}
diff --git a/devel/jsoncpp/Makefile b/devel/jsoncpp/Makefile
index fc921c389e2..435e049bf93 100644
--- a/devel/jsoncpp/Makefile
+++ b/devel/jsoncpp/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.26 2018/02/18 20:50:25 jca Exp $
+# $OpenBSD: Makefile,v 1.27 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT =		JSON parsing C++ API
 
 GH_ACCOUNT =		open-source-parsers
 GH_PROJECT =		jsoncpp
 GH_TAGNAME =		1.8.4
-REVISION =		0
+REVISION =		1
 
 # no upstream revision
 SHARED_LIBS =		jsoncpp 4.0
@@ -21,6 +21,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/meson
 
 TEST_ENV +=	LD_PRELOAD=${WRKBUILD}/libjsoncpp.so.${LIBjsoncpp_VERSION}
diff --git a/devel/kdiff3/Makefile b/devel/kdiff3/Makefile
index 02af561684d..afc906747b5 100644
--- a/devel/kdiff3/Makefile
+++ b/devel/kdiff3/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT =	compares and merges multiple files or directories
 
 DISTNAME =	kdiff3-0.9.98
-REVISION =	1
+REVISION =	2
 CATEGORIES =	devel x11/kde
 HOMEPAGE =	http://kdiff3.sourceforge.net/
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB =	ICE QtGui SM X11 Xext Xi Xinerama Xrender
 WANTLIB +=	c fontconfig freetype m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =	x11/qt4 devel/qmake
 
 CONFIGURE_STYLE =	qmake
diff --git a/devel/kyua-cli/Makefile b/devel/kyua-cli/Makefile
index 633d2533aff..c8b1ab91b83 100644
--- a/devel/kyua-cli/Makefile
+++ b/devel/kyua-cli/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT =		testing framework
 DISTNAME =		kyua-cli-0.8
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		devel
 HOMEPAGE =		https://github.com/jmmv/kyua
@@ -16,6 +16,8 @@ WANTLIB += ${MODLUA_WANTLIB} atf-c atf-c++ c lutok m pthread sqlite3 ${COMPILER_
 
 MASTER_SITES =		https://github.com/jmmv/kyua/releases/download/${DISTNAME}/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		lang/lua
 MODLUA_SA =		Yes
 
diff --git a/devel/libaudiofile/Makefile b/devel/libaudiofile/Makefile
index bfb6b23f73a..1efbd08e25d 100644
--- a/devel/libaudiofile/Makefile
+++ b/devel/libaudiofile/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.56 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.57 2018/10/24 14:28:00 sthen Exp $
 
 # -fvisibility
 NOT_FOR_ARCHS=	${GCC3_ARCHS}
@@ -10,7 +10,7 @@ SUBST_VARS=	V
 
 DISTNAME=	audiofile-${V}
 PKGNAME=	lib${DISTNAME}
-REVISION=	3
+REVISION=	4
 
 SHARED_LIBS +=  audiofile            1.0      # 1.0
 
@@ -25,6 +25,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += FLAC c m ogg ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	audio/flac
 
 
diff --git a/devel/libbinio/Makefile b/devel/libbinio/Makefile
index feefabedacf..82485706a91 100644
--- a/devel/libbinio/Makefile
+++ b/devel/libbinio/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT =	binary I/O stream class library
 
 DISTNAME =	libbinio-1.4
-REVISION =	1
+REVISION =	2
 SHARED_LIBS +=	binio	0.0	# 1.0
 CATEGORIES =	devel
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB +=	m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=libbinio/}
 
 CONFIGURE_STYLE = gnu
diff --git a/devel/libconfig/Makefile b/devel/libconfig/Makefile
index 4f934e684d5..51d810880ef 100644
--- a/devel/libconfig/Makefile
+++ b/devel/libconfig/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2018/05/17 09:55:16 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=		library for manipulating structured configuration files
 
 DISTNAME=		libconfig-1.7.2
-REVISION=		0
+REVISION=		1
 
 SHARED_LIBS +=  config               11.0     # 11.2
 SHARED_LIBS +=  config++             11.0     # 11.2
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		https://hyperrealm.github.io/libconfig/dist/
 
 CONFIGURE_STYLE=	gnu
diff --git a/devel/libmemcached/Makefile b/devel/libmemcached/Makefile
index e479c668358..80e9b25b9bb 100644
--- a/devel/libmemcached/Makefile
+++ b/devel/libmemcached/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=		C C++ API for memcached
 
 VERSION=		1.0.18
-REVISION=		2
+REVISION=		3
 DISTNAME=		libmemcached-${VERSION}
 CATEGORIES=		devel misc
 
@@ -21,6 +21,8 @@ PERMIT_PACKAGE_CDROM=   Yes
 
 WANTLIB += c ${COMPILER_LIBCXX} m pthread sasl2
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=	sysutils/e2fsprogs # detects libuuid in autoconf; only used when building tests
 LIB_DEPENDS= 	security/cyrus-sasl2
 TEST_DEPENDS=	misc/memcached
diff --git a/devel/libofx/Makefile b/devel/libofx/Makefile
index bc133570311..c8e44544eb6 100644
--- a/devel/libofx/Makefile
+++ b/devel/libofx/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2018/05/14 16:35:30 landry Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=	opensource implementation of the OFX specification
 
 DISTNAME=	libofx-0.9.13
 CATEGORIES=	devel
+REVISION=	0
 
 HOMEPAGE=	http://libofx.sourceforge.net/
 
@@ -18,6 +19,8 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libofx/}
 
 WANTLIB=	c iconv intl m pthread ${COMPILER_LIBCXX} osp
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	textproc/opensp
 BUILD_DEPENDS =	devel/help2man
 
diff --git a/devel/libplist/Makefile b/devel/libplist/Makefile
index 860cc41fcad..d92b684791f 100644
--- a/devel/libplist/Makefile
+++ b/devel/libplist/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT-main =		library to handle Apple Property List format
 COMMENT-python =	python bindings for libplist
@@ -8,8 +8,8 @@ SUBST_VARS +=		VERSION
 DISTNAME =		libplist-${VERSION}
 PKGNAME-main =		${DISTNAME}
 PKGNAME-python =	py-plist-${VERSION}
-REVISION-main =		0
-REVISION-python =	0
+REVISION-main =		1
+REVISION-python =	1
 
 SHARED_LIBS +=  plist                2.0      # 3.0
 SHARED_LIBS +=  plist++              2.0      # 3.0
@@ -39,6 +39,8 @@ WANTLIB +=		iconv lzma m pthread xml2 z
 WANTLIB-main += 	${WANTLIB} c ${COMPILER_LIBCXX}
 WANTLIB-python += 	${WANTLIB} plist util python${MODPY_VERSION}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ENV =		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile
index efae1143cc6..e72e7b3dbc3 100644
--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=		logging API for C++
 
 DISTNAME =		log4cplus-1.2.0
 EXTRACT_SUFX=		.tar.bz2
-REVISION =		0
+REVISION =		1
 
 SHARED_LIBS +=  log4cplus             2.0 # 0.0
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=log4cplus/}
 
 MODULES=		devel/cmake
diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile
index 91156486ad1..537b563e945 100644
--- a/devel/log4cpp/Makefile
+++ b/devel/log4cpp/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=	library of C++ classes for flexible logging
 
 DISTNAME=	log4cpp-1.1.3
 WRKDIST=	${WRKDIR}/log4cpp
-REVISION=	0
+REVISION=	1
 
 SHARED_LIBS +=	log4cpp              0.0      # 5.6
 
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=log4cpp/}
 
 CONFIGURE_STYLE= gnu
diff --git a/devel/lutok/Makefile b/devel/lutok/Makefile
index 5257900d8c1..4f5724e9ea0 100644
--- a/devel/lutok/Makefile
+++ b/devel/lutok/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2018/06/04 01:47:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT =		lightweight C++ API for Lua
 DISTNAME =		lutok-0.4
-REVISION =		1
+REVISION =		2
 
 SHARED_LIBS +=		lutok                     0.0 # 2.0
 CATEGORIES =		devel
@@ -17,6 +17,8 @@ WANTLIB += atf-c atf-c++ c ${MODLUA_WANTLIB} m ${COMPILER_LIBCXX}
 
 MASTER_SITES =		https://github.com/jmmv/lutok/releases/download/${DISTNAME}/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		lang/lua
 MODLUA_SA =		Yes
 
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 95f90c32837..dab5c2d5e93 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.15 2017/11/21 00:13:00 naddy Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=	distributed version control system
 
 VERSION=	1.1
 DISTNAME=	monotone-${VERSION}
 CATEGORIES=	devel
-REVISION=	2
+REVISION=	3
 
 HOMEPAGE=	http://monotone.ca/
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += botan-1.10 c iconv idn intl m pcre pthread sqlite3 z
 WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${HOMEPAGE}/downloads/${VERSION}/
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/devel/mygui/Makefile b/devel/mygui/Makefile
index 8941f1b37c5..5d5ad72173d 100644
--- a/devel/mygui/Makefile
+++ b/devel/mygui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2018/09/15 23:12:23 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT =		library for creating GUIs for games and 3D applications
 
@@ -7,7 +7,7 @@ GH_ACCOUNT = 		MyGUI
 GH_PROJECT = 		mygui
 GH_TAGNAME = 		MyGUI${V}
 DISTNAME = 		mygui-${V}
-REVISION =              1
+REVISION =              2
 
 SHARED_LIBS +=		MyGUIEngine 0.0
 SHARED_LIBS +=		MyGUI.OgrePlatform 0.0
@@ -24,6 +24,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += OgreMain boost_atomic-mt boost_chrono-mt boost_date_time-mt
 WANTLIB += boost_system-mt boost_thread-mt freetype m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake
 BUILD_DEPENDS =		devel/ois
 LIB_DEPENDS =		x11/ogre,-main
diff --git a/devel/mysql++/Makefile b/devel/mysql++/Makefile
index 7329e510277..d63cbca4f31 100644
--- a/devel/mysql++/Makefile
+++ b/devel/mysql++/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.47 2018/04/11 18:47:26 jasper Exp $
+# $OpenBSD: Makefile,v 1.48 2018/10/24 14:28:00 sthen Exp $
 
 ONLY_FOR_ARCHS=		${GCC4_ARCHS} ${CLANG_ARCHS}
 
 COMMENT =		C++ API for MySQL
 
 DISTNAME =		mysql++-3.2.3
+REVISION =		0
 
 SHARED_LIBS += mysqlpp	5.0	# 3
 
@@ -17,6 +18,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += m mysqlclient ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		https://tangentsoft.com/mysqlpp/releases/
 
 LIB_DEPENDS =		databases/mariadb
diff --git a/devel/ninja/Makefile b/devel/ninja/Makefile
index 918f269d19f..20fab7791e2 100644
--- a/devel/ninja/Makefile
+++ b/devel/ninja/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2017/09/20 07:30:19 giovanni Exp $
+# $OpenBSD: Makefile,v 1.26 2018/10/24 14:28:00 sthen Exp $
 
 # as error: ``operation combines symbols in different segments''
 # (known toolchain problem) - if fixing, re-enable in devel/cmake/Makefile
@@ -10,6 +10,7 @@ COMMENT =		small build system with a focus on speed
 GH_ACCOUNT =		ninja-build
 GH_PROJECT =		ninja
 GH_TAGNAME =		v1.8.2
+REVISION =		0
 
 CATEGORIES =		devel
 HOMEPAGE =		https://ninja-build.org/
@@ -21,6 +22,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 # c>=68.1 needed for ppoll
 WANTLIB =		c>=68.1 m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		lang/python
 
 MODPY_RUNDEP =		No
diff --git a/devel/ode/Makefile b/devel/ode/Makefile
index 6eac686e2c3..681d0537906 100644
--- a/devel/ode/Makefile
+++ b/devel/ode/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2018/08/03 07:07:44 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT =	high performance library for simulating rigid body dynamics
 SHARED_LIBS += 	ode	3.0	# 6.0
 DISTNAME = 	ode-0.14
 CATEGORIES =	devel
-REVISION =      0
+REVISION =      1
 
 HOMEPAGE =	http://www.ode.org/
 
@@ -20,6 +20,8 @@ WANTLIB += GL GLU X11 X11-xcb Xdamage Xext Xfixes Xxf86vm
 WANTLIB += c drm expat glapi m pthread ${COMPILER_LIBCXX} xcb xcb-dri2
 WANTLIB += xcb-glx
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS = 	${MODGNU_AUTOCONF_DEPENDS} \
 			${MODGNU_AUTOMAKE_DEPENDS} \
 			devel/libtool
diff --git a/devel/ois/Makefile b/devel/ois/Makefile
index 40dbd0ead3d..43955c1d6e6 100644
--- a/devel/ois/Makefile
+++ b/devel/ois/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2018/08/03 07:07:44 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT =		object-oriented input system
 
 V =			1.3
 DISTNAME =		ois-v${V:S/./-/g}
 PKGNAME =		ois-${V}
-REVISION =		4
+REVISION =		5
 
 SHARED_LIBS =		OIS	0.0
 
@@ -20,6 +20,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		X11 m ${COMPILER_LIBCXX} xcb
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=wgois/}
 EXTRACT_SUFX =		.zip
 
diff --git a/devel/openmpi/Makefile b/devel/openmpi/Makefile
index 44bfbfacc68..64dae9c5b56 100644
--- a/devel/openmpi/Makefile
+++ b/devel/openmpi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2018/01/20 14:03:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:00 sthen Exp $
 
 BROKEN-hppa =		error: Could not determine global symbol label prefix
 BROKEN-powerpc =	checking if Fortran 77 compiler works... no
@@ -7,7 +7,7 @@ COMMENT =		open source MPI-2 implementation
 
 V=			1.4.1
 DISTNAME =		openmpi-$V
-REVISION =		6
+REVISION =		7
 
 SHARED_LIBS =		mca_common_sm 1.0 \
 			mpi 0.1 \
@@ -29,6 +29,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB	+=		c m pthread ${COMPILER_LIBCXX} util z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${HOMEPAGE}/software/ompi/v${V:C/^([0-9]+\.[0-9]+).*/\1/}/downloads/
 
 # XXX: uses a locally modified libtool.
diff --git a/devel/pasmo/Makefile b/devel/pasmo/Makefile
index 7f460b2db89..52a3574b6f1 100644
--- a/devel/pasmo/Makefile
+++ b/devel/pasmo/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2018/09/15 13:16:01 edd Exp $
+# $OpenBSD: Makefile,v 1.2 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT =	Z80 cross assembler
 DISTNAME =	pasmo-0.5.3
+REVISION =	0
 
 CATEGORIES =	devel
 HOMEPAGE =	http://pasmo.speccy.org/
@@ -12,6 +13,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += c m ${LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://pasmo.speccy.org/bin/
 EXTRACT_SUFX =		.tgz
 
diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile
index 71ab760e9a6..a0075e9a37f 100644
--- a/devel/pcre++/Makefile
+++ b/devel/pcre++/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.21 2017/12/07 13:12:44 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=		wrapper class around the pcre library
 
 DISTNAME=		pcre++-0.9.5
 PKGNAME=		${DISTNAME}
-REVISION =		7
+REVISION =		8
 SHARED_LIBS=		pcre++ 1.0
 FIX_EXTRACT_PERMISSIONS=Yes
 
@@ -20,6 +20,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 LIB_DEPENDS =		devel/pcre
 WANTLIB =		pcre m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=          CPPFLAGS="-I${LOCALBASE}/include" \
                         LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 2018b0f6af0..1914284086f 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.68 2017/10/22 08:21:35 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.69 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=	perl-compatible regular expression library
 
 DISTNAME=	pcre-8.41
+REVISION=	0
 
 SHARED_LIBS +=  pcre                 3.0      # 0.1
 SHARED_LIBS +=  pcre16               0.0      # 0.0
@@ -24,6 +25,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c curses m readline ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--enable-pcre8 \
 			--enable-pcre16 \
diff --git a/devel/poedit/Makefile b/devel/poedit/Makefile
index 5df869ea019..a569a5d498f 100644
--- a/devel/poedit/Makefile
+++ b/devel/poedit/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.27 2018/06/29 22:16:11 espie Exp $
+# $OpenBSD: Makefile,v 1.28 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=	cross-platform gettext catalogs (PO-files) editor
 
 DISTNAME=	poedit-1.3.7
-REVISION=	11
+REVISION=	12
 CATEGORIES=	devel
 
 HOMEPAGE=	http://www.poedit.net/
@@ -17,6 +17,9 @@ PERMIT_PACKAGE_CDROM=   Yes
 
 WANTLIB=	c m pthread ${COMPILER_LIBCXX} wx_base_xml wx_gtk2_html wx_gtk2_adv \
 		wx_gtk2_xrc wx_base wx_gtk2_core
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS=	devel/desktop-file-utils \
 		x11/gtk+3,-guic
 LIB_DEPENDS=	x11/wxWidgets>=2.6.3
diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile
index 042416bf72a..1cc03f4ec70 100644
--- a/devel/ptlib/Makefile
+++ b/devel/ptlib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2018/04/13 19:50:50 naddy Exp $
+# $OpenBSD: Makefile,v 1.43 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT=	portable tools library
 
@@ -6,7 +6,7 @@ V=		2.12.9
 DISTNAME=	ptlib-${V}
 EXTRACT_SUFX=	.tar.bz2
 SUBST_VARS=	V
-REVISION=	12
+REVISION=	13
 
 SHARED_LIBS=	pt	7.0
 
@@ -22,6 +22,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += SDL c crypto expat lber ldap ldap_r m pthread sasl2
 WANTLIB += sndio ssl ${COMPILER_LIBCXX} v4l2
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opalvoip/}
 
 BUILD_DEPENDS=	devel/bison
diff --git a/devel/py-llvmlite/Makefile b/devel/py-llvmlite/Makefile
index 12cee7edcfa..5f1a442a326 100644
--- a/devel/py-llvmlite/Makefile
+++ b/devel/py-llvmlite/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2018/06/25 05:58:54 rpointel Exp $
+# $OpenBSD: Makefile,v 1.2 2018/10/24 14:28:00 sthen Exp $
 
 COMMENT =	lightweight LLVM-Python binding for writing JIT compilers
 
 MODPY_EGG_VERSION =	0.23.2
 
 PKGNAME =	py-${DISTNAME}
+REVISION =	0
 
 GH_ACCOUNT =	numba
 GH_PROJECT =	llvmlite
@@ -19,6 +20,10 @@ HOMEPAGE =	http://llvmlite.pydata.org/
 # BSD
 PERMIT_PACKAGE_CDROM =	Yes
 
+WANTLIB += ${COMPILER_LIBCXX} m
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =	lang/python
 
 FLAVORS =	python3
@@ -37,6 +42,4 @@ BUILD_DEPENDS += devel/py-enum34
 RUN_DEPENDS +=	devel/py-enum34
 .endif
 
-WANTLIB += ${COMPILER_LIBCXX} m
-
 .include <bsd.port.mk>
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index afa66f3a6e5..3ef7e4c7c4e 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2017/11/13 19:13:47 landry Exp $
+# $OpenBSD: Makefile,v 1.41 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=	automatically generate Python bindings for C and C++ libs
 
@@ -7,7 +7,7 @@ COMMENT=	automatically generate Python bindings for C and C++ libs
 
 DISTNAME=	sip-4.19.3
 PKGNAME=	py-${DISTNAME}
-REVISION =	2
+REVISION =	3
 CATEGORIES=	devel
 
 HOMEPAGE=	http://www.riverbankcomputing.co.uk/software/sip/intro
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	m c ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyqt/}
 
 MODULES=	lang/python
diff --git a/devel/pycdc/Makefile b/devel/pycdc/Makefile
index 1848f48ebb5..e29e3fabba1 100644
--- a/devel/pycdc/Makefile
+++ b/devel/pycdc/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2018/06/12 13:01:02 rpointel Exp $
+# $OpenBSD: Makefile,v 1.2 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =	python bytecode disassembler and decompiler
 
 DISTNAME =	pycdc-0.0.20180428
+REVISION =	0
 
 GH_ACCOUNT =	zrax
 GH_PROJECT =	pycdc
@@ -22,6 +23,8 @@ MODPY_VERSION =	${MODPY_DEFAULT_VERSION_3}
 
 WANTLIB += ${COMPILER_LIBCXX} c m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 pre-test:
 	sed -i "s|#!/bin/bash|#!\${LOCALBASE}/bin/bash|" ${WRKSRC}/pycdc_test.sh
 
diff --git a/devel/pysvn/Makefile b/devel/pysvn/Makefile
index bad4279cf73..4af3f01def0 100644
--- a/devel/pysvn/Makefile
+++ b/devel/pysvn/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =		python interface to subversion
 
 MODPY_EGG_VERSION =	1.9.2
-REVISION =		2
+REVISION =		3
 DISTNAME = 		pysvn-${MODPY_EGG_VERSION}
 PKGNAME = 		py-pysvn-${MODPY_EGG_VERSION}
 CATEGORIES =		devel
@@ -21,6 +21,8 @@ MODULES = 	lang/python
 LIB_DEPENDS = 	devel/subversion,-main
 WANTLIB = 	expat m ${COMPILER_LIBCXX} svn_client-1 svn_diff-1 svn_repos-1
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE = 	Yes
 _PYSVN_PYVERSION = ${MODPY_VERSION:S/./_/}
 SUBST_VARS += 	_PYSVN_PYVERSION
diff --git a/devel/qgit/Makefile b/devel/qgit/Makefile
index 21a5810780f..8a19c3abf17 100644
--- a/devel/qgit/Makefile
+++ b/devel/qgit/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =	qt git repository viewer
 
 # XXX also change MASTER_SITES when updating
 DISTNAME =	qgit-2.5
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	devel x11
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += ICE QtGui SM X11 Xext Xi Xinerama Xrender c fontconfig
 WANTLIB += freetype m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	http://libre.tibirna.org/attachments/download/9/
 
 MODULES =	devel/qmake x11/qt4
diff --git a/devel/qjson/Makefile b/devel/qjson/Makefile
index 41cb12040c5..e23d05ad93f 100644
--- a/devel/qjson/Makefile
+++ b/devel/qjson/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:28:01 sthen Exp $
 
 CATEGORIES =	devel
 
@@ -7,7 +7,7 @@ COMMENT=	Qt-based library that maps JSON data to QVariant objects
 GH_ACCOUNT =	flavio
 GH_PROJECT =	qjson
 GH_TAGNAME =	0.9.0
-REVISION =	1
+REVISION =	2
 
 HOMEPAGE =	http://qjson.sourceforge.net/
 
@@ -18,6 +18,8 @@ MODULES =	devel/cmake \
 
 WANTLIB += QtGui m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # LGPLv2
 PERMIT_PACKAGE_CDROM =		Yes
 
diff --git a/devel/ragel/Makefile b/devel/ragel/Makefile
index b4ecebff036..e524037c9a6 100644
--- a/devel/ragel/Makefile
+++ b/devel/ragel/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =		state machine compiler
 
 DISTNAME =		ragel-6.9
-REVISION =		2
+REVISION =		3
 CATEGORIES =		devel
 
 HOMEPAGE =		http://www.colm.net/open-source/ragel/
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://www.colm.net/files/ragel/
 
 MODULES =		lang/ruby
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index 6a4f3bbd8d1..c13ec3849a3 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2017/11/21 00:13:00 naddy Exp $
+# $OpenBSD: Makefile,v 1.33 2018/10/24 14:28:01 sthen Exp $
 
 # XXX doesn't build if already installed
 COMMENT=	graphical subversion client
@@ -6,7 +6,7 @@ COMMENT=	graphical subversion client
 VERSION=	0.12.1
 DISTNAME=	rapidsvn-${VERSION}
 CATEGORIES=	devel
-REVISION=	10
+REVISION=	11
 
 HOMEPAGE=	http://www.rapidsvn.org/
 
@@ -35,6 +35,8 @@ WANTLIB += wx_gtk2_core wx_gtk2_dbgrid wx_gtk2_html wx_gtk2_qa
 WANTLIB += wx_gtk2_richtext wx_gtk2_xrc xcb xcb-render xcb-shm
 WANTLIB += z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE=	Yes
 
 BUILD_DEPENDS=	devel/gettext-tools
diff --git a/devel/re2c/Makefile b/devel/re2c/Makefile
index 7012e2ef2c8..ac43baa5ff1 100644
--- a/devel/re2c/Makefile
+++ b/devel/re2c/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2018/10/16 14:12:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=		C-based regular expression scanner generator
 
@@ -6,12 +6,15 @@ V=			1.1.1
 DISTNAME=		re2c-$V
 CATEGORIES=		devel
 HOMEPAGE=		http://re2c.org/
+REVISION=		0
 
 # public domain
 PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		https://github.com/skvadrik/re2c/releases/download/$V/
 
 TEST_DEPENDS=		shells/bash
diff --git a/devel/riscv-elf/gcc/Makefile b/devel/riscv-elf/gcc/Makefile
index 2f10572fa04..eee652ae477 100644
--- a/devel/riscv-elf/gcc/Makefile
+++ b/devel/riscv-elf/gcc/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2018/06/08 14:24:31 kevlo Exp $
+# $OpenBSD: Makefile,v 1.2 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=	gcc for riscv-elf cross-development
 
 VERSION=	8.1.0
 DISTNAME=	gcc-${VERSION}
 PKGNAME=	riscv-elf-gcc-${VERSION}
+REVISION=	0
 
 SHARED_LIBS=	cc1		0.0 \
 		cc1plugin	0.0 \
@@ -15,6 +16,8 @@ SUBST_VARS+=	VERSION
 WANTLIB=	c m ${COMPILER_LIBCXX} gmp mpfr mpc pthread
 DIST_SUBDIR=	gcc
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MAKE_GXX=	No
 MAKE_FORTRAN=	No
 MAKE_OBJC=	No
diff --git a/devel/rlog/Makefile b/devel/rlog/Makefile
index ea881d1695e..0e755dbaf09 100644
--- a/devel/rlog/Makefile
+++ b/devel/rlog/Makefile
@@ -1,16 +1,19 @@
-# $OpenBSD: Makefile,v 1.7 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =		C++ logging library
 DISTNAME =		rlog-1.4
 SHARED_LIBS =		rlog	0.0	# 5.0
 CATEGORIES =		devel
 HOMEPAGE =		http://www.arg0.net/rlog
-REVISION =		1
+REVISION =		2
 
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		m pthread ${COMPILER_LIBCXX}
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=rlog/}
 CONFIGURE_STYLE =	gnu
 
diff --git a/devel/ruby-therubyracer/Makefile b/devel/ruby-therubyracer/Makefile
index e048d388850..2d8b22b5fbb 100644
--- a/devel/ruby-therubyracer/Makefile
+++ b/devel/ruby-therubyracer/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2018/06/13 22:26:52 jeremy Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =	embeds the V8 javascript interpreter into ruby
 
 DISTNAME =	therubyracer-0.12.3
-REVISION =	0
+REVISION =	1
 CATEGORIES =	devel
 
 HOMEPAGE=	https://github.com/cowboyd/therubyracer
@@ -15,6 +15,8 @@ WANTLIB =	pthread ${COMPILER_LIBCXX} v8
 MODULES =	lang/ruby
 CONFIGURE_STYLE = ruby gem ext
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =	${RUN_DEPENDS}
 RUN_DEPENDS =	devel/ruby-libv8,${MODRUBY_FLAVOR}>=3.16.14.15,<3.16.15 \
 		devel/ruby-ref,${MODRUBY_FLAVOR}
diff --git a/devel/sdlmm/Makefile b/devel/sdlmm/Makefile
index f2ca6145107..f60d3183e27 100644
--- a/devel/sdlmm/Makefile
+++ b/devel/sdlmm/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.34 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.35 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=	C++ wrapper for the Simple DirectMedia Layer
 
 VERSION=	0.1.8
 DISTNAME=	SDLmm-${VERSION}
 PKGNAME=	sdlmm-${VERSION}
-REVISION=	14
+REVISION=	15
 CATEGORIES=	devel
 
 SHARED_LIBS +=	SDLmm                9.0      # .8.0
@@ -19,6 +19,8 @@ WANTLIB +=	SDL iconv m pthread sndio ${COMPILER_LIBCXX} usbhid
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sdlmm/}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	converters/libiconv \
 		devel/sdl
 
diff --git a/devel/smpeg/Makefile b/devel/smpeg/Makefile
index 5d0ba0e9c25..4c16b1abe74 100644
--- a/devel/smpeg/Makefile
+++ b/devel/smpeg/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.49 2017/07/26 22:45:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.50 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=	MPEG video player library with sound support
 
 DISTNAME=	smpeg-0.4.4
-REVISION=	15
+REVISION=	16
 CATEGORIES=	devel graphics
 MASTER_SITES=	https://distfiles.nl/
 
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM=   Yes
 
 WANTLIB=	SDL c iconv m pthread sndio ${COMPILER_LIBCXX} usbhid
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	converters/libiconv \
 		devel/sdl
 
diff --git a/devel/smpeg2/Makefile b/devel/smpeg2/Makefile
index 9216ab50c49..aaf11804e5d 100644
--- a/devel/smpeg2/Makefile
+++ b/devel/smpeg2/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.6 2017/07/26 22:45:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:01 sthen Exp $
 
-BROKEN-hppa=	video/mmxflags_asm.S:54: Error: unknown pseudo-op: `.note.gnu'
+BROKEN-hppa=	video/mmxflags_asm.S:54: Error: unknown pseudo-op: .note.gnu
 COMMENT=	MPEG video player library with sound support
 
 DISTNAME=	smpeg2-2.0.0
 CATEGORIES=	devel graphics
 MASTER_SITES=	http://www.libsdl.org/projects/smpeg/release/
-REVISION=	0
+REVISION=	1
 
 SHARED_LIBS=	smpeg2	2.0
 
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=   Yes
 
 WANTLIB=	SDL2 c m pthread sndio ${COMPILER_LIBCXX} usbhid
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	devel/sdl2
 
 SEPARATE_BUILD=	Yes
diff --git a/devel/srecord/Makefile b/devel/srecord/Makefile
index ad4df05950e..d6e54bda6d3 100644
--- a/devel/srecord/Makefile
+++ b/devel/srecord/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2017/11/21 00:13:00 naddy Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=		collection of tools for manipulating EPROM load files
 
 DISTNAME=		srecord-1.64
-REVISION =		2
+REVISION =		3
 CATEGORIES=		devel
 
 SHARED_LIBS +=  srecord              0.0      # 0.0
@@ -17,6 +17,8 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=srecord/}
 
 WANTLIB += c gcrypt gpg-error iconv intl m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=		devel/boost \
 			print/ghostscript/gnu
 LIB_DEPENDS=		security/libgcrypt
diff --git a/devel/swig/Makefile b/devel/swig/Makefile
index 4c012d26fdc..22e018c4690 100644
--- a/devel/swig/Makefile
+++ b/devel/swig/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.68 2017/11/01 16:41:21 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.69 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =	simplified wrapper and interface generator
 
@@ -7,6 +7,7 @@ VERSION =	3.0.12
 
 DISTNAME =	swig-${VERSION}
 CATEGORIES =	devel
+REVISION =	0
 
 HOMEPAGE =	http://www.swig.org/
 
@@ -15,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =	c m pcre ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=swig/}
 
 MODULES =	lang/python \
diff --git a/devel/tbb/Makefile b/devel/tbb/Makefile
index 78ed5566385..6869f904517 100644
--- a/devel/tbb/Makefile
+++ b/devel/tbb/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2018/07/05 09:14:55 bentley Exp $
+# $OpenBSD: Makefile,v 1.2 2018/10/24 14:28:01 sthen Exp $
 
 ONLY_FOR_ARCHS =	${CLANG_ARCHS}
 
 COMMENT =		threading building blocks
 
 PKGNAME =		tbb-${GH_TAGNAME:S/_U/./}
+REVISION =		0
 
 GH_ACCOUNT =		01org
 GH_PROJECT =		tbb
@@ -22,6 +23,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MAKE_FLAGS =		CONLY="${CC}" \
 			CPLUS="${CXX}" \
 			CC="${CC}" \
diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile
index 0a36b4cbb5d..b004e291f6f 100644
--- a/devel/tclcl/Makefile
+++ b/devel/tclcl/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.33 2017/07/26 22:45:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.34 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=	Tcl/C++ interface used by ns and nam
 
 V=		1.20
 DISTNAME=	tclcl-src-$V
 PKGNAME=	tclcl-$V
-REVISION =	2
+REVISION =	3
 CATEGORIES=	devel
 MAINTAINER =	Stuart Cassoff <stwo@users.sourceforge.net>
 
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=   Yes
 MODULES +=	x11/tk
 WANTLIB=		c m ${COMPILER_LIBCXX} otcl>=1
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/}
 WRKDIST=	${WRKDIR}/tclcl-$V
 
diff --git a/devel/uuid/Makefile b/devel/uuid/Makefile
index 215e1ffe24a..82d5a45676f 100644
--- a/devel/uuid/Makefile
+++ b/devel/uuid/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.56 2017/09/23 10:51:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.57 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT-main=	ISO-C API and CLI for generating UUIDs
 COMMENT-perl=	UUID modules for Perl
@@ -12,8 +12,8 @@ CATEGORIES=		devel
 SHARED_LIBS +=	ossp-uuid            0.0      # 16.22
 SHARED_LIBS +=	ossp-uuid++          0.0      # 16.22
 
-REVISION-main =		5
-REVISION-perl=		7
+REVISION-main =		6
+REVISION-perl=		8
 
 # Note there is a different libuuid in sysutils/e2fsprogs,-uuid.
 # If you are porting something which needs libuuid, you may need
@@ -32,6 +32,8 @@ MULTI_PACKAGES=		-main -perl
 
 WANTLIB-main=		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CATEGORIES-perl=	devel perl5
 WANTLIB-perl=		c perl ossp-uuid
 LIB_DEPENDS-perl=	${BASE_PKGPATH}
diff --git a/devel/xtensa-elf/gcc/Makefile b/devel/xtensa-elf/gcc/Makefile
index 562d928df32..eadb279cace 100644
--- a/devel/xtensa-elf/gcc/Makefile
+++ b/devel/xtensa-elf/gcc/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/11/02 18:30:58 bentley Exp $
+# $OpenBSD: Makefile,v 1.2 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=	gcc for xtensa-elf cross-development
 
 VERSION=	6.3.0
 DISTNAME=	gcc-${VERSION}
 PKGNAME=	${CONFIG}-gcc-${VERSION}
+REVISION=	0
 
 SUBST_VARS+=	VERSION
 
@@ -13,6 +14,8 @@ DIST_SUBDIR=	gcc
 
 MASTER_SITES= 	${MASTER_SITE_GCC:=releases/gcc-$(VERSION)/}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS+=	devel/bison \
 		devel/xtensa-elf/binutils
 
diff --git a/devel/yaml-cpp/Makefile b/devel/yaml-cpp/Makefile
index 5e02f9e6cac..cf76d38f7fc 100644
--- a/devel/yaml-cpp/Makefile
+++ b/devel/yaml-cpp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2017/07/26 22:45:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =		YAML parser and emitter in C++
 
@@ -7,7 +7,7 @@ GH_ACCOUNT=		jbeder
 GH_PROJECT=		yaml-cpp
 GH_TAGNAME=		release-$V
 DISTNAME =		yaml-cpp-$V
-REVISION =		4
+REVISION =		5
 
 SHARED_LIBS =		yaml-cpp	2.0 # 0.5
 
@@ -20,6 +20,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =		devel/boost
 RUN_DEPENDS =		devel/boost
 
diff --git a/editors/fte/Makefile b/editors/fte/Makefile
index 97482199031..8d2c6dd0958 100644
--- a/editors/fte/Makefile
+++ b/editors/fte/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=	powerful and intuitive editor for programmers
 
 DISTNAME=	fte-20090118
-REVISION =	1
+REVISION =	2
 CATEGORIES=	editors devel
 
 HOMEPAGE=	http://fte.sourceforge.net/
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB+=	X11 Xau Xdmcp Xpm c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	ftp://ftp.mrsserver.net/pub/distfiles/
 
 NO_TEST=	Yes
diff --git a/editors/ht/Makefile b/editors/ht/Makefile
index c17a6477eb6..4cf1b82aa47 100644
--- a/editors/ht/Makefile
+++ b/editors/ht/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.31 2018/06/27 20:43:11 benoit Exp $
+# $OpenBSD: Makefile,v 1.32 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =		file editor/viewer/analyzer for executables
 
 DISTNAME =		ht-2.1.0
 CATEGORIES =		editors
-REVISION =		4
+REVISION =		5
 
 HOMEPAGE =		http://hte.sourceforge.net/
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c m ncurses ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=hte/}
 
 EXTRACT_SUFX =		.tar.bz2
diff --git a/editors/le/Makefile b/editors/le/Makefile
index 111d933a83b..5f4a425d9f2 100644
--- a/editors/le/Makefile
+++ b/editors/le/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2017/10/20 23:05:31 bcallah Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =	text editor inspired by Norton Commander
 DISTNAME =	le-1.16.5
 CATEGORIES =	editors
+REVISION =	0
 
 HOMEPAGE =	http://lav.yar.ru/programs.html
 MAINTAINER =	Ivan Ivanov <rambiusparkisanius@gmail.com>
@@ -12,6 +13,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB +=	c m ncursesw ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	http://lav.yar.ru/download/le/
 
 CONFIGURE_STYLE =	gnu
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 6f83c6273ad..9e0b468a3b3 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.191 2018/09/20 13:54:12 robert Exp $
+# $OpenBSD: Makefile,v 1.192 2018/10/24 14:28:01 sthen Exp $
 
 USE_WXNEEDED=	Yes
 
@@ -13,7 +13,7 @@ SHARED_LIBS +=  orcus-0.13                0.0 # 0.0
 SHARED_LIBS +=  orcus-parser-0.13         0.0 # 0.0
 SHARED_LIBS +=  staroffice-0.0-lo         0.0 # 0.0
 
-REVISION-main=	0
+REVISION=	1
 
 BV=		6.1
 VERSION=	${BV}.1.2
@@ -180,6 +180,8 @@ BUILD_DEPENDS+=	archivers/zip \
 # dlopen()ed if found
 BUILD_DEPENDS +=	x11/gnome/librsvg
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES+=	lang/python
 
 # XXX can't use ${MODPY_DEFAULT_VERSION_3}, it specifically wants 3.3 and
diff --git a/editors/moe/Makefile b/editors/moe/Makefile
index a3a529dc5ad..3861fec6439 100644
--- a/editors/moe/Makefile
+++ b/editors/moe/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =	powerful and user-friendly console text editor
 DISTNAME =	moe-1.9
-REVISION =	1
+REVISION =	2
 EXTRACT_SUFX =	.tar.lz
 CATEGORIES =	editors
 
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += c m ncurses ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_GNU:=moe/}
 
 CONFIGURE_STYLE =	simple
diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile
index b26255a5bd5..b72849d3e2e 100644
--- a/editors/neovim/Makefile
+++ b/editors/neovim/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2018/09/04 12:46:11 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =	continuation and extension of Vim
 
 GH_ACCOUNT =	neovim
 GH_PROJECT =	neovim
 GH_TAGNAME =	v0.3.1
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	editors devel
 HOMEPAGE =	http://neovim.org
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += c iconv intl ${MODLUA_WANTLIB} m msgpackc pthread termkey
 WANTLIB += unibilium util uv vterm ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake \
 			lang/lua \
 			textproc/intltool
diff --git a/editors/py-qscintilla/Makefile b/editors/py-qscintilla/Makefile
index 21a3e7b02fe..b0031b76413 100644
--- a/editors/py-qscintilla/Makefile
+++ b/editors/py-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2018/05/20 08:30:21 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =	Python binding for the Scintilla source code editor
 
@@ -6,7 +6,7 @@ VERSION =	2.10.1
 DISTNAME =	QScintilla_gpl-${VERSION}
 PKGNAME =	py-qscintilla-${VERSION}
 CATEGORIES =	editors x11 devel
-REVISION =	1
+REVISION =	2
 
 HOMEPAGE =	http://www.riverbankcomputing.com/software/qscintilla/
 
@@ -25,6 +25,8 @@ RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
 
 WANTLIB =	${COMPILER_LIBCXX} m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 WRKSRC =	${WRKDIST}/Python
 
 NO_TEST =	Yes
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index d1e71ad1647..9fa0722f8e2 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.26 2017/11/21 00:13:00 naddy Exp $
+# $OpenBSD: Makefile,v 1.27 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=	powerful and simple GTK editor
 
 DISTNAME=	teagtk-17.6.6
-REVISION=	10
+REVISION=	11
 CATEGORIES=	editors x11
 MASTER_SITES=	http://semiletov.org/tea/dloads/ \
 		${MASTER_SITE_SOURCEFORGE:=tea-editor/}
@@ -21,6 +21,8 @@ WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gtk-x11-2.0
 WANTLIB += gtksourceview-2.0 iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pixman-1 png pthread ${COMPILER_LIBCXX} xcb xml2 z zzip>=13
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=	devel/gettext-tools
 LIB_DEPENDS=	x11/gtk+2 \
 		gtksourceview->=2,<3:x11/gtksourceview \
diff --git a/editors/teaqt/Makefile b/editors/teaqt/Makefile
index 1f6547ea639..3c7a29a67ad 100644
--- a/editors/teaqt/Makefile
+++ b/editors/teaqt/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2017/07/26 22:45:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =	powerful and simple qt4 editor
 
 V =		33.3.0
-REVISION =	1
+REVISION =	2
 DISTNAME =	tea-${V}
 PKGNAME =	teaqt-${V}
 CATEGORIES =	editors x11
@@ -20,6 +20,8 @@ LIB_DEPENDS =	textproc/aspell/core
 WANTLIB += c m pthread ${COMPILER_LIBCXX} z QtGui QtXml aspell
 WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =	devel/qmake x11/qt4
 CONFIGURE_ENV =	USE_ASPELL=true USE_HUNSPELL=false
 
diff --git a/editors/tiled/Makefile b/editors/tiled/Makefile
index 9b31584a1b7..c8081465b4d 100644
--- a/editors/tiled/Makefile
+++ b/editors/tiled/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2018/06/29 22:16:12 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =		tile map editor
 
 V =			0.9.1
 DISTNAME =		tiled-qt-${V}
 PKGNAME =		tiled-${V}
-REVISION =		5
+REVISION =		6
 
 SHARED_LIBS +=		tiled                     0.0 # 1.0
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += GL ICE QtGui QtOpenGL SM X11 Xext Xi Xinerama Xrender
 WANTLIB += c fontconfig freetype m pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=tiled/}
 
 RUN_DEPENDS =		devel/desktop-file-utils \
diff --git a/education/drgeo/Makefile b/education/drgeo/Makefile
index a18a068c501..e35681fca90 100644
--- a/education/drgeo/Makefile
+++ b/education/drgeo/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.43 2018/06/27 21:03:42 espie Exp $
+# $OpenBSD: Makefile,v 1.44 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=	interactive geometry program
 
 DISTNAME=	drgeo-1.1.0
-REVISION=	24
+REVISION=	25
 CATEGORIES=	education math
 
 HOMEPAGE=	http://www.ofset.org/drgeo/
@@ -22,6 +22,8 @@ WANTLIB += png pthread ${COMPILER_LIBCXX} xcb xml2 z glade-2.0
 WANTLIB += ffi gthread-2.0 xcb-render xcb-shm
 WANTLIB += harfbuzz graphite2 lzma
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	textproc/intltool
 
 RUN_DEPENDS=	devel/desktop-file-utils
diff --git a/education/verbiste/Makefile b/education/verbiste/Makefile
index 0a8a732a723..b5fc834427b 100644
--- a/education/verbiste/Makefile
+++ b/education/verbiste/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2018/07/01 09:01:29 espie Exp $
+# $OpenBSD: Makefile,v 1.41 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=	French and Italian conjugation system
 
@@ -6,7 +6,7 @@ DISTNAME=	verbiste-0.1.45
 SHARED_LIBS=	verbiste-0.1	5.0	# .0.0
 CATEGORIES=	education
 HOMEPAGE=	http://sarrazip.com/dev/verbiste.html
-REVISION=	1
+REVISION=	2
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
@@ -20,6 +20,8 @@ WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz iconv
 WANTLIB += intl lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1    
 WANTLIB += png pthread ${COMPILER_LIBCXX} xcb xcb-render xcb-shm xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://sarrazip.com/dev/
 
 BUILD_DEPENDS=	textproc/p5-XML-Parser
diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
index e63853be2a5..affa78a8430 100644
--- a/emulators/BasiliskII/Makefile
+++ b/emulators/BasiliskII/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.39 2018/04/16 21:01:30 fcambus Exp $
+# $OpenBSD: Makefile,v 1.40 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=		open source 68k Macintosh emulator
 
 DISTNAME=		BasiliskII_src_01052006
 PKGNAME=		BasiliskII-1.0
-REVISION=		9
+REVISION=		10
 CATEGORIES=		emulators
 
 HOMEPAGE=		http://basilisk.cebix.net/
@@ -21,6 +21,8 @@ WANTLIB += cairo fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 iconv intl m pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		devel/sdl \
 			x11/gtk+2
 
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 3835ff6bd77..561eb942e8b 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.71 2017/07/26 22:45:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.72 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=	x86 machine simulator
 
 DISTNAME=	bochs-2.6.9
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bochs/}
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://bochs.sourceforge.net/
 
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c m pthread ${COMPILER_LIBCXX} termlib
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	--enable-all-optimizations \
 		--enable-avx \
diff --git a/emulators/dgen-sdl/Makefile b/emulators/dgen-sdl/Makefile
index 868d3c6f991..98d49ed8eb1 100644
--- a/emulators/dgen-sdl/Makefile
+++ b/emulators/dgen-sdl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2017/07/26 22:45:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:28:01 sthen Exp $
 
 BROKEN-alpha =		OOM or ICE on hqx/src/hq4x_32.c
 BROKEN-hppa =		OOM or ICE on hqx/src/hq4x_32.c
@@ -8,7 +8,7 @@ DISTNAME =		dgen-sdl-1.33
 CATEGORIES =		emulators games
 HOMEPAGE =		http://dgen.sourceforge.net/
 MAINTAINER =		Edd Barrett <edd@openbsd.org>
-REVISION =		0
+REVISION =		1
 
 FLAVORS =		debugger
 FLAVOR ?=
@@ -26,6 +26,8 @@ PERMIT_PACKAGE_FTP =	Yes
 
 WANTLIB =		GL SDL archive c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=dgen/}
 
 BUILD_DEPENDS =		devel/sdl
diff --git a/emulators/dolphin/Makefile b/emulators/dolphin/Makefile
index 2a14bba08d7..3c0bde2064e 100644
--- a/emulators/dolphin/Makefile
+++ b/emulators/dolphin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2018/09/02 16:41:40 thfr Exp $
+# $OpenBSD: Makefile,v 1.3 2018/10/24 14:28:01 sthen Exp $
 
 USE_WXNEEDED =		Yes
 ONLY_FOR_ARCHS =	amd64
@@ -10,6 +10,8 @@ V =			5.0.0.20180901
 DISTNAME =		dolphin-emu-${V}
 PKGNAME-main =		dolphin-${V}
 PKGNAME-nogui =		dolphin-nogui-${V}
+REVISION-main =		0
+REVISION-nogui =	0
 
 MULTI_PACKAGES =	-main -nogui
 
@@ -33,6 +35,8 @@ cWANTLIB =	GL GLU ICE SDL2 SM X11 Xext Xi Xrandr avcodec avformat avutil \
 WANTLIB-main =	${cWANTLIB} Qt5Core Qt5Gui Qt5Widgets
 WANTLIB-nogui =	${cWANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake
 BUILD_DEPENDS =		devel/gettext-tools
 LIB_DEPENDS-nogui =	archivers/lzo2 \
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index 35ced105aad..6ecb95afe7d 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.38 2017/07/29 08:59:35 sthen Exp $
+# $OpenBSD: Makefile,v 1.39 2018/10/24 14:28:01 sthen Exp $
 
 ONLY_FOR_ARCHS=	${GCC4_ARCHS} ${CLANG_ARCHS}
 
 COMMENT=	x86 with DOS emulator targeted at playing games
 
 DISTNAME=	dosbox-0.74
-REVISION=	10
+REVISION=	11
 CATEGORIES=	games x11 emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dosbox/}
 
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM=   Yes
 
 WANTLIB += GL SDL SDL_net SDL_sound ${COMPILER_LIBCXX} png X11 c m pthread sndio z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	devel/sdl-net \
 		devel/sdl-sound \
 		graphics/png
diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile
index 8c8d8724fd1..7aaa245c394 100644
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2018/06/27 21:03:42 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT =		emulator for Nintendo Entertainment System
 
@@ -6,7 +6,7 @@ V =			2.2.3
 DISTNAME =		fceux-${V}.src
 PKGNAME =		fceux-${V}
 CATEGORIES =		emulators games
-REVISION =		3
+REVISION =		4
 
 HOMEPAGE =		http://fceux.com/
 
@@ -21,6 +21,8 @@ WANTLIB += 		GL SDL X11 c gd gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0
 WANTLIB += 		gobject-2.0 gtk-x11-2.0 lua5.1 m pthread
 WANTLIB += 		z ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS =		devel/desktop-file-utils
 LIB_DEPENDS =		devel/sdl \
 			graphics/gd \
diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile
index c1bde187790..61d762d3cb4 100644
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.29 2018/04/15 21:29:32 bluhm Exp $
+# $OpenBSD: Makefile,v 1.30 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=	Commodore 64 emulator
 
 DISTNAME=	FrodoV4_1b.Src
 PKGNAME=	frodo-4.1b
-REVISION=	9
+REVISION=	10
 DISTFILES=	FrodoV4_1b.Src${EXTRACT_SUFX}
 
 CATEGORIES=	emulators games
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		SDL c m pthread sndio ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=	gnu
 
 MODULES=	x11/tk
diff --git a/emulators/fs-uae/Makefile b/emulators/fs-uae/Makefile
index aae29c01dd7..b14892e9fbe 100644
--- a/emulators/fs-uae/Makefile
+++ b/emulators/fs-uae/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2018/09/04 12:46:11 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2018/10/24 14:28:01 sthen Exp $
 
 BROKEN-powerpc =	error: invalid 'asm': invalid %k value
 BROKEN-alpha =		error: invalid 'asm': invalid %xn code
@@ -8,7 +8,7 @@ V =			2.4.0
 MODPY_EGG_VERSION =	${V}
 DISTNAME =		fs-uae-$V
 CATEGORIES =		emulators
-REVISION =		8
+REVISION =		9
 
 HOMEPAGE =		http://fengestad.no/fs-uae/
 MAINTAINER =		Edd Barrett <edd@openbsd.org>
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += GL GLU SDL X11 c freetype glib-2.0 gthread-2.0 intl m
 WANTLIB += openal png pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${HOMEPAGE}stable/$V/
 
 BUILD_DEPENDS =		devel/gettext-tools
diff --git a/emulators/fuse-utils/Makefile b/emulators/fuse-utils/Makefile
index 846b712d87c..2f9c8d5ca71 100644
--- a/emulators/fuse-utils/Makefile
+++ b/emulators/fuse-utils/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.31 2018/07/08 18:34:02 fcambus Exp $
+# $OpenBSD: Makefile,v 1.32 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=		Free Unix Spectrum Emulator utilities
 
 DISTNAME=		fuse-utils-1.4.3
 CATEGORIES=		emulators
 HOMEPAGE=		http://fuse-emulator.sourceforge.net/
+REVISION=		0
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
@@ -12,6 +13,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += FLAC audiofile bz2 c gcrypt glib-2.0 gpg-error iconv
 WANTLIB += intl jpeg m ogg pcre png pthread spectrum ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fuse-emulator/}
 
 LIB_DEPENDS=		devel/libspectrum \
diff --git a/emulators/gambatte/Makefile b/emulators/gambatte/Makefile
index 9e48718ca35..3151e5a4e66 100644
--- a/emulators/gambatte/Makefile
+++ b/emulators/gambatte/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2017/07/26 22:45:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT-main =		highly accurate Game Boy Color emulator
 COMMENT-qt =		highly accurate Game Boy Color emulator with GUI
@@ -8,8 +8,8 @@ V =			0.5.0.${REV}
 DISTNAME =		gambatte_src-r${REV}
 PKGNAME-main =		gambatte-$V
 PKGNAME-qt =		gambatte-qt-$V
-REVISION-main =		3
-REVISION-qt =		2
+REVISION-main =		4
+REVISION-qt =		3
 
 MULTI_PACKAGES =	-main -qt
 
@@ -28,6 +28,8 @@ cWANTLIB =	c m pthread ${COMPILER_LIBCXX} z
 WANTLIB-main =	${cWANTLIB} SDL
 WANTLIB-qt =	${cWANTLIB} GL QtCore QtGui QtOpenGL X11 Xext Xrandr Xv ossaudio usbhid Xi
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=gambatte/}
 
 MODULES =		devel/qmake lang/python x11/qt4
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index dd469fda8b0..7cae259cc90 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.40 2018/04/22 18:41:21 naddy Exp $
+# $OpenBSD: Makefile,v 1.41 2018/10/24 14:28:01 sthen Exp $
 
 COMMENT=		ARM/M88k/MIPS/PowerPC/SuperH machines emulator
 
 DISTNAME =		gxemul-0.6.0.1
 CATEGORIES=		emulators
-REVISION =		4
+REVISION =		5
 
 HOMEPAGE=		http://gxemul.sourceforge.net/
 
@@ -15,6 +15,8 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gxemul/}
 
 WANTLIB =		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=	simple
 
 FLAVORS=		no_x11
diff --git a/emulators/higan/Makefile b/emulators/higan/Makefile
index d1691f9515a..78714ee6033 100644
--- a/emulators/higan/Makefile
+++ b/emulators/higan/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2018/09/20 16:32:12 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =	multi-system Nintendo emulator
 
 V =		106
 DISTNAME =	higan_v$V-source
 PKGNAME =	higan-$V
-REVISION =	2
+REVISION =	3
 
 USE_WXNEEDED =	Yes
 
@@ -40,7 +40,7 @@ MAKE_FLAGS =	compiler="${CXX}" \
 			-I${LOCALBASE}/include -I${X11BASE}/include" \
 		build=
 
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 
 USE_GMAKE =	Yes
 
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 7760b450b6e..29f3e0a94b2 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2018/09/27 10:43:14 fcambus Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:02 sthen Exp $
 
 ONLY_FOR_ARCHS = amd64 i386
 
@@ -9,6 +9,7 @@ COMMENT =	Multiple Arcade Machine Emulator
 V =		202
 DISTNAME =	mame0${V}s
 PKGNAME =	mame-0.${V}
+REVISION =	0
 
 CATEGORIES =	emulators
 
@@ -24,6 +25,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += ${COMPILER_LIBCXX} FLAC GL SDL2 SDL2_ttf X11 Xinerama
 WANTLIB += c expat fontconfig freetype jpeg lua5.3 m sqlite3 util z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=mame/}
 
 EXTRACT_SUFX =	.zip
diff --git a/emulators/mupen64plus/core/Makefile b/emulators/mupen64plus/core/Makefile
index fb958ffede4..1cc31e2db0d 100644
--- a/emulators/mupen64plus/core/Makefile
+++ b/emulators/mupen64plus/core/Makefile
@@ -1,13 +1,16 @@
-# $OpenBSD: Makefile,v 1.18 2018/01/03 08:26:12 bentley Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		n64 emulator core
 SHARED_LIBS =		mupen64plus 2.3 # 2.5
-REVISION =		5
+REVISION =		6
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		GL GLU c m ${COMPILER_LIBCXX} z freetype png pthread SDL2
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		devel/sdl2 \
 			graphics/png \
 			print/freetype
diff --git a/emulators/mupen64plus/rsp-z64/Makefile b/emulators/mupen64plus/rsp-z64/Makefile
index 3842586ab3e..08ce19a96be 100644
--- a/emulators/mupen64plus/rsp-z64/Makefile
+++ b/emulators/mupen64plus/rsp-z64/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.12 2017/07/26 22:45:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		n64 emulator signal co-processor plugin
-REVISION =		5
+REVISION =		6
 
 # XXX upstream was inconsistent with numbering this release (2.0 vs 2.0.0)
 VERSION =		2.0.0
@@ -13,6 +13,8 @@ WRKDIST =		${WRKDIR}/mupen64plus-${MUPEN64PLUS_MOD}
 
 WANTLIB =		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MUPEN64PLUS_MOD = 	rsp-z64
 
 .include <bsd.port.mk>
diff --git a/emulators/mupen64plus/video-arachnoid/Makefile b/emulators/mupen64plus/video-arachnoid/Makefile
index bac43814c9b..b5ce6fb841b 100644
--- a/emulators/mupen64plus/video-arachnoid/Makefile
+++ b/emulators/mupen64plus/video-arachnoid/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/26 22:45:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		n64 emulator video plugin
-REVISION =		4
+REVISION =		5
 
 # XXX upstream was inconsistent with numbering this release (2.0 vs 2.0.0)
 VERSION =		2.0.0
@@ -13,6 +13,8 @@ WRKDIST =		${WRKDIR}/mupen64plus-${MUPEN64PLUS_MOD}
 
 WANTLIB =		GL c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MUPEN64PLUS_MOD = 	video-arachnoid
 
 .include <bsd.port.mk>
diff --git a/emulators/mupen64plus/video-glide64/Makefile b/emulators/mupen64plus/video-glide64/Makefile
index 83027cf2bff..28e5f64d261 100644
--- a/emulators/mupen64plus/video-glide64/Makefile
+++ b/emulators/mupen64plus/video-glide64/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.15 2018/04/09 05:25:45 bentley Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		n64 emulator video plugin
-REVISION =		7
+REVISION =		8
 
 # XXX upstream was inconsistent with numbering this release (2.0 vs 2.0.0)
 VERSION =		2.0.0
@@ -12,6 +12,9 @@ PERMIT_PACKAGE_CDROM =	Yes
 WRKDIST =		${WRKDIR}/mupen64plus-${MUPEN64PLUS_MOD}
 
 WANTLIB =		GL SDL c m pthread ${COMPILER_LIBCXX}
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		devel/sdl
 
 MUPEN64PLUS_MOD = 	video-glide64
diff --git a/emulators/mupen64plus/video-rice/Makefile b/emulators/mupen64plus/video-rice/Makefile
index 3b16a26cb60..0cd4e439856 100644
--- a/emulators/mupen64plus/video-rice/Makefile
+++ b/emulators/mupen64plus/video-rice/Makefile
@@ -1,12 +1,15 @@
-# $OpenBSD: Makefile,v 1.15 2017/09/25 21:25:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		n64 emulator opengl video plugin
-REVISION =		4
+REVISION =		5
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		GL SDL2 m png pthread z ${COMPILER_LIBCXX}
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		devel/sdl2 graphics/png
 MUPEN64PLUS_MOD = 	video-rice
 
diff --git a/emulators/mupen64plus/video-z64/Makefile b/emulators/mupen64plus/video-z64/Makefile
index f2cfe7cc021..a8751dae1c1 100644
--- a/emulators/mupen64plus/video-z64/Makefile
+++ b/emulators/mupen64plus/video-z64/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.13 2017/07/26 22:45:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		n64 emulator video plugin
-REVISION =		6
+REVISION =		7
 
 # XXX upstream was inconsistent with numbering this release (2.0 vs 2.0.0)
 VERSION =		2.0.0
@@ -12,6 +12,9 @@ PERMIT_PACKAGE_CDROM =	Yes
 WRKDIST =		${WRKDIR}/mupen64plus-${MUPEN64PLUS_MOD}
 
 WANTLIB =		GL GLEW GLU SDL c m pthread ${COMPILER_LIBCXX}
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		graphics/glew>=1.12.0 \
 			devel/sdl
 
diff --git a/emulators/nestopia/Makefile b/emulators/nestopia/Makefile
index 8eacee5dd0a..f7ab43f2ca3 100644
--- a/emulators/nestopia/Makefile
+++ b/emulators/nestopia/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2018/06/27 21:03:43 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT-main =		accurate Nintendo Entertainment System emulator
 COMMENT-libretro =	Nintendo Entertainment System core for retroarch
@@ -7,8 +7,8 @@ V =			1.47
 DISTNAME =		nestopia-$V
 PKGNAME-main =		nestopia-$V
 PKGNAME-libretro =	libretro-nestopia-$V
-REVISION-main =		2
-REVISION-libretro =	1
+REVISION-main =		3
+REVISION-libretro =	2
 
 MULTI_PACKAGES =	-main -libretro
 
@@ -27,6 +27,8 @@ WANTLIB-main += SDL2 ao c gdk-3 gdk_pixbuf-2.0 glib-2.0 gobject-2.0
 WANTLIB-main += gtk-3 m pthread ${COMPILER_LIBCXX} z archive epoxy
 WANTLIB-libretro =	${COMPILER_LIBCXX} m pthread
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=nestopiaue/}
 EXTRACT_SUFX =		.tgz
 
diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
index 67565d6567e..8e79ac0c1d0 100644
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.22 2018/06/27 21:03:43 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =	Playstation 1 emulator
 
 DISTNAME =	pcsxr-1.9.94.r87113p0
 PKGNAME =	pcsxr-1.9.94beta0
-REVISION =	8
+REVISION =	9
 CATEGORIES =	emulators games
 HOMEPAGE =	http://pcsxr.codeplex.com/
 
@@ -21,6 +21,8 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
 WANTLIB += sndio ${COMPILER_LIBCXX} usbhid xcb xcb-dri2 xcb-glx
 WANTLIB += xcb-render xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	http://www.elsasser.org/openbsd/distfiles/
 
 USE_GMAKE =	Yes
diff --git a/emulators/retroarch/Makefile b/emulators/retroarch/Makefile
index f3c01350d0e..1b03fe80ca6 100644
--- a/emulators/retroarch/Makefile
+++ b/emulators/retroarch/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2018/06/27 21:03:43 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		generic multi-emulator frontend
 
 V =			1.7.2
-REVISION =		2
+REVISION =		3
 DISTNAME =		RetroArch-$V
 PKGNAME =		retroarch-$V
 
@@ -20,6 +20,8 @@ WANTLIB += avcodec avformat avutil c drm freetype gbm m openal
 WANTLIB += pthread swresample swscale usb-1.0 xcb xkbcommon
 WANTLIB += z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		https://github.com/libretro/RetroArch/releases/download/v$V/
 
 EXTRACT_SUFX =		.tar.xz
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 07b04c97660..f8abb06e199 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2018/06/27 20:56:54 benoit Exp $
+# $OpenBSD: Makefile,v 1.32 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		Atari 2600 VCS emulator
 
@@ -7,6 +7,7 @@ DISTNAME =		stella-$V
 CATEGORIES =		emulators
 EXTRACT_SUFX =		-src.tar.xz
 WRKDIST =		${WRKDIR}/${DISTNAME}
+REVISION =		0
 
 HOMEPAGE =		https://stella-emu.github.io/
 
@@ -17,6 +18,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		${COMPILER_LIBCXX} c m z pthread SDL2 png
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		https://github.com/stella-emu/stella/releases/download/$V/
 
 LIB_DEPENDS =		devel/sdl2 \
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 7236ac15601..b7841716efb 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2018/09/27 09:13:02 fcambus Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		versatile Commodore emulator
 
 DISTNAME =		vice-3.2
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		emulators
 
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += ${COMPILER_LIBCXX} FLAC SDL2 c curses gif jpeg m ogg
 WANTLIB += png readline vorbis vorbisenc vorbisfile z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=vice-emu/}
 
 BUILD_DEPENDS =		devel/xa
diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index 396efbdf04c..26ceb546e6a 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2017/11/12 06:37:15 kirby Exp $
+# $OpenBSD: Makefile,v 1.50 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =	SDL port of the legendary 2D platform shooter
 
@@ -7,7 +7,7 @@ PKGNAME =	abuse-0.8
 EPOCH =		0
 ABUSE_SFX =	abuse-free-sounds-20120309
 CATEGORIES =	games x11
-REVISION =	4
+REVISION =	5
 
 HOMEPAGE =	http://abuse.zoy.org/
 
@@ -21,6 +21,8 @@ WANTLIB += sndio ${COMPILER_LIBCXX} usbhid vorbis vorbisfile xcb
 WANTLIB += X11-xcb glapi xcb-dri2 xcb-glx
 WANTLIB += expat
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${HOMEPAGE}raw-attachment/wiki/download/
 MASTER_SITES0 =	http://www.linklevel.net/distfiles/
 
diff --git a/games/afternoonstalker/Makefile b/games/afternoonstalker/Makefile
index 20f2d1c5c57..f9a44a49527 100644
--- a/games/afternoonstalker/Makefile
+++ b/games/afternoonstalker/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.28 2018/06/27 21:03:43 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT=	Night Stalker clone for X
 
 DISTNAME=	afternoonstalker-1.1.5
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	games
 
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=   Yes
 
 WANTLIB += SDL SDL_image SDL_mixer c flatzebra-0.1 m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://sarrazip.com/dev/
 
 LIB_DEPENDS =	devel/flatzebra>=0.1.6
diff --git a/games/alephone/alephone/Makefile b/games/alephone/alephone/Makefile
index 776ca5f2d9f..d06787b4070 100644
--- a/games/alephone/alephone/Makefile
+++ b/games/alephone/alephone/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.24 2018/04/20 11:48:37 schwarze Exp $
+#	$OpenBSD: Makefile,v 1.25 2018/10/24 14:28:02 sthen Exp $
 
 DIST_SUBDIR ?=		alephone
 COMMENT =		open source game engine based on Marathon 2: Durandal
@@ -6,7 +6,7 @@ COMMENT =		open source game engine based on Marathon 2: Durandal
 DATE =			20150620
 DISTNAME =		AlephOne-${DATE}
 PKGNAME =		alephone-1.2.1
-REVISION =		1
+REVISION =		2
 
 EXTRACT_SUFX =		.tar.bz2
 CATEGORIES =		games x11
@@ -25,6 +25,8 @@ WANTLIB +=		SDL SDL_net SDL_image SDL_ttf mad png sndfile
 WANTLIB +=		smpeg speex speexdsp vorbisfile zzip
 WANTLIB += avcodec avformat avutil swscale boost_filesystem boost_system curl
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =		devel/automake/${AUTOMAKE_VER} \
 			devel/autoconf/${AUTOCONF_VER}
 LIB_DEPENDS =		archivers/zziplib \
diff --git a/games/amoebax/Makefile b/games/amoebax/Makefile
index 865c8d832e6..6a019fe9a6d 100644
--- a/games/amoebax/Makefile
+++ b/games/amoebax/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2018/06/27 21:03:43 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT=	cute and addictive action-puzzle game
 
 DISTNAME= 	amoebax-0.2.1
-REVISION=       2
+REVISION=       3
 
 CATEGORIES=	games
 EXTRACT_SUFX=	.tar.bz2
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	SDL c m pthread ${COMPILER_LIBCXX} SDL_image SDL_mixer
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	devel/sdl-image \
 		devel/sdl-mixer
 
diff --git a/games/amph/Makefile b/games/amph/Makefile
index 1444282f12c..df75743c207 100644
--- a/games/amph/Makefile
+++ b/games/amph/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2018/04/11 12:16:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT=	jump'n'run game with unique video effects
 
@@ -6,7 +6,7 @@ VERSION=	0.8.10
 DVERSION=	0.8.6
 DISTNAME=	amphetamine-${VERSION}
 PKGNAME=	amph-${VERSION}
-REVISION=	6
+REVISION=	7
 CATEGORIES=	games x11
 EXTRACT_SUFX=	.tar.bz2
 
@@ -21,6 +21,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} SDL Xpm Xt c m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 DISTFILES=	amphetamine-data-${DVERSION}${EXTRACT_SUFX} \
 		${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/games/armagetronad/Makefile b/games/armagetronad/Makefile
index 1c0781e426b..41ceec8d6ff 100644
--- a/games/armagetronad/Makefile
+++ b/games/armagetronad/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2018/01/01 18:11:46 bcallah Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		3D light cycle game
 
 DISTNAME =		armagetronad-0.2.8.3.4.src
 PKGNAME =		${DISTNAME:S/.src//}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		games
 
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM =		Yes
 WANTLIB += GL GLU SDL SDL_image c iconv jpeg lzma m png pthread ${COMPILER_LIBCXX}
 WANTLIB += xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=armagetronad/}
 
 BUILD_DEPENDS =		shells/bash
diff --git a/games/arx-libertatis/Makefile b/games/arx-libertatis/Makefile
index d73d070bb42..cad5414bb53 100644
--- a/games/arx-libertatis/Makefile
+++ b/games/arx-libertatis/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2018/09/04 12:46:12 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =	cross-platform port of Arx Fatalis, a first-person RPG
 CATEGORIES =	games
@@ -9,7 +9,7 @@ GH_ACCOUNT =	arx
 GH_PROJECT =	ArxLibertatis
 GH_TAGNAME =	1.1.2-r1
 PKGNAME =	arx-libertatis-${GH_TAGNAME:S/-r/pl/}
-REVISION =	1
+REVISION =	2
 
 # GPLv3+, fonts are SIL OFL 1.1 license
 PERMIT_PACKAGE_CDROM =	Yes
@@ -18,7 +18,7 @@ WANTLIB += ${COMPILER_LIBCXX} GL GLEW SDL c freetype m openal
 WANTLIB += z
 
 # C++11
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 
 MODULES =	devel/cmake
 
diff --git a/games/astromenace/Makefile b/games/astromenace/Makefile
index 42d70c19f86..faa18f109c7 100644
--- a/games/astromenace/Makefile
+++ b/games/astromenace/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2017/07/26 22:45:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		hardcore 3D space shmup
 BROKEN-sparc64 =	SIGABRT terminate called after throwing an instance of 'std::bad_alloc'
@@ -7,7 +7,7 @@ BROKEN-powerpc =	SIGABRT terminate called after throwing an instance of 'std::ba
 V =			1.3.2
 DISTNAME =		astromenace-src-$V
 PKGNAME =		astromenace-$V
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		games
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += GL GLU ICE SDL SM X11 Xext Xinerama alut c fontconfig
 WANTLIB += freetype m ogg openal pthread ${COMPILER_LIBCXX} vorbis vorbisfile
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=openastromenace/}
 EXTRACT_SUFX =		.tar.bz2
 
diff --git a/games/batrachians/Makefile b/games/batrachians/Makefile
index 6e2a2174a64..cce6e076c03 100644
--- a/games/batrachians/Makefile
+++ b/games/batrachians/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2018/06/27 21:03:43 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT=	clone of the classic Frog Bog game
 
 DISTNAME =	batrachians-0.1.6
 CATEGORIES=	games
-REVISION =	1
+REVISION =	2
 
 HOMEPAGE=	http://sarrazip.com/dev/batrachians.html
 
@@ -15,6 +15,8 @@ MASTER_SITES=	http://sarrazip.com/dev/
 
 WANTLIB=	SDL SDL_image SDL_mixer c m pthread ${COMPILER_LIBCXX} flatzebra-0.1>=1
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS=	devel/desktop-file-utils
 LIB_DEPENDS=	devel/flatzebra>=0.1.5
 
diff --git a/games/blobby/Makefile b/games/blobby/Makefile
index 88d228b91f6..8902e772687 100644
--- a/games/blobby/Makefile
+++ b/games/blobby/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/26 22:45:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		volleyball game with online play
 
 V =			1.0rc3
 DISTNAME =		blobby2-linux-${V}
 PKGNAME =		blobby-${V}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		games
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =		Yes
 
 WANTLIB +=		GL GLU ICE SDL SM X11 Xext c m physfs pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=blobby/}
 
 MODULES =		devel/cmake
diff --git a/games/blobwars/Makefile b/games/blobwars/Makefile
index 135256fcbce..d8108ad9cee 100644
--- a/games/blobwars/Makefile
+++ b/games/blobwars/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2018/06/29 22:16:12 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =	2D arcade game
 
 DISTNAME =	blobwars-2.00
-REVISION =	3
+REVISION =	4
 FIX_EXTRACT_PERMISSIONS=Yes
 
 CATEGORIES =	games
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM =		Yes
 WANTLIB =	SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf c iconv intl \
 		m pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=blobwars/}
 
 BUILD_DEPENDS =	devel/gettext-tools
diff --git a/games/boswars/Makefile b/games/boswars/Makefile
index 2680fb7d18f..a2f503d3b9a 100644
--- a/games/boswars/Makefile
+++ b/games/boswars/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2017/07/26 22:45:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT=	real-time strategy game
 
@@ -7,7 +7,7 @@ DISTNAME=	boswars-${V}-src
 PKGNAME=	boswars-${V}
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.boswars.org/dist/releases/
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://www.boswars.org/
 
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB +=	GL SDL X11 c m ogg png pthread ${COMPILER_LIBCXX} theora vorbis z
 WANTLIB +=	${MODLUA_WANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	devel/scons \
 		lang/lua
 MODSCONS_FLAGS=	CPPPATH="${LOCALBASE}/include ${X11BASE}/include" \
diff --git a/games/braincurses/Makefile b/games/braincurses/Makefile
index 91e69539b36..6aa2f9413fc 100644
--- a/games/braincurses/Makefile
+++ b/games/braincurses/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2017/07/26 22:45:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT=	clone of the Mastermind game
 
 DISTNAME=	braincurses-0.5b
-REVISION =	1
+REVISION =	2
 CATEGORIES=	games
 HOMEPAGE=	http://sourceforge.net/projects/braincurses/
 
@@ -16,6 +16,8 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=braincurses/}
 
 WANTLIB=	c m ncurses ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 do-build:
 	cd ${WRKBUILD} && ${CXX} ${CXXFLAGS} -o braincurses \
 	    curses/windows.cpp braincurses.cpp -lncurses
diff --git a/games/brumbrumrally/Makefile b/games/brumbrumrally/Makefile
index b7a4e8778f5..4789afcd80a 100644
--- a/games/brumbrumrally/Makefile
+++ b/games/brumbrumrally/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2018/06/27 21:03:44 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:02 sthen Exp $
 
 BROKEN-alpha =		OOM on src/hqx/hq4x.cpp
 
 COMMENT =		racing game with randomized tracks
 
 DISTNAME =		brumbrumrally-0.7
-REVISION =		2
+REVISION =		3
 FIX_EXTRACT_PERMISSIONS=Yes
 
 CATEGORIES =		games
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += SDL SDL_image SDL_net c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://dataapa.net/brumbrumrally/files/
 
 RUN_DEPENDS =		devel/desktop-file-utils
diff --git a/games/burgerspace/Makefile b/games/burgerspace/Makefile
index f9b7c438b03..ce169f456f8 100644
--- a/games/burgerspace/Makefile
+++ b/games/burgerspace/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.33 2018/06/27 21:03:44 espie Exp $
+# $OpenBSD: Makefile,v 1.34 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT=	burgertime clone for X
 
 DISTNAME =	burgerspace-1.9.2
-REVISION =	1
+REVISION =	2
 
 CATEGORIES=	games
 
@@ -16,6 +16,8 @@ WANTLIB += FLAC SDL SDL_image SDL_mixer c flatzebra-0.1
 WANTLIB += iconv jpeg m mikmod ogg png pthread smpeg sndio ${COMPILER_LIBCXX} tiff
 WANTLIB += usbhid vorbis vorbisfile z webp
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://sarrazip.com/dev/
 
 LIB_DEPENDS=	converters/libiconv \
diff --git a/games/capitan-sevilla/Makefile b/games/capitan-sevilla/Makefile
index 4ef0973286b..1a559d52e91 100644
--- a/games/capitan-sevilla/Makefile
+++ b/games/capitan-sevilla/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2018/06/27 21:03:44 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		platform game set in Seville and in space
 VERSION = 		1.0.3
@@ -6,13 +6,15 @@ DISTNAME =		capitan-sevilla-${VERSION}
 CATEGORIES =		games
 HOMEPAGE =		http://computeremuzone.com/ficha.php?id=754&l=en
 
-REVISION =		3
+REVISION =		4
 
 # GPLv3
 PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB = 	alleg c freetype m ogg png pthread ${COMPILER_LIBCXX} vorbis vorbisfile z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://computeremuzone.com/pc/juegos/
 EXTRACT_SUFX = 		.tar.bz2
 # XXX upstream distfile has no version number
diff --git a/games/choria/Makefile b/games/choria/Makefile
index e57d688e8d1..a1713fcae12 100644
--- a/games/choria/Makefile
+++ b/games/choria/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2018/06/27 21:03:44 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:02 sthen Exp $
 
 BROKEN-mips64el =	Bus error on startup, no core file left
 
 V =		0.4.1
-REVISION =	4
+REVISION =	5
 COMMENT =	2D MMORPG focused on grinding
 DISTNAME =	choria-${V}-src
 PKGNAME =	choria-${V}
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =		Yes
 
 WANTLIB += Irrlicht c m pthread sqlite3 ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=choria/}
 
 MODULES =	devel/cmake
diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile
index 7cb22932ea7..f9aae6c4c81 100644
--- a/games/chromium-bsu/Makefile
+++ b/games/chromium-bsu/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2018/06/29 22:16:12 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		fast paced arcade-style space shooter
 DISTNAME =		chromium-bsu-0.9.16.1
 CATEGORIES =		games x11
 HOMEPAGE =		http://chromium-bsu.sourceforge.net/
-REVISION =		1
+REVISION =		2
 
 # Clarified Artistic License
 PERMIT_PACKAGE_CDROM =	Yes
@@ -12,6 +12,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += GL GLU SDL2 SDL2_image alut c fontconfig freetype ftgl
 WANTLIB += iconv intl m openal pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=chromium-bsu/}
 
 USE_GMAKE =		Yes
diff --git a/games/clonekeen/Makefile b/games/clonekeen/Makefile
index 4b7cdb96d2c..3c018ed99a2 100644
--- a/games/clonekeen/Makefile
+++ b/games/clonekeen/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2018/09/04 12:46:12 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		commander keen clone
 DISTNAME =		clonekeen-src-84
 PKGNAME =		clonekeen-8.4
-REVISION =		3
+REVISION =		4
 CATEGORIES =		games
 
 WRKDIST = 		${WRKDIR}/keen
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 LIB_DEPENDS = 		devel/sdl
 WANTLIB =		SDL c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=clonekeen/}
 
 USE_X11 =		Yes
diff --git a/games/corsixth/Makefile b/games/corsixth/Makefile
index 39c66ea2f23..b582d434cc9 100644
--- a/games/corsixth/Makefile
+++ b/games/corsixth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2018/09/04 12:46:12 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:02 sthen Exp $
 
 ONLY_FOR_ARCHS =	${CXX11_ARCHS}
 
@@ -6,7 +6,7 @@ V =		0.62
 COMMENT =	open source clone of Theme Hospital
 PKGNAME =	corsixth-${V}
 CATEGORIES =	games x11
-REVISION =	0
+REVISION =	1
 
 GH_ACCOUNT =	CorsixTH
 GH_PROJECT =	CorsixTH
@@ -23,7 +23,7 @@ WANTLIB += ${COMPILER_LIBCXX} SDL2 SDL2_mixer avcodec avformat
 WANTLIB += avutil c freetype m swresample swscale ${MODLUA_WANTLIB}
 
 # C++14
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 
 MODULES =	devel/cmake \
 		lang/lua
diff --git a/games/cosmosmash/Makefile b/games/cosmosmash/Makefile
index f7ea2330eeb..4fda4987d7f 100644
--- a/games/cosmosmash/Makefile
+++ b/games/cosmosmash/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2018/06/27 21:03:44 espie Exp $
+# $OpenBSD: Makefile,v 1.30 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT=	astrosmash clone for X
 
 DISTNAME =	cosmosmash-1.4.7
-REVISION =	1
+REVISION =	2
 
 CATEGORIES=	games
 
@@ -16,6 +16,8 @@ WANTLIB += SDL SDL_image SDL_mixer c flatzebra-0.1 m pthread ${COMPILER_LIBCXX}
 WANTLIB += FLAC iconv jpeg mikmod ogg png smpeg sndio tiff usbhid
 WANTLIB += vorbis vorbisfile webp z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://sarrazip.com/dev/
 
 LIB_DEPENDS =	converters/libiconv \
diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile
index 7776cbdf23e..5232e219694 100644
--- a/games/crack-attack/Makefile
+++ b/games/crack-attack/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2018/06/27 21:03:44 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT=	OpenGL game based on SNES classic Tetris Attack
 
 DISTNAME=	crack-attack-1.1.14
-REVISION=	13
+REVISION=	14
 CATEGORIES=	games
 
 MAINTAINER=	Mattieu Baptiste <mattieu.b@free.fr>
@@ -20,6 +20,8 @@ WANTLIB = GL GLU ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes \
 	pangoft2-1.0 pixman-1 png pthread ${COMPILER_LIBCXX} xcb xcb-render \
 	xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SAVANNAH:=crack-attack/}
 
 RUN_DEPENDS=	devel/desktop-file-utils
diff --git a/games/crimson/Makefile b/games/crimson/Makefile
index a4d2885953e..5bce6927955 100644
--- a/games/crimson/Makefile
+++ b/games/crimson/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.31 2018/06/27 21:03:45 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT=	tactical war game like Battle Isle; multiplayer
 DISTNAME=	crimson-0.5.3
 CATEGORIES=	games x11
 MASTER_SITES=	${HOMEPAGE}files/
-REVISION=	1
+REVISION=	2
 
 HOMEPAGE=	http://crimson.seul.org/
 
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += SDL SDL_mixer SDL_net SDL_ttf c m pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE=	Yes
 USE_GROFF =	Yes
 
diff --git a/games/csmash/Makefile b/games/csmash/Makefile
index 1a585bf2f88..563d09b9202 100644
--- a/games/csmash/Makefile
+++ b/games/csmash/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2017/11/21 00:13:00 naddy Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT=	Cannon Smash 3D table tennis
 
 DISTNAME=	csmash-0.6.6
-REVISION=	8
+REVISION=	9
 CATEGORIES=	games
 HOMEPAGE=	http://cannonsmash.sourceforge.net/
 
@@ -27,6 +27,8 @@ WANTLIB+=	GL GLU ICE Xcomposite Xcursor Xdamage Xfixes \
 		pthread ${COMPILER_LIBCXX} z X11 Xext m SDL \
 		gdk_pixbuf-2.0 SDL_image SDL_mixer gdk-x11-2.0 gtk-x11-2.0
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE= gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/dangerdeep/Makefile b/games/dangerdeep/Makefile
index 6dd1ae7a4bf..a31055b9cc3 100644
--- a/games/dangerdeep/Makefile
+++ b/games/dangerdeep/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2018/09/04 12:46:12 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =		WWII German submarine simulator
 
 PKGNAME =		dangerdeep-0.3.99.3327
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		games
 
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_FTP =	Yes
 WANTLIB += GL GLU SDL SDL_image SDL_mixer bz2 c fftw3f m ${COMPILER_LIBCXX}
 WANTLIB += pthread
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=dangerdeep/}
 DISTFILES =		dangerdeep-0.4.0_pre3327.tar.gz \
 			dangerdeep-data-0.4.0_pre3327.zip
diff --git a/games/dungeon-crawl/Makefile b/games/dungeon-crawl/Makefile
index d393cbed7b1..4b76b815a7f 100644
--- a/games/dungeon-crawl/Makefile
+++ b/games/dungeon-crawl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT=	dungeon crawl
 CATEGORIES=	games
@@ -9,7 +9,7 @@ DISTNAME=	dc400b26-src
 EXTRACT_SUFX=	.tbz2
 V=		4.0.0b26
 PKGNAME=	dungeon-crawl-$V
-REVISION =	2
+REVISION =	3
 
 BUILD_DEPENDS+=	archivers/bzip2
 
@@ -24,6 +24,8 @@ ALL_TARGET=debug
 
 WANTLIB=	c m ${COMPILER_LIBCXX} ncurses
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 
 # Almost nethack... http://www.dungeoncrawl.org/?d.l
 
diff --git a/games/dxx-rebirth/Makefile b/games/dxx-rebirth/Makefile
index ebae222a14b..97781a91878 100644
--- a/games/dxx-rebirth/Makefile
+++ b/games/dxx-rebirth/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2018/09/04 12:46:12 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2018/10/24 14:28:02 sthen Exp $
 
 V =		0.60
 COMMENT =	source port of Descent, a 6-degrees-of-freedom shooter
 DISTNAME =	dxx-rebirth_v${V}-weekly-11-08-17-src
 PKGNAME =	dxx-rebirth-${V}
 CATEGORIES =	games x11
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	http://www.dxx-rebirth.com/
 MAINTAINER =	Thomas Frohwein <frohwein@ymail.com>
@@ -19,7 +19,7 @@ WANTLIB += ${COMPILER_LIBCXX} GL GLU SDL SDL_mixer c m physfs
 MASTER_SITES =	http://www.dxx-rebirth.com/download/dxx/user/afuturepilot/
 
 # C++14
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 
 MODULES =	devel/scons
 MODSCONS_ENV =	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index 4dbd5268c53..c24a880bbc4 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.52 2017/07/26 22:45:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.53 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT=	gtk+2 chess board interface
 
 DISTNAME=	eboard-1.1.1
 CATEGORIES=	games x11
-REVISION=	3
+REVISION=	4
 
 HOMEPAGE=	http://www.bergo.eng.br/eboard/
 
@@ -18,6 +18,8 @@ WANTLIB =	X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama \
 		pangocairo-1.0 pangoft2-1.0 png pthread \
 		sndio ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=eboard/}
 
 EXTRACT_SUFX=	.tar.bz2
diff --git a/games/einstein/Makefile b/games/einstein/Makefile
index c70e0bd595d..7e1a751aea1 100644
--- a/games/einstein/Makefile
+++ b/games/einstein/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2018/04/11 12:30:41 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =	open source remake of old DOS game Sherlock
 
 DISTNAME =	einstein-2.0
-REVISION =	3
+REVISION =	4
 
 CATEGORIES =	games
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =		Yes
 WANTLIB += ${COMPILER_LIBCXX} SDL SDL_mixer SDL_ttf c freetype
 WANTLIB += m z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${HOMEPAGE}files/einstein/
 EXTRACT_SUFX =	-src.tar.gz
 
diff --git a/games/eliot/Makefile b/games/eliot/Makefile
index 4f5bf1c17e4..d13108c4460 100644
--- a/games/eliot/Makefile
+++ b/games/eliot/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2018/06/27 21:03:45 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:02 sthen Exp $
 
 V =		2.1
 COMMENT =	scrabble game
 DISTNAME =	eliot-${V}
 CATEGORIES =	games
-REVISION =	3
+REVISION =	4
 
 HOMEPAGE =	http://nongnu.org/eliot/
 
@@ -24,6 +24,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 MODULES =	x11/qt4
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ENV +=	CPPFLAGS="-I${LOCALBASE}/include" \
 			 LDFLAGS="-L${X11BASE}/lib -pthread -L${LOCALBASE}/lib -liconv"
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index 459e305c44b..03fa9e0341e 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.36 2018/06/29 22:16:12 espie Exp $
+# $OpenBSD: Makefile,v 1.37 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT=	Oxyd/Rock'n'Roll clone
 
 V=		1.21
 DISTNAME=	enigma-${V}
-REVISION=	2
+REVISION=	3
 
 CATEGORIES=	games x11
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM=   Yes
 WANTLIB += ${COMPILER_LIBCXX} SDL SDL_image SDL_mixer SDL_ttf
 WANTLIB += c curl enet intl m png xerces-c z zipios
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enigma-game/}
 
 WRKDIST=	${WRKDIR}/enigma-${V}
diff --git a/games/f1spirit/Makefile b/games/f1spirit/Makefile
index ac14da0ef23..22cdb457a57 100644
--- a/games/f1spirit/Makefile
+++ b/games/f1spirit/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2018/06/27 21:03:45 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT=	remake of Konami's F1-Spirit
 
 DISTNAME=	f1spirit.src_0.rc9-1615
 PKGNAME=	${DISTNAME:S/.src_0.rc9-/-0./}
-REVISION =	5
+REVISION =	6
 WRKDIST=	${WRKDIR}/${DISTNAME:S/.src_0.rc9-/-0.rc9./}
 
 EXTRACT_SUFX=	.tgz
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB+= GL GLU SDL SDL_image SDL_mixer SDL_net c crypto curl m nghttp2
 WANTLIB+= pthread ssl ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 NO_TEST=	Yes
 USE_GMAKE=	Yes
 
diff --git a/games/fifechan/Makefile b/games/fifechan/Makefile
index 8abc432239d..21c6ee827a0 100644
--- a/games/fifechan/Makefile
+++ b/games/fifechan/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/11/04 22:02:16 bentley Exp $
+# $OpenBSD: Makefile,v 1.2 2018/10/24 14:28:02 sthen Exp $
 
 COMMENT =	graphical user interface library for games
 
 GH_ACCOUNT =	fifengine
 GH_PROJECT =	fifechan
 GH_TAGNAME =	0.1.4
+REVISION =	0
 
 SHARED_LIBS +=  fifechan                  0.0 # 0.1
 SHARED_LIBS +=  fifechan_allegro          0.0 # 0.1
@@ -22,6 +23,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += ${COMPILER_LIBCXX}
 WANTLIB += GL GLU Irrlicht SDL2 SDL2_image alleg m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake
 LIB_DEPENDS =		devel/sdl2-image \
 			games/allegro \
diff --git a/games/fifengine/Makefile b/games/fifengine/Makefile
index 419fe0e6b83..9b150687eda 100644
--- a/games/fifengine/Makefile
+++ b/games/fifengine/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2018/01/20 15:05:34 jsg Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:03 sthen Exp $
 
 BROKEN-i386 =	std::bad_alloc when compiling fifePYTHON_wrap.cxx
 BROKEN-powerpc =out of memory when compiling fifePYTHON_wrap.cxx
@@ -9,6 +9,7 @@ COMMENT =	2D game engine
 GH_ACCOUNT =	fifengine
 GH_PROJECT =	fifengine
 GH_TAGNAME =	0.4.1
+REVISION =	0
 
 CATEGORIES =	games
 
@@ -23,6 +24,8 @@ WANTLIB += boost_system-mt fifechan fifechan_opengl fifechan_sdl
 WANTLIB += m ogg openal png pthread ${MODPY_WANTLIB} tinyxml vorbis
 WANTLIB += vorbisfile z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake \
 			lang/python
 BUILD_DEPENDS =		devel/swig>=3.0.12
diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile
index 125746c33e5..99a9923ba90 100644
--- a/games/fillets-ng/Makefile
+++ b/games/fillets-ng/Makefile
@@ -1,17 +1,20 @@
-# $OpenBSD: Makefile,v 1.6 2018/05/15 11:50:08 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =		wonderful puzzle game
 V = 			1.0.1
 DISTNAME = 		fillets-ng-${V}
 CATEGORIES =		games
 HOMEPAGE =		http://fillets.sourceforge.net/
-REVISION =              1
+REVISION =              2
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB = 		SDL SDL_image SDL_mixer SDL_ttf c fribidi \
 			${MODLUA_WANTLIB} m pthread smpeg ${COMPILER_LIBCXX}
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=fillets/}
 DISTFILES = 		fillets-ng-${V}.tar.gz \
 			fillets-ng-data-${V}.tar.gz
diff --git a/games/flare/Makefile b/games/flare/Makefile
index b5dbe3da135..9b5dde0fc1a 100644
--- a/games/flare/Makefile
+++ b/games/flare/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2018/06/29 22:16:12 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT-main =		free/libre action roleplaying engine
 COMMENT-data =		free/libre action roleplaying engine data
@@ -7,7 +7,8 @@ V =			0.19
 DISTNAME = 		flare.${V}
 PKGNAME-main =		flare-${V}
 PKGNAME-data =		flare-data-${V}
-REVISION-main =		5
+REVISION-main =		6
+REVISION-data =		0
 
 CATEGORIES =		games
 
@@ -20,6 +21,8 @@ MAINTAINER =		Kirill Bychkov <kirby@openbsd.org>
 
 WANTLIB-main +=		SDL SDL_image SDL_mixer SDL_ttf c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=flare-game/}
 
 MODULES =		devel/cmake
diff --git a/games/freeserf/Makefile b/games/freeserf/Makefile
index eaa2adb3c1c..43eb974d1ab 100644
--- a/games/freeserf/Makefile
+++ b/games/freeserf/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2018/09/04 12:46:12 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =	Settlers 1 (Serf City) clone
 DISTNAME =	freeserf-0.1.1.20180302
 CATEGORIES =	games x11
-REVISION =	0
+REVISION =	1
 
 # Switch to GH_TAGNAME or a real tarball once 0.2 is released.
 GH_ACCOUNT =	freeserf
@@ -19,7 +19,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += ${COMPILER_LIBCXX} SDL2 SDL2_image SDL2_mixer c m xmp
 
 # C++11
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 
 MODULES =	devel/cmake
 
diff --git a/games/gargoyle/Makefile b/games/gargoyle/Makefile
index a54db60cae2..74c68c45777 100644
--- a/games/gargoyle/Makefile
+++ b/games/gargoyle/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2018/07/09 15:45:48 naddy Exp $
+# $OpenBSD: Makefile,v 1.26 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =	cross-platform interactive fiction player
 
@@ -7,7 +7,7 @@ GH_PROJECT =	garglk
 GH_TAGNAME =	stable-2011.1
 DISTNAME =	gargoyle-${GH_TAGNAME:S/stable-//}
 EPOCH =		0
-REVISION =	4
+REVISION =	5
 
 CATEGORIES =	games x11
 
@@ -28,6 +28,8 @@ WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 iconv intl jpeg m pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 png pthread smpeg ${COMPILER_LIBCXX}
 WANTLIB += vorbisfile z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =	devel/jam
 LIB_DEPENDS =	devel/sdl-sound \
 		devel/sdl-mixer \
diff --git a/games/gemrb/Makefile b/games/gemrb/Makefile
index b8e330cef65..c3e580a57a7 100644
--- a/games/gemrb/Makefile
+++ b/games/gemrb/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2018/06/29 22:16:13 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:03 sthen Exp $
 
 SHARED_LIBS += 		gemrb_core 0.0
 
 COMMENT =		open-source implementation of Bioware's Infinity Engine
 
 DISTNAME =		gemrb-0.8.5
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		games emulators x11
 
@@ -21,6 +21,8 @@ MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=gemrb/}
 WANTLIB += SDL SDL_mixer c freetype iconv m openal png pthread
 WANTLIB += vlc vorbisfile z ${MODPY_WANTLIB} ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake \
 			lang/python
 LIB_DEPENDS =		audio/openal \
diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index 91367bcc791..66307841a3b 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.43 2017/11/03 00:43:49 jca Exp $
+# $OpenBSD: Makefile,v 1.44 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT=	chess program
 
 DISTNAME=	gnuchess-6.2.5
 DISTFILES=	${DISTNAME}.tar.gz book_1.02.pgn.gz
+REVISION=	0
 
 CATEGORIES=	games
 HOMEPAGE=	http://www.gnu.org/software/chess/
@@ -14,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c iconv intl m ncurses pthread readline ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	devel/gettext
 
 BUILD_DEPENDS=	devel/help2man
diff --git a/games/godot/Makefile b/games/godot/Makefile
index 059f49eb90f..ea13073d5e3 100644
--- a/games/godot/Makefile
+++ b/games/godot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2018/08/25 19:20:29 thfr Exp $
+# $OpenBSD: Makefile,v 1.5 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =	2D and 3D game engine
 
@@ -8,6 +8,7 @@ PKGNAME =	godot-${V}
 CATEGORIES =	games
 HOMEPAGE =	https://godotengine.org/
 MAINTAINER =	Thomas Frohwein <thfr@openbsd.org>
+REVISION =	0
 
 # MIT
 PERMIT_PACKAGE_CDROM =	Yes
@@ -18,6 +19,8 @@ WANTLIB += Xrender c crypto enet execinfo freetype intl m mpcdec
 WANTLIB += ogg opus opusfile png ssl theora theoradec vorbis vorbisfile
 WANTLIB += webp xcb z pcre2-32 vpx zstd
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	https://downloads.tuxfamily.org/godotengine/${V}/
 EXTRACT_SUFX =	.tar.xz
 
diff --git a/games/golly/Makefile b/games/golly/Makefile
index f6e8e9c6b91..714c2f75f3a 100644
--- a/games/golly/Makefile
+++ b/games/golly/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2018/06/27 21:03:46 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =	game of life simulator
 
 PKGNAME =	golly-2.7
-REVISION =	3
+REVISION =	4
 DISTNAME =	${PKGNAME}-src
 WRKSRC =	${WRKDIST}/gui-wx/configure
 CATEGORIES =	games math
@@ -24,6 +24,8 @@ WANTLIB += ${COMPILER_LIBCXX} c m wx_base wx_base_net wx_base_odbc
 WANTLIB += wx_base_xml wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid
 WANTLIB += wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # Note: perl and python are loaded with wxDynamicLibrary.Load(), and
 # python needs libutil to prevent undefined openpty and forkpty symbols.
 WANTLIB += perl util ${MODPY_WANTLIB}
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index 0b15be1ba07..e63662200cd 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2018/06/27 21:03:47 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =		Othello/Reversi-like game
 DISTNAME =		grhino-${V}
 V =			0.16.1
-REVISION=		6
+REVISION=		7
 CATEGORIES =		games
 HOMEPAGE =		http://rhino.sourceforge.net/
 FIX_EXTRACT_PERMISSIONS=Yes
@@ -21,6 +21,8 @@ WANTLIB += glib-2.0 gmodule-2.0 gnome-2 gnomecanvas-2 gnomeui-2 gnomevfs-2
 WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 iconv intl m pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 popt pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=rhino/GRhino/${V}/}
 
 MODULES =		x11/gnome
diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile
index f82d2bb6ec5..a047821ab21 100644
--- a/games/hedgewars/Makefile
+++ b/games/hedgewars/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2018/01/11 19:27:02 rpe Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT-main =		Worms-like strategy game
 COMMENT-server =	Worms-like strategy game, server
@@ -12,7 +12,8 @@ V =			$R
 DISTNAME =		hedgewars-src-$V
 PKGNAME-main =		hedgewars-$V
 PKGNAME-server =	hedgewars-server-$V
-REVISION-server =	0
+REVISION-server =	1
+REVISION-main =		0
 
 CATEGORIES =		games
 
@@ -32,6 +33,8 @@ WANTLIB-main += GL GLU glut
 
 WANTLIB-server += c iconv m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://www.hedgewars.org/download/releases/
 EXTRACT_SUFX =		.tar.bz2
 
diff --git a/games/hex-a-hop/Makefile b/games/hex-a-hop/Makefile
index 4bed6a3915a..c2cd0f6b184 100644
--- a/games/hex-a-hop/Makefile
+++ b/games/hex-a-hop/Makefile
@@ -1,16 +1,18 @@
-# $OpenBSD: Makefile,v 1.6 2018/04/12 08:37:09 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =		hexagonal tile-based puzzle game
 DISTNAME =		hex-a-hop-1.1.0
 CATEGORIES =		games
 HOMEPAGE =		http://hexahop.sourceforge.net
-REVISION =		0
+REVISION =		1
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		SDL SDL_mixer SDL_ttf c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=hexahop/}
 
 LIB_DEPENDS =		devel/sdl-mixer \
diff --git a/games/instead-launcher/Makefile b/games/instead-launcher/Makefile
index f5ceffb1b60..399dc66fc87 100644
--- a/games/instead-launcher/Makefile
+++ b/games/instead-launcher/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2018/06/27 21:03:47 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =		package manager for Instead game engine
 V =			0.7.0
@@ -7,7 +7,7 @@ PKGNAME =		${DISTNAME:C/_/-/}
 CATEGORIES =		games
 HOMEPAGE =		https://instead.syscall.ru/
 MAINTAINER =		Roman Yakovlev <obsd@51t.ru>
-REVISION =		1
+REVISION =		2
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB =  ICE QtGui QtNetwork SM X11 Xext Xi Xinerama Xrender
 WANTLIB += c fontconfig freetype m pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=instead/}
 
 MODULES	=		x11/qt4 devel/qmake
diff --git a/games/ja2-stracciatella/Makefile b/games/ja2-stracciatella/Makefile
index d6ec8a49f69..b7f955ecc70 100644
--- a/games/ja2-stracciatella/Makefile
+++ b/games/ja2-stracciatella/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2018/09/04 12:46:13 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =	Jagged Alliance 2 engine
 
 GH_ACCOUNT =	ja2-stracciatella
 GH_PROJECT =	ja2-stracciatella
 GH_TAGNAME =	v0.15.1
-REVISION =	3
+REVISION =	4
 
 CATEGORIES =	games
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_FTP =	Yes
 
 WANTLIB +=	boost_filesystem boost_system c m pthread SDL ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =	devel/sdl \
 		devel/boost
 
diff --git a/games/jag/Makefile b/games/jag/Makefile
index 6ed76cae26a..97e2141f1ed 100644
--- a/games/jag/Makefile
+++ b/games/jag/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/26 22:45:21 sthen Exp $ 
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:28:03 sthen Exp $ 
 COMMENT =		arcade-puzzle game
 V = 			0.3.2
 DISTNAME =		jag-${V}
 CATEGORIES =		games
 HOMEPAGE =		http://jag.xlabsoft.com
-REVISION =		1
+REVISION =		2
 
 # GPLv3
 PERMIT_PACKAGE_CDROM =	Yes
@@ -13,6 +13,8 @@ WANTLIB += GL ICE QtGui QtOpenGL QtXml SDL SDL_mixer SM X11 Xext
 WANTLIB += Xi Xinerama Xrandr Xrender c fontconfig freetype m
 WANTLIB += pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES = 		http://jag.xlabsoft.com/files/
 DISTFILES = 		jag-${V}-src.zip jag-${V}-data.zip
 
diff --git a/games/kobodeluxe/Makefile b/games/kobodeluxe/Makefile
index 30313a813a6..7a7acda8b2e 100644
--- a/games/kobodeluxe/Makefile
+++ b/games/kobodeluxe/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2017/07/26 22:45:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT=	sdl port of xkobo
 DISTNAME=	KoboDeluxe-0.5.1
 PKGNAME=	${DISTNAME:L}
 CATEGORIES=	games x11
 MASTER_SITES=	${HOMEPAGE}download/
-REVISION=	2
+REVISION=	3
 
 EXTRACT_SUFX=	.tar.bz2
 
@@ -22,6 +22,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	SDL c m pthread ${COMPILER_LIBCXX} SDL_image
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	devel/sdl-image
 
 CONFIGURE_STYLE=gnu
diff --git a/games/koboredux/Makefile b/games/koboredux/Makefile
index 59d4e648a85..00fa045c2eb 100644
--- a/games/koboredux/Makefile
+++ b/games/koboredux/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2018/09/04 12:46:13 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =	frenetic space shoot-em-up
 
 V =		0.7.5.1
 DISTNAME =	koboredux-$V
-REVISION =	1
+REVISION =	2
 
 GH_ACCOUNT =	olofson
 GH_PROJECT =	koboredux
@@ -21,6 +21,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} SDL2 SDL2_image audiality2 c m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake
 RUN_DEPENDS =		devel/desktop-file-utils
 LIB_DEPENDS =		audio/audiality2 \
diff --git a/games/late/Makefile b/games/late/Makefile
index 55926c00749..671bd1584b2 100644
--- a/games/late/Makefile
+++ b/games/late/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.19 2017/10/23 17:10:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT=	puzzle game resembling the arcade game Qix
 DISTNAME=	late-0.1.0
-REVISION=	3
+REVISION=	4
 EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=late/}
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=		SDL X11 Xext c m pthread ${COMPILER_LIBCXX} \
 			usbhid xcb SDL_image
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	devel/sdl-image
 
 
diff --git a/games/liberalcrimesquad/Makefile b/games/liberalcrimesquad/Makefile
index 69a02d4974f..65705fec6e1 100644
--- a/games/liberalcrimesquad/Makefile
+++ b/games/liberalcrimesquad/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2018/07/04 15:10:31 bcallah Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:28:03 sthen Exp $
 
 V =		4.10.0
 COMMENT =	politics and government game with liberal bias
 DISTNAME =	liberalcrimesquad-${V}{v${V}}
 PKGNAME =	liberalcrimesquad-${V}
 CATEGORIES =	games
-REVISION =	1
+REVISION =	2
 
 HOMEPAGE =	http://lcs.wikidot.com/
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
@@ -18,7 +18,7 @@ WANTLIB += ${COMPILER_LIBCXX} c curses iconv m
 MASTER_SITES =	https://github.com/Kamal-Sadek/Liberal-Crime-Squad/archive/
 
 # C++11
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 
 LIB_DEPENDS =	converters/libiconv
 
diff --git a/games/life/Makefile b/games/life/Makefile
index cecb782ac8e..c364204b9a3 100644
--- a/games/life/Makefile
+++ b/games/life/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2017/07/26 22:45:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT=	SDL clone of the popular Game of Life
 
 DISTNAME=	life-1.0
-REVISION =	2
+REVISION =	3
 EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	games
 
@@ -12,6 +12,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		c m pthread ${COMPILER_LIBCXX} SDL
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 NO_TEST=	Yes
 
 LIB_DEPENDS=	devel/sdl
diff --git a/games/lincity-ng/Makefile b/games/lincity-ng/Makefile
index 56003ef77b4..074443fac3a 100644
--- a/games/lincity-ng/Makefile
+++ b/games/lincity-ng/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2018/06/27 21:03:47 espie Exp $
+# $OpenBSD: Makefile,v 1.26 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT=	city simulation game
 
 DISTNAME=	lincity-ng-2.0
-REVISION =	11
+REVISION =	12
 EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	games x11
 
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=	GL SDL X11 c iconv intl m pthread ${COMPILER_LIBCXX} xcb z \
 		SDL_gfx SDL_image SDL_mixer SDL_ttf physfs xml2
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	devel/sdl-gfx \
 		devel/sdl-image \
 		devel/sdl-mixer \
diff --git a/games/lostpixels/Makefile b/games/lostpixels/Makefile
index f5010c40d7b..c938c994bbb 100644
--- a/games/lostpixels/Makefile
+++ b/games/lostpixels/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2018/04/15 20:32:47 bcallah Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:28:03 sthen Exp $
 
 BROKEN-sparc64 =	Illegal operands error building SDL_gfxPrimitives.cpp
 
@@ -7,7 +7,7 @@ COMMENT =		blinkensisters - hunt for the lost pixels
 V =			0.5.3
 DISTNAME =		LostPixels-${V}-source-with-addons
 PKGNAME =		lostpixels-${V}
-REVISION =		5
+REVISION =		6
 HOMEPAGE =		http://www.blinkensisters.org
 
 CATEGORIES =		games
@@ -25,6 +25,8 @@ LIB_DEPENDS =		devel/sdl-net		\
 WANTLIB +=		SDL SDL_image SDL_mixer SDL_net SDL_ttf X11 Xau
 WANTLIB +=		Xdmcp Xext Xrandr Xrender c freetype m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES +=		devel/cmake \
 			lang/lua
 MODLUA_BUILDDEP =	No
diff --git a/games/love/Makefile b/games/love/Makefile
index ba1b4af4394..1cc4b53c0d7 100644
--- a/games/love/Makefile
+++ b/games/love/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.22 2017/07/26 22:45:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT=		2D games framework for use with Lua
 
 V=			0.8.0
 DISTNAME=		love-$V-linux-src
 PKGNAME=		love-$V
-REVISION=		8
+REVISION=		9
 
 HOMEPAGE=		http://love2d.org/
 
@@ -23,6 +23,8 @@ WANTLIB += ogg openal physfs png pthread sndio ${COMPILER_LIBCXX}
 WANTLIB += tiff usbhid vorbis vorbisfile xcb xcb-dri2 xcb-glx
 WANTLIB += z expat
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		https://bitbucket.org/rude/love/downloads/
 
 MODULES=		lang/lua
diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile
index b108176ac13..95107e6b90b 100644
--- a/games/maelstrom/Makefile
+++ b/games/maelstrom/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2018/04/09 16:35:38 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =		asteroid-like game
 
 DISTNAME =		Maelstrom-3.0.6
 PKGNAME = 		${DISTNAME:L}
-REVISION =		2
+REVISION =		3
 CATEGORIES =		games x11
 HOMEPAGE =		http://www.devolution.com/~slouken/Maelstrom/
 MASTER_SITES =		${HOMEPAGE}/src/
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 CONFIGURE_STYLE = 	gnu
 
 WANTLIB =		SDL c m pthread ${COMPILER_LIBCXX} SDL_net
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		devel/sdl-net
 
 pre-configure:
diff --git a/games/mars/Makefile b/games/mars/Makefile
index f979d29db68..5b9894808e6 100644
--- a/games/mars/Makefile
+++ b/games/mars/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2018/06/29 22:16:14 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:03 sthen Exp $
 
 V =		0.7.5
 COMMENT =	ridiculous shoot-em-up game
 DISTNAME =	mars_source_${V}
 PKGNAME =	mars-${V}
 CATEGORIES =	games x11
-REVISION =	6
+REVISION =	7
 
 HOMEPAGE =	http://mars-game.sourceforge.net/
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += GL GLU Xrandr c fribidi m pthread sfml-audio sfml-graphics
 WANTLIB += sfml-system sfml-window ${COMPILER_LIBCXX} tag
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # Not using the GH_* variables on purpose. The tarball was generated
 # separately. Will update to use GH_* next time M.A.R.S. is updated.
 MASTER_SITES =	https://github.com/downloads/thelaui/M.A.R.S./
diff --git a/games/meandmyshadow/Makefile b/games/meandmyshadow/Makefile
index 7f3d290ba96..e607bec7bc4 100644
--- a/games/meandmyshadow/Makefile
+++ b/games/meandmyshadow/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2018/06/29 22:16:14 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =	puzzle/platform game
 
 DISTNAME =	meandmyshadow-0.4.1-src
 CATEGORIES =	games
 PKGNAME =	${DISTNAME:S/-src//}
-REVISION =	3
+REVISION =	4
 
 HOMEPAGE =	http://meandmyshadow.sourceforge.net/
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=meandmyshadow/}
@@ -25,6 +25,8 @@ LIB_DEPENDS =	net/curl \
 WANTLIB += SDL SDL_gfx SDL_image SDL_mixer SDL_ttf archive c crypto
 WANTLIB += curl m pthread ssl ${COMPILER_LIBCXX} GL GLU ICE SM X11 Xext
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS =	devel/desktop-file-utils \
 		x11/gtk+3,-guic
 
diff --git a/games/megaglest/base/Makefile b/games/megaglest/base/Makefile
index 0471a696703..d9dce1feb5e 100644
--- a/games/megaglest/base/Makefile
+++ b/games/megaglest/base/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2017/11/09 12:46:36 bentley Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =		3D real-time strategy game
 GH_PROJECT =		megaglest-source
 PKGNAME =		megaglest-${GH_TAGNAME}
-REVISION =		0
+REVISION =		1
 
 WANTLIB += GL GLEW GLU ICE SDL2 SM X11 Xext c crypto curl fontconfig
 WANTLIB += freetype fribidi ftgl glib-2.0 intl ircclient jpeg m
@@ -11,6 +11,8 @@ WANTLIB += miniupnpc nghttp2 openal png pthread ssl vlc vlccore
 WANTLIB += vorbisfile wx_base wx_gtk2_core wx_gtk2_gl z
 WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		lang/lua
 
 BUILD_DEPENDS =		devel/help2man
diff --git a/games/minetest/Makefile b/games/minetest/Makefile
index 3e761ebf27e..32051f5e076 100644
--- a/games/minetest/Makefile
+++ b/games/minetest/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2018/06/29 22:16:14 espie Exp $
+# $OpenBSD: Makefile,v 1.27 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =		infinite-world block sandbox game
 # minetest_game is still 0.4.17
@@ -7,7 +7,7 @@ GAME_V =		0.4.17
 V =			${GAME_V}.1
 DISTNAME =		minetest-${V}
 CATEGORIES =		games x11
-REVISION =	2
+REVISION =	3
 
 HOMEPAGE =		http://www.minetest.net/
 
@@ -19,6 +19,8 @@ WANTLIB += Xxf86vm bz2 c curl curses form freetype gmp iconv intl
 WANTLIB += jpeg luajit-${MODLUA_VERSION} m ogg openal png pq
 WANTLIB += spatialindex sqlite3 vorbis vorbisfile z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		https://github.com/minetest/
 
 DISTFILES =		minetest-{minetest/archive/}${V}${EXTRACT_SUFX} \
diff --git a/games/nethack/3.4/Makefile b/games/nethack/3.4/Makefile
index e0bb8b3d0b5..9efdc8451b8 100644
--- a/games/nethack/3.4/Makefile
+++ b/games/nethack/3.4/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2018/04/25 14:30:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =	dungeon explorin', hackin', game.  Piece of cake
 V =		3.4.3
 DISTNAME =	nethack-$V
 PKGNAME =	${DISTNAME}
-REVISION =	13
+REVISION =	14
 CATEGORIES =	games
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=nethack/}
@@ -18,6 +18,8 @@ MAINTAINER =	Marc Espie <espie@openbsd.org>
 PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB =		c termlib
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 FAKE_FLAGS =	PREFIX=${PREFIX}
 
 GAMEDIR =	lib/nethackdir-$V
diff --git a/games/nethack/3.6/Makefile b/games/nethack/3.6/Makefile
index 1a1b841bf83..74313740dd0 100644
--- a/games/nethack/3.6/Makefile
+++ b/games/nethack/3.6/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2018/09/20 13:34:27 naddy Exp $
+# $OpenBSD: Makefile,v 1.3 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =	dungeon explorin', hackin', game.  Piece of cake
 V =		3.6.0
 DISTNAME =	nethack-$V
 PKGNAME =	${DISTNAME}
-REVISION =	0
+REVISION =	1
 CATEGORIES =	games
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=nethack/} \
 		http://www.nethack.de/download/
@@ -15,6 +15,8 @@ HOMEPAGE =	http://nethack.org/
 MAINTAINER =	Marc Espie <espie@openbsd.org>
 WANTLIB +=	c curses
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 FLAVORS = no_x11 qt
 FLAVOR ?=
 
diff --git a/games/numptyphysics/Makefile b/games/numptyphysics/Makefile
index 404a25257d4..b547acd7ce4 100644
--- a/games/numptyphysics/Makefile
+++ b/games/numptyphysics/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2018/06/29 22:16:14 espie Exp $
+# $OpenBSD: Makefile,v 1.34 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT-main =		physics-based drawing puzzle game
 COMMENT-npcomplete =	extra levels for physics-based drawing puzzle game
@@ -6,8 +6,8 @@ COMMENT-npcomplete =	extra levels for physics-based drawing puzzle game
 DISTNAME =		numptyphysics-0.3.r20100916
 PKGNAME-main =		${DISTNAME}
 PKGNAME-npcomplete =	npcomplete-0.0.r20100124
-REVISION-main =		5
-REVISION-npcomplete =	2
+REVISION-main =		6
+REVISION-npcomplete =	3
 
 MULTI_PACKAGES =	-main -npcomplete
 
@@ -27,6 +27,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB-main =		SDL SDL_image SDL_ttf X11 c m \
 			pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS-main =	devel/desktop-file-utils \
 			x11/gtk+3,-guic
 LIB_DEPENDS-main =	devel/sdl \
diff --git a/games/oilwar/Makefile b/games/oilwar/Makefile
index f878276fcbd..5b03c6bb53b 100644
--- a/games/oilwar/Makefile
+++ b/games/oilwar/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2018/04/12 08:12:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT=	sdl shoot 'em up; stop evil army from getting your oil
 DISTNAME=	OilWar-1.2.1
 PKGNAME=	${DISTNAME:L}
-REVISION=	6
+REVISION=	7
 CATEGORIES=	games x11
 
 # GPLv2
@@ -11,6 +11,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} SDL SDL_image SDL_mixer c m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 NO_TEST=     Yes
 
 LIB_DEPENDS=	devel/sdl-image \
diff --git a/games/openfodder/Makefile b/games/openfodder/Makefile
index 6b568cfa1a3..0f6bd9e0fe0 100644
--- a/games/openfodder/Makefile
+++ b/games/openfodder/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2018/09/04 12:46:13 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =	open source port of Cannon Fodder game
 DISTNAME =	openfodder-1.4.0
 CATEGORIES =	games x11
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	http://openfodder.com/
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
@@ -17,7 +17,7 @@ WANTLIB += ${COMPILER_LIBCXX} SDL2 SDL2_mixer c m
 MASTER_SITES =	https://devio.us/~bcallah/source/
 
 # C++14
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 
 LIB_DEPENDS =	devel/sdl2-mixer
 
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 5f81006cf6d..60139f2832e 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.58 2018/09/04 12:46:13 espie Exp $
+# $OpenBSD: Makefile,v 1.59 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT=	open source clone of the game Transport Tycoon Deluxe
 
 V =		1.8.0
 DISTNAME =	openttd-$V-source
 PKGNAME =	openttd-$V
-REVISION =	2
+REVISION =	3
 
 CATEGORIES=	games
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += SDL c fontconfig freetype icudata icui18n icuuc
 WANTLIB += lzma lzo2 m png pthread ${COMPILER_LIBCXX} xdg-basedir z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		https://binaries.openttd.org/releases/$V/
 
 DIST_SUBDIR =		openttd
diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index 321d5b59034..1746701f973 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.41 2018/07/10 10:53:10 tb Exp $
+# $OpenBSD: Makefile,v 1.42 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT=	texas hold'em poker game with online capabilities
 #'
 BROKEN-hppa =	needs atomic ops
 
 DISTNAME =	pokerth-1.1.2
-REVISION =	1
+REVISION =	2
 
 CATEGORIES=	games x11
 
@@ -24,7 +24,7 @@ WANTLIB += sqlite3 ssl tinyxml
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pokerth/}
 
 # C++11
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 CXXFLAGS +=	-std=gnu++11
 
 MODULES=	devel/qmake \
diff --git a/games/postal/Makefile b/games/postal/Makefile
index 7bee3d25967..d6944a1fc83 100644
--- a/games/postal/Makefile
+++ b/games/postal/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2018/09/04 12:46:13 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2018/10/24 14:28:03 sthen Exp $
 
 V =		20171127
 COMMENT =	Postal 1, the non-stop killing isometric shooter game
 DISTNAME =	postal-1-open-source-${V}
 PKGNAME =	postal-${V}
-REVISION =	1
+REVISION =	2
 CATEGORIES =	games x11
 
 HOMEPAGE =	http://runningwithscissors.com/
@@ -18,7 +18,7 @@ WANTLIB += ${COMPILER_LIBCXX} SDL2 c m
 MASTER_SITES =	https://devio.us/~bcallah/source/
 
 # base-gcc not good enough (tested on armv7)
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 
 LIB_DEPENDS =	devel/sdl2
 
diff --git a/games/pushover/Makefile b/games/pushover/Makefile
index 6c5fedb9c92..a07924f0a3c 100644
--- a/games/pushover/Makefile
+++ b/games/pushover/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2017/11/21 00:13:00 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =		puzzle game featuring dominoes
 
 DISTNAME =		pushover-0.0.5
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		games
 
@@ -16,6 +16,8 @@ WANTLIB += FLAC SDL SDL_mixer SDL_ttf c freetype iconv intl m mikmod ogg
 WANTLIB += png pthread smpeg sndio ${COMPILER_LIBCXX} usbhid vorbis vorbisfile z
 WANTLIB += ${MODLUA_WANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=pushover/}
 
 MODULES =		lang/lua
diff --git a/games/qgo/Makefile b/games/qgo/Makefile
index 6b0aed7c79c..0d4cc71cbee 100644
--- a/games/qgo/Makefile
+++ b/games/qgo/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2017/10/23 17:10:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT=	go client and fully featured sgf editor
 
 DISTNAME=	qgo-1.5.4
-REVISION =	7
+REVISION =	8
 CATEGORIES=	games
 
 # GPL
@@ -14,6 +14,8 @@ WANTLIB += Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm c drm expat
 WANTLIB += fontconfig freetype glapi jpeg lcms m mng png pthread
 WANTLIB += ${COMPILER_LIBCXX} xcb xcb-dri2 xcb-glx z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	x11/qt3
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qgo/}
diff --git a/games/qqwing/Makefile b/games/qqwing/Makefile
index dbe61da1124..93335fd7f0b 100644
--- a/games/qqwing/Makefile
+++ b/games/qqwing/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/12/17 16:58:14 bcallah Exp $
+# $OpenBSD: Makefile,v 1.2 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =	Sudoku generator and solver
 DISTNAME =	qqwing-1.3.4
 SHARED_LIBS +=  qqwing                    0.0 # 3.0
+REVISION =	0
 
 CATEGORIES =	games
 
@@ -14,6 +15,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} c m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	https://qqwing.com/
 
 CONFIGURE_STYLE =	gnu
diff --git a/games/quadrupleback/Makefile b/games/quadrupleback/Makefile
index d032e0b9bc0..30a665cf3a1 100644
--- a/games/quadrupleback/Makefile
+++ b/games/quadrupleback/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2018/06/27 21:03:49 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT =		clone of Doubleback, an intruder circling game
 
 DISTNAME =		quadrupleback-0.1.0
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		games
 
@@ -16,6 +16,8 @@ WANTLIB += FLAC SDL SDL_gfx SDL_image SDL_mixer c flatzebra-0.1 iconv
 WANTLIB += jpeg m mikmod ogg png pthread smpeg sndio ${COMPILER_LIBCXX} tiff
 WANTLIB += usbhid vorbis vorbisfile webp z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://sarrazip.com/dev/
 
 RUN_DEPENDS =		devel/desktop-file-utils
diff --git a/games/redeclipse/Makefile b/games/redeclipse/Makefile
index 0fd175a2ae4..78e7b9ed99e 100644
--- a/games/redeclipse/Makefile
+++ b/games/redeclipse/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2018/06/29 22:16:14 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:03 sthen Exp $
 
 ONLY_FOR_ARCHS=	i386 amd64
 
@@ -20,13 +20,16 @@ PKGNAME-data=	${N}-data-${V}
 MASTER_SITES=	https://github.com/red-eclipse/base/releases/download/v${V}/
 DISTNAME=	redeclipse_${V}_combined
 EXTRACT_SUFX=	.tar.bz2
-REVISION-main=	1
+REVISION-main=	2
+REVISION-data=	0
 
 PKG_ARCH-data=	*
 
 # zlib (code) + CC-BY-SA-3.0+ (data)
 PERMIT_PACKAGE_CDROM=	Yes
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS-main +=	${BASE_PKGPATH},-data>=${V} \
 			devel/desktop-file-utils \
 			x11/gtk+3,-guic
diff --git a/games/returntotheroots/Makefile b/games/returntotheroots/Makefile
index 0da694db4bd..59b4b8b71b2 100644
--- a/games/returntotheroots/Makefile
+++ b/games/returntotheroots/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2018/09/24 21:43:10 bcallah Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:28:03 sthen Exp $
 
 V =		0.8.2.20180924
 COMMENT =	open source engine remake of The Settlers 2 (s25client)
 DISTNAME =	s25client-${V}
 PKGNAME =	returntotheroots-${V}
 CATEGORIES =	games x11
+REVISION =	0
 
 ONLY_FOR_ARCHS =	i386 amd64
 
@@ -23,7 +24,7 @@ WANTLIB += ${MODLUA_WANTLIB}
 MASTER_SITES =	https://mirrors.nycbug.org/pub/distfiles/
 
 # C++11
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 
 MODULES =	devel/cmake \
 		lang/lua
diff --git a/games/ri-li/Makefile b/games/ri-li/Makefile
index 2f47fbfc626..693aef898d8 100644
--- a/games/ri-li/Makefile
+++ b/games/ri-li/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2017/07/26 22:45:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT=	drive a toy wood engine
 
 DISTNAME=	Ri-li-2.0.1
 CATEGORIES=	games
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://ri-li.sourceforge.net
 
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += SDL SDL_mixer c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ri-li/}
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/games/roadfighter/Makefile b/games/roadfighter/Makefile
index 02ed5647f74..686f4ee5d8c 100644
--- a/games/roadfighter/Makefile
+++ b/games/roadfighter/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2018/06/27 21:03:49 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:03 sthen Exp $
 
 COMMENT=	remake of Konami's Road Fighter
 
 DISTNAME=	roadfighter.src_1.0.1269
 PKGNAME=	${DISTNAME:S/.src_/-/}
-REVISION =	3
+REVISION =	4
 WRKDIST=	${WRKDIR}/${DISTNAME:S/.src_/-/}
 
 EXTRACT_SUFX=	.tgz
@@ -28,4 +28,6 @@ LIB_DEPENDS=	devel/sdl-sound \
 		devel/sdl-mixer
 WANTLIB=	SDL c ${COMPILER_LIBCXX} m pthread SDL_sound SDL_image SDL_ttf SDL_mixer
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 .include <bsd.port.mk>
diff --git a/games/sauerbraten/Makefile b/games/sauerbraten/Makefile
index 074e986228c..58761595366 100644
--- a/games/sauerbraten/Makefile
+++ b/games/sauerbraten/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2017/07/26 22:45:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:03 sthen Exp $
 
 ONLY_FOR_ARCHS=	i386 amd64
 
@@ -14,7 +14,7 @@ MULTI_PACKAGES=	-main -data
 
 N=		sauerbraten
 V=		20130203
-REVISION=	2
+REVISION=	3
 PKGNAME=	${N}-${V}
 PKGNAME-main=	${N}-${V}
 PKGNAME-data=	${N}-data-${V}
@@ -40,6 +40,8 @@ LIB_DEPENDS-main=	devel/sdl-mixer \
 			net/enet
 WANTLIB-main=		GL X11 SDL SDL_image SDL_mixer c enet m pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sauer_client ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/sauer_server ${PREFIX}/libexec
diff --git a/games/scid/Makefile b/games/scid/Makefile
index 83bb04cf690..7f52ea1f017 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2018/01/17 20:18:53 bcallah Exp $
+# $OpenBSD: Makefile,v 1.2 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	chess database software
 DISTNAME =	scid-4.6.4
 EXTRACT_SUFX =	.zip
 CATEGORIES =	games x11
+REVISION =	0
 
 HOMEPAGE =	http://scid.sourceforge.net/
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
@@ -16,7 +17,7 @@ WANTLIB += ${COMPILER_LIBCXX} ${MODTCL_WANTLIB} c m z
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=scid/}
 
 # C++11
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 
 MODULES =	lang/python \
 		x11/tk
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 7ce42af1098..99c0831d9cb 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2017/11/05 08:51:46 kirby Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =		modernization of the classic DOS game Scorched Earth
 
 DISTNAME =		Scorched3D-44-src
 PKGNAME =		${DISTNAME:L:S/-src//}
+REVISION =		0
 
 CATEGORIES =		games x11
 
@@ -18,6 +19,8 @@ WANTLIB +=		wx_base wx_base_net wx_base_odbc wx_base_xml vorbis
 WANTLIB +=		wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid
 WANTLIB +=		wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=scorched3d/}
 
 BUILD_DEPENDS =		${MODGNU_AUTOCONF_DEPENDS} \
diff --git a/games/snipe2d/Makefile b/games/snipe2d/Makefile
index 383dca3abe0..728c6c8f92e 100644
--- a/games/snipe2d/Makefile
+++ b/games/snipe2d/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2017/07/26 22:45:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =		overhead shooting game
 
 V = 			1.30
 DISTNAME =		orbital_eunuchs_sniper-${V}
 PKGNAME = 		snipe2d-${V}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		games
 
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB +=		SDL c m pthread ${COMPILER_LIBCXX} SDL_image>=2 SDL_mixer>=3
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://icculus.org/oes/
 
 LIB_DEPENDS =		devel/sdl-image \
diff --git a/games/spacehulk/Makefile b/games/spacehulk/Makefile
index 13dda6c9e91..df76da05e67 100644
--- a/games/spacehulk/Makefile
+++ b/games/spacehulk/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2017/10/23 17:10:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT=	total conversion of the Space Hulk board game
 
 DISTNAME=	spacehulk-1.5-beta1
 PKGNAME=	spacehulk-1.5beta1
-REVISION =	8
+REVISION =	9
 CATEGORIES=	games x11
 
 HOMEPAGE=	http://r.vinot.free.fr/spacehulk/
@@ -17,6 +17,8 @@ WANTLIB += Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm c drm expat
 WANTLIB += fontconfig freetype glapi jpeg lcms m mng png pthread
 WANTLIB += ${COMPILER_LIBCXX} xcb xcb-dri2 xcb-glx z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${HOMEPAGE}
 
 MODULES=	x11/qt3
diff --git a/games/speeddreams/Makefile b/games/speeddreams/Makefile
index 321e3a67458..da8c164d318 100644
--- a/games/speeddreams/Makefile
+++ b/games/speeddreams/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2018/01/25 20:21:12 pascal Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:04 sthen Exp $
 
 BROKEN =		failure on startup
 
@@ -14,8 +14,8 @@ REV =			r6404
 DISTNAME =		speed-dreams-src-base-$V-${REV}
 PKGNAME-main =		speeddreams-$V
 PKGNAME-data =		speeddreams-data-$V
-REVISION-data =		0
-REVISION-main =		0
+REVISION-data =		1
+REVISION-main =		1
 
 CATEGORIES =		games
 
@@ -32,6 +32,8 @@ WANTLIB-main += osgShadow osgUtil osgViewer png pthread ${COMPILER_LIBCXX} vorbi
 WANTLIB-main += vorbisfile z
 WANTLIB-data = #empty
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=speed-dreams/}
 EXTRACT_SUFX =		.tar.xz
 TAR =			${LOCALBASE}/bin/gtar
diff --git a/games/starfighter/Makefile b/games/starfighter/Makefile
index ce2b2dfdaba..e68ece8f970 100644
--- a/games/starfighter/Makefile
+++ b/games/starfighter/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2018/06/27 21:03:49 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =		sidescrolling space shmup
 
 V =			1.7
 DISTNAME =		starfighter-$V-src
 PKGNAME =		starfighter-$V
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		games
 
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += SDL2 SDL2_image SDL2_mixer c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SAVANNAH:=starfighter/$V/}
 
 LIB_DEPENDS =		devel/sdl2-image \
diff --git a/games/stepmania/Makefile b/games/stepmania/Makefile
index 617584ab109..839ad0f24b2 100644
--- a/games/stepmania/Makefile
+++ b/games/stepmania/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2018/04/20 12:40:08 fcambus Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:04 sthen Exp $
 
 BROKEN-alpha=	libtomcrypt/src/headers/tomcrypt_cfg.h:130:6: error: #error You must specify a word size as well as endianess in tomcrypt_cfg.h
 
@@ -7,7 +7,7 @@ CATEGORIES = 	games emulators
 
 DISTNAME = 	stepmania-5.0b2a
 PKGNAME =	stepmania-5.0beta2a
-REVISION =	9
+REVISION =	10
 EXTRACT_SUFX = 	-src.tar.bz2
 HOMEPAGE =	http://www.stepmania.com
 MASTER_SITES = 	${MASTER_SITE_SOURCEFORGE:=stepmania/}
@@ -23,6 +23,8 @@ CONFIGURE_ENV += 	CPPFLAGS=-I${LOCALBASE}/include  \
 			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 NO_TEST =	Yes
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =	audio/libvorbis \
 		audio/libmad \
 		graphics/ffmpeg \
diff --git a/games/stockfish/Makefile b/games/stockfish/Makefile
index dfac7b603d0..cc5914a131b 100644
--- a/games/stockfish/Makefile
+++ b/games/stockfish/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2018/02/09 01:21:01 bcallah Exp $
+# $OpenBSD: Makefile,v 1.4 2018/10/24 14:28:04 sthen Exp $
 
 V =		9
 COMMENT =	open source chess engine
@@ -6,6 +6,7 @@ DISTNAME =	stockfish-${V}-src
 PKGNAME =	stockfish-${V}
 EXTRACT_SUFX =	.zip
 CATEGORIES =	games
+REVISION =	0
 
 HOMEPAGE =	https://stockfishchess.org/
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
@@ -18,7 +19,7 @@ WANTLIB += ${COMPILER_LIBCXX} c m
 MASTER_SITES =	https://stockfish.s3.amazonaws.com/
 
 # C++11
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 
 USE_GMAKE =	Yes
 MAKE_FLAGS =	CC="${CC}" CXX="${CXX}"
diff --git a/games/taxipilot/Makefile b/games/taxipilot/Makefile
index 1c156b637e9..f11f9c9e039 100644
--- a/games/taxipilot/Makefile
+++ b/games/taxipilot/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.40 2018/06/29 22:16:15 espie Exp $
+# $OpenBSD: Makefile,v 1.41 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT=	silly little game based on Spacetaxi for the C64
 
 DISTNAME=	taxipilot-0.7.2
-REVISION =	16
+REVISION =	17
 CATEGORIES=	games
 
 HOMEPAGE=	http://taxipilot.sourceforge.net/
@@ -19,6 +19,8 @@ WANTLIB += lib/kde3/kdesu lib/kde3/kdeui lib/kde3/kio
 WANTLIB += lib/kde3/kwalletclient m mng png pthread ${COMPILER_LIBCXX}
 WANTLIB += util xcb xcb-dri2 xcb-glx z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=taxipilot/}
 
 RUN_DEPENDS=	x11/gtk+3,-guic
diff --git a/games/teeworlds/Makefile b/games/teeworlds/Makefile
index 442e2799858..62e9dda2c4b 100644
--- a/games/teeworlds/Makefile
+++ b/games/teeworlds/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2017/07/26 22:45:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:28:04 sthen Exp $
 
 # Crashes on strict-alignment archs, see: src/base/system.c:164
 ONLY_FOR_ARCHS=	amd64 i386 powerpc
@@ -9,7 +9,7 @@ V=		0.6.4
 DISTNAME=	teeworlds-${V}-src
 PKGNAME=	teeworlds-${V}
 CATEGORIES=	games
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://www.teeworlds.com/
 
@@ -26,6 +26,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	GL GLU SDL X11 c freetype m pthread ${COMPILER_LIBCXX} wavpack z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	audio/wavpack \
 		devel/sdl
 
diff --git a/games/tong/Makefile b/games/tong/Makefile
index 4c70985940d..25de11bdc4a 100644
--- a/games/tong/Makefile
+++ b/games/tong/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2017/07/26 22:45:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	Tetris and Pong played simultaneously on one playing field
 DISTNAME =	tong-1.3
 CATEGORIES =	games x11
-REVISION =	1
+REVISION =	2
 
 HOMEPAGE =	http://www.nongnu.org/tong/
 
@@ -12,6 +12,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += SDL SDL_image SDL_mixer c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	http://www.nongnu.org/tong/
 
 LIB_DEPENDS =	devel/sdl-image \
diff --git a/games/toppler/Makefile b/games/toppler/Makefile
index 17a35c5c2e8..8d2805d8375 100644
--- a/games/toppler/Makefile
+++ b/games/toppler/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.32 2018/06/27 21:03:50 espie Exp $
+# $OpenBSD: Makefile,v 1.33 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT=		Nebulous rewrite of Tower Toppler
 
 DISTNAME=		toppler-1.1.6
-REVISION=		3
+REVISION=		4
 CATEGORIES=		games
 
 HOMEPAGE=		http://toppler.sourceforge.net/
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=   Yes
 WANTLIB += FLAC SDL SDL_mixer c iconv intl m ogg pthread smpeg sndio
 WANTLIB += ${COMPILER_LIBCXX} usbhid vorbis vorbisfile z mikmod
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=toppler/}
 
 LIB_DEPENDS=		audio/libmikmod \
diff --git a/games/tutris/Makefile b/games/tutris/Makefile
index 20520e03c20..1011d787ca3 100644
--- a/games/tutris/Makefile
+++ b/games/tutris/Makefile
@@ -1,16 +1,19 @@
-# $OpenBSD: Makefile,v 1.16 2017/10/23 17:10:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT=	graphical tetris clone
 DISTNAME=	Tutris-1.0.1
 PKGNAME =	${DISTNAME:L}
-REVISION =	3
+REVISION =	4
 CATEGORIES=	games x11
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
+
 WANTLIB=	SDL X11 Xext c m pthread ${COMPILER_LIBCXX} usbhid xcb \
 		SDL_image
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	devel/sdl-image
 
 
diff --git a/games/tuxkart/Makefile b/games/tuxkart/Makefile
index fcbe468497d..1cbaaaf363c 100644
--- a/games/tuxkart/Makefile
+++ b/games/tuxkart/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2017/10/23 17:10:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	tuxkart is a simple Go-Kart racing game.
 
 DISTNAME =	tuxkart-0.4.0
-REVISION =	4
+REVISION =	5
 CATEGORIES =	games
 
 HOMEPAGE =	http://tuxkart.sourceforge.net/
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB =		GL ICE SM X11 Xext Xi Xmu c m pthread \
 			sndio ${COMPILER_LIBCXX} xcb
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =		devel/plib
 
 USE_GMAKE =		Yes
diff --git a/games/tuxpaint-config/Makefile b/games/tuxpaint-config/Makefile
index 52a705af427..543fc9e4a49 100644
--- a/games/tuxpaint-config/Makefile
+++ b/games/tuxpaint-config/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.21 2018/09/02 08:31:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT=	graphical tool to change Tux Paint's settings
 #'
 
 DISTNAME=	tuxpaint-config-0.0.14
 CATEGORIES=	games graphics
+REVISION=	0
 
 HOMEPAGE=	http://www.tuxpaint.org/
 
@@ -18,6 +19,8 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tuxpaint/}
 WANTLIB += X11 Xau Xdmcp Xext c m ${COMPILER_LIBCXX} pthread fltk paper
 WANTLIB += Xft Xinerama fontconfig Xcursor Xfixes iconv intl
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=	devel/gettext-tools
 LIB_DEPENDS=	x11/fltk \
 		print/libpaper
diff --git a/games/valyriatear/Makefile b/games/valyriatear/Makefile
index d83a0590afd..35ef7d8429d 100644
--- a/games/valyriatear/Makefile
+++ b/games/valyriatear/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.23 2018/10/24 09:42:44 bentley Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	free J-RPG game
 CATEGORIES =	games x11
-REVISION =	8
+REVISION =	9
 
 GH_ACCOUNT =	Bertram25
 GH_PROJECT =	ValyriaTear
@@ -21,6 +21,8 @@ WANTLIB += GL GLU ICE SDL SDL_image SDL_ttf SM X11 Xext c iconv intl m
 WANTLIB += ogg openal png pthread ${COMPILER_LIBCXX} vorbis vorbisfile
 WANTLIB += z ${MODLUA_WANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =	devel/cmake \
 		lang/lua
 
diff --git a/games/vegastrike/engine/Makefile b/games/vegastrike/engine/Makefile
index 18c772c33b3..37c9c1a2e1a 100644
--- a/games/vegastrike/engine/Makefile
+++ b/games/vegastrike/engine/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2018/04/16 11:15:49 bentley Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =		3D space simulator
 
 DISTNAME =		vegastrike-src-${V}
 PKGNAME =		vegastrike-${V}
-REVISION =		3
+REVISION =		4
 
 WANTLIB += GL GLU OgreMain SDL X11 Xcomposite Xcursor Xdamage
 WANTLIB += Xext Xfixes Xi Xinerama Xmu Xrandr Xrender atk-1.0
@@ -14,6 +14,8 @@ WANTLIB += glut gobject-2.0 gtk-x11-2.0 iconv intl jpeg m ogg openal pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 png pthread ${COMPILER_LIBCXX} util
 WANTLIB += vorbis vorbisfile z python2.7
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 PATCHORIG =		.orig.port
 
 MODULES =		lang/python
diff --git a/games/vodovod/Makefile b/games/vodovod/Makefile
index 7be2d5fe58f..0ce1364df25 100644
--- a/games/vodovod/Makefile
+++ b/games/vodovod/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2017/07/26 22:45:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT=	combine pipes to lead water from the house to the tank
 
 DISTNAME=	vodovod-1.10-src
 PKGNAME=	vodovod-1.10
-REVISION =	4
+REVISION =	5
 CATEGORIES=	games
 
 HOMEPAGE=	http://home.gna.org/vodovod/
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	SDL c m pthread ${COMPILER_LIBCXX} SDL_image SDL_mixer
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://download.gna.org/vodovod/
 
 LIB_DEPENDS=	devel/sdl-image \
diff --git a/games/warmux/Makefile b/games/warmux/Makefile
index 3306fb09790..3a1ff661c42 100644
--- a/games/warmux/Makefile
+++ b/games/warmux/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2018/06/27 21:03:50 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT=		free software clone of Worms(R) game concept
 
 DISTNAME=		warmux-11.04.1
-REVISION=		8
+REVISION=		9
 WRKDIST=		${WRKDIR}/warmux-11.04
 CATEGORIES=		games
 
@@ -14,6 +14,8 @@ WANTLIB += ${COMPILER_LIBCXX}
 WANTLIB += SDL SDL_gfx SDL_image SDL_mixer SDL_net SDL_ttf X11 c crypto
 WANTLIB += curl intl m nghttp2 png pthread ssl xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		http://download.gna.org/warmux/ \
 			http://download.gna.org/warmux/archive/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/games/xbreaky/Makefile b/games/xbreaky/Makefile
index 1398dfa2adb..0cfc5b51ab6 100644
--- a/games/xbreaky/Makefile
+++ b/games/xbreaky/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2017/10/23 17:10:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT=	breakout game for the X Window System
 
 DISTNAME=	xbreaky-0.0.5
-REVISION =	5
+REVISION =	6
 CATEGORIES=	games x11
 MASTER_SITES=	${HOMEPAGE}
 
@@ -11,8 +11,11 @@ HOMEPAGE=	http://xbreaky.sourceforge.net/
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=   Yes
+
 WANTLIB=		X11 Xpm c m sndio ${COMPILER_LIBCXX} xcb
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 NO_TEST=	Yes
 
 .include <bsd.port.mk>
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 3774151efc4..7c7403a5f57 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2017/10/23 17:10:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.36 2018/10/24 14:28:04 sthen Exp $
 #
 
 PORTROACH_COMMENT =	2.02r2 is newer than 2.02
@@ -9,7 +9,7 @@ COMMENT=	side-view, fast-action, kill everything type of game
 V=		2.02r2
 DISTNAME=	xevilsrc${V}
 PKGNAME=	xevil-${V}
-REVISION =	5
+REVISION =	6
 
 CATEGORIES=	games
 
@@ -22,6 +22,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	X11 Xpm c m ${COMPILER_LIBCXX} xcb
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE=	Yes
 
 WRKDIST=	${WRKDIR}
diff --git a/games/xjig/Makefile b/games/xjig/Makefile
index 6919d704401..62cd0a1cfed 100644
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.34 2017/10/23 17:10:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.35 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT=	jigsaw puzzle game for X11
 
 DISTNAME=	xjig-2.4
-REVISION =	6
+REVISION =	7
 CATEGORIES=	games
 
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=games/}
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	X11 Xau Xdmcp Xext c m ${COMPILER_LIBCXX} xcb
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MAKE_FILE=	Makefile.Linux
 
 NO_TEST=	Yes
diff --git a/games/xkobo/Makefile b/games/xkobo/Makefile
index 8416db9fa90..73d2520e304 100644
--- a/games/xkobo/Makefile
+++ b/games/xkobo/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.36 2017/10/23 17:10:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.37 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	multi-way scrolling shoot'em up for X11, addictive
 #'
 
 DISTNAME =	xkobo-1.11
-REVISION =	8
+REVISION =	9
 CATEGORIES =	games
 
 MASTER_SITES =	${MASTER_SITE_XCONTRIB:=games/}  \
@@ -24,6 +24,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 	
 WANTLIB =	X11 Xau Xdmcp Xext c m xcb ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE =	imake
 
 ALL_TARGET =	xkobo
diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile
index 7173b15674e..d307dc23f9e 100644
--- a/games/xmahjongg/Makefile
+++ b/games/xmahjongg/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.33 2017/10/23 17:10:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.34 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT=	colorful solitaire Mah Jongg game for X11
 
 DISTNAME=	xmahjongg-3.7
-REVISION =	5
+REVISION =	6
 CATEGORIES=	games x11
 
 HOMEPAGE=	http://www.lcdf.org/~eddietwo/xmahjongg/
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM=   Yes
 
 WANTLIB=	ICE SM X11 c m ${COMPILER_LIBCXX} xcb
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${HOMEPAGE}
 
 CONFIGURE_STYLE=gnu
diff --git a/games/xminehunter/Makefile b/games/xminehunter/Makefile
index 06fd0b3ce7e..78a26bcb73f 100644
--- a/games/xminehunter/Makefile
+++ b/games/xminehunter/Makefile
@@ -1,17 +1,20 @@
-# $OpenBSD: Makefile,v 1.32 2018/04/17 03:44:52 bcallah Exp $
+# $OpenBSD: Makefile,v 1.33 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT=	Motif minesweeper game
 
 DISTNAME=	xminehunter-0.4
-REVISION =	6
+REVISION =	7
 CATEGORIES=	games
 
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=games/}
 
 PERMIT_PACKAGE_CDROM=	no fee
 PERMIT_PACKAGE_FTP=	Yes
+
 WANTLIB=		X11 Xext Xpm Xt c m ${COMPILER_LIBCXX} xcb Xm
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS+=	x11/motif
 
 WRKDIST=	${WRKDIR}/xminehunter
diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index cfe0f23b6ee..c0401f40112 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.31 2018/06/27 21:03:51 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	challenging 2D motocross platform game
 
 V =	 	0.5.11
-REVISION =	6
+REVISION =	7
 DISTNAME =	xmoto-${V}-src
 PKGNAME =	xmoto-${V}
 CATEGORIES =	games
@@ -20,6 +20,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += GL GLU SDL SDL_mixer SDL_net SDL_ttf X11 bz2 c curl iconv intl jpeg
 WANTLIB += ${MODLUA_WANTLIB} m ode png pthread sqlite3 ${COMPILER_LIBCXX} xdg-basedir lzma xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	lang/lua
 MODLUA_SA=	Yes
 BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \
diff --git a/games/xwelltris/Makefile b/games/xwelltris/Makefile
index feb2fe39497..f136d416738 100644
--- a/games/xwelltris/Makefile
+++ b/games/xwelltris/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2017/10/23 17:10:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT=	2.5 dimensional tetris-like game
 
 DISTNAME=	xwelltris-1.0.1
 DISTFILES=	${DISTNAME}.src.tar.gz
-REVISION =	5
+REVISION =	6
 CATEGORIES=	games x11
 MASTER_SITES=	${HOMEPAGE}src/
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 NO_TEST=	Yes
 
 CONFIGURE_STYLE=gnu
diff --git a/games/xye/Makefile b/games/xye/Makefile
index 89b1614c774..05a57195e27 100644
--- a/games/xye/Makefile
+++ b/games/xye/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2018/06/27 21:03:51 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	puzzle game collecting diamonds and avoiding obstacles
 DISTNAME =	xye-0.12.2
 CATEGORIES =	games x11
-REVISION =	3
+REVISION =	4
 
 HOMEPAGE =	http://xye.sourceforge.net/
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
@@ -15,6 +15,8 @@ MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=xye/}
 
 WANTLIB += SDL SDL_image SDL_ttf c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =	devel/sdl-image \
 		devel/sdl-ttf
 
diff --git a/games/zaz/Makefile b/games/zaz/Makefile
index fbbcdedc6cb..9949945fb9f 100644
--- a/games/zaz/Makefile
+++ b/games/zaz/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2018/07/10 13:50:52 naddy Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	Zuma-like arcade game
 DISTNAME =	zaz-1.0.0
-REVISION =	4
+REVISION =	5
 CATEGORIES =	games
 
 HOMEPAGE =	http://zaz.sourceforge.net/
@@ -16,6 +16,8 @@ WANTLIB =	GL SDL SDL_image c freetype ftgl iconv intl m ogg pthread \
 		${COMPILER_LIBCXX} theoradec theoraenc \
 		vorbis vorbisenc vorbisfile z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 EXTRACT_SUFX =	.tar.bz2
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=zaz/}
 
diff --git a/geo/garmindev/Makefile b/geo/garmindev/Makefile
index 110bea0b5db..abb0d6b6c8e 100644
--- a/geo/garmindev/Makefile
+++ b/geo/garmindev/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/26 22:45:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	garmin gps device driver
 
-REVISION =	2
+REVISION =	3
 DISTNAME =	garmindev-0.3.4
 CATEGORIES =	geo x11
 HOMEPAGE =	http://www.qlandkarte.org/
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM =		Yes
 
 MODULES =	devel/cmake
 WANTLIB +=	m pthread ${COMPILER_LIBCXX} usb
+
+COMPILER =		base-clang ports-gcc base-gcc
 LIB_DEPENDS +=	devel/libusb-compat
 
 # libgarmindev is only needed to compile the drivers, but not on runtime
diff --git a/geo/gpsbabel/Makefile b/geo/gpsbabel/Makefile
index 5d779d0a004..9f09b2cfaf7 100644
--- a/geo/gpsbabel/Makefile
+++ b/geo/gpsbabel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2018/06/27 21:03:51 espie Exp $
+# $OpenBSD: Makefile,v 1.33 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT-main=		GPS waypoint, track, and route conversion tool
 COMMENT-tk=		Tk front-end to gpsbabel
@@ -11,9 +11,9 @@ PKGNAME-tk=		gpsbabel-tk-${VERSION}
 PKGNAME-qt=		gpsbabel-qt-${VERSION}
 CATEGORIES=		geo
 
-REVISION-main=		1
-REVISION-tk=		1
-REVISION-qt=		2
+REVISION-main=		2
+REVISION-tk=		2
+REVISION-qt=		3
 
 HOMEPAGE=		http://www.gpsbabel.org/
 
@@ -22,6 +22,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 MASTER_SITES=		http://www.linklevel.net/distfiles/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 AUTOCONF_VERSION=	2.61
 CONFIGURE_STYLE=	autoconf qmake
 CONFIGURE_ARGS+=	--with-zlib=system \
diff --git a/geo/mapserver/Makefile b/geo/mapserver/Makefile
index d041d79cad7..2dfb1798547 100644
--- a/geo/mapserver/Makefile
+++ b/geo/mapserver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2018/10/18 08:08:38 landry Exp $
+# $OpenBSD: Makefile,v 1.58 2018/10/24 14:28:04 sthen Exp $
 
 MULTI_PACKAGES=	-utils -main -php -perl -python
 
@@ -16,10 +16,16 @@ PKGNAME-php=	php-mapscript-${V}
 PKGNAME-perl=	p5-mapscript-${V}
 PKGNAME-python=	py3-mapscript-${V}
 SHARED_LIBS +=	mapserver 3.0
+REVISION-main=	0
+REVISION-perl=	0
+REVISION-php=	0
+REVISION-python=0
+REVISION-utils=	0
 
 CATEGORIES=	geo www
 
 HOMEPAGE=	http://www.mapserver.org/
+
 # MIT
 PERMIT_PACKAGE_CDROM=	Yes
 
@@ -27,6 +33,8 @@ MAINTAINER=	Landry Breuil <landry@openbsd.org>
 
 MASTER_SITES=	http://download.osgeo.org/mapserver/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	lang/php lang/python devel/cmake
 MODPHP_RUNDEP=	No
 #notyet, cf https://github.com/mapserver/mapserver/issues/5252
diff --git a/geo/merkaartor/Makefile b/geo/merkaartor/Makefile
index 98e770253e5..109dbb596c7 100644
--- a/geo/merkaartor/Makefile
+++ b/geo/merkaartor/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.32 2018/06/29 22:16:15 espie Exp $
+# $OpenBSD: Makefile,v 1.33 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	OpenStreetMap editor
 
 GH_ACCOUNT =	openstreetmap
 GH_PROJECT =	merkaartor
 GH_TAGNAME =	0.18.3
-REVISION =	4
+REVISION =	5
 
 CATEGORIES =	geo x11
 
@@ -27,6 +27,8 @@ LIB_DEPENDS =	devel/proj \
 WANTLIB += QtGui QtNetwork QtSvg QtWebKit QtXml c iconv intl m proj pthread gdal
 WANTLIB += ${COMPILER_LIBCXX} z ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 #generate the .qm files from the .ts files before configure runs
 pre-configure:
 	cd ${WRKSRC} && lrelease4 src/src.pro
diff --git a/geo/osm2pgrouting/Makefile b/geo/osm2pgrouting/Makefile
index 251c3bfebad..e412de528ba 100644
--- a/geo/osm2pgrouting/Makefile
+++ b/geo/osm2pgrouting/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2017/07/26 22:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:04 sthen Exp $
+
+GH_ACCOUNT =		pgRouting
+GH_PROJECT =		osm2pgrouting
+GH_TAGNAME =		v2.0.0
+REVISION =		2
 
-V =			2.0.0
 COMMENT =		convert OSM data to PgRouting format
-DISTNAME =		osm2pgrouting-${V}
-REVISION =		1
 CATEGORIES =		geo
 
 HOMEPAGE =		http://pgrouting.org
@@ -13,9 +15,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += 		c expat m pq ${COMPILER_LIBCXX}
 
-GH_ACCOUNT =		pgRouting
-GH_PROJECT =		osm2pgrouting
-GH_TAGNAME =		v${V}
+COMPILER =		base-clang ports-gcc base-gcc
 
 MODULES =		devel/cmake
 BUILD_DEPENDS =		devel/boost
diff --git a/geo/osrm-backend/Makefile b/geo/osrm-backend/Makefile
index 353a1bcab29..5ad8ad8cbd8 100644
--- a/geo/osrm-backend/Makefile
+++ b/geo/osrm-backend/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2018/09/10 11:10:20 bentley Exp $
+# $OpenBSD: Makefile,v 1.4 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =		high-performance road network routing engine
 
 GH_ACCOUNT =		Project-OSRM
 GH_PROJECT =		osrm-backend
 GH_TAGNAME =		v5.18.0
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		geo
 
@@ -19,6 +19,8 @@ WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
 WANTLIB += boost_iostreams-mt boost_program_options-mt boost_regex-mt
 WANTLIB += boost_system-mt boost_thread-mt bz2 c expat m tbb tbbmalloc z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake \
 			lang/lua
 MODLUA_VERSION =	5.3
diff --git a/geo/postgis/Makefile b/geo/postgis/Makefile
index 3b487f2d7e2..19807f51396 100644
--- a/geo/postgis/Makefile
+++ b/geo/postgis/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.49 2018/09/30 11:46:22 landry Exp $
+# $OpenBSD: Makefile,v 1.50 2018/10/24 14:28:04 sthen Exp $
 
 V =	2.5.0
 COMMENT=	geographic objects support for PostgreSQL
 DISTNAME=	postgis-${V}
 CATEGORIES=	geo databases
+REVISION=	0
 
 SHARED_LIBS +=	lwgeom 0.0 lwgeom-2.5 0.0 # 4.0
 
@@ -18,6 +19,8 @@ WANTLIB += c crypto curl expat freexl gdal geos geos_c geotiff gif iconv intl
 WANTLIB += jasper jpeg json-c lzma m nghttp2 openjp2 pcre png pq>=5.3 protobuf-c zstd
 WANTLIB += proj pthread qhull spatialite sqlite3 ssl ${COMPILER_LIBCXX} tiff webp xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://download.osgeo.org/postgis/source/
 
 MODULES =	databases/postgresql
diff --git a/geo/qlandkartegt/Makefile b/geo/qlandkartegt/Makefile
index 9cdfd688cf2..4996324e0d1 100644
--- a/geo/qlandkartegt/Makefile
+++ b/geo/qlandkartegt/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.28 2018/06/27 21:03:52 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2018/10/24 14:28:04 sthen Exp $
 
-COMMENT =	garmin gps map management tool
+COMMENT =	garmin GPS map management tool
 
 DISTNAME =	qlandkartegt-1.8.1
 CATEGORIES =	geo x11
-REVISION =	1
+REVISION =	2
 
 HOMEPAGE =	http://www.qlandkarte.org/
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=qlandkartegt/}
@@ -14,9 +14,13 @@ MAINTAINER =	Sebastian Reitenbach <sebastia@openbsd.org>
 PERMIT_PACKAGE_CDROM =		Yes
 
 MODULES =	devel/cmake x11/qt4
+
 WANTLIB +=	GL GLU c m pthread ${COMPILER_LIBCXX} z gdal gps>=19
 WANTLIB +=	exif QtDBus QtGui QtNetwork QtOpenGL QtSql QtXml QtCore proj
 WANTLIB +=	QtWebKit QtXmlPatterns phonon jpeg dmtx QtScript
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS +=	geo/gpsbabel
 LIB_DEPENDS +=	devel/proj \
 		graphics/libdmtx \
diff --git a/geo/spatialindex/Makefile b/geo/spatialindex/Makefile
index 1c9b6f53407..b833c200be1 100644
--- a/geo/spatialindex/Makefile
+++ b/geo/spatialindex/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2017/07/26 22:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	library for spatial indexing and querying
 DISTNAME=	spatialindex-src-1.8.5
@@ -6,7 +6,7 @@ PKGNAME =	${DISTNAME:S/-src//}
 CATEGORIES =	geo
 SHARED_LIBS =	spatialindex 2.0 \
 		spatialindex_c 0.2 #4.1
-REVISION =	0
+REVISION =	1
 
 # MIT
 PERMIT_PACKAGE_CDROM =	Yes
@@ -15,6 +15,9 @@ HOMEPAGE =	http://libspatialindex.github.com/
 MASTER_SITES =	http://download.osgeo.org/libspatialindex/
 
 CONFIGURE_STYLE =	gnu
+
 WANTLIB =	m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 .include <bsd.port.mk>
diff --git a/geo/spatialite/gis/Makefile b/geo/spatialite/gis/Makefile
index 47c24ddd36b..281aa636c35 100644
--- a/geo/spatialite/gis/Makefile
+++ b/geo/spatialite/gis/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2018/06/27 21:03:52 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	minimalistic GIS on top of spatialite and rasterlite
 PROJECT =	spatialite_gis
 DISTNAME =	${PROJECT}-1.0.0c
-REVISION=	6
+REVISION=	7
 
 LIB_DEPENDS +=	print/libharu \
 		databases/sqlite3 \
@@ -24,6 +24,8 @@ WANTLIB += wx_gtk2_core wx_gtk2_dbgrid wx_gtk2_html wx_gtk2_qa
 WANTLIB += wx_gtk2_richtext wx_gtk2_xrc xcb xcb-render xcb-shm
 WANTLIB += z lzma xml2
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/{pixmaps,applications}
 	${INSTALL_DATA} ${WRKSRC}/gnome_resource/*.desktop ${PREFIX}/share/applications/
diff --git a/geo/spatialite/gui/Makefile b/geo/spatialite/gui/Makefile
index 24f54784027..82f12042f1e 100644
--- a/geo/spatialite/gui/Makefile
+++ b/geo/spatialite/gui/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2018/06/27 21:03:52 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	GUI for spatialite
 DISTNAME =	spatialite_gui-1.7.1
-REVISION =	5
+REVISION =	6
 
 LIB_DEPENDS +=	x11/wxWidgets \
 		databases/sqlite3 \
@@ -21,6 +21,8 @@ WANTLIB += wx_base_net wx_base_odbc wx_base_xml wx_gtk2_adv wx_gtk2_aui
 WANTLIB += wx_gtk2_core wx_gtk2_dbgrid wx_gtk2_html wx_gtk2_qa
 WANTLIB += wx_gtk2_richtext wx_gtk2_xrc xcb xcb-render xcb-shm xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # so that it finds all libs without rpath..
 CONFIGURE_ENV +=	LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
 
diff --git a/geo/spatialite/librasterlite/Makefile b/geo/spatialite/librasterlite/Makefile
index 58d0a7f4fcf..49d6d38312a 100644
--- a/geo/spatialite/librasterlite/Makefile
+++ b/geo/spatialite/librasterlite/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2017/07/26 22:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	store rasters coverages within spatialite
 PROJECT =	librasterlite
 DISTNAME =	${PROJECT}-1.1g
 SHARED_LIBS =	rasterlite 0.0 #2.0
-REVISION =	3
+REVISION =	4
 
 # breaks build if static is disabled
 LIBTOOL_FLAGS =
@@ -18,6 +18,8 @@ LIB_DEPENDS +=	converters/libiconv \
 WANTLIB += c freexl geos geos_c geotiff iconv jpeg lzma m png proj pthread
 WANTLIB += spatialite sqlite3 ${COMPILER_LIBCXX} tiff xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # 1 test fails
 #ERROR: jpeg50 reference image mismatch at offset 717
 #FAIL: check_rastergen
diff --git a/geo/spatialite/librasterlite2/Makefile b/geo/spatialite/librasterlite2/Makefile
index ea761350556..1cf2cfb49aa 100644
--- a/geo/spatialite/librasterlite2/Makefile
+++ b/geo/spatialite/librasterlite2/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2017/11/21 00:13:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	store rasters coverages within spatialite
 PROJECT =	librasterlite2
 DISTNAME =	${PROJECT}-1.0.0-rc0
 PKGNAME =	${PROJECT}-1.0.0rc0
-REVISION =	5
+REVISION =	6
 SHARED_LIBS +=	rasterlite2 0.0 # 1.0
 
 LIB_DEPENDS +=	geo/spatialite/libspatialite>=4.1.0 \
@@ -20,6 +20,8 @@ WANTLIB += freetype freexl geos geos_c geotiff gif iconv intl jpeg lzma m
 WANTLIB += nghttp2 pixman-1 png proj pthread spatialite sqlite3
 WANTLIB += ssl ${COMPILER_LIBCXX} tiff webp xcb xcb-render xcb-shm xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # needed for check_sql_stmt test to succeed - it loads mod_rasterlite2
 TEST_DEPENDS =	${BUILD_PKGPATH}
 
diff --git a/geo/spatialite/librewms/Makefile b/geo/spatialite/librewms/Makefile
index d40dacc60ce..61621c9bced 100644
--- a/geo/spatialite/librewms/Makefile
+++ b/geo/spatialite/librewms/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2018/06/27 21:03:52 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT =	WMS viewer built on top of spatialite and rasterlite2
 DISTNAME =	librewms-1.0.0
-REVISION =	6
+REVISION =	7
 
 # Licence: GPLv3
 
@@ -24,6 +24,8 @@ WANTLIB += wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid
 WANTLIB += wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc xcb
 WANTLIB += xcb-render xcb-shm xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/{pixmaps,applications}
 	${INSTALL_DATA} ${WRKSRC}/gnome_resource/*.desktop ${PREFIX}/share/applications/
diff --git a/geo/spatialite/libspatialite/Makefile b/geo/spatialite/libspatialite/Makefile
index 82ee6df54cd..5a9057cd65d 100644
--- a/geo/spatialite/libspatialite/Makefile
+++ b/geo/spatialite/libspatialite/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:04 sthen Exp $
 
 COMMENT=	sqlite extented with spatial SQL capabilities
 PROJECT =	libspatialite
 DISTNAME =	${PROJECT}-4.3.0a
 SHARED_LIBS =	spatialite 1.1 # 8.0.1
-REVISION =	1
+REVISION =	2
 
 LIB_DEPENDS +=	converters/libiconv \
 		databases/sqlite3 \
@@ -15,6 +15,8 @@ LIB_DEPENDS +=	converters/libiconv \
 
 WANTLIB += freexl geos geos_c iconv m proj pthread sqlite3 ${COMPILER_LIBCXX} xml2 lzma z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # needed for check_extension test to succeed
 TEST_DEPENDS =	${BUILD_PKGPATH}
 
diff --git a/geo/spatialite/tools/Makefile b/geo/spatialite/tools/Makefile
index 9069bfa6ada..fc8bfaa109b 100644
--- a/geo/spatialite/tools/Makefile
+++ b/geo/spatialite/tools/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2017/07/26 22:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =	CLI tools for spatialite
 PROJECT =	spatialite-tools
 DISTNAME =	${PROJECT}-4.3.0
-REVISION =	1
+REVISION =	2
 
 LIB_DEPENDS +=	converters/libiconv \
 		databases/sqlite3 \
@@ -13,4 +13,6 @@ LIB_DEPENDS +=	converters/libiconv \
 WANTLIB += c curses expat freexl geos geos_c iconv lzma m proj pthread
 WANTLIB += readline readosm spatialite sqlite3 ${COMPILER_LIBCXX} xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 .include <bsd.port.mk>
diff --git a/graphics/DevIL/Makefile b/graphics/DevIL/Makefile
index 93e0aea5e9b..3eaa539eef3 100644
--- a/graphics/DevIL/Makefile
+++ b/graphics/DevIL/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2017/12/14 00:24:36 jca Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=		library for powerful image loading capabilities
 
 DISTNAME=		DevIL-1.7.8
-REVISION=		13
+REVISION=		14
 SHARED_LIBS+=		IL	1.0 # 2.0
 SHARED_LIBS+=		ILU	1.0 # 2.0
 SHARED_LIBS+=		ILUT	1.0 # 2.0
@@ -24,6 +24,8 @@ WANTLIB += Xmu Xrandr Xrender Xt Xxf86vm c drm glapi glut iconv jasper
 WANTLIB += jpeg lcms m mng png pthread sndio ${COMPILER_LIBCXX}
 WANTLIB += tiff usbhid xcb xcb-dri2 xcb-glx z expat
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		converters/libiconv \
 			devel/sdl \
 			graphics/freeglut \
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 25dd4714757..8f3c4295f83 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.56 2018/08/12 13:39:35 sthen Exp $
+# $OpenBSD: Makefile,v 1.57 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=	image processing tools with stable ABI
 
@@ -6,6 +6,7 @@ DISTNAME=	GraphicsMagick-1.3.30
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=graphicsmagick/}
 EXTRACT_SUFX=	.tar.xz
+REVISION=	0
 
 SHARED_LIBS=	GraphicsMagick		7.0 \
 		GraphicsMagick++	5.2 \
@@ -24,6 +25,8 @@ WANTLIB += tiff webp webpmux wmflite-0.2 xcb xml2 z
 
 WANTLIB += perl # uses perl ABI
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		archivers/bzip2 \
 			archivers/xz \
 			converters/libiconv \
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index d88052c9338..9498df03af5 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.180 2018/08/23 12:48:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.181 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=		image processing tools
 
 VER=			6.9.10
 DASHVER=		10
-REVISION=		1
+REVISION=		2
 DISTNAME=		ImageMagick-${VER}-${DASHVER}
 PKGNAME=		ImageMagick-${VER}.${DASHVER}
 PORTROACH=		site:https://www.imagemagick.org/download/ limit:6.*
@@ -31,6 +31,8 @@ WANTLIB += c djvulibre expat fftw3 fontconfig freetype iconv jasper
 WANTLIB += jbig jpeg lcms2 lzma m openjp2 perl png raw_r tiff webp
 WANTLIB += webpmux xcb xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		archivers/bzip2 \
 			archivers/xz \
 			converters/libiconv \
diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile
index 7913b718235..9834e2091b8 100644
--- a/graphics/agg/Makefile
+++ b/graphics/agg/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.28 2017/07/26 22:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=	anti-grain geometry graphics library
 
 DISTNAME=	agg-2.5
-REVISION=	7
+REVISION=	8
 SHARED_LIBS=	agg		3.0 \
 		aggfontfreetype	3.0 \
 		aggplatformsdl	3.0 \
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	X11 freetype iconv m sndio usbhid xcb z SDL>=6 ${COMPILER_LIBCXX} pthread
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${HOMEPAGE}
 
 AUTOCONF_VERSION=	2.59
diff --git a/graphics/amide/Makefile b/graphics/amide/Makefile
index c913884244f..5d7cf7b2237 100644
--- a/graphics/amide/Makefile
+++ b/graphics/amide/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.51 2018/06/27 21:03:52 espie Exp $
+# $OpenBSD: Makefile,v 1.52 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =	Amide a Medical Imaging Data Examiner
 
 DISTNAME =	amide-1.0.5
 CATEGORIES =	graphics
-REVISION =	8
+REVISION =	9
 
 HOMEPAGE =	http://amide.sourceforge.net/
 
@@ -23,6 +23,8 @@ WANTLIB += vorbisenc vpx x264 xcb xcb-render xcb-shm xml2 z
 WANTLIB += dbus-1 dbus-glib-1 ffi graphite2 opus
 WANTLIB += harfbuzz xvidcore lzma swresample x265
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=amide/}
 
 EXTRACT_SUFX =	.tgz
diff --git a/graphics/animorph/Makefile b/graphics/animorph/Makefile
index 7a2590ae08b..144c61672fc 100644
--- a/graphics/animorph/Makefile
+++ b/graphics/animorph/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2017/07/26 22:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=	morphing engine
 
 DISTNAME=	animorph-0.3
 CATEGORIES=	graphics
-REVISION =	3
+REVISION =	4
 
 SHARED_LIBS +=  animorph             1.0      # unknown
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=makehuman/}
 
 CONFIGURE_STYLE=gnu
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index 4eeb7e5a89c..01856c604c2 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2018/07/01 18:33:36 espie Exp $
+# $OpenBSD: Makefile,v 1.38 2018/10/24 14:28:05 sthen Exp $
 
 ONLY_FOR_ARCHS=	${GCC4_ARCHS} ${CLANG_ARCHS}
 
@@ -6,7 +6,7 @@ COMMENT=	photorealistic 3D rendering solution
 
 V=		1.8.2
 DISTNAME=	aqsis-${V}
-REVISION=	8
+REVISION=	9
 CATEGORIES=	graphics
 
 SO_VERSION=	1.0 # 1.6
@@ -28,6 +28,8 @@ WANTLIB += boost_system-mt boost_thread-mt boost_wave-mt c
 WANTLIB += lib/qt4/QtCore lib/qt4/QtGui lib/qt4/QtOpenGL
 WANTLIB += m png pthread ${COMPILER_LIBCXX} tiff tiffxx z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	devel/cmake
 
 RUN_DEPENDS=	devel/desktop-file-utils \
diff --git a/graphics/asymptote/Makefile b/graphics/asymptote/Makefile
index 1081f9119cf..653af770a5d 100644
--- a/graphics/asymptote/Makefile
+++ b/graphics/asymptote/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2017/07/26 22:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.35 2018/10/24 14:28:05 sthen Exp $
 
 NOT_FOR_ARCHS=		${CLANG_ARCHS} # hangs during build, while running
 # ../asy -dir ../base -config "" -render=0 -f pdf -noprc cube.asy
@@ -10,7 +10,7 @@ BROKEN-hppa=		ghostscript segfaults during build
 
 DISTNAME=		asymptote-2.41.src
 PKGNAME=		asymptote-2.41
-REVISION=		1
+REVISION=		2
 CATEGORIES=		graphics
 
 HOMEPAGE=		http://asymptote.sourceforge.net/
@@ -26,6 +26,8 @@ MODULES=		lang/python
 WANTLIB += GL GLU OSMesa c fftw3 gc glut gsl gslcblas m ncurses pthread
 WANTLIB += readline sigsegv ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=		print/texlive/base \
 			print/texinfo
 RUN_DEPENDS=		graphics/py-Pillow \
diff --git a/graphics/autopano-sift-c/Makefile b/graphics/autopano-sift-c/Makefile
index 4860bb133e2..48821e2878a 100644
--- a/graphics/autopano-sift-c/Makefile
+++ b/graphics/autopano-sift-c/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2017/07/26 22:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =		identify control points from groups of overlapping images
 
 DISTNAME =		autopano-sift-C-2.5.1
-REVISION=		3
+REVISION=		4
 PKGNAME =		${DISTNAME:L}
 
 CATEGORIES =		graphics
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_FTP =	Yes
 
 WANTLIB += c jpeg m pano13 png pthread ${COMPILER_LIBCXX} tiff xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=hugin/}
 
 LIB_DEPENDS =		graphics/jpeg \
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index 345fe59121e..6db72cb5540 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.16 2018/01/24 08:01:00 kirby Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =	skeletal based character animation library
 DISTNAME =	cal3d-0.11.0
-REVISION =	5
+REVISION =	6
 
 SHARED_LIBS =	cal3d	1.0	# .12.0
 
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =	c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	https://mp3butcher.github.io/Cal3D/sources/
 
 CONFIGURE_STYLE=gnu
diff --git a/graphics/ctl/Makefile b/graphics/ctl/Makefile
index 7ca5b8914fb..fc0de005246 100644
--- a/graphics/ctl/Makefile
+++ b/graphics/ctl/Makefile
@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.13 2017/12/03 13:32:52 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =		Color Transformation Language interpreter
 
-V =			1.5.2
-DISTNAME =		ctl-$V
-REVISION =		1
+GH_ACCOUNT =		ampas
+GH_PROJECT =		CTL
+GH_TAGNAME =		ctl-1.5.2
+DISTNAME =		${GH_TAGNAME}
+REVISION =		2
 
 SHARED_LIBS +=  IlmCtl               1.0      # .2.0
 SHARED_LIBS +=  IlmCtlMath           1.0      # .2.0
@@ -20,15 +22,10 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += Half Iex IexMath IlmImf IlmThread Imath c m pthread
 WANTLIB += ${COMPILER_LIBCXX} tiff
 
-GH_ACCOUNT =		ampas
-GH_PROJECT =		ctl
-GH_TAGNAME =		ctl-${V}
-MASTER_SITES =		${MASTER_SITES_GITHUB}
+COMPILER =		base-clang ports-gcc base-gcc
 
 MODULES =		devel/cmake
 LIB_DEPENDS =		graphics/openexr \
 			graphics/tiff
 
-WRKDIST =		${WRKDIR}/CTL-ctl-$V
-
 .include <bsd.port.mk>
diff --git a/graphics/dcmtk/Makefile b/graphics/dcmtk/Makefile
index 6b98a9350a3..77bad5b1f3d 100644
--- a/graphics/dcmtk/Makefile
+++ b/graphics/dcmtk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2018/04/10 19:07:40 jasper Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=		DICOM toolkit
 
@@ -30,6 +30,7 @@ SHARED_LIBS +=  ijg16                     0.0 # 3.6
 SHARED_LIBS +=  ijg8                      0.0 # 3.6
 SHARED_LIBS +=  oflog                     0.0 # 3.6
 SHARED_LIBS +=  ofstd                     0.0 # 3.6
+REVISION=		0
 
 CATEGORIES=		graphics
 
@@ -44,6 +45,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += c crypto jpeg m png pthread ssl ${COMPILER_LIBCXX} tiff
 WANTLIB += xml2 z charset iconv
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		converters/libiconv \
 			graphics/jpeg \
 			graphics/png \
diff --git a/graphics/delaboratory/Makefile b/graphics/delaboratory/Makefile
index b2141825af9..f59eb5d6fe9 100644
--- a/graphics/delaboratory/Makefile
+++ b/graphics/delaboratory/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2017/08/21 20:03:33 jasper Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =	color correction utility for digital images
 DISTNAME =	delaboratory-0.8
 CATEGORIES =	graphics x11
-REVISION =	4
+REVISION =	5
 
 # GPLv3+
 PERMIT_PACKAGE_CDROM =	Yes
@@ -12,6 +12,8 @@ WANTLIB += c iconv lzma m pthread ${COMPILER_LIBCXX} tiff wx_base wx_base_net wx
 WANTLIB += wx_base_xml wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid
 WANTLIB += wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	https://distfiles.nl/
 
 LIB_DEPENDS =	converters/libiconv \
diff --git a/graphics/discwrapper/Makefile b/graphics/discwrapper/Makefile
index 7f5c3c8229b..f04d410c345 100644
--- a/graphics/discwrapper/Makefile
+++ b/graphics/discwrapper/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2018/07/01 18:33:36 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=	disc cover designer
 
 DISTNAME=	discwrapper-1.2.2
-REVISION =	3
+REVISION =	4
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://discwrapper.sourceforge.net/
@@ -17,6 +17,9 @@ WANTLIB += c m pthread ${COMPILER_LIBCXX}
 WANTLIB += wx_base>=1 wx_base_net wx_base_odbc wx_base_xml wx_gtk2_adv
 WANTLIB += wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid wx_gtk2_html wx_gtk2_qa 
 WANTLIB += wx_gtk2_richtext wx_gtk2_xrc
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS=	devel/desktop-file-utils \
 		misc/shared-mime-info>=0.21
 
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index 65c75e7add2..26e9f0438f6 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.34 2018/06/29 22:16:16 espie Exp $
+# $OpenBSD: Makefile,v 1.35 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=	portable DjVu viewer and browser plugin
 
 DISTNAME=	djview-4.10.6
 PKGNAME=	${DISTNAME:S/djview/djview4/}
-REVISION=	4
+REVISION=	5
 CATEGORIES=	graphics print
 
 HOMEPAGE=	http://djvu.sourceforge.net/djview4.html
@@ -18,6 +18,8 @@ WANTLIB += GL ICE QtGui QtNetwork QtOpenGL SM X11 Xext Xi Xinerama
 WANTLIB += Xrender c djvulibre fontconfig freetype glib-2.0 iconv intl m
 WANTLIB += pcre pthread ${COMPILER_LIBCXX} tiff
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=djvu/}
 
 MODULES=	x11/qt4
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 9ea98462d2c..75cbf04d51f 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.42 2018/07/01 18:33:36 espie Exp $
+# $OpenBSD: Makefile,v 1.43 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=	view, decode and encode DjVu files
 
 DISTNAME=	djvulibre-3.5.27
-REVISION=	4
+REVISION=	5
 SHARED_LIBS=	djvulibre	26.0	# 27.0
 CATEGORIES=	graphics print
 
@@ -18,6 +18,8 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=djvu/}
 
 WANTLIB=	c iconv m jpeg pthread ${COMPILER_LIBCXX} tiff z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	converters/libiconv \
 		graphics/jpeg \
 		graphics/tiff
diff --git a/graphics/drawpile/Makefile b/graphics/drawpile/Makefile
index 0480be08984..320d20bf861 100644
--- a/graphics/drawpile/Makefile
+++ b/graphics/drawpile/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2018/08/15 23:44:34 bcallah Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =	collaborative drawing program
 DISTNAME =	drawpile-2.0.11
 CATEGORIES =	graphics x11
+REVISION =	0
 
 HOMEPAGE =	https://drawpile.net/
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
@@ -17,7 +18,7 @@ WANTLIB += gif m microhttpd miniupnpc sodium
 MASTER_SITES =	https://drawpile.net/files/src/
 
 # C++11
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 
 MODULES =	devel/cmake \
 		x11/qt5
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 159f989287e..13da0886319 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.162 2018/09/30 12:27:16 jasper Exp $
+# $OpenBSD: Makefile,v 1.163 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=		GNOME document viewer
 
 GNOME_PROJECT=		evince
 GNOME_VERSION=		3.28.4
+REVISION=		0
 
 MAJ_V=			3.0
 SUBST_VARS=		MAJ_V
@@ -32,6 +33,8 @@ WANTLIB += gmp hogweed nettle p11-kit tasn1 epoxy iconv intl
 WANTLIB += gstbase-1.0 gstreamer-1.0 gstvideo-1.0 orc-0.4 idn2
 WANTLIB += fribidi
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/dconf \
 			x11/gnome
 
diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
index afd0ea229bd..09548f32d1f 100644
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.27 2018/04/05 21:21:52 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.28 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=	manipulate image meta-data such as exif and ipct
 
 DISTNAME=	exiv2-0.26-trunk
 PKGNAME=	exiv2-0.26
 CATEGORIES=	graphics devel
+REVISION=	0
 
 SHARED_LIBS +=  exiv2                9.0      # 14.0
 
@@ -15,6 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} c expat iconv intl m z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://www.exiv2.org/builds/
 
 USE_GMAKE=	Yes
diff --git a/graphics/fotowall/Makefile b/graphics/fotowall/Makefile
index 5465fb4467c..bdd28050816 100644
--- a/graphics/fotowall/Makefile
+++ b/graphics/fotowall/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2018/06/27 21:03:53 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =	Pictures collage & creativity tool
 
 DISTNAME =	Fotowall-0.9
 PKGNAME =	${DISTNAME:L}
-REVISION =	2
+REVISION =	3
 
 CATEGORIES =	graphics
 
@@ -18,6 +18,8 @@ WANTLIB += GL ICE QtGui QtNetwork QtOpenGL QtSvg QtXml SM X11
 WANTLIB += Xext Xi Xinerama Xrender c fontconfig freetype m pthread
 WANTLIB += ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=fotowall/}
 
 EXTRACT_SUFX =		.tar.bz2
diff --git a/graphics/freeimage/Makefile b/graphics/freeimage/Makefile
index b7ad3b365b0..06b5f11eaca 100644
--- a/graphics/freeimage/Makefile
+++ b/graphics/freeimage/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2018/04/28 21:18:46 danj Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=		c++ library for common image format
 
 DISTNAME=		FreeImage3152
 PKGNAME=		freeimage-3.15.2
-REVISION =		4
+REVISION =		5
 CATEGORIES=		graphics
 
 SHARED_LIBS+=		freeimage	2.0
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=freeimage/}
 EXTRACT_SUFX=		.zip
 
diff --git a/graphics/ftgl/Makefile b/graphics/ftgl/Makefile
index 999f235eb37..d44f5f1ba9e 100644
--- a/graphics/ftgl/Makefile
+++ b/graphics/ftgl/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2017/07/26 22:45:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =		font rendering library for OpenGL applications
 
 V =			2.1.3
 DISTNAME =		ftgl-$V-rc5
 PKGNAME =		ftgl-$Vrc5
-REVISION =		6
+REVISION =		7
 EPOCH =			0
 SHARED_LIBS =		ftgl	0.0	# 2.1
 CATEGORIES =		graphics
@@ -20,6 +20,8 @@ WANTLIB += GL GLU ICE SM X11 Xdamage Xext Xfixes Xmu Xt Xxf86vm drm
 WANTLIB += freetype m ${COMPILER_LIBCXX} xcb xcb-glx z expat
 WANTLIB += X11-xcb glapi pthread xcb-dri2   
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 WRKDIST =		${WRKDIR}/${DISTNAME:S/-rc/~rc/}
 
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=ftgl/}
diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile
index ede6de34ab8..f96091087a6 100644
--- a/graphics/fyre/Makefile
+++ b/graphics/fyre/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.35 2018/07/01 18:33:36 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=		tool for producing computational artwork
 DISTNAME=		fyre-1.0.1
-REVISION=		22
+REVISION=		23
 CATEGORIES=		graphics
 
 HOMEPAGE=		http://fyre.navi.cx/
@@ -17,6 +17,8 @@ WANTLIB += glade-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 iconv intl m pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread ${COMPILER_LIBCXX} xml2 z
 WANTLIB += gdk_pixbuf-2.0
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		http://releases.navi.cx/fyre/ \
 			https://distfiles.nl/
 
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 00869613a4e..74fb4637c7c 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.76 2018/06/24 12:22:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.77 2018/10/24 14:28:05 sthen Exp $
 
 PORTROACH=	skipv:gd-2.2.5
 
@@ -7,7 +7,7 @@ COMMENT=	library for dynamic creation of images
 V=		2.2.5
 DISTNAME=	libgd-$V
 PKGNAME=	gd-$V
-REVISION=	0
+REVISION=	1
 
 SHARED_LIBS +=	gd                   22.0     # 3.0
 
@@ -20,6 +20,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += c expat fontconfig freetype iconv jpeg m png pthread
 WANTLIB += ${COMPILER_LIBCXX} tiff webp z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	https://github.com/libgd/libgd/releases/download/${PKGNAME}/
 
 CONFIGURE_STYLE= gnu
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 365ab8a7e82..b80a175ca7d 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2018/06/27 21:03:53 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=		lightweight Gtk+3 based image viewer
 
@@ -6,7 +6,7 @@ DISTNAME=		geeqie-1.4
 EXTRACT_SUFX=		.tar.xz
 CATEGORIES=		graphics
 EPOCH=			0
-REVISION=		0
+REVISION=		1
 
 HOMEPAGE=		http://geeqie.org/
 
@@ -18,6 +18,8 @@ WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-3 intl
 WANTLIB += jpeg lcms2 m pango-1.0 pangocairo-1.0 pthread ${COMPILER_LIBCXX}
 WANTLIB += tiff
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		http://geeqie.org/
 
 MODULES=		textproc/intltool
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index 5d565157cdf..74dc0911b50 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.65 2018/08/30 17:27:50 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.66 2018/10/24 14:28:05 sthen Exp $
 
 PORTROACH=		limit:^0\.2
 
@@ -17,8 +17,8 @@ CATEGORIES=		graphics devel
 PKGNAME-main=		gegl-${V}
 PKGNAME-plugins=	gegl-plugins-${V}
 
-REVISION-main=		0
-REVISION-plugins=	0
+REVISION-main=		1
+REVISION-plugins=	1
 
 SHARED_LIBS +=  gegl-0.2             0.0      # 201.1
 SHARED_LIBS +=  gegl-sc-0.2          0.0      # unknown
@@ -34,6 +34,8 @@ MASTER_SITES=		http://download.gimp.org/pub/gegl/${V:R}/
 
 MULTI_PACKAGES=		-main -plugins
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 WANTLIB += ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += gthread-2.0 iconv intl m pcre z
 
diff --git a/graphics/gegl03/Makefile b/graphics/gegl03/Makefile
index a89b9f093d6..c0e082d8bd5 100644
--- a/graphics/gegl03/Makefile
+++ b/graphics/gegl03/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2018/08/30 17:27:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.35 2018/10/24 14:28:05 sthen Exp $
 
 PORTROACH=		limit:^0\.3
 
@@ -8,7 +8,7 @@ V=			0.3.34
 DISTNAME=		gegl-${V}
 PKGNAME=		gegl03-${V}
 EXTRACT_SUFX=		.tar.bz2
-REVISION=		1
+REVISION=		2
 
 SHARED_LIBS +=  gegl-0.3             0.6      # 332.0
 
@@ -32,6 +32,8 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
 WANTLIB += raw rsvg-2 ${COMPILER_LIBCXX} tiff webp xcb xcb-render
 WANTLIB += xcb-shm xml2 z fribidi
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		http://download.gimp.org/pub/gegl/${API_VERSION}/
 
 MODULES=		x11/gnome
diff --git a/graphics/gegl04/Makefile b/graphics/gegl04/Makefile
index 6c24a3f8f5e..329bfef1561 100644
--- a/graphics/gegl04/Makefile
+++ b/graphics/gegl04/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2018/10/17 10:08:16 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=		graph based image processing framework (API version 0.4)
 
@@ -6,6 +6,7 @@ V=			0.4.10
 DISTNAME=		gegl-${V}
 PKGNAME=		gegl04-${V}
 EXTRACT_SUFX=		.tar.bz2
+REVISION=		0
 
 SHARED_LIBS +=  gegl-0.4                  0.0 # 410.0
 
@@ -29,6 +30,8 @@ WANTLIB += lcms2 lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 png raw rsvg-2 tiff webp xcb xcb-render
 WANTLIB += xcb-shm xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		http://download.gimp.org/pub/gegl/${API_VERSION}/
 
 MODULES=		x11/gnome
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 7fb281c969e..cd77ad44e81 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2017/10/23 17:10:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =		geometry viewer for OOGL file formats
 
 V =			1.9.4
 DISTNAME =		geomview-$V
-REVISION =		10
+REVISION =		11
 SHARED_LIBS =		geomview	0.0
 CATEGORIES =		graphics
 
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += ICE SM X11 Xext Xft Xm Xmu Xrender Xt c expat fontconfig
 WANTLIB += freetype iconv jpeg m png ${COMPILER_LIBCXX} xcb z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=geomview/}
 
 RUN_DEPENDS =		graphics/netpbm \
diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index f801b73d61c..a4443c1c288 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2017/07/26 22:45:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.31 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=		fractal program with GTK interface
 GH_ACCOUNT=		oskusalerma
@@ -7,7 +7,7 @@ GH_TAGNAME=		v1.0
 DISTFILES=		${DISTNAME}.tar.gz \
 			gfract-palettes-0.1.tar.gz:0
 CATEGORIES=		graphics math
-REVISION=		0
+REVISION=		1
 
 HOMEPAGE=		http://www.oskusoft.com/osku/gfract/
 
@@ -21,6 +21,8 @@ WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0
 WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 png pthread
 WANTLIB += ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES0= 		http://distfiles.nl/
 
 MODULES=		lang/python
diff --git a/graphics/gimp/deskew/Makefile b/graphics/gimp/deskew/Makefile
index 592a5939c0a..250122595ca 100644
--- a/graphics/gimp/deskew/Makefile
+++ b/graphics/gimp/deskew/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2017/07/26 22:45:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =		deskew plug-in for GIMP
 DISTNAME =		gimp-deskew-plugin-0.0.20141025
 GH_ACCOUNT =		prokoudine
 GH_PROJECT =		gimp-deskew-plugin
 GH_COMMIT =		b9214ddc8acf9ff5b01afdd44a9bdf96fe7d6e8e
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		graphics x11
 
@@ -24,6 +24,8 @@ WANTLIB += gimpwidgets-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0
 WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 ${COMPILER_LIBCXX}
 WANTLIB += z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		textproc/intltool
 BUILD_DEPENDS =		${MODGNU_AUTOCONF_DEPENDS} \
 			${MODGNU_AUTOMAKE_DEPENDS} \
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index 020dd06a1e9..6fecd1bcd84 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2018/07/01 18:33:36 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =		fractal image generator
 
@@ -8,7 +8,7 @@ DISTNAME =		gnofract4d-${MODPY_EGG_VERSION}
 GH_PROJECT =		gnofract4d
 GH_ACCOUNT =		edyoung
 GH_TAGNAME =		V_${MODPY_EGG_VERSION:S/./_/g}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		graphics
 
@@ -20,6 +20,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += ${MODPY_WANTLIB}
 WANTLIB += m png pthread z ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		lang/python
 
 LIB_DEPENDS =		graphics/png
diff --git a/graphics/grap/Makefile b/graphics/grap/Makefile
index 38a3a7fa0cc..c34109f5e2d 100644
--- a/graphics/grap/Makefile
+++ b/graphics/grap/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =	language for typesetting graphs
 
 DISTNAME =	grap-1.45
-REVISION =	1
+REVISION =	2
 CATEGORIES =	textproc graphics
 
 HOMEPAGE =	http://lunabase.org/~faber/Vault/software/grap/
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM = Yes
 
 MASTER_SITES =		${HOMEPAGE}
 WANTLIB =		c m ${COMPILER_LIBCXX}
+
+COMPILER =		base-clang ports-gcc base-gcc
 CONFIGURE_STYLE =	gnu
 
 .include <bsd.port.mk>
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index f9a3bd2d544..877f6658cff 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.108 2018/10/02 11:57:47 jasper Exp $
+# $OpenBSD: Makefile,v 1.109 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=	image viewer and browser for GNOME
 
 GNOME_PROJECT=	gthumb
 GNOME_VERSION=	3.6.2
+REVISION=	0
 
 API_V=		${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 SUBST_VARS=	API_V
@@ -27,6 +28,8 @@ WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread colord
 WANTLIB += rsvg-2 secret-1 soup-2.4 ${COMPILER_LIBCXX} tiff lcms2 raw
 WANTLIB += webkit2gtk-4.0 webp xcb xcb-render xcb-shm z iconv intl
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	devel/dconf \
 		x11/gnome
 
diff --git a/graphics/gtkimageview/Makefile b/graphics/gtkimageview/Makefile
index d6d1461fb21..18b7fd1f9fc 100644
--- a/graphics/gtkimageview/Makefile
+++ b/graphics/gtkimageview/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2017/11/21 00:13:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=	image viewer widget for gtk
 
 DISTNAME=	gtkimageview-1.6.4
-REVISION=	10
+REVISION=	11
 
 SHARED_LIBS=	gtkimageview	0.0
 
@@ -22,6 +22,8 @@ WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread ${COMPILER_LIBCXX} xcb
 WANTLIB += xcb-render xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${HOMEPAGE}chrome/common/releases/
 
 LIB_DEPENDS=	x11/gtk+2,-main
diff --git a/graphics/ilmbase/Makefile b/graphics/ilmbase/Makefile
index 98765d66e4e..033e49d3cc7 100644
--- a/graphics/ilmbase/Makefile
+++ b/graphics/ilmbase/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2017/12/03 13:04:26 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=	ILM base libraries
 
 DISTNAME=	ilmbase-2.2.1
 CATEGORIES=	graphics
+REVISION=	0
 
 SHARED_LIBS +=	Half                 5.0      # 23.0
 SHARED_LIBS +=	Iex                  5.0      # 23.0
@@ -19,6 +20,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SAVANNAH:=openexr/}
 
 BUILD_DEPENDS=	shells/bash
diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
index 9ca97c87e49..38af4cd7883 100644
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2018/07/01 09:02:41 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =		extensible drawing editor
 
@@ -6,7 +6,7 @@ V =			7.1.2
 SUBST_VARS +=		V
 DISTNAME =		ipe-${V}-src
 PKGNAME =		ipe-${V}
-REVISION =		8
+REVISION =		9
 
 # their libraries would be installed as libxxx.so.${V}, overide this.
 SHLIB_VERSION =	0.0
@@ -29,6 +29,8 @@ WANTLIB += glib-2.0 gobject-2.0 ${MODLUA_WANTLIB} iconv intl m pixman-1 png
 WANTLIB += pthread ${COMPILER_LIBCXX} xcb xcb-render xcb-shm
 WANTLIB += z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=ipe7/}
 
 # Dependencies
diff --git a/graphics/k3dsurf/Makefile b/graphics/k3dsurf/Makefile
index 27cd810e9a9..8feee2e5ea8 100644
--- a/graphics/k3dsurf/Makefile
+++ b/graphics/k3dsurf/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2017/07/26 22:45:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=	visualize and manipulate mathematical models
 
 DISTNAME=	k3dsurf-0.6.2
-REVISION =	6
+REVISION =	7
 CATEGORIES=	graphics math
 
 HOMEPAGE=	http://k3dsurf.sourceforge.net/
@@ -15,6 +15,8 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=k3dsurf/}
 
 WANTLIB=	GL GLU X11 Xext Xmu c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	x11/qt3 devel/qmake
 NO_TEST=	Yes
 
diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile
index c9d1d2d2470..8847a6ea75d 100644
--- a/graphics/lensfun/Makefile
+++ b/graphics/lensfun/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.26 2018/01/25 09:09:26 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=	library to adjust for photographic lens characteristics
 DISTNAME=	lensfun-0.3.2
-REVISION=	2
+REVISION=	3
 
 SHARED_LIBS=	lensfun	2.0
 
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c glib-2.0 m png ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=lensfun/}
 
 MODULES=		devel/cmake \
diff --git a/graphics/libpgf/Makefile b/graphics/libpgf/Makefile
index 944a06a866b..e4e9a92a507 100644
--- a/graphics/libpgf/Makefile
+++ b/graphics/libpgf/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2018/08/03 07:07:44 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =	PGF image format handling library
 V =		6.12.24
 DISTNAME =	libpgf-$V-src
-REVISION =	1
+REVISION =	2
 PKGNAME =	${DISTNAME:C/-src//}
 
 SHARED_LIBS =	pgf		0.0
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =	m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=libpgf/}
 
 # needs libtoolize
diff --git a/graphics/libraw/Makefile b/graphics/libraw/Makefile
index cab0b9f7b26..984154e55fd 100644
--- a/graphics/libraw/Makefile
+++ b/graphics/libraw/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.39 2018/07/01 11:44:15 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.40 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT =		library for reading RAW files
 
 DISTNAME =		LibRaw-0.18.13
+REVISION =		0
 PKGNAME =		${DISTNAME:L}
 CATEGORIES =		graphics
 
@@ -21,13 +22,11 @@ WANTLIB += c jasper jpeg lcms2 m pthread ${COMPILER_LIBCXX}
 MASTER_SITES =		https://www.libraw.org/data/
 
 COMPILER =		base-clang ports-gcc base-gcc
-# for atomic builtins (__sync_fetch_and_add_4)
-MODGCC4_ARCHS =		hppa
 
 LIB_DEPENDS =		graphics/jasper \
 			graphics/lcms2
 
-SEPARATE_BUILD = 	Yes
+SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/libvidcap/Makefile b/graphics/libvidcap/Makefile
index 80c38112b89..a5bb2de8417 100644
--- a/graphics/libvidcap/Makefile
+++ b/graphics/libvidcap/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=	video capture library
 
 DISTNAME=	libvidcap-0.2.1
-REVISION =	2
+REVISION =	3
 SHARED_LIBS=	vidcap	0.0
 CATEGORIES=	graphics
 
@@ -17,6 +17,8 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libvidcap/}
 
 WANTLIB=	pthread m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 SEPARATE_BUILD= Yes
 CONFIGURE_STYLE=gnu
 
diff --git a/graphics/lsys/Makefile b/graphics/lsys/Makefile
index b2b2c56fe49..8d8e53d7de9 100644
--- a/graphics/lsys/Makefile
+++ b/graphics/lsys/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2018/04/25 16:25:34 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=	intepreter for Lindenmayer-systems
 
 # CVS checkout on 04-30-2010
 DISTNAME=	lsys-0.8
 CATEGORIES=	graphics math
-REVISION=	1
+REVISION=	2
 
 HOMEPAGE=	http://software.schmorp.de/pkg/lsys
 
@@ -16,6 +16,8 @@ MASTER_SITES=		http://crappydiffs.org/
 
 WANTLIB += GL GLU X11 Xext c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/graphics/makehuman/Makefile b/graphics/makehuman/Makefile
index 5d727549bf4..d96f5bbed6b 100644
--- a/graphics/makehuman/Makefile
+++ b/graphics/makehuman/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.24 2017/07/26 22:45:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:05 sthen Exp $
 
 COMMENT=	parametrical modeling of 3D humanoid characters
 
 DISTNAME=	makehuman-0.9.1-rc1a
 PKGNAME=	makehuman-0.9.1rc1
 CATEGORIES=	graphics
-REVISION=	3
+REVISION=	4
 
 HOMEPAGE=	http://www.dedalo-3d.com/
 
@@ -17,6 +17,8 @@ WANTLIB += animorph c drm glut m mhgui png ${COMPILER_LIBCXX} xcb z
 WANTLIB += X11-xcb Xrandr Xrender glapi pthread
 WANTLIB += usbhid xcb-dri2 xcb-glx expat
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=makehuman/}
 
 # gcp(1), see pre-configure
diff --git a/graphics/mhgui/Makefile b/graphics/mhgui/Makefile
index 01059b0aea8..7580c57b71f 100644
--- a/graphics/mhgui/Makefile
+++ b/graphics/mhgui/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2017/07/26 22:45:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	GUI widget library used in MakeHuman
 
 DISTNAME=	mhgui-0.2
 CATEGORIES=	graphics
-REVISION=	4
+REVISION=	5
 
 SHARED_LIBS +=  mhgui                1.0      # unknown
 
@@ -18,6 +18,8 @@ WANTLIB += animorph drm glut m png ${COMPILER_LIBCXX} xcb z
 WANTLIB += X11-xcb Xrandr Xrender glapi pthread
 WANTLIB += usbhid xcb-dri2 xcb-glx expat
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=makehuman/}
 
 LIB_DEPENDS=	graphics/animorph>=0.3 \
diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile
index 4a32a05c6e3..e4e7335d2ce 100644
--- a/graphics/ocrad/Makefile
+++ b/graphics/ocrad/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2018/05/20 13:18:37 solene Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	OCR program for pnm files
 
 DISTNAME=	ocrad-0.26
+REVISION=	0
 
 CATEGORIES=	graphics
 EXTRACT_SUFX=	.tar.lz
@@ -12,6 +13,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_GNU:=ocrad/}
 
 CONFIGURE_STYLE=simple
diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile
index 602f59d0d54..0f087f7561c 100644
--- a/graphics/opencolorio/Makefile
+++ b/graphics/opencolorio/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/26 22:45:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT =		color management library
 
 V =			20140911
 DISTNAME =		OpenColorIO-$V
 PKGNAME =		opencolorio-$V
-REVISION =		1
+REVISION =		2
 
 SHARED_LIBS +=  OpenColorIO               1.0 # 1.0
 
@@ -20,6 +20,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += m pthread ${COMPILER_LIBCXX} tinyxml yaml-cpp
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://deftly.net/
 
 MODULES =		devel/cmake \
diff --git a/graphics/opencsg/Makefile b/graphics/opencsg/Makefile
index 6df7c17fdad..94474a751f8 100644
--- a/graphics/opencsg/Makefile
+++ b/graphics/opencsg/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT =		constructive solid geometry rendering library
 
 V =			1.3.2
 DISTNAME =		OpenCSG-${V}
 PKGNAME =		opencsg-${V}
-REVISION =		0
+REVISION =		1
 
 SHARED_LIBS =		opencsg		0.0
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB +=		GL GLEW lib/qt4/QtGui m ${COMPILER_LIBCXX} pthread
 WANTLIB +=		ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/qmake x11/qt4
 SEPARATE_BUILD =	No
 
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index c4bbf076733..ccccba85bf0 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2018/04/17 05:58:30 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.45 2018/10/24 14:28:06 sthen Exp $
 
 ONLY_FOR_ARCHS =	${GCC4_ARCHS} ${CLANG_ARCHS}
 
@@ -15,8 +15,9 @@ GH_TAGNAME = 		${V}
 PKGNAME-main =		${PKGNAME}
 PKGNAME-docs =		opencv-docs-$V
 PKGNAME-java =		opencv-java-$V
-REVISION-java =		0
-REVISION-main =		0
+REVISION-java =		1
+REVISION-main =		1
+REVISION-docs =		0
 
 .for i in opencv_calib3d opencv_contrib opencv_core opencv_features2d \
   opencv_flann opencv_gpu opencv_highgui opencv_imgproc opencv_legacy \
@@ -56,6 +57,8 @@ WANTLIB-java += opencv_flann opencv_gpu opencv_highgui opencv_imgproc
 WANTLIB-java += opencv_legacy opencv_ml opencv_nonfree opencv_objdetect
 WANTLIB-java += opencv_ocl opencv_photo opencv_video
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MULTI_PACKAGES =	-main -docs -java
 PSEUDO_FLAVORS =	no_docs no_java
 FLAVOR ?=
diff --git a/graphics/openexr-viewers/Makefile b/graphics/openexr-viewers/Makefile
index 7fd01622504..443d846722e 100644
--- a/graphics/openexr-viewers/Makefile
+++ b/graphics/openexr-viewers/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.15 2017/12/03 13:34:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT =		viewers for OpenEXR
 V =			2.2.1
 DISTNAME =		openexr_viewers-$V
 PKGNAME =		${DISTNAME:S/_/-/}
 SUBST_VARS +=		V
+REVISION =		0
 
 CATEGORIES =		graphics
 HOMEPAGE =		http://www.openexr.com/
@@ -19,6 +20,8 @@ WANTLIB += c drm expat fltk fltk_gl fontconfig freetype glapi
 WANTLIB += m pthread ${COMPILER_LIBCXX} xcb xcb-dri2 xcb-glx
 WANTLIB += z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SAVANNAH:=openexr/}
 
 LIB_DEPENDS =		graphics/ctl \
diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile
index 59661e343e8..fefc1cf71bc 100644
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2017/12/03 13:33:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT-main=	high dynamic range image format
 COMMENT-tools=	image viewing tools for OpenEXR
@@ -9,6 +9,9 @@ DISTNAME=	openexr-$V
 PKGNAME-main=	OpenEXR-$V
 PKGNAME-tools=  OpenEXR-tools-$V
 PKGNAME-doc=	OpenEXR-doc-$V
+REVISION-doc=	0
+REVISION-main=	0
+REVISION-tools= 0
 
 SHARED_LIBS +=	IlmImf               6.0      # 23.0
 SHARED_LIBS +=	IlmImfUtil           1.0      # 23.0
@@ -32,6 +35,8 @@ WANTLIB-tools=		${WANTLIB-main} c m pthread ${COMPILER_LIBCXX} IlmImf>=4
 LIB_DEPENDS-tools=	${LIB_DEPENDS-main} graphics/openexr
 PKG_ARCH-doc=		*
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # Test unhappy with separate build
 #SEPARATE_BUILD=	Yes
 
diff --git a/graphics/orthanc/webviewer-plugin/Makefile b/graphics/orthanc/webviewer-plugin/Makefile
index 6988b1eaf95..ee5d500bbe4 100644
--- a/graphics/orthanc/webviewer-plugin/Makefile
+++ b/graphics/orthanc/webviewer-plugin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2017/08/10 01:51:19 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT =		web viewer plugin for Orthanc
 
@@ -15,6 +15,7 @@ DISTNAME =		Orthanc${PLUGIN}-${VERSION}
 DISTFILES =		${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY =		${DISTNAME}${EXTRACT_SUFX}
 DISTFILES +=		${PLUGIN_3RDPARTY:C/$/:1/}
+REVISION =		0
 
 MASTER_SITES1 =		http://www.orthanc-server.com/downloads/third-party/WebViewer/
 
@@ -24,6 +25,8 @@ WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt gdcmCommon
 WANTLIB += gdcmDICT gdcmDSED gdcmIOD gdcmMSFF gtest jsoncpp m
 WANTLIB += sqlite3
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =		graphics/orthanc/server
 RUN_DEPENDS =		graphics/orthanc/server
 LIB_DEPENDS =		databases/sqlite3 \
diff --git a/graphics/piglit/Makefile b/graphics/piglit/Makefile
index 9582f33c1d0..db127fd76be 100644
--- a/graphics/piglit/Makefile
+++ b/graphics/piglit/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2018/04/15 07:27:58 landry Exp $
+# $OpenBSD: Makefile,v 1.4 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT =	automated OpenGL and OpenCL testsuite
 ONLY_FOR_ARCHS =	amd64 i386
 
 DISTNAME =	piglit-20180108
+REVISION =	0
 
 GH_ACCOUNT =	mesa3d
 GH_PROJECT =	piglit
@@ -21,6 +22,8 @@ WANTLIB += ${COMPILER_LIBCXX} EGL GL X11 Xrender c drm drm_intel
 WANTLIB += m xcb xcb-dri2 z
 WANTLIB += png waffle-1
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake \
 			lang/python
 
diff --git a/graphics/png2ico/Makefile b/graphics/png2ico/Makefile
index d2450c0edbd..6f70b62a392 100644
--- a/graphics/png2ico/Makefile
+++ b/graphics/png2ico/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2017/07/26 22:45:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	convert PNG images to Windows .ico files
 
 VERSION=	2002-12-09
 PKGNAME=	png2ico-${VERSION:S/-//g}
 DISTNAME=	png2ico-src-${VERSION}
-REVISION =	1
+REVISION =	2
 CATEGORIES=	graphics www
 HOMEPAGE=	http://www.winterdrache.de/freeware/png2ico/
 MASTER_SITES=	${HOMEPAGE}data/
@@ -16,6 +16,8 @@ MAINTAINER=	Wilbern Cobb <wcobb@openbsd.org>
 PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=		c m ${COMPILER_LIBCXX} z png>=3
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	graphics/png
 
 MAKE_ENV=	CXX="${CXX}"
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index f9b82b8e728..92ab23bafbc 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.36 2017/07/26 22:45:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.37 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	3D image rendering package
 
 DISTNAME=	povray-3.6.1
-REVISION =	10
+REVISION =	11
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://www.povray.org/
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_FTP=	Yes
 
 WANTLIB += ICE SM X11 Xpm c jpeg m ${COMPILER_LIBCXX} tiff z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	\
 	http://www.povray.org/ftp/pub/povray/Old-Versions/Official-3.62/Unix/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index d533fa4d48e..d51389428b4 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.25 2018/04/27 05:35:15 steven Exp $
+# $OpenBSD: Makefile,v 1.26 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	translate PostScript/PDF graphics to other vector formats
 
 DISTNAME=	pstoedit-3.71
 SHARED_LIBS=	pstoedit 3.0
 CATEGORIES=	graphics
+REVISION=	0
 
 HOMEPAGE=	http://www.pstoedit.net/
 
@@ -25,6 +26,8 @@ CONFIGURE_ARGS=	--without-libplot	\
 		--without-magick
 WANTLIB=	c ${COMPILER_LIBCXX} m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/pstoedit.1 ${PREFIX}/man/man1
 
diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile
index 3f95919e0de..df205d29ab6 100644
--- a/graphics/py-matplotlib/Makefile
+++ b/graphics/py-matplotlib/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.70 2018/09/25 06:11:24 daniel Exp $
+# $OpenBSD: Makefile,v 1.71 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	Python charting and plotting API
 
 MODPY_EGG_VERSION =	1.5.3
 DISTNAME =		matplotlib-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		8
+REVISION =		9
 CATEGORIES =		graphics devel math
 
 HOMEPAGE =	https://matplotlib.org/
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX}
 WANTLIB += freetype m png z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	lang/python
 
 FLAVORS=	python3
diff --git a/graphics/quesoglc/Makefile b/graphics/quesoglc/Makefile
index 6f53237cef3..6a7e7c88190 100644
--- a/graphics/quesoglc/Makefile
+++ b/graphics/quesoglc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2017/10/23 17:10:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	implementation of the OpenGL Character Renderer
 
 DISTNAME=	quesoglc-0.7.2
-REVISION=	6
+REVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=quesoglc/}
 
@@ -20,6 +20,8 @@ WANTLIB+= GL GLU X11 Xdamage Xext Xfixes Xxf86vm drm expat fontconfig
 WANTLIB += X11-xcb Xau Xdmcp glapi pthread xcb-dri2
 WANTLIB+= freetype fribidi m ${COMPILER_LIBCXX} xcb xcb-glx z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	devel/fribidi
 
 CONFIGURE_STYLE= gnu
diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile
index f7f78630142..890488c2c5f 100644
--- a/graphics/rawstudio/Makefile
+++ b/graphics/rawstudio/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.31 2018/06/27 21:03:54 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT =	tool for working with RAW images
 
 DISTNAME =	rawstudio-1.2
-REVISION =	19
+REVISION =	20
 
 CATEGORIES =	graphics
 
@@ -20,6 +20,8 @@ WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
 WANTLIB += intl jpeg lcms m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += tiff xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ENV +=	CPPFLAGS=-I${LOCALBASE}/include \
 			LDFLAGS=-L${LOCALBASE}/lib
diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index 7bcea0bbd22..993a0b5e5ee 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2018/09/04 12:46:14 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2018/10/24 14:28:06 sthen Exp $
 
 # http://rawpedia.rawtherapee.com/The_Floating_Point_Engine
 ONLY_FOR_ARCHS = 	amd64
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = 	amd64
 COMMENT =		RAW image processing application
 
 DISTNAME =		rawtherapee-5.4
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		graphics
 
@@ -24,6 +24,8 @@ WANTLIB += gthread-2.0 gtk-3 gtkmm-3.0 intl iptcdata jpeg lcms2
 WANTLIB += lensfun m pango-1.0 pangocairo-1.0 pangomm-1.4 png pthread
 WANTLIB += sigc-2.0 tiff z ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://www.rawtherapee.com/shared/source/
 EXTRACT_SUFX = 		.tar.xz
 
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index c75492ccf04..370a2d5bc60 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.85 2017/11/24 11:23:50 landry Exp $
+# $OpenBSD: Makefile,v 1.86 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	tools and library routines for working with TIFF images
 
@@ -6,6 +6,7 @@ DISTNAME=	tiff-4.0.9
 SHARED_LIBS=	tiff	40.2	# 7.6
 SHARED_LIBS+=	tiffxx	40.1	# 7.6
 CATEGORIES=	graphics
+REVISION=	0
 
 MASTER_SITES=	http://download.osgeo.org/libtiff/
 
@@ -14,6 +15,8 @@ HOMEPAGE=	http://www.simplesystems.org/libtiff/
 LIB_DEPENDS=	graphics/jpeg
 WANTLIB=	c m ${COMPILER_LIBCXX} z jpeg
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index 2e7680d4d0c..2da64c6bcc9 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.46 2017/11/21 00:13:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.47 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	read and manipulate raw images from digital cameras
 
 DISTNAME=	ufraw-0.22
-REVISION =	2
+REVISION =	3
 
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ufraw/}
@@ -26,6 +26,8 @@ WANTLIB += png pthread ${COMPILER_LIBCXX} tiff z
 # don't remove unless you are sure:
 WANTLIB += lensfun
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=	devel/gettext-tools
 
 LIB_DEPENDS=	gimp->=2,<3:graphics/gimp/stable \
diff --git a/graphics/viewnior/Makefile b/graphics/viewnior/Makefile
index 2d9b2529a9a..80c8a0abc3f 100644
--- a/graphics/viewnior/Makefile
+++ b/graphics/viewnior/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2018/06/29 22:16:17 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=		fast and simple image viewer
 
 DISTNAME=		viewnior-1.6
-REVISION=		4
+REVISION=		5
 
 CATEGORIES=		graphics x11
 
@@ -20,6 +20,8 @@ WANTLIB += harfbuzz iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
 WANTLIB += pixman-1 png pthread ${COMPILER_LIBCXX} xcb xcb-render
 WANTLIB += xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		https://github.com/xsisqox/Viewnior/archive/
 
 MODULES=		textproc/intltool
diff --git a/graphics/zxing/Makefile b/graphics/zxing/Makefile
index bd1ab993fe8..5681a84397b 100644
--- a/graphics/zxing/Makefile
+++ b/graphics/zxing/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2018/09/28 14:14:03 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT =	barcode image processing library
 
@@ -7,6 +7,7 @@ GH_PROJECT =	zxing-cpp
 GH_COMMIT =	5aad4744a3763d814df98a18886979893e638274
 
 DISTNAME =	zxing-20180320
+REVISION =	0
 
 CATEGORIES =	graphics
 
@@ -15,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += c iconv m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =	devel/cmake
 LIB_DEPENDS =	converters/libiconv
 BUILD_DEPENDS =	devel/cppunit
diff --git a/inputmethods/fcitx-anthy/Makefile b/inputmethods/fcitx-anthy/Makefile
index 3d2c16e8e64..0aa1d915119 100644
--- a/inputmethods/fcitx-anthy/Makefile
+++ b/inputmethods/fcitx-anthy/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/11/28 02:58:36 kevlo Exp $
+# $OpenBSD: Makefile,v 1.2 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT =	anthy wrapper for fcitx
 
 GH_ACCOUNT =	fcitx
 GH_PROJECT =	fcitx-anthy
 GH_TAGNAME =	0.2.3
+REVISION =	0
 
 CATEGORIES =	inputmethods japanese
 
@@ -17,6 +18,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB +=	${COMPILER_LIBCXX} anthy
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =	devel/cmake
 
 BUILD_DEPENDS =	devel/gettext-tools \
diff --git a/inputmethods/fcitx/Makefile b/inputmethods/fcitx/Makefile
index 8ad744e134b..240ec925489 100644
--- a/inputmethods/fcitx/Makefile
+++ b/inputmethods/fcitx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2018/07/07 22:39:42 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT-main =	flexible input method framework
 COMMENT-gtk3 = 	fcitx for GTK+3
@@ -9,7 +9,7 @@ DISTNAME = 	fcitx-$V
 PKGNAME-main =	fcitx-$V
 PKGNAME-gtk3 =	fcitx-gtk3-$V
 PKGNAME-qt4 =	fcitx-qt4-$V
-REVISION =	2
+REVISION =	3
 
 SHARED_LIBS +=	fcitx-config	0.0 # 4.1
 SHARED_LIBS +=	fcitx-core	0.0 # 0.3
@@ -28,6 +28,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 MULTI_PACKAGES =	-main -gtk3 -qt4
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 WANTLIB-common =	c iconv intl kvm xkbcommon
 
 WANTLIB-main +=		${WANTLIB-common}
diff --git a/inputmethods/scim-anthy/Makefile b/inputmethods/scim-anthy/Makefile
index bdd50600f7b..ca58cb9a474 100644
--- a/inputmethods/scim-anthy/Makefile
+++ b/inputmethods/scim-anthy/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.21 2017/11/21 00:13:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT =	scim input method module for anthy
 
 DISTNAME =	scim-anthy-1.2.7
 
-REVISION =	9
+REVISION =	10
 
 CATEGORIES =	inputmethods japanese
 
@@ -22,6 +22,8 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
 WANTLIB += scim-1.0 scim-gtkutils-1.0 scim-x11utils-1.0 ${COMPILER_LIBCXX} xcb
 WANTLIB += xcb-render xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_OSDN_JP:=scim-imengine/37309/}
 
 LIB_DEPENDS =	inputmethods/anthy \
diff --git a/inputmethods/scim-chewing/Makefile b/inputmethods/scim-chewing/Makefile
index a87b4a2bf9d..0e0d4fc5a9f 100644
--- a/inputmethods/scim-chewing/Makefile
+++ b/inputmethods/scim-chewing/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.25 2017/11/21 00:13:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.26 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	scim input method module for chewing
 
 GH_ACCOUNT=	chewing
 GH_PROJECT=	scim-chewing
 GH_TAGNAME=	v0.5.1
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	inputmethods chinese
 
@@ -22,6 +22,8 @@ WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pcre pixman-1 png scim-1.0 scim-gtkutils-1.0
 WANTLIB += scim-x11utils-1.0 sqlite3 xcb xcb-render xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	textproc/intltool
 BUILD_DEPENDS=	${MODGNU_AUTOCONF_DEPENDS} \
 		${MODGNU_AUTOMAKE_DEPENDS} \
diff --git a/inputmethods/scim-fcitx/Makefile b/inputmethods/scim-fcitx/Makefile
index a70be60bfe0..d295bcf5be8 100644
--- a/inputmethods/scim-fcitx/Makefile
+++ b/inputmethods/scim-fcitx/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2017/11/21 00:13:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	scim input method module for fcitx
 
 V=		3.1.1
 DISTNAME=	scim-fcitx.$V
 PKGNAME=	scim-fcitx-$V
-REVISION=	5
+REVISION=	6
 
 CATEGORIES=	inputmethods chinese
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c iconv intl m ${COMPILER_LIBCXX} scim-1.0 pthread
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scim/}
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/inputmethods/scim-hangul/Makefile b/inputmethods/scim-hangul/Makefile
index e72ab750199..c521f25ec82 100644
--- a/inputmethods/scim-hangul/Makefile
+++ b/inputmethods/scim-hangul/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2017/11/21 00:13:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	scim input method module for hangul
 
 DISTNAME=	scim-hangul-0.3.2
-REVISION=	12
+REVISION=	13
 
 CATEGORIES=	inputmethods korean
 
@@ -21,6 +21,8 @@ WANTLIB+= pangoft2-1.0 pcre pixman-1 png pthread scim-1.0
 WANTLIB+= scim-gtkutils-1.0 scim-x11utils-1.0 ${COMPILER_LIBCXX} xcb xcb-render
 WANTLIB+= xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scim/}
 
 LIB_DEPENDS=	korean/libhangul \
diff --git a/inputmethods/scim-pinyin/Makefile b/inputmethods/scim-pinyin/Makefile
index 70baba17f5a..75df0b9cfab 100644
--- a/inputmethods/scim-pinyin/Makefile
+++ b/inputmethods/scim-pinyin/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2017/11/21 00:13:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	scim input method module for pinyin
 
 DISTNAME=	scim-pinyin-0.5.91
-REVISION=	11
+REVISION=	12
 
 CATEGORIES=	inputmethods chinese
 
@@ -21,6 +21,8 @@ WANTLIB+= pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png
 WANTLIB+= pthread scim-1.0 scim-gtkutils-1.0
 WANTLIB+= scim-x11utils-1.0 ${COMPILER_LIBCXX} xcb xcb-render xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scim/}
 
 LIB_DEPENDS=	x11/gtk+2 \
diff --git a/inputmethods/scim-qtimm/Makefile b/inputmethods/scim-qtimm/Makefile
index 16a3f932d8b..a723bfa487e 100644
--- a/inputmethods/scim-qtimm/Makefile
+++ b/inputmethods/scim-qtimm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2017/11/21 00:13:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	scim plugin for qt
 
 DISTNAME=	scim-qtimm-0.9.4
-REVISION=	9
+REVISION=	10
 
 CATEGORIES=	inputmethods
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += X11 iconv intl m pthread scim-1.0 scim-x11utils-1.0
 WANTLIB += ${COMPILER_LIBCXX} xcb
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scim/}
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/inputmethods/scim-tables/Makefile b/inputmethods/scim-tables/Makefile
index 60dc8210de8..2f12f310161 100644
--- a/inputmethods/scim-tables/Makefile
+++ b/inputmethods/scim-tables/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2017/11/21 00:13:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	input method data tables for scim
 
 DISTNAME=	scim-tables-0.5.8
-REVISION=	11
+REVISION=	12
 
 CATEGORIES=	inputmethods chinese japanese korean
 
@@ -21,6 +21,8 @@ WANTLIB+= pangoft2-1.0 pcre pixman-1 png pthread scim-1.0
 WANTLIB+= scim-gtkutils-1.0 scim-x11utils-1.0 ${COMPILER_LIBCXX} xcb xcb-render
 WANTLIB+= xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scim/}
 
 LIB_DEPENDS=	x11/gtk+2 \
diff --git a/inputmethods/scim/Makefile b/inputmethods/scim/Makefile
index 638ba9e76f8..8f6e3aa53bb 100644
--- a/inputmethods/scim/Makefile
+++ b/inputmethods/scim/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.35 2018/09/04 12:46:14 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT =	smart common input method platform
 
 DISTNAME =	scim-1.4.9
-REVISION =	23
+REVISION =	24
 
 SHARED_LIBS +=  scim-1.0           0.0           # .10.4
 SHARED_LIBS +=  scim-x11utils-1.0  0.0           # .10.4
@@ -24,6 +24,8 @@ WANTLIB += harfbuzz iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 png pthread ${COMPILER_LIBCXX} xcb xcb-render
 WANTLIB += xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=scim/}
 
 MODULES =	textproc/intltool
diff --git a/inputmethods/uim/Makefile b/inputmethods/uim/Makefile
index 4b61b0bf036..7c80656aff9 100644
--- a/inputmethods/uim/Makefile
+++ b/inputmethods/uim/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.61 2018/07/07 22:39:42 espie Exp $
+# $OpenBSD: Makefile,v 1.62 2018/10/24 14:28:06 sthen Exp $
 
 DPB_PROPERTIES=		tag:kde3
 
@@ -19,7 +19,7 @@ PKGNAME-gtk3=		uim-gtk3-$V
 PKGNAME-kde=		uim-kde-$V
 PKGNAME-qt=		uim-qt-$V
 PKGNAME-qt4=		uim-qt4-$V
-REVISION=		7
+REVISION=		8
 
 MASTER_SITES=		https://github.com/uim/uim/releases/download/uim-$V/
 HOMEPAGE=		https://github.com/uim/uim
@@ -34,6 +34,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 cWANTLIB += X11 Xext Xrender fontconfig freetype iconv intl m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MULTI_PACKAGES=		-main -gtk -gtk3 -kde -qt -qt4
 
 MODULES=		textproc/intltool \
diff --git a/japanese/kasumi/Makefile b/japanese/kasumi/Makefile
index bb65f022b39..f30ae18c4b5 100644
--- a/japanese/kasumi/Makefile
+++ b/japanese/kasumi/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2018/06/27 21:03:56 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT =	personal dictionary manager for anthy
 
 DISTNAME =	kasumi-2.5
-REVISION =	8
+REVISION =	9
 
 CATEGORIES =	japanese
 
@@ -20,6 +20,8 @@ WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gobject-2.0 gtk-x11-2.0 iconv intl m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =	devel/gettext-tools
 RUN_DEPENDS =	devel/desktop-file-utils
 LIB_DEPENDS =	devel/gettext \
diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index b98d78b126c..5e5e9f0cc69 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2018/01/20 14:03:39 jsg Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:06 sthen Exp $
 
 # .libs/libmecab.so.0.0: undefined reference to `__sync_val_compare_and_swap_4'
 # .libs/libmecab.so.0.0: undefined reference to `__sync_add_and_fetch_4'
@@ -10,8 +10,8 @@ COMMENT-ipadic = IPA japanese dictionary for mecab
 DISTNAME =	mecab-0.996
 PKGNAME-main =	${DISTNAME}
 PKGNAME-ipadic = mecab-ipadic-2.7.0
-REVISION-main =	1
-REVISION-ipadic = 3
+REVISION-main =	2
+REVISION-ipadic = 4
 
 SHARED_LIBS =	mecab	0.0 # 2.0
 
@@ -27,6 +27,8 @@ MULTI_PACKAGES = -main -ipadic
 WANTLIB-main =	c iconv m pthread ${COMPILER_LIBCXX}
 WANTLIB-ipadic =
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	https://distfiles.nl/
 
 DISTFILES =	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/java/jlint/Makefile b/java/jlint/Makefile
index ed4fb4d30e2..b1f9c60846e 100644
--- a/java/jlint/Makefile
+++ b/java/jlint/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2017/07/26 22:45:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	Java program analyzer and checker
 
 DISTNAME=	jlint-3.1.2
-REVISION =	2
+REVISION =	3
 CATEGORIES=	java
 
 HOMEPAGE=	http://jlint.sourceforge.net/
@@ -12,6 +12,8 @@ HOMEPAGE=	http://jlint.sourceforge.net/
 PERMIT_PACKAGE_CDROM=  Yes
 WANTLIB=		c z m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jlint/}
 
 MAKE_ENV+=	CC="${CC}" CPP="${CXX}" \
diff --git a/lang/apl/Makefile b/lang/apl/Makefile
index fa6b6606cf5..0c6392e55fd 100644
--- a/lang/apl/Makefile
+++ b/lang/apl/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/09/11 23:44:11 bcallah Exp $
+# $OpenBSD: Makefile,v 1.2 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT =	interpreter for the programming language APL
 DISTNAME =	apl-1.7
 CATEGORIES =	lang
+REVISION =	0
 
 SHARED_LIBS +=	_sql                      0.0 # 0.0
 SHARED_LIBS +=	_template_F0              0.0 # 0.0
@@ -19,6 +20,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += c m ncurses pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_GNU:=apl/}
 
 RUN_DEPENDS =	fonts/apl-fonts
diff --git a/lang/bacon/Makefile b/lang/bacon/Makefile
index 3809cd1e7cf..7eca36eef20 100644
--- a/lang/bacon/Makefile
+++ b/lang/bacon/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2018/10/01 22:41:16 juanfra Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT =		BASIC converter to C translator for Unix system
 
 DISTNAME =		bacon-3.8
+REVISION =		0
 
 CATEGORIES =		lang
 
@@ -16,6 +17,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += ${COMPILER_LIBCXX} X11 Xau Xcursor Xdmcp Xext Xfixes
 WANTLIB += Xft Xinerama c fltk fltk_images fontconfig m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://www.basic-converter.org/stable/ \
 			http://www.basic-converter.org/museum/
 
diff --git a/lang/classpath/Makefile b/lang/classpath/Makefile
index 070cae5d4b0..c7412b08a26 100644
--- a/lang/classpath/Makefile
+++ b/lang/classpath/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2017/11/21 00:13:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.51 2018/10/24 14:28:06 sthen Exp $
 
 # uses gcj which is only supported on select archs
 ONLY_FOR_ARCHS=	amd64 i386 sparc64
@@ -7,7 +7,7 @@ BROKEN-sparc64= gcj blows during build
 COMMENT=	essential libraries for Java
 
 DISTNAME=	classpath-0.98
-REVISION=	24
+REVISION=	25
 
 CATEGORIES=	lang java
 
@@ -34,6 +34,8 @@ WANTLIB += harfbuzz iconv intl m magic pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 png pthread ${COMPILER_LIBCXX} xcb xcb-render
 WANTLIB += xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	gcc4
 MODGCC4_ARCHS=	*
 MODGCC4_LANGS=	java
diff --git a/lang/flang/driver/Makefile b/lang/flang/driver/Makefile
index 7697042a9e7..22a714075d6 100644
--- a/lang/flang/driver/Makefile
+++ b/lang/flang/driver/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2018/10/16 14:56:38 bcallah Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:06 sthen Exp $
 
 # If you are updating to a new version
 # (e.g. 6.0->6.1 or 7.0), you need to sync
 # patches with devel/llvm
 COMMENT =	LLVM Fortran compiler driver
 DISTNAME =	flang-driver-6.0.0.20181012
+REVISION =	0
 
 GH_PROJECT =	flang-driver
 GH_COMMIT =	f90d905b99ef497cc654b4a8433f1ac35a870f11
@@ -12,7 +13,7 @@ GH_COMMIT =	f90d905b99ef497cc654b4a8433f1ac35a870f11
 WANTLIB += ${COMPILER_LIBCXX} c m z
 
 # C++11
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 
 MODULES =	devel/cmake \
 		lang/python
diff --git a/lang/flang/flang/Makefile b/lang/flang/flang/Makefile
index fa48a003079..10ba1a88650 100644
--- a/lang/flang/flang/Makefile
+++ b/lang/flang/flang/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.30 2018/10/20 20:11:35 bcallah Exp $
+# $OpenBSD: Makefile,v 1.31 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT =	LLVM Fortran compiler passes and runtime library
 DISTNAME =	flang-6.0.0.20181017
+REVISION =	0
 
 SHARED_LIBS +=	flang                     1.4 # 6.0
 SHARED_LIBS +=	flangrti                  3.0 # 6.0
@@ -13,7 +14,7 @@ GH_COMMIT =	0479dc0252ef30581027355f5bb3fddad4d1edcc
 WANTLIB += ${COMPILER_LIBCXX} aio_compat c execinfo m pgmath
 
 # C11
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 
 MODULES =	devel/cmake
 
diff --git a/lang/freehdl/Makefile b/lang/freehdl/Makefile
index fb885f4db74..97436cb6655 100644
--- a/lang/freehdl/Makefile
+++ b/lang/freehdl/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	open-source (C++ generating) VHDL simulator
 
 DISTNAME=	freehdl-0.0.7
 CATEGORIES=	lang cad
-REVISION =	3
+REVISION =	4
 
 SHARED_LIBS +=  ieee                      0.0 # 0.0
 SHARED_LIBS +=  freehdl-cdfggen           0.0 # 0.0
@@ -22,6 +22,8 @@ MASTER_SITES=	${HOMEPAGE}/~enaroska/
 
 WANTLIB += c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE=	Yes
 CXXFLAGS +=	-Wno-parentheses-equality
 
diff --git a/lang/intel2gas/Makefile b/lang/intel2gas/Makefile
index 2330db430fb..53ea7825ff3 100644
--- a/lang/intel2gas/Makefile
+++ b/lang/intel2gas/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/26 22:45:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=	convert Intel assembly language (nasm) to AT&T syntax (gas)
 
 VERSION=	1.3.3
 DISTNAME=	intel2gas-${VERSION}
-REVISION =	1
+REVISION =	2
 CATEGORIES=	lang
 
 HOMEPAGE=	http://www.niksula.cs.hut.fi/~mtiihone/intel2gas/
@@ -14,6 +14,8 @@ MASTER_SITES=	${HOMEPAGE}
 PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=		c ${COMPILER_LIBCXX} m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 NO_TEST=	Yes
 CONFIGURE_STYLE=gnu
 MAKE_FLAGS=	CXX="${CXX}"
diff --git a/lang/iverilog/Makefile b/lang/iverilog/Makefile
index 0901928c7e0..bc06950f89a 100644
--- a/lang/iverilog/Makefile
+++ b/lang/iverilog/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2017/10/05 08:58:10 bentley Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=		Verilog simulation and synthesis tool
 
@@ -6,6 +6,7 @@ V=			10.2
 DISTNAME=		verilog-$V
 PKGNAME=		iverilog-$V
 CATEGORIES=		lang devel
+REVISION=		0
 
 HOMEPAGE=		http://iverilog.icarus.com/
 
@@ -16,6 +17,8 @@ MASTER_SITES=		ftp://ftp.icarus.com/pub/eda/verilog/v10/
 
 WANTLIB += c m pthread readline ${COMPILER_LIBCXX} termcap z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE=		Yes
 
 BUILD_DEPENDS=		devel/bison
diff --git a/lang/jikes/Makefile b/lang/jikes/Makefile
index 4b76b608ba9..5f521d08af4 100644
--- a/lang/jikes/Makefile
+++ b/lang/jikes/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.29 2017/07/26 22:45:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2018/10/24 14:28:06 sthen Exp $
 
 COMMENT=compile Java source into .class files (quickly!)
 
 # Jikes, a fast Java compiler. 
 
 DISTNAME=	jikes-1.22
-REVISION =	7
+REVISION =	8
 CATEGORIES=	lang
 HOMEPAGE=	http://jikes.sourceforge.net/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jikes/}
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_FTP=	Yes
 
 WANTLIB=		c iconv m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	converters/libiconv
 
 SEPARATE_BUILD=	Yes
diff --git a/lang/jruby/Makefile b/lang/jruby/Makefile
index 30342639ee3..77cbb282d65 100644
--- a/lang/jruby/Makefile
+++ b/lang/jruby/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2018/04/25 14:48:22 jeremy Exp $
+# $OpenBSD: Makefile,v 1.72 2018/10/24 14:28:06 sthen Exp $
 
 # Runtime failures on i386 in IO#pos and IO#rewind
 ONLY_FOR_ARCHS = amd64
@@ -12,6 +12,7 @@ CATEGORIES =	lang lang/ruby
 DISTFILES =	${DISTNAME}.tar.gz \
 		jnr-jffi-1.2.2-0-g4c196bb.tar.gz:0 \
 		${JRUBY_LAUNCHER_GEM}:1
+REVISION =	0
 
 HOMEPAGE =	http://www.jruby.org/
 
@@ -31,6 +32,8 @@ USE_GMAKE =	Yes
 
 WANTLIB =	c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =	devel/apache-ant \
 		shells/bash \
 		${RUN_DEPENDS}
diff --git a/lang/libv8/Makefile b/lang/libv8/Makefile
index 310a8f806fe..d79543d9755 100644
--- a/lang/libv8/Makefile
+++ b/lang/libv8/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2017/11/08 18:06:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:07 sthen Exp $
 
 ONLY_FOR_ARCHS=	amd64 i386
 
@@ -6,7 +6,7 @@ COMMENT=	V8 JavaScript for clients and servers
 
 V8_VERSION=	3.16.14.11
 EPOCH=		0
-REVISION=	0
+REVISION=	1
 V8_ARCH=	${MACHINE_ARCH:S/amd64/x64/:S/i386/ia32/}
 V8_RELEASE=	release
 
@@ -34,6 +34,8 @@ LIB_DEPENDS=	devel/libexecinfo
 
 WANTLIB +=	c execinfo m pthread ssl ${COMPILER_LIBCXX} 
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE=	Yes
 
 CONFIGURE_STYLE=	python.port.mk
diff --git a/lang/node/Makefile b/lang/node/Makefile
index 9af9d73d292..e9b13b6a0aa 100644
--- a/lang/node/Makefile
+++ b/lang/node/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.73 2018/09/19 19:10:27 abieber Exp $
+# $OpenBSD: Makefile,v 1.74 2018/10/24 14:28:07 sthen Exp $
 
 # XXX:
 # - Needs __ARM_NR_cacheflush (or the like) to work on arm-based ports.
@@ -18,6 +18,7 @@ DISTFILES =		node-pledge-{}${PLEDGE_VER}.tar.gz:0 ${DISTNAME}.tar.gz
 
 DISTNAME =		node-${NODE_VERSION}
 PKGNAME =		${DISTNAME:S/v//g}
+REVISION =		0
 
 MASTER_SITES0 =		https://github.com/qbit/node-pledge/archive/
 
@@ -36,6 +37,8 @@ MODULES =		lang/python
 
 WANTLIB += c execinfo kvm m pthread util z ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		devel/libexecinfo
 
 USE_GMAKE =		Yes
diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index 86a4be00107..b8e33a5d787 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.42 2017/11/21 00:13:02 naddy Exp $
+# $OpenBSD: Makefile,v 1.43 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT=	virtual machine designed for interpreted languages
 
 V=		7.10.0
 DISTNAME=	parrot-$V
-REVISION=	3
+REVISION=	4
 CATEGORIES=	lang perl6
 SHARED_LIBS=	parrot	11.0
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += GL GLU c glut gmp iconv icudata icuuc intl m ncurses pthread
 WANTLIB += readline ${COMPILER_LIBCXX} util z ffi
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=		graphics/glew \
 			devel/pcre
 LIB_DEPENDS=		textproc/icu4c \
diff --git a/lang/php/5.6/Makefile b/lang/php/5.6/Makefile
index 86a3bbbe736..3f1a04ab644 100644
--- a/lang/php/5.6/Makefile
+++ b/lang/php/5.6/Makefile
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.89 2018/10/24 10:19:36 sthen Exp $
+# $OpenBSD: Makefile,v 1.90 2018/10/24 14:28:07 sthen Exp $
 
 PV=		5.6
 V=		${PV}.38
-REVISION=	1
-REVISION-main=	3
-REVISION-apache=2
+REVISION=	4
 
 MASTER_SITES0=	https://download.suhosin.org/
 
diff --git a/lang/php/7.0/Makefile b/lang/php/7.0/Makefile
index 6cbee4aeb06..ac924144728 100644
--- a/lang/php/7.0/Makefile
+++ b/lang/php/7.0/Makefile
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.72 2018/10/24 10:19:36 sthen Exp $
+# $OpenBSD: Makefile,v 1.73 2018/10/24 14:28:07 sthen Exp $
 
 PV=		7.0
 V=		${PV}.32
-REVISION=	2
-REVISION-main=	4
-REVISION-apache=3
+REVISION=	5
 
 BUILD_DEPENDS+=	devel/bison
 
diff --git a/lang/php/7.1/Makefile b/lang/php/7.1/Makefile
index d09dc90cac9..cdf9bf41b5d 100644
--- a/lang/php/7.1/Makefile
+++ b/lang/php/7.1/Makefile
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2018/10/24 10:19:36 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2018/10/24 14:28:07 sthen Exp $
 
 PV=		7.1
 V=		${PV}.23
-REVISION=	0
-REVISION-main=	2
-REVISION-apache=1
+REVISION=	3
 
 BUILD_DEPENDS+=	devel/bison
 
diff --git a/lang/php/7.2/Makefile b/lang/php/7.2/Makefile
index a1a43579467..07c84809d28 100644
--- a/lang/php/7.2/Makefile
+++ b/lang/php/7.2/Makefile
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2018/10/24 10:19:36 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2018/10/24 14:28:07 sthen Exp $
 
 PV=		7.2
 V=		${PV}.11
-REVISION=	0
-REVISION-main=	2
-REVISION-apache=1
+REVISION=	3
 
 BUILD_DEPENDS+=	devel/bison
 
diff --git a/lang/php/Makefile.inc b/lang/php/Makefile.inc
index 27ba960c318..e4c01928584 100644
--- a/lang/php/Makefile.inc
+++ b/lang/php/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.124 2018/10/17 12:44:02 sthen Exp $
+# $OpenBSD: Makefile.inc,v 1.125 2018/10/24 14:28:07 sthen Exp $
 
 BROKEN-hppa=	no __sync_bool_compare_and_swap support nor asm fallback
 
@@ -40,6 +40,7 @@ INI_TEMPLATES?=		development production
 PATCHORIG=		.orig.port
 CONFIGURE_STYLE=	autoconf
 AUTOCONF_VERSION?=	2.69
+COMPILER=		base-clang ports-gcc base-gcc
 CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread" \
 			LDFLAGS="-L${LOCALBASE}/lib -pthread" \
 			EXTENSION_DIR=${MODULES_DIR} \
diff --git a/lang/python/2.7/Makefile b/lang/python/2.7/Makefile
index 1411f71f685..f2576b12b98 100644
--- a/lang/python/2.7/Makefile
+++ b/lang/python/2.7/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2018/09/18 16:43:12 danj Exp $
+# $OpenBSD: Makefile,v 1.58 2018/10/24 14:28:07 sthen Exp $
 
 # IMPORTANT!  If you make any changes to the Python ports, be sure
 # to also update files/CHANGES.OpenBSD for your change.  This is a
@@ -9,7 +9,7 @@ VERSION =		2.7
 PATCHLEVEL =		.15
 SHARED_LIBS =		python2.7 0.0
 VERSION_SPEC =		>=2.7,<2.8
-REVISION =		0
+REVISION =		1
 
 CONFIGURE_ARGS += --with-ensurepip=no
 
diff --git a/lang/python/3.6/Makefile b/lang/python/3.6/Makefile
index ac5d514a1b8..ee6a42e93ad 100644
--- a/lang/python/3.6/Makefile
+++ b/lang/python/3.6/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2018/09/18 16:43:12 danj Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:28:07 sthen Exp $
 
 # IMPORTANT!  If you make any changes to the Python ports, be sure
 # to also update files/CHANGES.OpenBSD for your change.  This is a
@@ -9,7 +9,7 @@ VERSION =		3.6
 PATCHLEVEL =		.6
 SHARED_LIBS =		python3.6m 0.0
 VERSION_SPEC =		>=3.6,<3.7
-REVISION =		1
+REVISION =		2
 
 CONFIGURE_ARGS +=	--with-ensurepip=no
 CONFIGURE_ARGS +=	--enable-loadable-sqlite-extensions
diff --git a/lang/python/Makefile.inc b/lang/python/Makefile.inc
index bb82dab29a4..165e0ee4271 100644
--- a/lang/python/Makefile.inc
+++ b/lang/python/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.125 2018/09/18 16:43:12 danj Exp $
+# $OpenBSD: Makefile.inc,v 1.126 2018/10/24 14:28:07 sthen Exp $
 
 # IMPORTANT!  If you make any changes to the Python ports, be sure
 # to also update files/CHANGES.OpenBSD for your change.  This is a
@@ -56,6 +56,8 @@ MULTI_PACKAGES =	-main -tests -gdbm -idle -tkinter
 ONLY_FOR_ARCHS-bsddb=	amd64 i386
 .endif
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # All subpackages depend on the main python package.
 
 RUN_DEPENDS =		${FULLPKGNAME-main}:lang/python/${VERSION},-main
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 806ee562bc8..e995c193efe 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.81 2018/10/08 15:25:58 landry Exp $
+# $OpenBSD: Makefile,v 1.82 2018/10/24 14:28:07 sthen Exp $
 
 ONLY_FOR_ARCHS =	${RUST_ARCHS}
 
@@ -24,6 +24,8 @@ BV =			${BV-${MACHINE_ARCH}}
 PKGNAME =		rust-${V}
 PKGNAME-main =		rust-${V}
 PKGNAME-doc =		rust-doc-${V}
+REVISION-doc =		0
+REVISION-main =		0
 
 MULTI_PACKAGES =	-main -doc
 
@@ -39,6 +41,9 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB-main =		${COMPILER_LIBCXX} c crypto curl git2 m pthread ssh2 ssl z
 WANTLIB-doc =
 
+# XXX should this actually just be ports-clang?
+COMPILER =		base-clang
+
 MASTER_SITES =		https://static.rust-lang.org/dist/ \
 			https://dev-static.rust-lang.org/dist/
 MASTER_SITES0 =		http://kapouay.odns.fr/pub/rust/
diff --git a/lang/verilator/Makefile b/lang/verilator/Makefile
index f09301a38a6..d6d4cf75157 100644
--- a/lang/verilator/Makefile
+++ b/lang/verilator/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2018/05/29 08:12:26 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT=	very fast free Verilog HDL simulator
 
 DISTNAME =	verilator-3.912
 CATEGORIES=	lang devel
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE=	https://www.veripool.org/wiki/verilator/Intro
 
@@ -16,6 +16,8 @@ EXTRACT_SUFX=		.tgz
 
 WANTLIB=		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS +=	devel/bison
 
 CONFIGURE_STYLE=	gnu
diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile
index 7bf9139479f..75effdd83a7 100644
--- a/mail/archiveopteryx/Makefile
+++ b/mail/archiveopteryx/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.22 2018/09/04 12:46:15 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT =		mail server storing messages in a database
 
 DISTNAME =		archiveopteryx-3.2.0
 CATEGORIES =		mail databases
-REVISION =		2
+REVISION =		3
 
 HOMEPAGE =		http://www.archiveopteryx.org/
 
@@ -13,6 +13,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c crypto m pthread ssl ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
 
 MASTER_SITES =		${HOMEPAGE}/download/
 EXTRACT_SUFX =		.tar.bz2
diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile
index a93b8d26b76..40a9f05c8f8 100644
--- a/mail/avenger/Makefile
+++ b/mail/avenger/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.27 2017/07/26 22:45:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT=		anti-spam SMTP server
 DISTNAME=		avenger-0.8.3
-REVISION =		1
+REVISION =		2
 CATEGORIES=		mail
 
 HOMEPAGE=		http://www.mailavenger.org/
@@ -12,6 +12,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		c crypto m pcap ssl ${COMPILER_LIBCXX} lib/db4/db>=4
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${HOMEPAGE}/dist/
 
 LIB_DEPENDS=		databases/db/v4
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index a22ffb380ee..4f705dedaa5 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.116 2018/09/11 17:52:22 danj Exp $
+# $OpenBSD: Makefile,v 1.117 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT-main=		mail and news client
 COMMENT-bogofilter=	bogofilter plugin
@@ -13,6 +13,11 @@ PKGNAME-bogofilter=	claws-mail-bogofilter-${V}
 PKGNAME-spamassassin=	claws-mail-spamassassin-${V}
 PKGNAME-pdfviewer=	claws-mail-pdfviewer-${V}
 PKGNAME-gdata=		claws-mail-gdata-${V}
+REVISION-bogofilter=	0
+REVISION-gdata=		0
+REVISION-main=		0
+REVISION-pdfviewer=	0
+REVISION-spamassassin=	0
 
 CATEGORIES=		mail news
 
@@ -26,6 +31,8 @@ MASTER_SITES=		http://www.claws-mail.org/releases/
 
 DIST_SUBDIR=		claws
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MULTI_PACKAGES=		-main -bogofilter -spamassassin -pdfviewer -gdata
 FLAVORS=		jpilot ldap
 FLAVOR?=
diff --git a/mail/courier-authlib/Makefile b/mail/courier-authlib/Makefile
index 0ff321a443a..ef5a2f84baf 100644
--- a/mail/courier-authlib/Makefile
+++ b/mail/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.73 2018/01/12 16:09:42 naddy Exp $
+# $OpenBSD: Makefile,v 1.74 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT-main=		authentication library for courier
 COMMENT-ldap=		ldap authentication module for courier-authLib
@@ -7,8 +7,8 @@ COMMENT-pgsql=		pgsql authentication module for courier-authLib
 COMMENT-userdb=		userdb authentication module for courier-authLib
 
 DISTNAME=		courier-authlib-0.68.0
-REVISION=		2
-REVISION-main=		3
+REVISION=		3
+REVISION-main=		4
 PKGNAME-main=		${DISTNAME}
 PKGNAME-ldap=		${DISTNAME:S/lib-/lib-ldap-/}
 PKGNAME-mysql=		${DISTNAME:S/lib-/lib-mysql-/}
@@ -38,6 +38,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=		.tar.bz2
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE=		Yes
 AUTOCONF_VERSION=	2.69
 # only libs/rfc822/configure.ac is patched
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 4c59e53332a..dec609daff9 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.117 2018/09/25 02:50:19 bentley Exp $
+# $OpenBSD: Makefile,v 1.118 2018/10/24 14:28:07 sthen Exp $
 
 PORTROACH=		limitw:1,even
 
@@ -6,7 +6,7 @@ COMMENT=		Cyrus IMAP server
 
 V=			3.0.8
 DISTNAME=		cyrus-imapd-${V}
-REVISION=		0
+REVISION=		1
 
 SHARED_LIBS +=	cyrus                     0.0 # 0.0
 SHARED_LIBS +=	cyrus_imap                0.0 # 0.0
@@ -26,6 +26,8 @@ WANTLIB += c com_err crypto icudata icuuc jansson m pcre pcreposix
 WANTLIB += pthread sasl2 sqlite3 ssl ${COMPILER_LIBCXX} uuid z
 WANTLIB += perl # uses perl ABI
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		https://www.cyrusimap.org/releases/ \
 			ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 			ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index c0e8e05d03a..fb72cf358b7 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.64 2018/09/10 09:04:03 naddy Exp $
+# $OpenBSD: Makefile,v 1.65 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT-main =	anti-spam filter
 COMMENT-pgsql =	PostgreSQL driver for dspam
@@ -6,9 +6,9 @@ COMMENT-mysql =	MySQL driver for dspam
 
 VERSION =	3.10.2
 DISTNAME =	dspam-${VERSION}
-REVISION-main =	8
-REVISION-mysql = 6
-REVISION-pgsql = 5
+REVISION-main =	9
+REVISION-mysql = 7
+REVISION-pgsql = 6
 
 PKGNAME-main =	${PKGNAME}
 .for p in pgsql mysql
@@ -35,6 +35,8 @@ MULTI_PACKAGES = -main -mysql -pgsql
 WANTLIB =	m pthread
 WANTLIB-main += ${WANTLIB} c sqlite3
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIBTOOL_FLAGS =		--tag=disable-static
 CONFIGURE_STYLE =	gnu
 SEPARATE_BUILD =	Yes
diff --git a/mail/evolution-rss/Makefile b/mail/evolution-rss/Makefile
index 1da0318bb83..ef9ac945a59 100644
--- a/mail/evolution-rss/Makefile
+++ b/mail/evolution-rss/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.81 2018/09/20 09:22:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.82 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT=		RSS reader plugin for evolution
 
 GNOME_PROJECT=		evolution-rss
 GNOME_VERSION=		0.3.95
-REVISION=		23
+REVISION=		24
 
 CATEGORIES=		mail
 
@@ -54,6 +54,8 @@ WANTLIB += lib/evolution/evolution-smime
 WANTLIB += lib/evolution/evolution-util
 WANTLIB += lib/evolution/gnomecanvas
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		http://gnome.eu.org/
 
 MODULES=		devel/dconf \
diff --git a/mail/kopano/core/Makefile b/mail/kopano/core/Makefile
index 4ca49081b0a..bb11e6e0b5f 100644
--- a/mail/kopano/core/Makefile
+++ b/mail/kopano/core/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.26 2018/10/17 14:15:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.27 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT-main=	MS Exchange groupware suite replacement
 COMMENT-mapi=	kopano MAPI extensions for PHP
 
 PKGNAME-main=	kopano-core-${V}.${BUILD}
 PKGNAME-mapi=	kopano-mapi-${V}.${BUILD}
-REVISION-mapi=	0
+REVISION-mapi=	1
+REVISION-main=	0
 
 CATEGORIES=	mail www productivity
 
@@ -25,7 +26,7 @@ SHARED_LIBS +=  kcutil                    0.0 # 0.0
 MULTI_PACKAGES=	-main -mapi
 
 # C++11
-COMPILER=	base-clang ports-gcc ports-clang
+COMPILER=	base-clang ports-gcc base-gcc
 
 MODULES=	lang/python \
 		lang/php
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 37809332ba2..d604645c64f 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2018/09/20 21:01:57 danj Exp $
+# $OpenBSD: Makefile,v 1.32 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT=	mail purpose library
 
@@ -6,6 +6,7 @@ GH_ACCOUNT=	dinhviethoa
 GH_PROJECT=	libetpan
 GH_TAGNAME=	1.9.1
 CATEGORIES=	mail devel
+REVISION=	0
 
 SHARED_LIBS +=  etpan                18.0     # 22.0
 
@@ -18,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += crypto curl expat iconv m nghttp2 pthread sasl2 ssl ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 AUTOCONF_VERSION=	2.69
 AUTOMAKE_VERSION=	1.15
 BUILD_DEPENDS=	${MODGNU_AUTOCONF_DEPENDS} \
diff --git a/mail/opensmtpd-extras/Makefile b/mail/opensmtpd-extras/Makefile
index 7ec3ee136cb..bbb7700603d 100644
--- a/mail/opensmtpd-extras/Makefile
+++ b/mail/opensmtpd-extras/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2017/09/22 21:37:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT-main=		extras for smtpd
 COMMENT-mysql=		mysql based smtpd table support
@@ -13,7 +13,7 @@ PKGNAME-mysql=		opensmtpd-extras-mysql-${V}
 PKGNAME-pgsql=		opensmtpd-extras-pgsql-${V}
 PKGNAME-python=		opensmtpd-extras-python-${V}
 PKGNAME-redis=		opensmtpd-extras-redis-${V}
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		mail
 
@@ -33,6 +33,8 @@ WANTLIB-pgsql=		c crypto event ssl pq
 WANTLIB-python=		c crypto event ssl m util pthread ${MODPY_WANTLIB}
 WANTLIB-redis=		c crypto event ssl hiredis
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${HOMEPAGE}archives/
 
 MODULES=		lang/python
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index 19e93a3bcd8..b1081fd9843 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2017/11/04 21:48:06 naddy Exp $
+# $OpenBSD: Makefile,v 1.39 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT-main=	fully featured POP3 and IMAP4 proxy server
 COMMENT-ldap=	LDAP backend for perdition mail proxy
@@ -11,10 +11,10 @@ PKGNAME-main=	perdition-${DISTVER:S/-//}
 PKGNAME-ldap=	perdition-ldap-${DISTVER:S/-//}
 PKGNAME-mysql=	perdition-mysql-${DISTVER:S/-//}
 PKGNAME-pgsql=	perdition-pgsql-${DISTVER:S/-//}
-REVISION-ldap=	1
-REVISION-main=	1
-REVISION-mysql=	1
-REVISION-pgsql=	1
+REVISION-ldap=	2
+REVISION-main=	2
+REVISION-mysql=	2
+REVISION-pgsql=	2
 
 CATEGORIES=	mail
 
@@ -57,6 +57,8 @@ FLAVOR?=
 
 MULTI_PACKAGES=		-main -mysql -pgsql -ldap
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 .include <bsd.port.arch.mk>
 
 cWANTLIB=		lib/db4/db>=4 vanessa_logger>=1.0
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index a5982ec0664..68cc2ddd234 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.121 2018/06/27 21:03:56 espie Exp $
+# $OpenBSD: Makefile,v 1.122 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT =		lightweight and user-friendly e-mail client
 
 DISTNAME =		sylpheed-3.7.0
-REVISION =		1
+REVISION =		2
 
 SHARED_LIBS += 	 	sylph-0                   4.1 # 4.0
 SHARED_LIBS += 		sylpheed-plugin-0         4.0 # 4.0
@@ -29,6 +29,8 @@ WANTLIB += harfbuzz iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
 WANTLIB += pixman-1 png pthread ssl ${COMPILER_LIBCXX} xcb
 WANTLIB += xcb-render xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS =		devel/desktop-file-utils
 MASTER_SITES =		http://sylpheed.sraoss.jp/sylpheed/v3.7/
 
diff --git a/math/R/Makefile b/math/R/Makefile
index 1786364f9d4..db4a9548654 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.102 2018/09/04 12:46:15 espie Exp $
+# $OpenBSD: Makefile,v 1.103 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT=	powerful math/statistics/graphics language
 DISTNAME=	R-3.5.1
-REVISION=	0
+REVISION=	1
 
 SO_VERSION=	34.1
 .for _lib in R Rblas Rlapack
@@ -22,6 +22,8 @@ WANTLIB += ICE SM X11 Xext Xmu Xss Xt bz2 c cairo crypto curl curses fribidi
 WANTLIB += glib-2.0 gobject-2.0 iconv icui18n icuuc intl jpeg lzma m
 WANTLIB += nghttp2 pango-1.0 pangocairo-1.0 pcre pcre2-8 png readline ssl tiff z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	https://cran.r-project.org/src/base/R-3/ \
 		http://cran.at.r-project.org/src/base/R-3/ \
 		http://cran.br.r-project.org/src/base/R-3/ \
diff --git a/math/aamath/Makefile b/math/aamath/Makefile
index 58efaf2fd85..dc49ae28702 100644
--- a/math/aamath/Makefile
+++ b/math/aamath/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2018/05/20 08:21:35 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT=		ASCII art mathematics
 
 DISTNAME=		aamath-0.3
-REVISION =		3
+REVISION =		4
 CATEGORIES=		math
 
 HOMEPAGE=		http://fuse.superglue.se/aamath/
@@ -17,6 +17,8 @@ MASTER_SITES=		http://openbsd.dead-parrot.de/distfiles/
 
 WANTLIB=		c m ${COMPILER_LIBCXX} termcap readline
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 NO_TEST=		Yes
 WRKDIST=		${WRKDIR}/aamath
 ALL_TARGET=
diff --git a/math/cgal/Makefile b/math/cgal/Makefile
index 4c6e3599c86..2abbe475f79 100644
--- a/math/cgal/Makefile
+++ b/math/cgal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2018/05/29 08:13:38 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:07 sthen Exp $
 
 BROKEN-mips64 =		ICE on Interval_nt.h:98
 
@@ -10,7 +10,7 @@ COMMENT =		Computational Geometry Algorithms Library
 DISTNAME =		CGAL-4.6.3
 MASTER_SITES =		https://gforge.inria.fr/frs/download.php/file/35139/
 PKGNAME =		${DISTNAME:L}
-REVISION =		2
+REVISION =		3
 EPOCH =			0
 
 SHARED_LIBS =		CGAL		1.0 \
@@ -29,6 +29,8 @@ WANTLIB += GL GLU boost_system-mt boost_thread-mt gmp m mpfr pthread
 WANTLIB += boost_atomic-mt boost_chrono-mt boost_date_time-mt
 WANTLIB += ${COMPILER_LIBCXX} z lib/qt4/QtGui lib/qt4/QtOpenGL lib/qt4/QtSvg
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 EXTRACT_SUFX =		.tar.xz
 
 MODULES =		devel/cmake \
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index cdf00f786c6..867eb7f2b22 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.34 2017/07/26 22:45:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.35 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT=	environment for rapid engineering and scientific processing
 BROKEN-hppa =	undefined reference to lapack funcs
 
 V=		4.0
 DISTNAME=	FreeMat-${V}-Source
-REVISION=	3
+REVISION=	4
 PKGNAME=	freemat-${V}
 
 CATEGORIES=	graphics math
@@ -19,6 +19,8 @@ WANTLIB += GL GLU QtGui QtNetwork QtOpenGL QtSvg QtXml amd c fftw3
 WANTLIB += fftw3f m ncurses pcre portaudio pthread ${COMPILER_LIBCXX} umfpack
 WANTLIB += z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=freemat/}
 
 MODULES=	x11/qt4 devel/cmake
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 87b37d5d934..f3efc797e66 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.69 2018/08/09 12:25:55 solene Exp $
+# $OpenBSD: Makefile,v 1.70 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT =	command-driven interactive function plotting program
 
@@ -7,6 +7,7 @@ PATCHLEVEL =	4
 DISTNAME =	gnuplot-${V}.${PATCHLEVEL}
 CATEGORIES =	math graphics
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=gnuplot/}
+REVISION =	0
 
 HOMEPAGE =	http://www.gnuplot.info/
 
@@ -18,6 +19,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += c cerf m ncurses ereadline ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS +=	devel/readline \
 		math/libcerf
 
diff --git a/math/graphviz/Makefile b/math/graphviz/Makefile
index bf68dd1473c..80453867c14 100644
--- a/math/graphviz/Makefile
+++ b/math/graphviz/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.72 2017/11/14 20:10:11 naddy Exp $
+# $OpenBSD: Makefile,v 1.73 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT-main=	graph drawing software
 
 DISTNAME=	graphviz-2.36.0
-REVISION=	11
+REVISION=	12
 PKGNAME-main=	${DISTNAME}
 CATEGORIES=	math devel graphics
 
@@ -56,6 +56,8 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre perl pixman-1 png
 WANTLIB += poppler poppler-glib pthread rsvg-2 ${COMPILER_LIBCXX}
 WANTLIB += tiff tk85 webp xcb xcb-render xcb-shm xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	x11/tk \
 		perl
 LIB_DEPENDS =	graphics/jpeg \
diff --git a/math/hdf5/Makefile b/math/hdf5/Makefile
index 3da9de08e64..6ae463849d0 100644
--- a/math/hdf5/Makefile
+++ b/math/hdf5/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2017/12/07 06:13:45 feinerer Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT =		Hierarchical Data Format 5 Technology suite
 
 V =			1.8.20
 DISTNAME =		hdf5-${V}
+REVISION =		0
 
 SHARED_LIBS +=	hdf5		1.1 # 13.1
 SHARED_LIBS +=	hdf5_cpp	4.1 # 15.0
@@ -21,6 +22,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += c m ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		https://support.hdfgroup.org/ftp/HDF5/current18/src/ \
 			https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-${V}/src/
 
diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile
index c89e85ce137..6d7b067f137 100644
--- a/math/libqalculate/Makefile
+++ b/math/libqalculate/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2017/11/21 00:13:02 naddy Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:28:07 sthen Exp $
 
 BROKEN-macppc =	libqalculate/Calculator.cc:7030: internal compiler error
 COMMENT =	applied math library
 CATEGORIES =	math devel
 DISTNAME =	libqalculate-0.9.7
-REVISION =	3
+REVISION =	4
 HOMEPAGE =	http://qalculate.sourceforge.net/
 
 SHARED_LIBS =	qalculate		0.0	# 5.0
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM = Yes
 WANTLIB += c cln glib-2.0 gmp iconv intl lzma m ncurses pcre pthread readline
 WANTLIB += ${COMPILER_LIBCXX} xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
 MODULES =	textproc/intltool
diff --git a/math/minisat/Makefile b/math/minisat/Makefile
index f03ebc91a29..83c032de837 100644
--- a/math/minisat/Makefile
+++ b/math/minisat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2017/08/20 16:39:44 jca Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT=		minimalistic Boolean satisfiability solver
 
@@ -6,6 +6,7 @@ DISTNAME=		minisat-2.2.0.20170810
 GH_ACCOUNT=		niklasso
 GH_PROJECT=		minisat
 GH_COMMIT=		37dc6c67e2af26379d88ce349eb9c4c6160e8543
+REVISION=		0
 
 SHARED_LIBS +=		minisat                   0.0 # 2.1
 
@@ -20,6 +21,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB +=		c m ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/cmake
 
 NO_TEST=		Yes
diff --git a/math/netcdf/Makefile b/math/netcdf/Makefile
index 9b88b189938..c2433f09f24 100644
--- a/math/netcdf/Makefile
+++ b/math/netcdf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2017/07/26 22:45:26 sthen Exp $ 
+# $OpenBSD: Makefile,v 1.32 2018/10/24 14:28:07 sthen Exp $ 
 
 BROKEN-powerpc=	fails to build
 BROKEN-hppa =	fails to configure
@@ -6,7 +6,7 @@ BROKEN-hppa =	fails to configure
 COMMENT=	library for machine-independent, array-oriented data access
 
 DISTNAME=	netcdf-3.6.2
-REVISION =	5
+REVISION =	6
 CATEGORIES=	math
 
 SHARED_LIBS=	netcdf		4.0 \
@@ -25,6 +25,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		ftp://ftp.unidata.ucar.edu/pub/netcdf/
 
 CONFIGURE_STYLE= 	gnu
diff --git a/math/ntl/Makefile b/math/ntl/Makefile
index b297844e93a..ec81a86831c 100644
--- a/math/ntl/Makefile
+++ b/math/ntl/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.49 2017/07/26 22:45:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.50 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT =	Victor Shoup's Number Theory Library
 
 DISTNAME =	ntl-9.11.0
-REVISION =	1
+REVISION =	2
 SHARED_LIBS =	ntl	9.2	# 0.0
 CATEGORIES =	math
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		m gmp ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${HOMEPAGE}
 
 LIB_DEPENDS =		devel/gmp
diff --git a/math/openfst/Makefile b/math/openfst/Makefile
index 57b80acdca7..93a27f1c9b4 100644
--- a/math/openfst/Makefile
+++ b/math/openfst/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/26 22:45:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT =		weighted finite-state transducers library
 
@@ -6,7 +6,7 @@ COMMENT =		weighted finite-state transducers library
 NOT_FOR_ARCHS=		${GCC3_ARCHS}
 
 DISTNAME =		openfst-1.3.1
-REVISION =		2
+REVISION =		3
 
 SHARED_LIBS +=		fst                       0.0 # 0.0
 SHARED_LIBS +=		fstscript                 0.0 # 0.0
@@ -20,6 +20,8 @@ PERMIT_PACKAGE_CDROM =		Yes
 
 WANTLIB +=		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://www.openfst.org/twiki/pub/FST/FstDownload/
 
 CONFIGURE_STYLE =	gnu
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 41d4e887f3e..b57667fd746 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.60 2018/01/19 15:21:46 jca Exp $
+# $OpenBSD: Makefile,v 1.61 2018/10/24 14:28:07 sthen Exp $
 
 BROKEN-powerpc = Error: Kind -2 not supported for type INTEGER at (1)
 
@@ -18,6 +18,9 @@ SHARED_LIBS =	csirocsa	4.0	\
 PKGNAME-main =	${DISTNAME}
 PKGNAME-c++ =	plplot-c++-${VERSION}
 PKGNAME-fortran =	plplot-fortran-${VERSION}
+REVISION-c++ =	0
+REVISION-fortran =	0
+REVISION-main =	0
 
 CATEGORIES =	math graphics
 
@@ -30,8 +33,8 @@ PERMIT_PACKAGE_CDROM =		Yes
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=plplot/}
 
+COMPILER =		base-clang ports-gcc base-gcc
 MODULES =	fortran
-
 MODFORTRAN_COMPILER = gfortran
 
 BUILD_DEPENDS =	print/ghostscript/gnu-fonts \
diff --git a/math/py-numexpr/Makefile b/math/py-numexpr/Makefile
index 6d2e8340e1f..dfbe016d73d 100644
--- a/math/py-numexpr/Makefile
+++ b/math/py-numexpr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2018/02/23 16:45:26 shadchin Exp $
+# $OpenBSD: Makefile,v 1.5 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT =		fast numerical expression evaluator for NumPy
 
@@ -6,6 +6,7 @@ MODPY_EGG_VERSION =	2.6.4
 DISTNAME =		numexpr-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		math
+REVISION =		0
 
 MAINTAINER =		Alexandr Shadchin <shadchin@openbsd.org>
 
@@ -14,6 +15,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB +=		m pthread ${MODPY_WANTLIB} ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		lang/python
 
 MODPY_PI =		Yes
diff --git a/math/py-pandas/Makefile b/math/py-pandas/Makefile
index 3f4f56e92a2..c040fbdd804 100644
--- a/math/py-pandas/Makefile
+++ b/math/py-pandas/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2018/09/14 08:09:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.2 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT =		data analysis and manipulation library
 
 MODPY_EGG_VERSION =	0.23.4
 DISTNAME =		pandas-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
+REVISION =		0
 
 CATEGORIES =		math
 
@@ -24,6 +25,8 @@ MODPY_SETUPTOOLS =	Yes
 
 WANTLIB +=		${COMPILER_LIBCXX} m ${MODPY_WANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS +=	math/py-numpy${MODPY_FLAVOR}>=1.9.0
 
 RUN_DEPENDS +=		math/py-numpy${MODPY_FLAVOR}>=1.9.0 \
diff --git a/math/py-scipy/Makefile b/math/py-scipy/Makefile
index 598ade8a0bc..c736a102cca 100644
--- a/math/py-scipy/Makefile
+++ b/math/py-scipy/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.34 2018/08/15 14:55:22 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.35 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT=		maths, science and engineering modules for Python
 
 MODPY_EGG_VERSION=	1.1.0
 DISTNAME=		scipy-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
+REVISION=		0
 
 CATEGORIES=		math devel
 
@@ -16,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += ${MODFORTRAN_WANTLIB} ${MODPY_WANTLIB}
 WANTLIB += blas lapack m pthread ${COMPILER_LIBCXX} util
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 HOMEPAGE=		https://scipy.org/
 
 MODULES=		lang/python fortran
diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile
index 480674a2e42..121603eb351 100644
--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2018/06/27 21:03:57 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:28:07 sthen Exp $
 
 # http://marc.info/?l=openbsd-ports&m=140587945502296&w=2
 BROKEN =		allocation error starting socket server
@@ -7,7 +7,7 @@ COMMENT =		wxWidgets GUI for the computer algebra system maxima
 
 DISTNAME =		wxMaxima-12.09.0
 CATEGORIES =		math
-REVISION =		1
+REVISION =		2
 
 HOMEPAGE =		http://wxmaxima.sourceforge.net/
 
@@ -20,6 +20,8 @@ MAINTAINER =		Edd Barrett <edd@openbsd.org>
 WANTLIB += c m pthread ${COMPILER_LIBCXX} wx_base wx_base_net wx_base_xml
 WANTLIB += wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_html
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS =		devel/desktop-file-utils \
 			math/gnuplot \
 			math/maxima
diff --git a/misc/cdrdao/Makefile b/misc/cdrdao/Makefile
index 4ab8102853a..07e48fe3b5e 100644
--- a/misc/cdrdao/Makefile
+++ b/misc/cdrdao/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.44 2018/06/24 19:18:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.45 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT=	write audio/data CD-Rs in disk-at-once mode
 
 DISTNAME= 	cdrdao-1.2.1
 CATEGORIES=	audio misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cdrdao/}
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://cdrdao.sourceforge.net/
 
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE=		Yes
 CONFIGURE_STYLE=	gnu
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} ${WRKSRC}/paranoia ${WRKSRC}/scsilib/conf
diff --git a/misc/dtcltiny/Makefile b/misc/dtcltiny/Makefile
index 49c73930da5..83304d0434d 100644
--- a/misc/dtcltiny/Makefile
+++ b/misc/dtcltiny/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2017/07/26 22:45:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:07 sthen Exp $
 
 COMMENT =		small SRCP client to control digital model trains
 
 DISTNAME =		dtcltiny-0.8.4
-REVISION=		2
+REVISION=		3
 CATEGORIES =		misc x11
 
 HOMEPAGE =		http://dtcltiny.sourceforge.net/
@@ -17,6 +17,8 @@ MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=dtcltiny/}
 MODULES =		x11/qt3
 WANTLIB += 		ICE SM X11 Xext c m png pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 SEPARATE_BUILD =	Yes
 USE_GMAKE =		Yes
 CONFIGURE_STYLE =	gnu
diff --git a/misc/gpsd/Makefile b/misc/gpsd/Makefile
index a0aff262ddc..3b11f626ad4 100644
--- a/misc/gpsd/Makefile
+++ b/misc/gpsd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.69 2018/10/17 14:15:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.70 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT-main=		service daemon that monitors one or more GPSes
 COMMENT-x11=		GUI test apps using gpsd
@@ -13,9 +13,9 @@ SHARED_LIBS=		gps	19.0 \
 			gpsd	0.0
 CATEGORIES=		misc geo
 
-REVISION-main=		9
-REVISION-php=		11
-REVISION-x11=		5
+REVISION-main=		10
+REVISION-php=		12
+REVISION-x11=		6
 
 HOMEPAGE=		http://www.catb.org/gpsd/
 
@@ -25,6 +25,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gpsd.berlios/} \
 			${MASTER_SITE_SAVANNAH:=gpsd/}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES +=		lang/python lang/php
 MODPHP_BUILDDEP=	No
 CONFIGURE_STYLE=	gnu
diff --git a/misc/openbabel/Makefile b/misc/openbabel/Makefile
index c290da763dd..31460d533a5 100644
--- a/misc/openbabel/Makefile
+++ b/misc/openbabel/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.25 2017/07/26 22:45:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=	chemistry file translation program
 
 V=		2.2.3
 DISTNAME=	openbabel-${V}
-REVISION=	6
+REVISION=	7
 CATEGORIES=	misc
 
 SUBST_VARS=	V
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c iconv lzma m pthread ${COMPILER_LIBCXX} xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openbabel/}
 
 BUILD_DEPENDS=	devel/boost
diff --git a/misc/rocrail/Makefile b/misc/rocrail/Makefile
index bb805d58286..ccdb0c68f4a 100644
--- a/misc/rocrail/Makefile
+++ b/misc/rocrail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2018/01/11 19:27:04 rpe Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT-main =		model railroad control daemon
 COMMENT-gui =		model railroad control daemon client
@@ -10,8 +10,8 @@ PKGNAME-main =		rocrail-${VERSION}.${REV}
 PKGNAME-gui =		rocview-${VERSION}.${REV}
 CATEGORIES =		misc x11
 
-REVISION-main =		6
-REVISION-gui =		4
+REVISION-main =		7
+REVISION-gui =		5
 
 HOMEPAGE =		http://www.rocrail.net/
 MAINTAINER =		Sebastian Reitenbach <sebastia@openbsd.org>
@@ -21,6 +21,8 @@ PERMIT_PACKAGE_CDROM =		Yes
 
 MASTER_SITES =		http://bugs.launchpad.net/rocrail/sunrise/2.0/+download/
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MULTI_PACKAGES =	-main -gui
 WANTLIB +=		c pthread
 WANTLIB-gui += 		${WANTLIB} m ${COMPILER_LIBCXX}
diff --git a/multimedia/atomicparsley/Makefile b/multimedia/atomicparsley/Makefile
index ac7d485d6cb..4ff85638401 100644
--- a/multimedia/atomicparsley/Makefile
+++ b/multimedia/atomicparsley/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2017/09/22 20:17:53 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=	read and set MPEG-4/3GPP metadata tags
 
 V=		0.9.6
 DISTNAME=	atomicparsley-$V
-REVISION=	2
+REVISION=	3
 DISTFILES=	${DISTNAME}{$V}.tar.bz2
 WRKDIST=	${WRKDIR}/wez-atomicparsley-da2f6e4fc120
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c m ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	https://bitbucket.org/wez/atomicparsley/get/
 
 CONFIGURE_STYLE=  gnu
diff --git a/multimedia/ccextractor/Makefile b/multimedia/ccextractor/Makefile
index 52829e9f4a2..5aacc018f94 100644
--- a/multimedia/ccextractor/Makefile
+++ b/multimedia/ccextractor/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2017/07/26 22:45:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:08 sthen Exp $
 
 MAINTAINER = 	Marc Espie <espie@openbsd.org>
 CATEGORIES =	multimedia
@@ -8,13 +8,15 @@ V =		0.56
 DISTFILES =	ccextractor.${V:S/.//}-src.zip
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=ccextractor/}
 DISTNAME =	ccextractor-$V
-REVISION =	1
+REVISION =	2
 WRKDIST =	${WRKDIR}/ccextractor.$V
 WRKSRC =	${WRKDIST}/src
 
 # GPL 2.0
 PERMIT_PACKAGE_CDROM =		Yes
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 DOCDIR = 	${PREFIX}/share/doc/ccextractor
 NO_TEST =	Yes
 
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index a743362e3bf..2a932400eaf 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2018/06/27 21:03:57 espie Exp $
+# $OpenBSD: Makefile,v 1.41 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=		DVD authoring application
 
@@ -7,7 +7,7 @@ PKGNAME=		${DISTNAME:L}
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
 EXTRACT_SUFX=		.tar.bz2
-REVISION=		4
+REVISION=		5
 
 HOMEPAGE=		https://www.dvdstyler.org/
 
@@ -25,6 +25,8 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 popt swscale wx_base wx_base_net
 WANTLIB += wx_gtk2_adv wx_gtk2_core wx_gtk2_html wx_gtk2_media
 WANTLIB += wxsvg z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=		archivers/zip \
 			multimedia/dvdauthor \
 			multimedia/mjpegtools \
diff --git a/multimedia/gstreamer-0.10/plugins-bad/Makefile b/multimedia/gstreamer-0.10/plugins-bad/Makefile
index da1d787041b..94b12755f0e 100644
--- a/multimedia/gstreamer-0.10/plugins-bad/Makefile
+++ b/multimedia/gstreamer-0.10/plugins-bad/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.101 2018/07/06 06:04:43 espie Exp $
+# $OpenBSD: Makefile,v 1.102 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT-main=		bad elements for GStreamer
 COMMENT-neon=		neon element for GStreamer (plugins-bad)
@@ -12,9 +12,9 @@ PKGNAME-main=		gstreamer-plugins-bad-${V}
 PKGNAME-neon=		gstreamer-neon-${V}
 PKGNAME-mjpeg=		gstreamer-mjpeg-${V}
 
-REVISION-main=		30
-REVISION-mjpeg=		13
-REVISION-neon=		14
+REVISION-main=		31
+REVISION-mjpeg=		14
+REVISION-neon=		15
 
 SHARED_LIBS +=  gstphotography-0.10       1.0 # 23.0
 SHARED_LIBS +=  gstsignalprocessor-0.10   1.0 # 23.0
diff --git a/multimedia/gstreamer-0.10/plugins-good/Makefile b/multimedia/gstreamer-0.10/plugins-good/Makefile
index 9bc4689136a..a9f226d5e85 100644
--- a/multimedia/gstreamer-0.10/plugins-good/Makefile
+++ b/multimedia/gstreamer-0.10/plugins-good/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.109 2017/10/23 17:10:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.110 2018/10/24 14:28:08 sthen Exp $
 
 # XXX ossaudio(3) is only enabled to be used as a mixing device by
 # audio/pulseaudio and x11/xfce4/xfce4-mixer
@@ -18,10 +18,10 @@ PKGNAME-dv=		gstreamer-dv-${V}
 PKGNAME-caca=		gstreamer-libcaca-${V}
 EPOCH-main=		0
 
-REVISION-main=		23
-REVISION-aalib=		11
-REVISION-dv=		11
-REVISION-caca=		11
+REVISION-main=		24
+REVISION-aalib=		12
+REVISION-dv=		12
+REVISION-caca=		12
 
 MULTI_PACKAGES=		-main -aalib -dv -caca
 
diff --git a/multimedia/gstreamer-0.10/plugins-ugly/Makefile b/multimedia/gstreamer-0.10/plugins-ugly/Makefile
index 5962abbaee9..4654d7d62d0 100644
--- a/multimedia/gstreamer-0.10/plugins-ugly/Makefile
+++ b/multimedia/gstreamer-0.10/plugins-ugly/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2017/09/28 20:23:35 naddy Exp $
+# $OpenBSD: Makefile,v 1.45 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT-main=		ugly elements for GStreamer
 COMMENT-sidplay=	sidplay element for GStreamer (plugins-ugly)
@@ -12,9 +12,9 @@ PKGNAME-main=		gstreamer-plugins-ugly-${V}
 PKGNAME-sidplay=	gstreamer-sidplay-${V}
 PKGNAME-lame=		gstreamer-lame-${V}
 
-REVISION-main=		10
-REVISION-sidplay=	7
-REVISION-lame=		7
+REVISION-main=		11
+REVISION-sidplay=	8
+REVISION-lame=		8
 
 PERMIT_PACKAGE_CDROM=	Patent issues
 
diff --git a/multimedia/gstreamer1/Makefile.inc b/multimedia/gstreamer1/Makefile.inc
index f85fdae0585..df3c4321238 100644
--- a/multimedia/gstreamer1/Makefile.inc
+++ b/multimedia/gstreamer1/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.53 2018/10/03 08:19:22 ajacoutot Exp $
+# $OpenBSD: Makefile.inc,v 1.54 2018/10/24 14:28:08 sthen Exp $
 
 # Most frequent usage of the GStreamer packages:
 # core		base library
@@ -49,7 +49,7 @@ TEST_DEPENDS +=	${BASE_PKGPATH}
 
 MODULES +=		lang/python
 
-COMPILER =		base-clang ports-gcc ports-clang
+COMPILER =		base-clang ports-gcc base-gcc
 COMPILER_LANGS ?=	c
 MODGCC4_ARCHS =		powerpc
 
diff --git a/multimedia/gstreamer1/mm/Makefile b/multimedia/gstreamer1/mm/Makefile
index 14d77c56f55..d77765056ad 100644
--- a/multimedia/gstreamer1/mm/Makefile
+++ b/multimedia/gstreamer1/mm/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2018/07/26 13:52:26 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=		C++ bindings for GStreamer
 
 V=			1.10.0
 DISTNAME=		gstreamermm-${V}
 PKGNAME=		gstreamer1mm-${V}
-REVISION=		0
+REVISION=		1
 
 SHARED_LIBS +=  gstreamermm-1.0      1.1      # 1.0
 
diff --git a/multimedia/gstreamer1/plugins-bad/Makefile b/multimedia/gstreamer1/plugins-bad/Makefile
index fb55434785c..f3460636941 100644
--- a/multimedia/gstreamer1/plugins-bad/Makefile
+++ b/multimedia/gstreamer1/plugins-bad/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.73 2018/10/03 08:19:22 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.74 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=		bad elements for GStreamer
 
 DISTNAME=		gst-plugins-bad-${V}
 PKGNAME=		${GST_PKGNAME_PREFIX}-plugins-bad-${V}
+REVISION=		0
 
 SHARED_LIBS +=  gstphotography-1.0   3.3      # 1404.0
 SHARED_LIBS +=  gstbasecamerabinsrc-1.0 3.3   # 1404.0
diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
index 8c4dd49830f..f15860941b1 100644
--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2017/11/05 10:14:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=	extensible open standard audio/video container library
 
@@ -6,6 +6,7 @@ DISTNAME=	libmatroska-1.4.8
 CATEGORIES=	multimedia
 MASTER_SITES=	http://dl.matroska.org/downloads/libmatroska/
 EXTRACT_SUFX=	.tar.xz
+REVISION=	0
 
 SHARED_LIBS=	matroska	4.2
 
@@ -18,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	ebml m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	textproc/libebml>=1.3.5
 
 USE_GMAKE=	Yes
diff --git a/multimedia/libmp4v2/Makefile b/multimedia/libmp4v2/Makefile
index 799c6e91dc6..0c34913472b 100644
--- a/multimedia/libmp4v2/Makefile
+++ b/multimedia/libmp4v2/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2018/04/13 15:31:12 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT =		read and manipulate the MP4 container format
 
 DISTNAME =		mp4v2-1.9.1
 PKGNAME =		lib${DISTNAME}
-REVISION =		4
+REVISION =		5
 CATEGORIES =		multimedia audio
 
 SHARED_LIBS =		mp4v2	4.0 #1.9
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_FTP =	Yes
 
 WANTLIB =		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		https://distfiles.nl/
 EXTRACT_SUFX =		.tar.bz2
 
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 15dff141e81..a48c0a680ab 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.57 2017/11/21 00:13:02 naddy Exp $
+# $OpenBSD: Makefile,v 1.58 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=	library for reading and writing QuickTime files
 
 DISTNAME=	libquicktime-1.2.4
-REVISION=	11
+REVISION=	12
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libquicktime/}
 
@@ -26,6 +26,8 @@ WANTLIB += swresample swscale vorbisenc vorbisfile vpx x264 x265
 WANTLIB += xcb xcb-dri2 xcb-glx xcb-render xcb-shm xvidcore z
 WANTLIB += atk-1.0 vorbis
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	audio/faad \
 		audio/lame \
 		audio/libvorbis \
diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index 91d9e242c62..f9a364e6784 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2018/09/11 10:04:37 naddy Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=	display technical and tag data for video and audio files
 
@@ -6,6 +6,7 @@ VERSION=	18.08.1
 PKGNAME=	mediainfo-${VERSION}
 CATEGORIES=	multimedia
 HOMEPAGE=	https://mediaarea.net/en/MediaInfo
+REVISION=	0
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
@@ -14,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c m pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	https://mediaarea.net/download/binary/mediainfo/${VERSION}/
 DISTFILES=	MediaInfo_CLI_${VERSION}_GNU_FromSource.tar.xz
 
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 78fecc7ccc9..d9b8cba4442 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.45 2018/04/25 20:55:22 naddy Exp $
+# $OpenBSD: Makefile,v 1.46 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=		tools to edit/modify/encode video streams
 
 DISTNAME=		mjpegtools-2.0.0
-REVISION=		8
+REVISION=		9
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mjpeg/}
 
@@ -28,6 +28,8 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
 WANTLIB += sndio usbhid xcb xcb-render xcb-shm z
 WANTLIB += ${COMPILER_LIBCXX} 
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		devel/sdl \
 			devel/sdl-gfx \
 			graphics/jpeg \
diff --git a/multimedia/mpgtx/Makefile b/multimedia/mpgtx/Makefile
index 68918e0ff55..795688c9305 100644
--- a/multimedia/mpgtx/Makefile
+++ b/multimedia/mpgtx/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2018/08/10 10:20:22 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=		command line MPEG audio/video/system file toolbox
 
 DISTNAME=		mpgtx-1.3.1
-REVISION =		1
+REVISION =		2
 CATEGORIES=		multimedia sysutils
 
 HOMEPAGE=		http://mpgtx.sourceforge.net/
@@ -15,6 +15,8 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mpgtx/}
 
 WANTLIB=		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE=		Yes
 
 CONFIGURE_STYLE=	simple
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index f223b74fd79..17823d48bb1 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2018/06/27 21:03:58 espie Exp $
+# $OpenBSD: Makefile,v 1.27 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT-main =		DVD ripper/converter
 COMMENT-dvdcpy =	copy selected info from DVD
@@ -7,8 +7,8 @@ V =			1.0.1
 DISTNAME =		ogmrip-$V
 PKGNAME-main =		ogmrip-$V
 PKGNAME-dvdcpy =	dvdcpy-$V
-REVISION-dvdcpy =	3
-REVISION-main =		7
+REVISION-dvdcpy =	4
+REVISION-main =		8
 
 SHARED_LIBS +=  ogmdvd-gtk                0.0 # 1.0
 SHARED_LIBS +=  ogmdvd                    0.0 # 1.0
@@ -41,6 +41,8 @@ WANTLIB-main += harfbuzz graphite2 Xau Xdmcp lzma
 
 WANTLIB-dvdcpy += c dvdread
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=ogmrip/}
 
 MODULES =		devel/gconf2 \
diff --git a/multimedia/ogmtools/Makefile b/multimedia/ogmtools/Makefile
index 14d572bd91b..7fb308a1522 100644
--- a/multimedia/ogmtools/Makefile
+++ b/multimedia/ogmtools/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/26 22:45:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=		ogg mux/demuxer
 DISTNAME=		ogmtools-1.5
-REVISION =		1
+REVISION =		2
 EXTRACT_SUFX=		.tar.bz2
 CATEGORIES=		multimedia
 MASTER_SITES=		${HOMEPAGE}
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c m ${COMPILER_LIBCXX} ogg dvdread vorbis vorbisenc
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--with-dvdread-includes=${LOCALBASE} \
diff --git a/multimedia/streamdvd/Makefile b/multimedia/streamdvd/Makefile
index 94206c5bd6b..c2d279de006 100755
--- a/multimedia/streamdvd/Makefile
+++ b/multimedia/streamdvd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2017/07/26 22:45:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=	fast tool to backup video DVDs 'on the fly'
 
 DISTNAME=	streamdvd-0.4
-REVISION =	3
+REVISION =	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.badabum.de/down/
 
@@ -19,6 +19,8 @@ NO_TEST=	Yes
 LIB_DEPENDS=	devel/libdvdread>=4.2.0
 WANTLIB=	c m ${COMPILER_LIBCXX} dvdread
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 WRKDIST=	${WRKDIR}/StreamDVD-0.4
 
 ALL_TARGET=all addon
diff --git a/multimedia/swfmill/Makefile b/multimedia/swfmill/Makefile
index dfd551d6fe9..9042dc009de 100644
--- a/multimedia/swfmill/Makefile
+++ b/multimedia/swfmill/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2018/04/24 15:16:47 jasper Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=	xml2swf and swf2xml processor with import functionalities
 
 DISTNAME=	swfmill-0.3.6
 CATEGORIES=	multimedia
 MASTER_SITES=	${HOMEPAGE}releases/
+REVISION=	0
 
 HOMEPAGE=	http://swfmill.org/
 
@@ -14,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += c exslt freetype gcrypt gpg-error iconv intl lzma m png pthread
 WANTLIB += ${COMPILER_LIBCXX} xml2 xslt z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	graphics/png \
 		textproc/libxslt
 
diff --git a/multimedia/swftools/Makefile b/multimedia/swftools/Makefile
index 7dff0556084..7dca27bdc1c 100644
--- a/multimedia/swftools/Makefile
+++ b/multimedia/swftools/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/26 22:45:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:08 sthen Exp $
 
 BROKEN-hppa =	ICE/double-free/cc1(30516) in malloc(): error: recursive call 
 COMMENT=	SWF manipulation and generation utilities
 
 DISTNAME=	swftools-0.9.1
-REVISION=	4
+REVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	${HOMEPAGE}
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c fftw3 freetype gif jpeg m mp3lame pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	audio/lame \
 		graphics/jpeg \
 		graphics/giflib \
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index f37fa33f478..b1fbd345682 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.70 2017/11/16 18:39:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.71 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=	video stream processing tools
 
 DISTNAME=	transcode-1.1.7
-REVISION=	12
+REVISION=	13
 CATEGORIES=	multimedia
 
 HOMEPAGE=	https://bitbucket.org/achurch_/transcode/
@@ -25,6 +25,8 @@ WANTLIB += lzma ${COMPILER_LIBCXX} swresample x265
 # want to track changes to the ABI to ensure transcode is updated if needed.
 WANTLIB += xvidcore
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 FLAVORS=	lzo mjpegtools altivec
 FLAVOR?=
 
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index c73947923d8..a8363d87cfd 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.138 2018/07/01 21:10:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.139 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=	multimedia decoding library
 
 DISTNAME=	xine-lib-1.2.9
-REVISION=	0
+REVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xine/}
 EXTRACT_SUFX=	.tar.xz
@@ -32,7 +32,7 @@ WANTLIB += z
 XINEAPI_REV=	2.7
 SUBST_VARS+=	XINEAPI_REV
 
-COMPILER=	base-clang base-gcc
+COMPILER=	base-clang ports-gcc base-gcc
 COMPILER_LANGS=	c
 
 BUILD_DEPENDS=	textproc/xmlto
diff --git a/net/amule/Makefile b/net/amule/Makefile
index 9e36f556869..76ce0936598 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2018/06/27 21:03:58 espie Exp $
+# $OpenBSD: Makefile,v 1.67 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT-main =	another eDonkey P2P file sharing client
 COMMENT-web =	webserver interface to amuled
@@ -6,7 +6,7 @@ COMMENT-daemon =stand-alone daemon/cmdline for amule
 
 V =		2.3.2
 DISTNAME =	aMule-$V
-REVISION =	8
+REVISION =	9
 CATEGORIES =	net
 
 HOMEPAGE =	http://www.amule.org/
@@ -28,6 +28,8 @@ LIB_DEPENDS =
 WANTLIB =
 RUN_DEPENDS =
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # bison needed if .y files are patched
 BUILD_DEPENDS =		devel/bison \
 			devel/gettext-tools
diff --git a/net/castget/Makefile b/net/castget/Makefile
index 8b499ab9c0d..8a0e49c5833 100644
--- a/net/castget/Makefile
+++ b/net/castget/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2017/11/21 00:13:02 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=		command-line podcast downloader
 
 DISTNAME=		castget-1.0.1
-REVISION=		9
+REVISION=		10
 SHARED_LIBS +=	castget              0.0      # .0.0
 CATEGORIES=		net
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += c crypto curl glib-2.0 iconv id3 intl lzma m nghttp2 pcre pthread ssl
 WANTLIB += ${COMPILER_LIBCXX} xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=            audio/id3lib \
 			devel/glib2 \
 			net/curl \
diff --git a/net/dclib/Makefile b/net/dclib/Makefile
index f51cd1f4db8..3868b10e1f9 100644
--- a/net/dclib/Makefile
+++ b/net/dclib/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2017/07/26 22:45:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=	Library for direct-connect protocol
 
 DISTNAME=	dclib-0.3.7
-REVISION=	8
+REVISION=	9
 CATEGORIES=	net
 SHARED_LIBS=	dc	1.0
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += bz2 crypto iconv lzma m pthread ssl ${COMPILER_LIBCXX} xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	https://spacehopper.org/mirrors/berlios/dcgui/
 
 LIB_DEPENDS=	archivers/bzip2 \
diff --git a/net/dxpc/Makefile b/net/dxpc/Makefile
index fa3b7f46d25..333b9cd76b7 100644
--- a/net/dxpc/Makefile
+++ b/net/dxpc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.37 2017/07/26 22:45:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.38 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT =	X11 over a low bandwidth link
 VERSION =	3.8.2
 DISTNAME =	dxpc-${VERSION}
-REVISION =	2
+REVISION =	3
 CATEGORIES =	net x11
 
 MAINTAINER =	Marc Espie <espie@openbsd.org>
@@ -17,6 +17,8 @@ HOMEPAGE =		http://www.vigor.nu/dxpc/
 LIB_DEPENDS =		archivers/lzo
 WANTLIB =		c m ${COMPILER_LIBCXX} lzo
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_X11 = 		Yes
 
 CONFIGURE_STYLE =	gnu dest
diff --git a/net/dysnomia/Makefile b/net/dysnomia/Makefile
index ff86624e5ee..ba5ecf4cb72 100644
--- a/net/dysnomia/Makefile
+++ b/net/dysnomia/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:08 sthen Exp $
 
 CATEGORIES = 	net audio www
 COMMENT = 	interface to the deezer on-demand music system
@@ -6,7 +6,7 @@ HOMEPAGE = 	http://dysnomia-project.org/
 MASTER_SITES = 	${HOMEPAGE}
 
 DISTNAME = 	dysnomia-en-0.3.4
-REVISION=	2
+REVISION=	3
 EXTRACT_SUFX = 	.tgz
 
 # GPLv2 or later
@@ -19,6 +19,8 @@ WANTLIB = c curl m pthread ${COMPILER_LIBCXX} wx_base wx_base_net wx_base_odbc \
 	wx_base_xml wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid \
 	wx_gtk2_html wx_gtk2_qa wx_gtk2_xrc wx_gtk2_richtext
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MAKE_FLAGS = \
 	CXX="${CXX}" \
 	LIBS="$(CXXFLAGS) `wx-config --libs` -L${LOCALBASE}/lib -lcurl" \
diff --git a/net/fastnetmon/Makefile b/net/fastnetmon/Makefile
index 6b4a7e8f702..9ae90be903b 100644
--- a/net/fastnetmon/Makefile
+++ b/net/fastnetmon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2018/09/04 12:46:16 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT =		DDoS detector with multiple packet capture engines
 
@@ -6,7 +6,7 @@ GH_ACCOUNT =		pavel-odintsov
 GH_PROJECT =		fastnetmon
 GH_COMMIT =		611ccd8bf494d6356901a6ac7cde5998bfe061e2
 DISTNAME =		fastnetmon-1.1.3.1
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		https://fastnetmon.com/guides/
 
@@ -24,6 +24,8 @@ WANTLIB += boost_date_time-mt boost_program_options-mt boost_regex-mt
 WANTLIB += boost_system-mt boost_thread-mt c curses form hiredis
 WANTLIB += json-c log4cpp m pcap
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		devel/boost \
 			devel/log4cpp \
 			devel/json-c \
diff --git a/net/freetalk/Makefile b/net/freetalk/Makefile
index 13181e17317..195ce306d1d 100644
--- a/net/freetalk/Makefile
+++ b/net/freetalk/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2017/11/21 00:13:02 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=	console based Jabber client
 
 DISTNAME=	freetalk-3.2
-REVISION=	4
+REVISION=	5
 
 CATEGORIES=	net
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=	c glib-2.0 gmp iconv idn intl ltdl m ncurses pthread \
 		readline ${COMPILER_LIBCXX} guile loudmouth-1>=3
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SAVANNAH:=freetalk/}
 
 LIB_DEPENDS=	lang/guile \
diff --git a/net/gloox/Makefile b/net/gloox/Makefile
index b8739b15532..3b380f22455 100644
--- a/net/gloox/Makefile
+++ b/net/gloox/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2017/11/21 00:13:02 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT =	extensible C++ library for XMPP clients and components
 
 DISTNAME =	gloox-1.0.20
 SHARED_LIBS +=	gloox                2.0      # 8.0
 CATEGORIES =	net devel
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	https://camaya.net/gloox/
 MASTER_SITES =	https://camaya.net/download/
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM =		Yes
 
 WANTLIB += crypto iconv idn intl m pthread ssl ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =			devel/libidn
 
 USE_GMAKE =			Yes
diff --git a/net/gnugk/Makefile b/net/gnugk/Makefile
index 2b40f406736..f84f8566025 100644
--- a/net/gnugk/Makefile
+++ b/net/gnugk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.77 2018/09/01 11:06:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.78 2018/10/24 14:28:08 sthen Exp $
 
 BROKEN-hppa=		libpt.so.7.0: undefined reference to __sync_fetch_and_or_4
 
@@ -9,6 +9,7 @@ GH_ACCOUNT=		willamowius
 GH_PROJECT=		gnugk
 GH_TAGNAME=		v${V:S/./_/}
 PKGNAME=		gnugk-${V}
+REVISION=		0
 
 CATEGORIES=		net telephony
 
@@ -23,6 +24,8 @@ WANTLIB += ${COMPILER_LIBCXX} SDL c crypto curl expat h323 kvm
 WANTLIB += lber ldap ldap_r lua5.2 m maxminddb netsnmp netsnmpagent
 WANTLIB += netsnmpmibs nghttp2 pt sasl2 ssh ssl z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		lang/lua
 
 # uses luaL_newlib, lua_setglobal
diff --git a/net/h323plus/Makefile b/net/h323plus/Makefile
index ebddccb4d82..d1a51fe77bf 100644
--- a/net/h323plus/Makefile
+++ b/net/h323plus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2018/09/01 11:05:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.33 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=		H.323 video conferencing library
 
@@ -6,7 +6,7 @@ GH_ACCOUNT=		willamowius
 GH_PROJECT=		h323plus
 GH_TAGNAME=		v1_27_0
 PKGNAME=		${DISTNAME:S/_/./g}
-REVISION=		0
+REVISION=		1
 
 CATEGORIES=		net devel
 
@@ -22,6 +22,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += ${COMPILER_LIBCXX} SDL c crypto expat lber ldap ldap_r
 WANTLIB += m pt sasl2 ssl
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		devel/ptlib
 
 ALL_TARGET=		default #${WRKSRC}/Makefile 
diff --git a/net/hexchat/Makefile b/net/hexchat/Makefile
index 749d43c6b54..7393e2f873d 100644
--- a/net/hexchat/Makefile
+++ b/net/hexchat/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2018/06/29 22:16:19 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT =		GTK+2 IRC Client
 DISTNAME =		hexchat-2.12.3
 EXTRACT_SUFX =		.tar.xz
 CATEGORIES =		net x11
-REVISION =		3
+REVISION =		4
 
 HOMEPAGE =		http://hexchat.github.io/
 MAINTAINER =		Florian Stinglmayr <florian@n0la.org>
@@ -21,6 +21,8 @@ WANTLIB += notify pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre perl pixman-1
 WANTLIB += png proxy pthread ${MODPY_WANTLIB} ssl ${COMPILER_LIBCXX} util
 WANTLIB += xcb xcb-render xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://dl.hexchat.net/hexchat/
 
 MODULES =		textproc/intltool \
diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index 529801ffb38..677861dc62c 100644
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.28 2018/09/09 10:27:29 bluhm Exp $
+# $OpenBSD: Makefile,v 1.29 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=	tool for measuring maximum TCP and UDP bandwidth
 
 DISTNAME=	iperf-2.0.12
 CATEGORIES=	net
+REVISION=	0
 
 HOMEPAGE=	http://sourceforge.net/projects/iperf/
 
@@ -14,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=iperf2/}
 
 CONFIGURE_STYLE= autoconf
diff --git a/net/irrtoolset/Makefile b/net/irrtoolset/Makefile
index b38ac566a87..dac8a34eb82 100644
--- a/net/irrtoolset/Makefile
+++ b/net/irrtoolset/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2017/07/26 22:45:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=	toolset for internet routing registries
 
 V=		5.0.1
-REVISION =	2
+REVISION =	3
 DISTNAME=	irrtoolset-$V
 
 CATEGORIES=	net
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c m readline ${COMPILER_LIBCXX} termcap
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://ftp.isc.org/isc/IRRToolSet/IRRToolSet-$V/ \
 		ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-$V/
 
diff --git a/net/jabberd/Makefile b/net/jabberd/Makefile
index c905bbd2e50..b142fe36dc3 100644
--- a/net/jabberd/Makefile
+++ b/net/jabberd/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.60 2017/07/26 22:45:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.61 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=		jabber server
 DISTNAME=		jabberd-2.0s11
-REVISION=		10
+REVISION=		11
 EPOCH=			1
 CATEGORIES=		net
 HOMEPAGE=		http://jabberd2.org/
@@ -12,6 +12,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		c crypto ssl
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		http://www.linklevel.net/distfiles/
 
 JABBERDUSER=		_jabberd
diff --git a/net/kismet/Makefile b/net/kismet/Makefile
index 7b895b3e9fd..d1eecf2dbc1 100644
--- a/net/kismet/Makefile
+++ b/net/kismet/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2017/07/26 22:45:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.46 2018/10/24 14:28:08 sthen Exp $
 # Much help came from Alexandre Anriot, Robert Nagy, Bernd Ahlers,
 # and, last but not least, Pedro la Peu.
 
@@ -10,8 +10,8 @@ NOT_FOR_ARCHS=	m88k
 
 V=		2008-05-R1
 DISTNAME=	kismet-${V}
-REVISION-main =	9
-REVISION-gpsmap= 10
+REVISION-main =	10
+REVISION-gpsmap= 11
 PKGNAME-main=	kismet-${V:S,-,,g}
 PKGNAME-gpsmap=	kismet-gpsmap-${V:S,-,,g}
 CATEGORIES=	net security
@@ -24,6 +24,8 @@ MAINTAINER=	Matthias Kilian <kili@openbsd.org>
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # "old" is required for setting --sysconfdir
 CONFIGURE_STYLE=	gnu old
 
diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 1c5c68d41b7..002bafe17fa 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.122 2018/08/13 14:36:41 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.123 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT=	shell-like command line ftp and sftp client
 
 DISTNAME=	lftp-4.8.4
 CATEGORIES=	net
+REVISION=	0
 
 HOMEPAGE=	https://lftp.tech/
 
@@ -15,6 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += ${COMPILER_LIBCXX} c crypto curses ereadline expat
 WANTLIB += iconv idn2 intl m ssl unistring util z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # lftp needs add_history_time()
 LIB_DEPENDS=	devel/libidn2 \
 		devel/gettext \
diff --git a/net/libmygpo-qt/Makefile b/net/libmygpo-qt/Makefile
index 8f12f1d10db..4d545a31e00 100644
--- a/net/libmygpo-qt/Makefile
+++ b/net/libmygpo-qt/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2017/07/26 22:45:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:28:08 sthen Exp $
 COMMENT =		Qt/C++ library wrapper for the GPodder
 DISTNAME =		libmygpo-qt.1.0.7
 PKGNAME =		${DISTNAME:S/./-/}
-REVISION =		3
+REVISION =		4
 
 SHARED_LIBS =		mygpo-qt	0.0
 
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		lib/qt4/QtNetwork m qjson ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://stefan.derkits.at/files/libmygpo-qt/
 
 MODULES =		devel/cmake x11/qt4
diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile
index 00e1b3ae1e5..5378b023ae6 100644
--- a/net/libproxy/Makefile
+++ b/net/libproxy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.59 2017/11/24 13:40:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.60 2018/10/24 14:28:08 sthen Exp $
 
 COMMENT-main=		library handling all the details of proxy configuration
 COMMENT-webkit=		pacrunner libproxy plugin for webkit-based browsers
@@ -10,8 +10,8 @@ SUBST_VARS=		GH_TAGNAME
 
 PKGNAME-main=		${DISTNAME}
 PKGNAME-webkit=		${GH_PROJECT}-webkit-${GH_TAGNAME}
-REVISION-main=		0
-REVISION-webkit=	0
+REVISION-main=		1
+REVISION-webkit=	1
 
 CATEGORIES=		net
 
@@ -28,6 +28,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 MODULES=		devel/cmake \
 			lang/python
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODPY_VERSION=		${MODPY_DEFAULT_VERSION_3}
 
 # cyclic dependency: libproxy,-webkit -> webkit -> gtk+3|libsoup -> glib2-networking -> libproxy
diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index 43f4f54d0ac..4c1657b145d 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2018/07/19 14:04:57 tj Exp $
+# $OpenBSD: Makefile,v 1.56 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=		BitTorrent library written in C++
 
@@ -10,7 +10,7 @@ NOT_FOR_ARCHS=		${GCC3_ARCHS}
 
 DISTNAME=		libtorrent-0.13.6
 EPOCH=			0
-REVISION=		3
+REVISION=		4
 SHARED_LIBS +=  	torrent 22.1	# .18.0
 CATEGORIES=		net devel
 
@@ -24,6 +24,8 @@ MASTER_SITES=		https://rtorrent.net/downloads/
 
 WANTLIB=		crypto m pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=		devel/cppunit
 
 CONFIGURE_STYLE=	autoconf
diff --git a/net/livemedia/Makefile b/net/livemedia/Makefile
index e7ce21384d9..3c149fd8b88 100644
--- a/net/livemedia/Makefile
+++ b/net/livemedia/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2018/04/10 21:15:33 naddy Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=	LIVE555 streaming media library
 
 DISTNAME=	live.2012.02.04
 PKGNAME=	liveMedia-20120204
-REVISION =	3
+REVISION =	4
 CATEGORIES=	net devel
 MASTER_SITES=	http://comstyle.com/source/
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=simple
 CONFIGURE_SCRIPT=genMakefiles
 CONFIGURE_ARGS=	fixed-openbsd
diff --git a/net/minbif/Makefile b/net/minbif/Makefile
index 01fe13ca059..96ef1206da0 100644
--- a/net/minbif/Makefile
+++ b/net/minbif/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2018/09/04 12:46:17 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT =	IRC-friendly instant messaging client
 
 DISTNAME=	minbif-1.0.5
 CATEGORIES=	net
-REVISION=	4
+REVISION=	5
 
 HOMEPAGE =	http://minbif.im/
 MASTER_SITES=	${HOMEPAGE}attachments/download/148/
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 MODULES =	devel/cmake
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =	net/pidgin,-libpurple \
 		security/gnutls
 WANTLIB =	purple c glib-2.0 gthread-2.0 intl m pthread \
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index c732cdf44e0..4b536f3b7de 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2017/09/16 14:55:27 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT =	e-donkey client
 
 VER =		3.1.6
 DISTNAME =	mldonkey-${VER}
-REVISION =	0
+REVISION =	1
 CATEGORIES =	net
 
 HOMEPAGE =	http://mldonkey.sourceforge.net/Main_Page
@@ -21,6 +21,8 @@ WANTLIB += gobject-2.0 gtk-x11-2.0 iconv intl jpeg m magic miniupnpc
 WANTLIB += natpmp pango-1.0 pangocairo-1.0 pangoft2-1.0 png pthread
 WANTLIB += rsvg-2 ${COMPILER_LIBCXX} tiff webp z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	https://github.com/ygrek/mldonkey/releases/download/release-${VER:S/./-/g}/
 
 EXTRACT_SUFX =		.tar.bz2
diff --git a/net/monitoring-plugins/Makefile b/net/monitoring-plugins/Makefile
index c8d3fe95952..0464dec1845 100644
--- a/net/monitoring-plugins/Makefile
+++ b/net/monitoring-plugins/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2017/11/13 15:36:16 naddy Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT-main=	monitoring plugins (for Nagios, Icinga, etc)
 COMMENT-dbi=	dbi monitoring plugin
@@ -12,7 +12,7 @@ COMMENT-snmp=	monitoring plugins using snmp
 COMMENT-radius=	RADIUS monitoring plugin
 
 V=		2.2
-REVISION-main=	4
+REVISION-main=	5
 DISTNAME=	monitoring-plugins-$V
 PKGNAME-main=	monitoring-plugins-$V
 PKGNAME-dbi=	monitoring-plugins-dbi-$V
@@ -25,15 +25,15 @@ PKGNAME-samba=	monitoring-plugins-samba-$V
 PKGNAME-snmp=	monitoring-plugins-snmp-$V
 PKGNAME-radius=	monitoring-plugins-radius-$V
 CATEGORIES=	net
-REVISION-dbi=	2
-REVISION-fping=	2
-REVISION-game=	2
-REVISION-ldap=	2
-REVISION-mysql=	2
-REVISION-pgsql=	2
-REVISION-radius=3
-REVISION-samba=	1
-REVISION-snmp=	2
+REVISION-dbi=	3
+REVISION-fping=	3
+REVISION-game=	3
+REVISION-ldap=	3
+REVISION-mysql=	3
+REVISION-pgsql=	3
+REVISION-radius=4
+REVISION-samba=	2
+REVISION-snmp=	3
 
 HOMEPAGE=	https://www.monitoring-plugins.org/
 
@@ -45,6 +45,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=	c iconv intl pthread
 WANTLIB-main=	${WANTLIB} crypto m ssl
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	https://www.monitoring-plugins.org/download/
 
 LIB_DEPENDS=	devel/gettext
diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index a604aa4a7e8..d7f48df7f80 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2018/09/27 11:07:39 jasper Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT =		opensource MQTT broker
 
 DISTNAME =		mosquitto-1.5.3
+REVISION =		0
 
 SHARED_LIBS +=  mosquitto                 0.0 # 1.5
 SHARED_LIBS +=  mosquittopp               0.0 # 1.5
@@ -17,6 +18,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB +=		c crypto m pthread ssl ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CFLAGS +=		-I${LOCALBASE}/include
 MASTER_SITES =		https://mosquitto.org/files/source/
 
diff --git a/net/mutella/Makefile b/net/mutella/Makefile
index be82855b606..997ff373546 100644
--- a/net/mutella/Makefile
+++ b/net/mutella/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2017/07/26 22:45:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=		gnutella client with an easy to use interface
 
 DISTNAME=		mutella-0.4.5
-REVISION=		1
+REVISION=		2
 CATEGORIES=		net
 
 HOMEPAGE=		http://mutella.sourceforge.net/
@@ -12,6 +12,8 @@ HOMEPAGE=		http://mutella.sourceforge.net/
 PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=		c curses m pthread readline ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mutella/}
 
 SEPARATE_BUILD=		Yes
diff --git a/net/nam/Makefile b/net/nam/Makefile
index 543e6e654eb..f153c1ef2c7 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.41 2018/04/16 23:16:52 schwarze Exp $
+# $OpenBSD: Makefile,v 1.42 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=	UCB/LBNL Network Animator
 
 V=		1.15
 DISTNAME=	nam-src-$V
 PKGNAME=	nam-$V
-REVISION =	2
+REVISION =	3
 CATEGORIES=	net
 MAINTAINER =	Stuart Cassoff <stwo@users.sourceforge.net>
 
@@ -21,6 +21,8 @@ WANTLIB +=		X11 Xext c m otcl ${COMPILER_LIBCXX} z
 WANTLIB +=		${MODTK_WANTLIB}
 LIB_DEPENDS +=		${MODTK_LIB_DEPENDS}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	devel/tclcl
 LIB_DEPENDS=	lang/otcl
diff --git a/net/neon/Makefile b/net/neon/Makefile
index 5a4a58669ee..9196eb022bf 100644
--- a/net/neon/Makefile
+++ b/net/neon/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.44 2017/11/21 00:13:02 naddy Exp $
+# $OpenBSD: Makefile,v 1.45 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=		HTTP and WebDAV client library, with C interface
 
 DISTNAME=		neon-0.30.2
 SHARED_LIBS +=  neon                 29.0     # 30.1
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		net www devel
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += crypto expat iconv intl m proxy pthread ssl ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${HOMEPAGE}
 
 LIB_DEPENDS =		net/libproxy
diff --git a/net/nload/Makefile b/net/nload/Makefile
index 5367276c901..07ab935fa54 100644
--- a/net/nload/Makefile
+++ b/net/nload/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/26 22:45:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=		network traffic and bandwidth usage in real time
 
 DISTNAME=		nload-0.7.4
-REVISION =		3
+REVISION =		4
 CATEGORIES=		net
 
 HOMEPAGE=		http://www.roland-riegel.de/nload/
@@ -12,11 +12,13 @@ MAINTAINER=		Gonzalo L. R. <gonzalo@openbsd.org>
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 
+WANTLIB=		c form m ncurses ${COMPILER_LIBCXX}
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${HOMEPAGE}
 
 CONFIGURE_STYLE=	gnu
 SEPARATE_BUILD=		Yes
 
-WANTLIB=		c form m ncurses ${COMPILER_LIBCXX}
-
 .include <bsd.port.mk>
diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index af1164566b1..778ca92d98d 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.133 2018/06/27 21:04:00 espie Exp $
+# $OpenBSD: Makefile,v 1.134 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT-main=	scan ports and fingerprint stack of network hosts
 COMMENT-zenmap=	graphical frontend for nmap
@@ -7,7 +7,8 @@ MODPY_EGG_VERSION=	7.70
 DISTNAME=		nmap-${MODPY_EGG_VERSION}
 PKGNAME-main=		${DISTNAME}
 PKGNAME-zenmap=		nmap-zenmap-${MODPY_EGG_VERSION}
-REVISION-zenmap=	0
+REVISION-zenmap=	1
+REVISION-main=		0
 
 CATEGORIES=	net security
 MASTER_SITES=	http://nmap.org/dist/
@@ -22,6 +23,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 MULTI_PACKAGES=	-main -zenmap
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE=	Yes
 MODLUA_SA=	Yes
 MODLUA_VERSION=	5.3
diff --git a/net/ns/Makefile b/net/ns/Makefile
index 3934fe625af..36dadd04839 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.49 2018/04/25 19:44:04 naddy Exp $
+# $OpenBSD: Makefile,v 1.50 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=	UCB/LBNL Network Simulator Version 2
 
 V=		2.35
 DISTNAME=	ns-src-$V
 PKGNAME=	ns-$V
-REVISION =	4
+REVISION =	5
 CATEGORIES=	net
 MAINTAINER =	Stuart Cassoff <stwo@users.sourceforge.net>
 
@@ -18,6 +18,8 @@ MODULES +=	x11/tk
 WANTLIB +=	X11 Xext c m pcap ${COMPILER_LIBCXX} otcl
 WANTLIB +=	${MODTK_WANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nsnam/}
 WRKDIST=	${WRKDIR}/ns-$V
 
diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile
index da7a8de2d9f..64958a63cf8 100644
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2018/10/04 22:28:03 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:28:09 sthen Exp $
 
 BROKEN=	too crashy, the packet dissectors trigger SIGSEGV within minutes
 
@@ -12,6 +12,7 @@ GH_PROJECT=	ntopng
 GH_TAGNAME=	3.6.1
 NDPI_V=		2.4
 DISTFILES=	ntopng-${GH_TAGNAME}.tar.gz ndpi-${NDPI_V}.tar.gz:0
+REVISION=	0
 
 CATEGORIES=	net
 
@@ -26,6 +27,8 @@ WANTLIB += ${COMPILER_LIBCXX}
 WANTLIB += c crypto curl hiredis json-c m maxminddb mysqlclient
 WANTLIB += pcap rrd sodium sqlite3 ssl z zmq zstd
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES0=	https://github.com/ntop/ndpi/archive/${NDPI_V}/
 
 BUILD_DEPENDS=	devel/libtool \
diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile
index 324c10ba56a..dfbbd8e407f 100644
--- a/net/openconnect/Makefile
+++ b/net/openconnect/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.44 2017/09/22 20:52:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.45 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=	client for Cisco AnyConnect SSL VPN
 
 DISTNAME=	openconnect-7.08
-REVISION=	2
+REVISION=	3
 
 SHARED_LIBS +=  openconnect               4.3 # 5.4
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += c ffi gmp gnutls hogweed iconv idn2 intl lz4 lzma m
 WANTLIB += nettle p11-kit pthread tasn1 unistring xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	ftp://ftp.infradead.org/pub/openconnect/
 
 FLAVORS=	light
diff --git a/net/osrtspproxy/Makefile b/net/osrtspproxy/Makefile
index 85a516f9065..544696e4dda 100644
--- a/net/osrtspproxy/Makefile
+++ b/net/osrtspproxy/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/26 22:45:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=		RTSP proxy reference implementation
 
 DISTNAME=		osrtspproxy_2_0
 PKGNAME=		osrtspproxy-2.0
-REVISION=		2
+REVISION=		3
 CATEGORIES=		net
 HOMEPAGE=		http://www.rtsp.org/
 
@@ -21,6 +21,8 @@ NO_TEST=Yes
 
 WANTLIB += c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/osrtspproxy
 	${INSTALL_PROGRAM} ${WRKSRC}/rtspproxy/rtspproxy ${PREFIX}/sbin
diff --git a/net/pchar/Makefile b/net/pchar/Makefile
index 745c9ecba1d..0dd9174b7d3 100644
--- a/net/pchar/Makefile
+++ b/net/pchar/Makefile
@@ -1,16 +1,19 @@
-# $OpenBSD: Makefile,v 1.31 2017/07/28 15:45:08 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=	Sandia Internet path characterization tool
 
 DISTNAME=	pchar-1.5
-REVISION =	3
+REVISION =	4
 CATEGORIES=	net
 
 MASTER_SITES=	${HOMEPAGE}
 
 PERMIT_PACKAGE_CDROM=	Yes
+
 WANTLIB=		c m pcap ${COMPILER_LIBCXX} 
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 HOMEPAGE=	http://www.kitchenlab.org/www/bmah/Software/pchar/
 
 CONFIGURE_STYLE=gnu
diff --git a/net/pidgin/Makefile b/net/pidgin/Makefile
index fd3abb72f4f..3cc9455e777 100644
--- a/net/pidgin/Makefile
+++ b/net/pidgin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.141 2018/06/29 22:16:19 espie Exp $
+# $OpenBSD: Makefile,v 1.142 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT-main=	multi-protocol instant messaging client
 COMMENT-finch=	multi-protocol instant messaging client, console client
@@ -16,7 +16,9 @@ FULLPKGPATH$i= ${PKGPATH},$i${FLAVOR_EXT:S/-gtkspell//:S/-/,/g}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
 EXTRACT_SUFX=	.tar.bz2
-REVISION-main=	1
+REVISION-main=	2
+REVISION-finch=	0
+REVISION-libpurple=0
 
 SHARED_LIBS=	jabber		0.0 \
 		oscar		0.0 \
@@ -31,6 +33,8 @@ MAINTAINER=	Brad Smith <brad@comstyle.com>
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 WANTLIB=	c dbus-1 dbus-glib-1 ffi gadu gio-2.0 glib-2.0 gmodule-2.0 \
 		gobject-2.0 gthread-2.0 idn lzma m pcre pthread xml2 z \
 		iconv intl
diff --git a/net/poco/Makefile b/net/poco/Makefile
index 5198d4bdff5..f117aee9966 100644
--- a/net/poco/Makefile
+++ b/net/poco/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2017/09/27 08:13:00 phessler Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT =	POCO C++ libraries for network based applications
 
 VERSION =	1.4.6p1
 DISTNAME =	poco-${VERSION}-all
 PKGNAME =	poco-${VERSION:S/p/pl/}
-REVISION =	3
+REVISION =	4
 CATEGORIES =	net devel
 SHLIB_VERSION =	1.0
 
@@ -24,6 +24,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += c crypto m pthread ssl ${COMPILER_LIBCXX} iodbc iodbcinst mysqlclient
 WANTLIB += expat pcre sqlite3 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =	databases/iodbc \
 		databases/mariadb \
 		databases/sqlite3 \
diff --git a/net/psi/Makefile b/net/psi/Makefile
index e34e1bf06bc..8a4af0e175f 100644
--- a/net/psi/Makefile
+++ b/net/psi/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2018/06/29 22:16:19 espie Exp $
+# $OpenBSD: Makefile,v 1.30 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=	multiplatform Jabber client
 
 DISTNAME=	psi-0.15
-REVISION=	8
+REVISION=	9
 CATEGORIES=	net
 
 HOMEPAGE=	http://psi-im.org/
@@ -18,6 +18,8 @@ WANTLIB += ICE QtDBus QtGui QtNetwork QtXml SM X11 Xext Xi Xinerama
 WANTLIB += Xrender Xss c enchant fontconfig freetype glib-2.0
 WANTLIB += gmodule-2.0 iconv intl m pthread qca ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		x11/qt4
 
 USE_GMAKE=		Yes
diff --git a/net/py-msgpack/Makefile b/net/py-msgpack/Makefile
index 7627aad5192..0208a1101ce 100644
--- a/net/py-msgpack/Makefile
+++ b/net/py-msgpack/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2018/06/21 14:38:14 bket Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT =		messagepack (de)serializer
 
@@ -8,6 +8,7 @@ COMMENT =		messagepack (de)serializer
 MODPY_EGG_VERSION =	0.5.6
 DISTNAME =		msgpack-python-${MODPY_EGG_VERSION}
 PKGNAME =		py-msgpack-${MODPY_EGG_VERSION}
+REVISION =		0
 
 CATEGORIES =		net textproc
 
@@ -20,6 +21,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		${COMPILER_LIBCXX} ${MODPY_WANTLIB} m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		lang/python
 MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
diff --git a/net/py-pcapy/Makefile b/net/py-pcapy/Makefile
index 159a4e234f8..6265d380c8a 100644
--- a/net/py-pcapy/Makefile
+++ b/net/py-pcapy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2017/07/26 22:45:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT =		libpcap module for Python
 
@@ -7,7 +7,7 @@ GH_ACCOUNT =		CoreSecurity
 GH_PROJECT =		pcapy
 GH_TAGNAME =		${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		net devel
 
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += 		${MODPY_WANTLIB} ${COMPILER_LIBCXX} m pcap
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		lang/python
 MODPY_SETUPTOOLS =	Yes
 
diff --git a/net/qsynergy/Makefile b/net/qsynergy/Makefile
index 8dc95734d74..58995ed4bbd 100644
--- a/net/qsynergy/Makefile
+++ b/net/qsynergy/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2018/06/27 21:04:00 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=		GUI for synergy
 
 DISTNAME=		qsynergy-0.9.1
-REVISION=		3
+REVISION=		4
 CATEGORIES=		net x11
 
 HOMEPAGE=		http://sourceforge.net/projects/qsynergy/
@@ -18,6 +18,8 @@ MODULES=		devel/qmake x11/qt4
 WANTLIB += 		ICE QtGui QtNetwork SM X11 Xext Xi Xinerama Xrender
 WANTLIB += 		c fontconfig freetype m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS=		devel/desktop-file-utils \
 			net/synergy
 
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index c0f6f9ae39e..c471b51da76 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.62 2018/09/04 12:46:18 espie Exp $
+# $OpenBSD: Makefile,v 1.63 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=		ncurses BitTorrent client based on libTorrent
 
 DISTNAME=		rtorrent-0.9.6
-REVISION=		4
+REVISION=		5
 EPOCH=			0
 CATEGORIES=		net
 
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=		c crypto curl>=14 m ncursesw nghttp2 \
 			pthread ssl ${COMPILER_LIBCXX} torrent>=21 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		https://rtorrent.net/downloads/
 
 MODULES=		gcc4
diff --git a/net/ruby-eventmachine/Makefile b/net/ruby-eventmachine/Makefile
index 21da24cf659..86f0ce81f6e 100644
--- a/net/ruby-eventmachine/Makefile
+++ b/net/ruby-eventmachine/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.28 2018/06/13 22:26:52 jeremy Exp $
+# $OpenBSD: Makefile,v 1.29 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=	event-driven I/O for Ruby using the Reactor pattern
 
 DISTNAME=	eventmachine-1.2.5
-REVISION =	0
+REVISION =	1
 CATEGORIES=	net devel
 
 HOMEPAGE=	http://rubyeventmachine.com/
@@ -15,6 +15,8 @@ MODULES=	lang/ruby
 
 WANTLIB=	crypto ssl ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=ruby gem ext
 
 MODRUBY_TEST =	rake
diff --git a/net/spectrum/Makefile b/net/spectrum/Makefile
index 75a199e5a05..a2ba0d01310 100644
--- a/net/spectrum/Makefile
+++ b/net/spectrum/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.31 2018/01/11 19:27:08 rpe Exp $
+# $OpenBSD: Makefile,v 1.32 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT =	XMPP transport/gateway
 
 DISTNAME =	spectrum-1.4.8
 CATEGORIES =	net
-REVISION =	8
+REVISION =	9
 
 HOMEPAGE =	http://spectrum.im/
 MASTER_SITES =	https://github.com/downloads/hanzz/libtransport/
@@ -17,6 +17,8 @@ WANTLIB += c m pthread ${COMPILER_LIBCXX} gloox purple glib-2.0 gthread-2.0 ev
 WANTLIB += PocoData PocoFoundation PocoDataMySQL PocoDataODBC PocoDataSQLite
 WANTLIB += Magick++-6.Q16
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =	devel/cmake lang/python
 
 BUILD_DEPENDS =	devel/gettext-tools
diff --git a/net/synergy/Makefile b/net/synergy/Makefile
index 899b6bf8046..7da28b6c79a 100644
--- a/net/synergy/Makefile
+++ b/net/synergy/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.33 2018/04/11 12:59:00 sthen Exp $
+# $OpenBSD: Makefile,v 1.34 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=		mouse and keyboard sharing utility
 
 VERSION=		1.7.6
 DISTNAME=		synergy-${VERSION}
 CATEGORIES=		net x11
+REVISION=		0
 
 GH_ACCOUNT=		symless
 GH_PROJECT=		synergy-core
@@ -18,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 Xext Xi Xinerama Xrandr
 WANTLIB += Xtst c curl m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		net/curl
 
 MODULES=		devel/cmake
diff --git a/net/tcpreen/Makefile b/net/tcpreen/Makefile
index f29846cc43c..267c6595504 100644
--- a/net/tcpreen/Makefile
+++ b/net/tcpreen/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.26 2017/11/19 00:53:16 naddy Exp $
+# $OpenBSD: Makefile,v 1.27 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=		simple tcp re-engineering tool
 
 DISTNAME=		tcpreen-1.4.4
-REVISION =		4
+REVISION =		5
 CATEGORIES=		net
 
 HOMEPAGE=		http://www.remlab.net/tcpreen/
@@ -16,6 +16,8 @@ MASTER_SITES=		http://www.remlab.net/files/tcpreen/stable/
 PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=		c iconv intl m ${COMPILER_LIBCXX} 
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 EXTRACT_SUFX=		.tar.bz2
 
 LIB_DEPENDS=		devel/gettext
diff --git a/net/telepathy/folks/Makefile b/net/telepathy/folks/Makefile
index f0f1343a987..e811ec9f521 100644
--- a/net/telepathy/folks/Makefile
+++ b/net/telepathy/folks/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.108 2018/07/06 06:04:43 espie Exp $
+# $OpenBSD: Makefile,v 1.109 2018/10/24 14:28:09 sthen Exp $
 
 # XXX: PORTROACH set below to override the value from gnome.port.mk
 
@@ -6,7 +6,7 @@ COMMENT=		people aggregation library
 
 GNOME_PROJECT=		folks
 GNOME_VERSION=		0.11.4
-REVISION=		12
+REVISION=		13
 
 # MODULE_VERSION in config.h
 API_V=			43
@@ -30,6 +30,8 @@ WANTLIB += nssutil3 oauth p11-kit pcre plc4 plds4 readline secret-1
 WANTLIB += smime3 soup-2.4 sqlite3 ssl ssl3 telepathy-glib xml2
 WANTLIB += z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/dconf \
 			x11/gnome
 
diff --git a/net/valknut/Makefile b/net/valknut/Makefile
index c610c5ecaf2..5a5a72b258c 100644
--- a/net/valknut/Makefile
+++ b/net/valknut/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2017/10/23 17:11:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=	graphical Direct-Connect client
 
 DISTNAME=	valknut-0.3.7
-REVISION=	7
+REVISION=	8
 CATEGORIES=	net
 
 HOMEPAGE=	http://wxdcgui.sourceforge.net/
@@ -17,6 +17,8 @@ WANTLIB += fontconfig freetype iconv jpeg lcms m mng png pthread
 WANTLIB += ssl ${COMPILER_LIBCXX} xcb xml2 z
 WANTLIB += X11-xcb Xau Xdmcp glapi lzma xcb-dri2 xcb-glx
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	x11/qt3
 LIB_DEPENDS=	net/dclib \
 		converters/libiconv \
diff --git a/net/vncsnapshot/Makefile b/net/vncsnapshot/Makefile
index ae203c0e462..feb402bf993 100644
--- a/net/vncsnapshot/Makefile
+++ b/net/vncsnapshot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2017/07/26 22:45:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=		connect to VNC server and save screen images
 
@@ -6,7 +6,7 @@ V=			1.2a
 PORTROACH=		ignore:1
 DISTNAME=		vncsnapshot-$V-src
 PKGNAME=		vncsnapshot-$V
-REVISION =		2
+REVISION =		3
 
 CATEGORIES=		net
 
@@ -19,6 +19,8 @@ LIB_DEPENDS=		graphics/jpeg
 
 WANTLIB += c m ${COMPILER_LIBCXX} z jpeg
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vncsnapshot/}
 
 MAKE_FLAGS=		CC="${CC}" CXX="${CXX}"
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index de75dd3a408..c5e612c80f9 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.78 2018/10/16 11:29:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.79 2018/10/24 14:28:09 sthen Exp $
 
 BROKEN-alpha =	.got subsegment exceeds 64K (size 101480)
 #BROKEN-sparc64 = cc: Internal error: Illegal instruction (program cc1)   # trying ports-gcc
@@ -8,6 +8,7 @@ COMMENT-text =	network protocol analyzer
 COMMENT-gtk =	graphical network protocol analyzer, Gtk+3 user-interface
 
 V =		2.6.4
+REVISION =	0
 PORTROACH =	limitw:1,even
 DISTNAME =	wireshark-$V
 PKGNAME-main =	wireshark-$V
@@ -45,7 +46,6 @@ FLAVOR ?=
 FLAVOR ?=	no_qt
 .endif
 COMPILER =	base-clang ports-gcc base-gcc
-MODGCC4_ARCHS =	mips64 sparc64
 
 MODLUA_VERSION = 5.2
 MODULES =	lang/lua \
diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile
index 3ac3db2d67c..129c87e589c 100644
--- a/net/xmlrpc-c/Makefile
+++ b/net/xmlrpc-c/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2018/05/11 19:15:53 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:28:09 sthen Exp $
 
 # as error: ``operation combines symbols in different segments''
 # (known toolchain problem)
@@ -10,6 +10,7 @@ CATEGORIES=	net devel textproc
 V=		1.39.12
 DISTNAME=	xmlrpc-c-${V}
 FIX_EXTRACT_PERMISSIONS=Yes
+REVISION=	0
 
 EXTRACT_SUFX=	.tgz
 
@@ -31,6 +32,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} crypto curl m nghttp2 ssl z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		net/curl
 
 CONFIGURE_STYLE=	gnu
diff --git a/net/xprobe/Makefile b/net/xprobe/Makefile
index 73197502807..e42ce282b12 100644
--- a/net/xprobe/Makefile
+++ b/net/xprobe/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2017/07/26 22:45:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=		ICMP active OS fingerprint scanner
 
 DISTNAME=		xprobe2-0.3
-REVISION =		2
+REVISION =		3
 CATEGORIES=    		net security
 
 HOMEPAGE=		http://xprobe.sourceforge.net/
@@ -12,6 +12,8 @@ HOMEPAGE=		http://xprobe.sourceforge.net/
 PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=		c m pcap ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xprobe/}
 
 CONFIGURE_STYLE=	gnu
diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 2d5abb67574..254959ff2c9 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2017/11/21 00:13:03 naddy Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=		Z39.50/SR client and API library
 DISTNAME=		yaz-3.0.49
 CATEGORIES=		net
-REVISION=		8
+REVISION=		9
 
 SHARED_LIBS+=		yaz		1.1	# 3.0
 SHARED_LIBS+=		yaz_icu		1.2	# 3.0
@@ -18,6 +18,8 @@ WANTLIB=		c iconv intl m ncurses pthread readline z \
 			xml2 gpg-error gcrypt exslt xslt icudata \
 			icui18n icuuc lzma ${COMPILER_LIBCXX} 
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		http://ftp.indexdata.dk/pub/yaz/
 
 LIB_DEPENDS=		textproc/libxml \
diff --git a/net/zeromq/Makefile b/net/zeromq/Makefile
index ff3c464f2df..0eb93d117e6 100644
--- a/net/zeromq/Makefile
+++ b/net/zeromq/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.29 2018/04/02 13:28:58 jasper Exp $
+# $OpenBSD: Makefile,v 1.30 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT =		open source message queue optimised for performance
 
 V =			4.2.5
 DISTNAME =		zeromq-${V}
+REVISION =		0
 
 SHARED_LIBS +=  zmq                  4.2      # 6.3
 
@@ -17,6 +18,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += c m pthread sodium ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		https://github.com/zeromq/libzmq/releases/download/v$V/
 
 LIB_DEPENDS =		security/libsodium
diff --git a/news/multimail/Makefile b/news/multimail/Makefile
index b21562252fb..ac0dffba125 100644
--- a/news/multimail/Makefile
+++ b/news/multimail/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2018/08/26 13:14:31 fcambus Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT =	offline mail reader for Blue Wave, QWK, OMEN, SOUP and OPX
 
 V =		0.51
 DISTNAME =	mmail-${V}
 PKGNAME =	multimail-${V}
+REVISION =	0
 
 CATEGORIES =	news
 
@@ -18,6 +19,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 # uses pledge()
 WANTLIB =	c curses m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=multimail/}
 
 FIX_EXTRACT_PERMISSIONS = Yes
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 50eff81e3e5..a4bc8929c44 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.59 2018/09/20 09:22:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.60 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=	powerful newsreader
 
 V=		0.140
 DISTNAME=	pan-${V}
 CATEGORIES=	news x11
-REVISION=	5
+REVISION=	6
 
 HOMEPAGE=	http://pan.rebelbase.com/
 
@@ -20,6 +20,8 @@ WANTLIB += gmodule-2.0 gnome-keyring gnutls gobject-2.0 gthread-2.0
 WANTLIB += gtk-3 gtkspell3-3 iconv intl m notify pango-1.0 pangocairo-1.0
 WANTLIB += z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GMAKE= 	Yes
 
 MASTER_SITES=	http://pan.rebelbase.com/download/releases/${V}/source/
diff --git a/print/apvlv/Makefile b/print/apvlv/Makefile
index 6a324ff3bb3..0f30ff75796 100644
--- a/print/apvlv/Makefile
+++ b/print/apvlv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2018/06/27 21:04:01 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=	lightweight PDF document viewer with vi bindings
 
@@ -8,7 +8,7 @@ GH_COMMIT =	9ab76264c7818097a38e69a2d7d6b47199fffc1f
 DISTNAME=	apvlv-0.1.5pl0
 CATEGORIES=	print
 HOMEPAGE=	https://naihe2010.github.io/apvlv/
-REVISION=	2
+REVISION=	3
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=   Yes
@@ -19,6 +19,8 @@ WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
 WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 gtk-3 iconv intl m pango-1.0
 WANTLIB += pangocairo-1.0 poppler-glib pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	x11/gtk+3 \
 		print/poppler
 
diff --git a/print/cups/Makefile b/print/cups/Makefile
index ae57fdc9f81..437afbd2a3a 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.240 2018/10/16 11:18:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.241 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT-main=		Common Unix Printing System
 COMMENT-libs=		CUPS libraries and headers
@@ -11,8 +11,8 @@ GH_TAGNAME=		v${VERSION}
 PKGNAME-main=		cups-${VERSION}
 PKGNAME-libs=		cups-libs-${VERSION}
 
-REVISION-main=		2
-REVISION-libs=		0
+REVISION-main=		3
+REVISION-libs=		1
 
 CATEGORIES=		print sysutils
 
@@ -30,6 +30,8 @@ MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 # GPLv2 - LGPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 WANTLIB += avahi-client avahi-common gnutls iconv m pthread ${COMPILER_LIBCXX} z
 
 WANTLIB-main += ${WANTLIB}
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 411cc6ba9f6..e543c0d8399 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.163 2018/09/04 12:46:20 espie Exp $
+# $OpenBSD: Makefile,v 1.164 2018/10/24 14:28:09 sthen Exp $
 
 PORTROACH=		skipv:${V}_py2.5
 
@@ -19,12 +19,12 @@ PKGNAME-hpaio=		hpaio-${V}
 PKGNAME-hpcups=		hpcups-${V}
 PKGNAME-hpijs=		hpijs-${V}
 PKGNAME-gui=		hplip-gui-${V}
-REVISION-common=	1
-REVISION-gui=		1
-REVISION-hpaio=		0
-REVISION-hpcups=	0
-REVISION-hpijs=		0
-REVISION-main=		0
+REVISION-common=	2
+REVISION-gui=		2
+REVISION-hpaio=		1
+REVISION-hpcups=	1
+REVISION-hpijs=		1
+REVISION-main=		1
 
 SHARED_LIBS +=  hpdiscovery          0.0      # 0.1
 SHARED_LIBS +=  hpmud                2.0      # 0.6
@@ -48,6 +48,8 @@ MODULES=		lang/python
 
 MODPY_RUNDEP=		No
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 cWANTLIB += crypto m pthread
 
 ### -main
diff --git a/print/htmldoc/Makefile b/print/htmldoc/Makefile
index 99dcf3ed085..af0d14dbe20 100644
--- a/print/htmldoc/Makefile
+++ b/print/htmldoc/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.42 2017/07/26 22:45:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.43 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT =		convert HTML pages to PDF/PS format
 
 V =			1.8.29
 DISTNAME =		htmldoc-${V}
 CATEGORIES =		print www
-REVISION =		2
+REVISION =		3
 
 HOMEPAGE =		http://www.msweet.org/projects.php?Z1
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += c crypto m ssl z jpeg png ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 DISTFILES =		${DISTNAME}-source${EXTRACT_SUFX}
 MASTER_SITES =		http://www.msweet.org/files/project1/ \
 			ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/htmldoc/${V}/
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index e55df98301d..85647273b47 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2017/11/13 15:38:07 naddy Exp $
+# $OpenBSD: Makefile,v 1.49 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT-main=		text based music notation system
 COMMENT-docs=		lilypond documentation
@@ -9,8 +9,8 @@ DISTNAME-docs=		${DISTNAME}-1.documentation
 PKGNAME-main=		lilypond-${VERSION}
 PKGNAME-docs=		lilypond-docs-${VERSION}
 CATEGORIES=		print
-REVISION-main=		2
-REVISION-docs=		1
+REVISION-main=		3
+REVISION-docs=		2
 
 DISTFILES=		${DISTNAME}.tar.gz ${DISTNAME-docs}.tar.bz2:0
 EXTRACT_ONLY=		${DISTNAME}.tar.gz
@@ -24,6 +24,8 @@ MAINTAINER=		Matthias Kilian <kili@openbsd.org>
 # GPLv3+
 PERMIT_PACKAGE_CDROM=	Yes
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_BASE=		http://download.linuxaudio.org/lilypond/
 MASTER_SITES=		${MASTER_BASE}sources/v${VERSION:C,\.[0-9]*$,,}/
 MASTER_SITES0=		${MASTER_BASE}binaries/documentation/
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 3550cd18f54..da7c6ea2116 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.83 2018/07/01 09:02:41 espie Exp $
+# $OpenBSD: Makefile,v 1.84 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=	graphical frontend for LaTeX (nearly WYSIWYG)
 
 # XXX check source files for UTF-8 BOM, they break build with base gcc
 DISTNAME=	lyx-2.2.3
-REVISION=	2
+REVISION=	3
 
 CATEGORIES=	print editors
 
@@ -19,6 +19,8 @@ MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/ \
 WANTLIB += ${COMPILER_LIBCXX} QtGui QtSvg aspell boost_regex-mt
 WANTLIB += boost_signals-mt c enchant iconv m magic z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 
diff --git a/print/py-poppler/Makefile b/print/py-poppler/Makefile
index ed4f28dc057..1f5743bf376 100644
--- a/print/py-poppler/Makefile
+++ b/print/py-poppler/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2017/11/21 00:13:03 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:09 sthen Exp $
 
 COMMENT=	python bindings for poppler
 
@@ -6,7 +6,7 @@ DISTNAME=	pypoppler-0.12.1
 PKGNAME=        ${DISTNAME:S/^py/py-/}
 CATEGORIES=	print
 
-REVISION=	11
+REVISION=	12
 
 MASTER_SITES=	${HOMEPAGE}/trunk/development/+download/
 HOMEPAGE=	http://launchpad.net/poppler-python/
@@ -23,6 +23,8 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png poppler-glib>=8
 WANTLIB += poppler>=10 pthread ${COMPILER_LIBCXX} tiff xcb xcb-render
 WANTLIB += xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		lang/python
 
 LIB_DEPENDS=		devel/libffi \
diff --git a/print/qpdf/Makefile b/print/qpdf/Makefile
index ba9b367b5a2..74d4e4bdeb9 100755
--- a/print/qpdf/Makefile
+++ b/print/qpdf/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2018/08/19 08:32:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=	PDF transformation and inspection utility
 
 DISTNAME=	qpdf-8.2.1
+REVISION=	0
 
 SHARED_LIBS +=  qpdf                 6.1      # 23.1
 
@@ -17,6 +18,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c jpeg m ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qpdf/}
 
 USE_GMAKE=	Yes
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index a218ea00e1d..376962751b7 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.64 2018/07/01 18:33:37 espie Exp $
+# $OpenBSD: Makefile,v 1.65 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=	desktop publishing program
 DISTNAME=	scribus-1.4.6
 CATEGORIES=	print
-REVISION=	1
+REVISION=	2
 
 HOMEPAGE=	https://www.scribus.net/
 
@@ -14,6 +14,8 @@ WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB}
 WANTLIB += QtGui QtNetwork QtXml c cairo cups fontconfig freetype
 WANTLIB += hyphen jpeg lcms2 m podofo tiff xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scribus/}
 
 EXTRACT_SUFX=	.tar.xz
diff --git a/print/sile/Makefile b/print/sile/Makefile
index bf84b7105ea..af77ed28a79 100644
--- a/print/sile/Makefile
+++ b/print/sile/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2017/11/21 00:13:03 naddy Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =	typesetting system and improved layout engine
 
 V =		0.9.4
 PKGNAME =	sile-$V
-REVISION =	3
+REVISION =	4
 
 SHARED_LIBS +=  texpdf                    0.0 # 0.0
 
@@ -19,6 +19,8 @@ WANTLIB += ${COMPILER_LIBCXX} expat fontconfig freetype glib-2.0 graphite2
 WANTLIB += harfbuzz iconv icudata icui18n icuio icuuc intl m pcre
 WANTLIB += png pthread z ${MODLUA_WANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		https://github.com/simoncozens/sile/releases/download/v$V/
 MASTER_SITES0 =		http://sile-typesetter.org/images/
 
diff --git a/print/splix/Makefile b/print/splix/Makefile
index 1bcb461ec10..6c0d2efab30 100644
--- a/print/splix/Makefile
+++ b/print/splix/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2018/09/04 12:46:20 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=	CUPS drivers for SPL printers
 
@@ -7,7 +7,7 @@ DISTNAME=	splix-${V}svn
 PKGNAME=	splix-${V}
 EXTRACT_SUFX=	.tar.bz2
 WRKDIST=	${WRKDIR}/splix
-REVISION=	2
+REVISION=	3
 
 CATEGORIES=	print
 
@@ -20,6 +20,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c cups cupsimage jbig85 m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # snapshot of SVN (Fedora tarball)
 MASTER_SITES=	http://pkgs.fedoraproject.org/repo/pkgs/splix/${DISTNAME}${EXTRACT_SUFX}/2901e9482dd1a7c44f7b730696868e09/
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=splix/}
diff --git a/productivity/aqbanking/Makefile b/productivity/aqbanking/Makefile
index 7058ad42e9b..fb4fbca2676 100644
--- a/productivity/aqbanking/Makefile
+++ b/productivity/aqbanking/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2017/11/21 00:13:03 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=	online banking interface and financial data framework
 
@@ -6,7 +6,7 @@ COMMENT=	online banking interface and financial data framework
 DISTNAME=	aqbanking-5.5.1
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}{download.php?package=03\&release=118\&file=01}
 WRKDIST=	${WRKDIR}/aqbanking-5.5.1
-REVISION=	5
+REVISION=	6
 
 SHARED_LIBS +=	aqbanking            2.0      # 39.2
 SHARED_LIBS +=	aqbankingpp          0.0      # unknown
@@ -27,6 +27,8 @@ WANTLIB += gwenhywfar hogweed iconv idn2 intl ltdl lzma m nettle p11-kit
 WANTLIB += tasn1 unistring xml2 xmlsec1 xmlsec1-gcrypt xmlsec1-gnutls
 WANTLIB += xslt z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://www.aquamaniac.de/sites/download/
 
 BUILD_DEPENDS=		devel/gettext-tools
diff --git a/productivity/devtodo/Makefile b/productivity/devtodo/Makefile
index 89bfd5d0e32..81bc06327c5 100644
--- a/productivity/devtodo/Makefile
+++ b/productivity/devtodo/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.27 2017/07/26 22:45:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=		reminder/task program aimed at developers
 
 DISTNAME=		devtodo-0.1.20
-REVISION =		3
+REVISION =		4
 CATEGORIES=		productivity devel
 
 HOMEPAGE=		http://swapoff.org/devtodo1.html
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		c m ncurses readline ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=	gnu
 
 EXAMPLES=		doc/scripts.* doc/todorc.example contrib/*
diff --git a/productivity/entomologist/Makefile b/productivity/entomologist/Makefile
index d87a7339a0c..2e089665ab4 100644
--- a/productivity/entomologist/Makefile
+++ b/productivity/entomologist/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2018/06/29 22:16:19 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =	bug tracker client
 DISTNAME =	entomologist-1.1
 CATEGORIES =	productivity
-REVISION =	4
+REVISION =	5
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=entomologist/}
 HOMEPAGE =	https://sourceforge.net/projects/entomologist/
@@ -21,6 +21,8 @@ RUN_DEPENDS =	devel/desktop-file-utils \
 WANTLIB +=	QtGui QtNetwork QtSql QtXml c m pthread ${COMPILER_LIBCXX}
 WANTLIB +=	ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MAKE_FLAGS =	CXX=${CXX} \
 		QMAKE_CXXFLAGS="${CXXFLAGS} -g"
 NO_TEST =	Yes
diff --git a/productivity/fet/Makefile b/productivity/fet/Makefile
index cb4b88db084..8c1ec7c747f 100644
--- a/productivity/fet/Makefile
+++ b/productivity/fet/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2017/11/21 00:13:03 naddy Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=		automatically create timetables
 
 DISTNAME=		fet-5.14.1
-REVISION=		4
+REVISION=		5
 CATEGORIES=		productivity x11
 
 HOMEPAGE=		http://www.lalescu.ro/liviu/fet/
@@ -15,6 +15,8 @@ WANTLIB += Qt3Support QtGui QtNetwork QtSql QtXml c m pthread
 WANTLIB += ${COMPILER_LIBCXX}
 WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype iconv intl
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${HOMEPAGE}/download/ \
 			http://timetabling.de/download/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/productivity/glabels/Makefile b/productivity/glabels/Makefile
index 99bde8056ac..69217889c7a 100644
--- a/productivity/glabels/Makefile
+++ b/productivity/glabels/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.64 2018/07/06 06:04:43 espie Exp $
+# $OpenBSD: Makefile,v 1.65 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =		labels and business card designer
 
 GNOME_PROJECT =		glabels
 GNOME_VERSION =		3.4.1
-REVISION =		4
+REVISION =		5
 
 CATEGORIES =		productivity graphics
 
@@ -31,6 +31,8 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 plc4 plds4
 WANTLIB += png qrencode rsvg-2 secret-1 smime3 soup-2.4 sqlite3
 WANTLIB += ssl ssl3 xcb xcb-render xcb-shm xml2 z zint
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/dconf \
 			x11/gnome
 
diff --git a/productivity/gnucash/Makefile b/productivity/gnucash/Makefile
index 7893cdbc935..c8b0903ddf7 100644
--- a/productivity/gnucash/Makefile
+++ b/productivity/gnucash/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.103 2018/07/18 05:46:15 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.104 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =		personal and small-business financial-accounting software
 
 GNOME_PROJECT =		gnucash
 GNOME_VERSION =		3.2
 EXTRACT_SUFX =		.tar.bz2
-REVISION =		0
+REVISION =		1
 
 DISTFILES =		${DISTNAME}${EXTRACT_SUFX} \
 			gnucash-docs-${GNOME_VERSION}.tar.gz
@@ -33,6 +33,8 @@ WANTLIB += gtk-3 guile-2.2 gwenhywfar icudata icui18n icuuc intl
 WANTLIB += javascriptcoregtk-4.0 m ofx osp pango-1.0 pangocairo-1.0
 WANTLIB += secret-1 soup-2.4 webkit2gtk-4.0 xml2 xslt z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=gnucash/}
 
 MODULES =		devel/dconf \
diff --git a/productivity/grisbi/Makefile b/productivity/grisbi/Makefile
index b4c1106e982..8ef14ddf5b8 100644
--- a/productivity/grisbi/Makefile
+++ b/productivity/grisbi/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.49 2018/07/01 18:33:37 espie Exp $
+# $OpenBSD: Makefile,v 1.50 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=	personal accounting application
 
 DISTNAME=	grisbi-1.0.4
 EXTRACT_SUFX=	.tar.bz2
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=grisbi/}
-REVISION=	2
+REVISION=	3
 
 CATEGORIES=	productivity x11
 
@@ -25,6 +25,8 @@ WANTLIB += osp pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png
 WANTLIB += pthread ${COMPILER_LIBCXX} xcb xcb-render xcb-shm xml2 z
 WANTLIB += iconv intl fribidi
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =	textproc/intltool
 
 LIB_DEPENDS=	textproc/libxml \
diff --git a/productivity/qhacc/Makefile b/productivity/qhacc/Makefile
index fd9b402b7a3..239cba24517 100644
--- a/productivity/qhacc/Makefile
+++ b/productivity/qhacc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.26 2017/10/23 17:11:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.27 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=	qt home accounting program
 
 DISTNAME=	qhacc-3.4
-REVISION=	7
+REVISION=	8
 CATEGORIES=	productivity x11
 
 HOMEPAGE=	http://qhacc.sourceforge.net/
@@ -29,6 +29,8 @@ WANTLIB += Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm c drm expat
 WANTLIB += fontconfig freetype glapi jpeg lcms m mng png pthread
 WANTLIB += ${COMPILER_LIBCXX} xcb xcb-dri2 xcb-glx z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	x11/qt3
 
 MAKE_ENV=	QTDIR=${MODQT_LIBDIR} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
diff --git a/productivity/rubrica2/Makefile b/productivity/rubrica2/Makefile
index 00c4ebe1383..1d85315627a 100644
--- a/productivity/rubrica2/Makefile
+++ b/productivity/rubrica2/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.34 2018/07/01 18:33:37 espie Exp $
+# $OpenBSD: Makefile,v 1.35 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=	addressbook manager
 
 DISTNAME=	rubrica2-2.0.7
-REVISION=	16
+REVISION=	17
 EPOCH=		0
 
 CATEGORIES=	productivity x11
@@ -24,6 +24,8 @@ WANTLIB += notify pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
 WANTLIB += png pthread ${COMPILER_LIBCXX} xcb xcb-render xcb-shm xml2
 WANTLIB += z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rubrica.berlios/}
 
 MODULES=	textproc/intltool \
diff --git a/productivity/tudu/Makefile b/productivity/tudu/Makefile
index 72bb810e1fe..6722b1417ef 100644
--- a/productivity/tudu/Makefile
+++ b/productivity/tudu/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2017/07/26 22:45:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =	hierarchical todos manager
 
 DISTNAME =	tudu-0.10.2
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	productivity
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB +=	c m ncursesw ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${HOMEPAGE}
 
 CONFIGURE_STYLE = simple
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 1075dd13346..9f20a78075b 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.101 2018/01/11 19:27:09 rpe Exp $
+# $OpenBSD: Makefile,v 1.102 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=		RFC 2222 SASL (Simple Authentication and Security Layer)
 
 DISTNAME=		cyrus-sasl-2.1.26
-REVISION=		25
+REVISION=		26
 
 SHARED_LIBS +=  sasl2                3.0      # 3.0
 
@@ -20,6 +20,8 @@ MASTER_SITES=		ftp://ftp.cyrusimap.org/cyrus-sasl/
 
 WANTLIB += c crypto
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config ${WRKSRC}/saslauthd/config
 
 CONFIGURE_STYLE=	gnu
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 76164e3be83..537035e9adc 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,15 +1,21 @@
-# $OpenBSD: Makefile,v 1.41 2018/06/29 22:16:20 espie Exp $
+# $OpenBSD: Makefile,v 1.42 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =	firewall GUI
 DISTNAME =	fwbuilder-5.1.0.3599
 CATEGORIES =	net security
-REVISION =	6
+REVISION =	7
 
 HOMEPAGE =	http://www.fwbuilder.org/
 
 # GPLv2+ mostly, some code under BSD-like
 PERMIT_PACKAGE_CDROM =	Yes
 
+WANTLIB += c crypto iconv m netsnmp QtGui QtNetwork
+WANTLIB += lzma pthread ${COMPILER_LIBCXX} util xml2 xslt z
+WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
 
 # .orig produces too much spam in tests directories
@@ -52,10 +58,6 @@ TEST_TARGET =	tests
 TEST_ENV +=		COPTS="${COPTS}"
 TEST_IS_INTERACTIVE =	X11
 
-WANTLIB += c crypto iconv m netsnmp QtGui QtNetwork
-WANTLIB += lzma pthread ${COMPILER_LIBCXX} util xml2 xslt z
-WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
-
 FAKE_FLAGS =	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_FILE="${INSTALL_DATA}"
 post-patch:
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index a152133897b..201c40edcb8 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.146 2018/07/17 08:01:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.147 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=		GNU Transport Layer Security library
 
 V=			3.5.19
 DISTNAME=		gnutls-${V}
 EXTRACT_SUFX=		.tar.xz
+REVISION=		0
 
 CATEGORIES=		security
 
@@ -21,6 +22,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += c ffi gmp hogweed iconv idn2 intl m nettle p11-kit pthread
 WANTLIB += tasn1 unistring z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		https://www.gnupg.org/ftp/gcrypt/gnutls/v${V:R}/ \
 			ftp://ftp.gnutls.org/gcrypt/gnutls/v${V:R}/
 
diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile
index 049b71486a4..3244110dcd9 100644
--- a/security/keepassx/Makefile
+++ b/security/keepassx/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2018/07/01 18:33:37 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =	management tool for sensitive data
 
 V =		2.0.3
 DISTNAME =	keepassx-$V
-REVISION =	4
+REVISION =	5
 CATEGORIES =	security
 
 HOMEPAGE =	https://www.keepassx.org/
@@ -23,6 +23,8 @@ CONFIGURE_ARGS=	-DWITH_CXX11=no
 
 WANTLIB += QtGui X11 Xi Xtst c gcrypt m ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =	security/libgcrypt
 
 RUN_DEPENDS =	devel/desktop-file-utils \
diff --git a/security/kqoauth/Makefile b/security/kqoauth/Makefile
index 3c64544c1c7..fcbbe9525f8 100644
--- a/security/kqoauth/Makefile
+++ b/security/kqoauth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2017/07/26 22:45:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =	OAuth support library for Qt-based applications
 V =		0.97
@@ -6,7 +6,7 @@ DISTNAME =	${V}
 PKGNAME =	kqoauth-${V}
 CATEGORIES =	security devel
 HOMEPAGE =	https://github.com/kypeli/kQOAuth
-REVISION =	0
+REVISION =	1
 
 SHARED_LIBS =	kqoauth		0.0
 
@@ -17,6 +17,8 @@ WANTLIB =  ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
 WANTLIB += m pthread ${COMPILER_LIBCXX}
 WANTLIB += lib/qt4/QtGui lib/qt4/QtNetwork
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${HOMEPAGE}/archive/
 DIST_SUBDIR =	kqoauth
 WRKDIST =	${WRKDIR}/kQOAuth-${V}
diff --git a/security/libnipper/Makefile b/security/libnipper/Makefile
index fc2f1dbc03a..0fb09bca0d1 100644
--- a/security/libnipper/Makefile
+++ b/security/libnipper/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2017/07/26 22:45:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =		library for nipper
 
 DISTNAME =		libnipper-0.12.6
-REVISION =		5
+REVISION =		6
 CATEGORIES =		security net
 
 SHARED_LIBS =		nipper 0.0
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_FTP =	Yes
 EXTRACT_SUFX =		.tgz
 
 WANTLIB=		m ${COMPILER_LIBCXX}
+
+COMPILER =		base-clang ports-gcc base-gcc
 MODULES +=		devel/cmake
 
 NO_TEST =		Yes
diff --git a/security/nipper/Makefile b/security/nipper/Makefile
index 7f3633bcbc5..f95f04c00d0 100644
--- a/security/nipper/Makefile
+++ b/security/nipper/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2017/07/26 22:45:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =		audit network device configuration
 
 V =			0.12.0
 DISTNAME =		nipper-cli-$V
 PKGNAME =		nipper-$V
-REVISION =		3
+REVISION =		4
 CATEGORIES =		security net
 
 HOMEPAGE =		http://nipper.sf.net/
@@ -18,6 +18,8 @@ EXTRACT_SUFX =		.tgz
 
 WANTLIB =		c m ${COMPILER_LIBCXX} nipper
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		security/libnipper
 
 MODULES +=		devel/cmake
diff --git a/security/pwsafe/Makefile b/security/pwsafe/Makefile
index 8f6101dfe10..d2a7e5ca8a3 100644
--- a/security/pwsafe/Makefile
+++ b/security/pwsafe/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.20 2017/07/26 22:45:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=		program that manages encrypted password databases
 DISTNAME=		pwsafe-0.2.0
-REVISION =		6
+REVISION =		7
 CATEGORIES=		security
 
 HOMEPAGE=		http://nsd.dyndns.org/pwsafe/
@@ -12,6 +12,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		m ncurses crypto c ${COMPILER_LIBCXX} readline curses
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${HOMEPAGE}releases/
 
 CONFIGURE_STYLE=        gnu
diff --git a/security/qca/Makefile b/security/qca/Makefile
index 29c17036dae..4efc722d754 100644
--- a/security/qca/Makefile
+++ b/security/qca/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2017/11/14 15:34:11 landry Exp $
+# $OpenBSD: Makefile,v 1.27 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT-main =	Qt Cryptographic Architecture for Qt4
 COMMENT-ossl =	SSL/TLS plugin
@@ -10,9 +10,9 @@ DISTNAME =	qca-${VERSION}
 PKGNAME-main =	qca-${VERSION}
 PKGNAME-ossl =	qca-ossl-${VERSION}
 PKGNAME-gnupg =	qca-gnupg-${VERSION}
-REVISION-main =	3
-REVISION-ossl =	1
-REVISION-gnupg =1
+REVISION-main =	4
+REVISION-ossl =	2
+REVISION-gnupg =2
 
 CATEGORIES =	security
 
@@ -27,6 +27,8 @@ WANTLIB += QtCore c m ${COMPILER_LIBCXX}
 WANTLIB-ossl += QtCore crypto m qca ssl ${COMPILER_LIBCXX}
 WANTLIB-gnupg += QtCore m qca ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_KDE:=stable/qca/${VERSION}/src/}
 EXTRACT_SUFX =	.tar.xz
 
diff --git a/security/qoauth/Makefile b/security/qoauth/Makefile
index 79ddecc7702..463a99ee383 100644
--- a/security/qoauth/Makefile
+++ b/security/qoauth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/26 22:45:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =	OAuth support library for Qt-based applications
 V =		1.0.1
@@ -6,7 +6,7 @@ DISTNAME =	qoauth-${V}-src
 PKGNAME =	${DISTNAME:C/-src//}
 CATEGORIES =	security devel
 HOMEPAGE =	https://github.com/ayoy/qoauth
-REVISION =	1
+REVISION =	2
 
 SHARED_LIBS =	qoauth		0.0
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		lib/qt4/QtNetwork m pthread qca ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://files.ayoy.net/qoauth/$V/
 EXTRACT_SUFX =		.tar.bz2
 
diff --git a/security/qtkeychain/Makefile b/security/qtkeychain/Makefile
index d64e29acc5b..2c4e80b5ad9 100644
--- a/security/qtkeychain/Makefile
+++ b/security/qtkeychain/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/27 10:05:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =		Qt API to store passwords and other secret data
 
 GH_ACCOUNT =		frankosterfeld
 GH_PROJECT =		qtkeychain
 GH_TAGNAME =		v0.7.0
-REVISION =		2
+REVISION =		3
 
 SHARED_LIBS +=		qtkeychain	1.0 # 0.4
 SHARED_LIBS +=		qt5keychain	1.0 # 0.4
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/cmake
 
 FLAVORS = 		qt5
diff --git a/security/softhsm/Makefile b/security/softhsm/Makefile
index 1c71e052323..2f73254ca75 100644
--- a/security/softhsm/Makefile
+++ b/security/softhsm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2017/07/26 22:45:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:10 sthen Exp $
 
 PORTROACH=	limit:^1\.
 PORTROACH_COMMENT=	the 2.x version has a different user interface
@@ -6,7 +6,7 @@ PORTROACH_COMMENT=	the 2.x version has a different user interface
 COMMENT=	software PKCS\#11 cryptographic token
 
 DISTNAME=	softhsm-1.3.8
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	security
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += botan-1.10 bz2 c crypto gmp m pthread sqlite3 ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://dist.opendnssec.org/source/
 
 LIB_DEPENDS=	security/botan \
diff --git a/security/ssdeep/Makefile b/security/ssdeep/Makefile
index f63fd8cea08..02f9baf9769 100644
--- a/security/ssdeep/Makefile
+++ b/security/ssdeep/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2018/04/19 16:31:40 rpointel Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =		fuzzy hashing program and library
 
 VERSION =		2.14.1
 DISTNAME =		ssdeep-${VERSION}
+REVISION =		0
 
 CATEGORIES =		security
 
@@ -18,6 +19,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		https://github.com/ssdeep-project/ssdeep/releases/download/release-${VERSION}/
 
 CONFIGURE_STYLE =	gnu
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index 1afaeb6f4bc..b21211651ad 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2018/04/13 11:13:31 jca Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =		software able to hide data in various kind of files
 
 DISTNAME =		steghide-0.5.1
-REVISION =		5
+REVISION =		6
 CATEGORIES =		security
 HOMEPAGE =		http://steghide.sf.net/
 
@@ -12,6 +12,10 @@ MAINTAINER =		Giovanni Bechis <giovanni@openbsd.org>
 # BSD
 PERMIT_PACKAGE_CDROM =	Yes
 
+WANTLIB =		c iconv intl jpeg m mhash mcrypt ${COMPILER_LIBCXX} z
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=steghide/}
 
 BUILD_DEPENDS =		devel/gettext-tools
@@ -19,7 +23,6 @@ LIB_DEPENDS =		devel/gettext \
 			security/libmcrypt \
 			security/mhash \
 			graphics/jpeg
-WANTLIB =		c iconv intl jpeg m mhash mcrypt ${COMPILER_LIBCXX} z
 CONFIGURE_STYLE =	autoconf
 AUTOCONF_VERSION =	2.57
 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/yubico/yubikey-personalization-gui/Makefile b/security/yubico/yubikey-personalization-gui/Makefile
index 22ccf337951..98c119e67ec 100644
--- a/security/yubico/yubikey-personalization-gui/Makefile
+++ b/security/yubico/yubikey-personalization-gui/Makefile
@@ -1,16 +1,18 @@
-# $OpenBSD: Makefile,v 1.9 2018/06/27 21:04:03 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=	Qt GUI to configure YubiKeys
 
 YK_PROJECT=	yubikey-personalization-gui
 DISTNAME=	yubikey-personalization-gui-3.1.25
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	x11
 
 WANTLIB += ICE QtGui SM X11 Xext Xi Xinerama Xrender c fontconfig
 WANTLIB += freetype m pthread ${COMPILER_LIBCXX} ykpers-1 yubikey
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS=	devel/desktop-file-utils
 LIB_DEPENDS=	security/yubico/yubico-c \
 		security/yubico/yubikey-personalization
diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index 32854948b53..2db11d1d80c 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2018/04/08 22:49:23 abieber Exp $
+# $OpenBSD: Makefile,v 1.5 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =		friendly interactive shell
 
 V =			2.7.1
 DISTNAME =		fish-$V
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		shells
 
@@ -20,7 +20,7 @@ WANTLIB += ${COMPILER_LIBCXX} c curses intl m pcre2-32
 MASTER_SITES =		https://github.com/fish-shell/fish-shell/releases/download/${V}/
 
 # C++11
-COMPILER =		base-clang ports-gcc ports-clang
+COMPILER =		base-clang ports-gcc base-gcc
 
 MODULES =		lang/python
 
diff --git a/sysutils/apachetop/Makefile b/sysutils/apachetop/Makefile
index 7492abdb306..900bf1e9122 100644
--- a/sysutils/apachetop/Makefile
+++ b/sysutils/apachetop/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2018/04/13 07:39:33 gonzalo Exp $
+# $OpenBSD: Makefile,v 1.14 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =		top-like monitor for Apache
 
 V =			0.18.4
 DISTNAME =		apachetop-$V
 CATEGORIES =		sysutils
+REVISION =		0
 
 MAINTAINER =		Gonzalo L. R. <gonzalo@openbsd.org>
 
@@ -13,12 +14,14 @@ HOMEPAGE =		https://github.com/tessus/apachetop
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
+WANTLIB +=		c m curses readline ${COMPILER_LIBCXX}
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		https://github.com/tessus/apachetop/releases/download/$V/
 
 CONFIGURE_STYLE =	gnu
 
 CONFIGURE_ARGS =	--with-logfile=/var/www/logs/access_log
 
-WANTLIB +=		c m curses readline ${COMPILER_LIBCXX}
-
 .include <bsd.port.mk>
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index b11da6ad0c0..07ca8618ef2 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2018/09/04 12:46:21 espie Exp $
+# $OpenBSD: Makefile,v 1.43 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT-main =		daemon for controlling APC UPSes
 COMMENT-cgi =		CGI scripts for web monitoring
@@ -8,10 +8,10 @@ DISTNAME =		apcupsd-3.14.14
 PKGNAME-main =		${DISTNAME}
 PKGNAME-cgi =		${DISTNAME:S/-/-cgi-/}
 PKGNAME-x11 =		${DISTNAME:S/-/-x11-/}
-REVISION =		1
-REVISION-main =		4
-REVISION-x11 =		2
-REVISION-cgi =		2
+REVISION =		2
+REVISION-main =		5
+REVISION-x11 =		3
+REVISION-cgi =		3
 
 CATEGORIES =		sysutils
 
@@ -24,6 +24,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		${COMPILER_LIBCXX} c m pthread
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS-main = 	devel/libusb-compat
 WANTLIB-main =		${WANTLIB} usb
 
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 51b32d10500..d65eb8b6c7f 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.129 2018/09/21 00:08:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.130 2018/10/24 14:28:10 sthen Exp $
 
 # XXX building this port while a version is already installed on the
 # system will lead to unexpected hidden dependencies!!!
@@ -18,6 +18,12 @@ PKGNAME-bat=		bacula-bat-$V
 PKGNAME-mysql=		bacula-mysql-$V
 PKGNAME-pgsql=		bacula-pgsql-$V
 PKGNAME-sqlite3=	bacula-sqlite3-$V
+REVISION-bat=		0
+REVISION-main=		0
+REVISION-mysql=		0
+REVISION-pgsql=		0
+REVISION-server=	0
+REVISION-sqlite3=	0
 
 CATEGORIES=		sysutils
 
@@ -40,6 +46,8 @@ MAINTAINER=		Stuart Henderson <sthen@openbsd.org>
 
 WANTLIB += c crypto iconv intl m pthread ssl z ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # AGPLv3 with exception for OpenSSL (majority),
 # FDL (docs), LGPL (some libraries), and PD
 # http://www.bacula.org/7.0.x-manuals/en/main/Bacula_Copyright_Trademark_.html
diff --git a/sysutils/colortail/Makefile b/sysutils/colortail/Makefile
index 6971e29dfc4..8306b1b9f89 100644
--- a/sysutils/colortail/Makefile
+++ b/sysutils/colortail/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2017/07/26 22:45:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=		color-able replacement for tail(1)
 
 DISTNAME=		colortail-0.3.0
 CATEGORIES=		sysutils
-REVISION =		3
+REVISION =		4
 
 MASTER_SITES=		http://keyserver.kjsl.com/~jharris/distfiles/
 MAINTAINER=		Robert Nagy <robert@openbsd.org>
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=	gnu
 
 post-install:
diff --git a/sysutils/ddrescue/Makefile b/sysutils/ddrescue/Makefile
index 48e7bd079a9..fe908869bce 100755
--- a/sysutils/ddrescue/Makefile
+++ b/sysutils/ddrescue/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2018/03/11 10:52:33 bket Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =		data recovery tool
 
 DISTNAME =		ddrescue-1.23
+REVISION =		0
 
 CATEGORIES =		sysutils
 
@@ -13,6 +14,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_GNU:=ddrescue/}
 
 EXTRACT_SUFX =		.tar.lz
diff --git a/sysutils/dtpstree/Makefile b/sysutils/dtpstree/Makefile
index 17e66de6075..e295f24c8ff 100644
--- a/sysutils/dtpstree/Makefile
+++ b/sysutils/dtpstree/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/26 22:45:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =		display a tree of processes
 
 DISTNAME =		dtpstree-1.0.3
-REVISION =		2
+REVISION =		3
 CATEGORIES =		sysutils
 
 HOMEPAGE =		http://code.douglasthrift.net/trac/dtpstree
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c kvm m ncurses ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://code.douglasthrift.net/files/dtpstree/ \
 			http://apt.douglasthrift.net/files/dtpstree/
 EXTRACT_SUFX =		.tar.bz2
diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile
index 802d626e628..30ed109fa7f 100644
--- a/sysutils/dvd+rw-tools/Makefile
+++ b/sysutils/dvd+rw-tools/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2017/07/26 22:45:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=		mastering tools for DVD+RW/+R/-R/-RW
 
 DISTNAME=		dvd+rw-tools-7.1
 CATEGORIES=		sysutils
 HOMEPAGE=		http://fy.chalmers.se/~appro/linux/DVD+RW/
-REVISION=		0
+REVISION=		1
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -14,6 +14,8 @@ MASTER_SITES=		${HOMEPAGE}tools/
 
 WANTLIB += c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS=		sysutils/cdrtools>=1.10
 
 # allow growisofs to work under sudo(8)
diff --git a/sysutils/incron/Makefile b/sysutils/incron/Makefile
index c7219144776..f292bf80b3f 100644
--- a/sysutils/incron/Makefile
+++ b/sysutils/incron/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:10 rpe Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =	cron-like daemon but reacting to filesystem events
 
 DISTNAME =	incron-0.5.10
-REVISION =	3
+REVISION =	4
 
 CATEGORIES =	sysutils
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB +=	lib/inotify/inotify c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =	devel/argp-standalone
 LIB_DEPENDS =	devel/libinotify
 
diff --git a/sysutils/logstalgia/Makefile b/sysutils/logstalgia/Makefile
index 0fae12206b4..96b670bccae 100644
--- a/sysutils/logstalgia/Makefile
+++ b/sysutils/logstalgia/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.18 2018/06/14 08:21:26 gonzalo Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =	website access log visualization
 
 DISTNAME =	logstalgia-1.1.2
 CATEGORIES =	sysutils graphics
 HOMEPAGE =	http://logstalgia.io/
+REVISION =	0
 
 MAINTAINER =	Gonzalo L. R. <gonzalo@openbsd.org>
 
@@ -21,7 +22,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib"
 
 # -std=gnu++0x
-COMPILER =	base-clang ports-gcc ports-clang
+COMPILER =	base-clang ports-gcc base-gcc
 
 BUILD_DEPENDS =	graphics/glm \
 		devel/boost
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 3efdae06617..9b5318cbb9c 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.99 2018/09/04 12:46:22 espie Exp $
+# $OpenBSD: Makefile,v 1.100 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT-main=		UPS monitoring program supporting many brands
 COMMENT-cgi=		CGIs for monitoring Nut-based UPSs
@@ -12,10 +12,10 @@ PKGNAME-cgi=		${DISTNAME:S/-/-cgi-/}
 PKGNAME-snmp=		${DISTNAME:S/-/-snmp-/}
 PKGNAME-xml=		${DISTNAME:S/-/-xml-/}
 
-REVISION-main=		5
-REVISION-snmp=		1
-REVISION-xml=		2
-REVISION-cgi=		1
+REVISION-main=		6
+REVISION-snmp=		2
+REVISION-xml=		3
+REVISION-cgi=		2
 
 SHARED_LIBS +=	upsclient            4.0      # .4.0
 SHARED_LIBS +=	nutclient            0.0      # .0.0
@@ -29,6 +29,8 @@ MAINTAINER=		Stuart Henderson <sthen@openbsd.org>
 # GPLv2+, some scripts (not packaged) are GPLv3+
 PERMIT_PACKAGE_CDROM=	Yes
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 COMMON +=	c crypto pthread
 WANTLIB-main +=	${COMMON} ltdl m ssl ${COMPILER_LIBCXX} usb usb-1.0
 WANTLIB-xml +=	${COMMON} expat iconv intl neon proxy ssl z
diff --git a/sysutils/rsyslog/Makefile b/sysutils/rsyslog/Makefile
index a886fceec83..3804805b5a3 100644
--- a/sysutils/rsyslog/Makefile
+++ b/sysutils/rsyslog/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2018/09/13 21:38:05 remi Exp $
+# $OpenBSD: Makefile,v 1.44 2018/10/24 14:28:10 sthen Exp $
 
 BROKEN-powerpc =	64-bit atomics (__sync_bool_compare_and_swap_8)
 
@@ -18,6 +18,11 @@ PKGNAME-normalize =	rsyslog-normalize-$V
 PKGNAME-pgsql =		rsyslog-pgsql-$V
 PKGNAME-elasticsearch =	rsyslog-elasticsearch-$V
 CATEGORIES =		sysutils
+REVISION-elasticsearch =0
+REVISION-main =		0
+REVISION-mysql =	0
+REVISION-normalize =	0
+REVISION-pgsql =	0
 
 HOMEPAGE =		https://www.rsyslog.com/
 
@@ -26,6 +31,8 @@ MAINTAINER =		Remi Locherer <remi@openbsd.org>
 # GPLv3+
 PERMIT_PACKAGE_CDROM =	Yes
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 WANTLIB-main += 	c crypto curl estr fastjson ffi gcrypt gmp gnutls
 WANTLIB-main +=		gpg-error hogweed iconv idn2 intl nettle nghttp2
 WANTLIB-main +=		p11-kit pthread relp ssl tasn1 unistring uuid z
diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile
index 0d528c8a916..9f548da5a41 100644
--- a/sysutils/sleuthkit/Makefile
+++ b/sysutils/sleuthkit/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2018/04/07 23:15:28 nigel Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=		forensic toolkit based on TCT
 
 DISTNAME=		sleuthkit-4.6.0
 CATEGORIES=		sysutils security
-REVISION=		0
+REVISION=		1
 
 SHARED_LIBS +=		tsk	1.0 # 17.0
 
@@ -20,6 +20,8 @@ MASTER_SITES =		https://github.com/sleuthkit/sleuthkit/releases/download/${DISTN
 
 WANTLIB += 		c m pthread ${COMPILER_LIBCXX} sqlite3 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE =	gnu
 
 CONFIGURE_ARGS += 	--mandir='${PREFIX}/man' \
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile
index cadc993020b..72c8eb7ee9e 100644
--- a/sysutils/smartmontools/Makefile
+++ b/sysutils/smartmontools/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.38 2018/01/11 19:27:10 rpe Exp $
+# $OpenBSD: Makefile,v 1.39 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT=		control and monitor storage systems using SMART
 
 # XXX at update time check whether C++11 is actually needed
 DISTNAME=		smartmontools-6.6
 CATEGORIES=		sysutils
-REVISION=		0
+REVISION=		1
 
 HOMEPAGE=		https://www.smartmontools.org/
 MAINTAINER=		Giovanni Bechis <giovanni@openbsd.org>
@@ -14,6 +14,8 @@ MAINTAINER=		Giovanni Bechis <giovanni@openbsd.org>
 PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		c m ${COMPILER_LIBCXX} util
+
+COMPILER =		base-clang ports-gcc base-gcc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=smartmontools/}
 
 SEPARATE_BUILD=		Yes
diff --git a/sysutils/tmux-mem-cpu-load/Makefile b/sysutils/tmux-mem-cpu-load/Makefile
index 60f11404d6d..55715fb809d 100644
--- a/sysutils/tmux-mem-cpu-load/Makefile
+++ b/sysutils/tmux-mem-cpu-load/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2018/06/01 15:44:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:10 sthen Exp $
 
 COMMENT =		CPU, RAM memory, and load monitor for use with tmux(1)
 
 GH_ACCOUNT =		thewtex
 GH_PROJECT =		tmux-mem-cpu-load
 GH_TAGNAME =		v3.4.0
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		sysutils
 
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 MODULES =		devel/cmake
 
-COMPILER =		base-clang ports-gcc ports-clang
+COMPILER =		base-clang ports-gcc base-gcc
 
 WANTLIB +=		c m ${COMPILER_LIBCXX}
 
diff --git a/telephony/iaxclient/Makefile b/telephony/iaxclient/Makefile
index d79f464d101..43b52f76964 100644
--- a/telephony/iaxclient/Makefile
+++ b/telephony/iaxclient/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2017/11/04 21:48:06 naddy Exp $
+# $OpenBSD: Makefile,v 1.39 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT-main=	IAX client library
 COMMENT-tcl=	IAX client library, tcl bindings
@@ -8,7 +8,7 @@ DISTNAME=	iaxclient-2.1beta3
 PKGNAME-main=	${DISTNAME}
 PKGNAME-tcl=	${DISTNAME:S/iaxclient/iaxclient-tcl/}
 PKGNAME-iaxcomm= iaxcomm-1.1.0
-REVISION=	21
+REVISION=	22
 
 CATEGORIES=	telephony
 SHARED_LIBS=	tcliaxclient02 0.0 \
@@ -24,6 +24,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 MULTI_PACKAGES=	-main -tcl -iaxcomm
 MODULES=	x11/tk
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 cWANTLIB	+= avcodec gsm m ogg ossaudio portaudio pthread speex
 cWANTLIB	+= speexdsp sndio theora vidcap z
 
diff --git a/telephony/pjsua/Makefile b/telephony/pjsua/Makefile
index 52ea4ba564c..d5b1314a49b 100644
--- a/telephony/pjsua/Makefile
+++ b/telephony/pjsua/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.43 2017/08/05 12:31:01 sthen Exp $
+# $OpenBSD: Makefile,v 1.44 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT-main=	multimedia communication library (SIP, RTP, ICE, etc)
 COMMENT-pjsua=	lightweight sip client
 
 V=		2.4.5
-REVISION=	2
+REVISION=	3
 DISTNAME=	pjproject-$V
 PKGNAME-main=	pjsip-$V
 PKGNAME-pjsua=	pjsua-$V
@@ -45,6 +45,8 @@ WANTLIB-pjsua += pjsip-ua pjsua resample
 
 WANTLIB-main = ${WANTLIB} ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MULTI_PACKAGES=	-main -pjsua
 
 LIB_DEPENDS-main= audio/gsm \
diff --git a/telephony/stuntman/Makefile b/telephony/stuntman/Makefile
index 733f560ffcc..9e48653b2bb 100644
--- a/telephony/stuntman/Makefile
+++ b/telephony/stuntman/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2018/09/04 12:46:23 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT =	STUN server implementing RFCs 5389, 5769, and 5780
 NOT_FOR_ARCHS = arm hppa # atomic ops
@@ -8,7 +8,7 @@ DISTNAME =	stunserver-${VERSION}
 PKGNAME =	stuntman-${VERSION}
 CATEGORIES =	telephony net
 EXTRACT_SUFX =	.tgz
-REVISION =	2
+REVISION =	3
 
 MAINTAINER =	Roman Kravchuk <kravchuk.kp@gmail.com>
 
@@ -21,6 +21,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB +=	c crypto m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =	devel/boost
 
 MAKE_FLAGS =	BOOST_INCLUDE='-I${LOCALBASE}/include' \
diff --git a/textproc/apertium-lex-tools/Makefile b/textproc/apertium-lex-tools/Makefile
index bae40af3d5b..fb44f35f952 100644
--- a/textproc/apertium-lex-tools/Makefile
+++ b/textproc/apertium-lex-tools/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2018/10/17 06:58:07 bentley Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT =		module for compiling and processing lexical rules
 
 V =			0.2.1
 DISTNAME =		apertium-lex-tools-$V
+REVISION =		0
 
 CATEGORIES =		textproc
 
@@ -16,6 +17,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += apertium3 c lttoolbox3 m pcre pthread ${COMPILER_LIBCXX} xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		https://github.com/apertium/apertium-lex-tools/releases/download/v$V/ \
 			${MASTER_SITE_SOURCEFORGE:=apertium/}
 
diff --git a/textproc/arabica/Makefile b/textproc/arabica/Makefile
index 5607daf00e0..4fc32caa923 100644
--- a/textproc/arabica/Makefile
+++ b/textproc/arabica/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2017/07/26 22:45:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT =	XML and HTML processing toolkit
 DISTNAME =	arabica-2010-November
 PKGNAME =	arabica-2010.11
 CATEGORIES =	textproc
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=arabica/}
-REVISION =	2
+REVISION =	3
 
 HOMEPAGE =	http://www.jezuk.co.uk/cgi-bin/view/arabica
 
@@ -14,10 +14,13 @@ SHARED_LIBS +=	arabica	0.0 # 0.0
 # BSD-like
 PERMIT_PACKAGE_CDROM=	Yes
 
+WANTLIB +=	c expat m ${COMPILER_LIBCXX}
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE =	gnu
 
 BUILD_DEPENDS =	devel/boost
 CONFIGURE_ENV =	CPPFLAGS='-I${LOCALBASE}/include'
-WANTLIB +=	c expat m ${COMPILER_LIBCXX}
 
 .include <bsd.port.mk>
diff --git a/textproc/aspell/core/Makefile b/textproc/aspell/core/Makefile
index 8db161a90a7..f907c6095a5 100644
--- a/textproc/aspell/core/Makefile
+++ b/textproc/aspell/core/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.41 2018/04/07 22:50:15 naddy Exp $
+# $OpenBSD: Makefile,v 1.42 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	spell checker designed to eventually replace Ispell
 
 DISTNAME=	aspell-0.60.6.1
-REVISION=	6
+REVISION=	7
 SHARED_LIBS +=  aspell               17.0     # .16.4
 SHARED_LIBS +=  pspell               17.0     # .16.4
 DIST_SUBDIR=	aspell
@@ -24,6 +24,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		c iconv intl m ncursesw pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		devel/gettext
 
 CONFIGURE_STYLE=	gnu
diff --git a/textproc/clo++/Makefile b/textproc/clo++/Makefile
index ed5211278eb..d9e8ea04931 100644
--- a/textproc/clo++/Makefile
+++ b/textproc/clo++/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2017/07/26 22:45:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	command line parser generator
 
 DISTNAME=	clo++-0.3.0
-REVISION=	5
+REVISION=	6
 CATEGORIES=	textproc
 
 HOMEPAGE=	http://pmade.org/~pjones/software/clo++/
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c iconv m pthread lzma ${COMPILER_LIBCXX} xml2>=6 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${HOMEPAGE}/download/
 
 LIB_DEPENDS=	converters/libiconv \
diff --git a/textproc/clucene/Makefile b/textproc/clucene/Makefile
index 65e34ab4d59..36b86b95f2b 100644
--- a/textproc/clucene/Makefile
+++ b/textproc/clucene/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2018/04/10 20:30:58 jasper Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT =	full-text search engine library
 CATEGORIES =	textproc
 DISTNAME =	clucene-core-2.3.3.4
 
-REVISION =	2
+REVISION =	3
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=clucene/}
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += m pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	devel/cmake
 
 BUILD_DEPENDS=	devel/boost
diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile
index 99996732336..b61085ade41 100644
--- a/textproc/exempi/Makefile
+++ b/textproc/exempi/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.15 2017/07/26 22:45:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2018/10/24 14:28:11 sthen Exp $
 
 # g++3 chokes on the code
 NOT_FOR_ARCHS=	${GCC3_ARCHS}
 
 COMMENT =		implementation of XMP
 DISTNAME =		exempi-2.2.1
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		textproc
 
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += c expat m pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # configure checks for libiconv but it's unused
 BUILD_DEPENDS =		converters/libiconv
 
diff --git a/textproc/fragistics/Makefile b/textproc/fragistics/Makefile
index c5ca1d71aab..b601fc55f73 100644
--- a/textproc/fragistics/Makefile
+++ b/textproc/fragistics/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2017/07/26 22:45:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT =	Quake 3 statistics program
 
 DISTNAME =	fragistics-1.7.0
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	textproc games
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=fragistics/}
 
 RUN_DEPENDS =		devel/p5-Shell
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index f5562351d8c..a944019c2a3 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.40 2018/09/04 12:46:24 espie Exp $
+# $OpenBSD: Makefile,v 1.41 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT =		GNU troff typesetter
 VERSION =		1.22.3
 SUBST_VARS =		VERSION
 DISTNAME =		groff-${VERSION}
-REVISION =		10
+REVISION =		11
 
 CATEGORIES =		textproc
 DPB_PROPERTIES =	parallel
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_GNU:=groff/}
 
 MAKE_FLAGS +=		docdir=${PREFIX}/share/doc/groff \
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index b7c768db361..2fb0a043935 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2017/11/21 00:13:04 naddy Exp $
+# $OpenBSD: Makefile,v 1.53 2018/10/24 14:28:11 sthen Exp $
 
 PORTROACH+=	limit:^2
 
@@ -7,7 +7,7 @@ DISTNAME=	gtkspell-2.0.16
 
 SHARED_LIBS=	gtkspell 1.0 # .0.0
 
-REVISION=	11
+REVISION=	12
 
 CATEGORIES=	textproc x11
 
@@ -26,6 +26,8 @@ WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread ${COMPILER_LIBCXX}
 WANTLIB += xcb xcb-render xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkspell/}
 
 USE_GMAKE=	Yes
diff --git a/textproc/heirloom-doctools/Makefile b/textproc/heirloom-doctools/Makefile
index 3ededac08c8..4c22e05c92f 100644
--- a/textproc/heirloom-doctools/Makefile
+++ b/textproc/heirloom-doctools/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2018/09/04 12:46:24 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT =		modernized troff implementation
 
 V =			160308
 DISTNAME =		heirloom-doctools-$V
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		textproc print
 
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		https://github.com/n-t-roff/heirloom-doctools/releases/download/$V/
 EXTRACT_SUFX =		.tar.bz2
 
diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
index 901771dda40..78f80b09149 100644
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2018/04/28 16:33:10 jasper Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT =	spelling, stemming, morphological analysis and generation
 
@@ -6,6 +6,7 @@ COMMENT =	spelling, stemming, morphological analysis and generation
 GH_ACCOUNT =	hunspell
 GH_PROJECT =	hunspell
 GH_TAGNAME =	v1.6.2
+REVISION =	0
 
 SHARED_LIBS =	hunspell-1.6 	0.0 #	.0.0
 
@@ -18,6 +19,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += c iconv m curses readline ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		converters/libiconv
 
 AUTOCONF_VERSION=	2.69
diff --git a/textproc/icu4c/Makefile b/textproc/icu4c/Makefile
index 0836eaf051f..9f5a00c0a6f 100644
--- a/textproc/icu4c/Makefile
+++ b/textproc/icu4c/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2018/07/13 02:57:07 jsg Exp $
+# $OpenBSD: Makefile,v 1.67 2018/10/24 14:28:11 sthen Exp $
 
 NOT_FOR_ARCHS=		${GCC3_ARCHS}
 
@@ -9,7 +9,8 @@ VERSION=		58.2
 DISTNAME=		icu4c-${VERSION:S/./_/g}-src
 PKGNAME-main=		icu4c-${VERSION}
 PKGNAME-wwwdata=	icu4c-wwwdata-${VERSION}
-REVISION-main=		6
+REVISION-main=		7
+REVISION-wwwdata=	0
 
 MAJ_V=			${VERSION:R}
 SO_VERSION=		13.0
@@ -30,6 +31,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		http://download.icu-project.org/files/icu4c/${VERSION}/ \
 			${MASTER_SITE_SOURCEFORGE:=icu/}
 EXTRACT_SUFX=		.tgz
diff --git a/textproc/isearch/Makefile b/textproc/isearch/Makefile
index ebe7fc48923..35aa1bcb648 100644
--- a/textproc/isearch/Makefile
+++ b/textproc/isearch/Makefile
@@ -1,16 +1,19 @@
-# $OpenBSD: Makefile,v 1.27 2017/07/26 22:45:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	text search engine by CNIDR
 
 DISTNAME=	Isearch-1.14
 PKGNAME=	${DISTNAME:L}
-REVISION =	2
+REVISION =	3
 CATEGORIES=	textproc databases
 
-# License: BSD
+# BSD
 PERMIT_PACKAGE_CDROM=	Yes
+
 WANTLIB=		c m ${COMPILER_LIBCXX} 
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	ftp://ftp.cnidr.org/pub/software/Isearch/
 
 CONFIGURE_STYLE=	gnu
diff --git a/textproc/libebml/Makefile b/textproc/libebml/Makefile
index 633de8655ff..2da80a9be30 100644
--- a/textproc/libebml/Makefile
+++ b/textproc/libebml/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2017/09/04 08:01:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	Extensible Binary Meta Language library
 
@@ -6,6 +6,7 @@ DISTNAME=	libebml-1.3.5
 CATEGORIES=	textproc
 MASTER_SITES=	https://dl.matroska.org/downloads/libebml/
 EXTRACT_SUFX=	.tar.xz
+REVISION=	0
 
 SHARED_LIBS=	ebml	3.1
 
@@ -18,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=	gnu
 
 .include <bsd.port.mk>
diff --git a/textproc/libical/Makefile b/textproc/libical/Makefile
index 2cd104d4d71..cda288dedac 100644
--- a/textproc/libical/Makefile
+++ b/textproc/libical/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2018/08/15 12:57:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.37 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT-main=		implementation of the iCalendar protocols and data units
 COMMENT-glib=		GObject wrapper for libical library
@@ -9,6 +9,8 @@ DISTNAME=		libical-${V}
 
 PKGNAME-main=		${PKGNAME}
 PKGNAME-glib=		libical-glib-${V}
+REVISION-glib=		0
+REVISION-main=		0
 
 SHARED_LIBS +=  ical                 4.1
 SHARED_LIBS +=  icalss               4.0
@@ -30,6 +32,8 @@ WANTLIB += icui18n icuuc
 WANTLIB-main += ${WANTLIB} ${COMPILER_LIBCXX} m lib/db4/db
 WANTLIB-glib += ${WANTLIB} ical glib-2.0 gobject-2.0 intl pthread
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		https://github.com/libical/libical/releases/download/v${V}/
 
 MULTI_PACKAGES=		-main -glib
diff --git a/textproc/libwpd/Makefile b/textproc/libwpd/Makefile
index 7a63a542f1d..c1a94f0c211 100644
--- a/textproc/libwpd/Makefile
+++ b/textproc/libwpd/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.22 2017/11/21 00:13:04 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	import and export WordPerfect(tm) documents
 
 DISTNAME=	libwpd-0.8.9
 CATEGORIES=	textproc
 
-REVISION=	10
+REVISION=	11
 
 SHARED_LIBS=	wpd-0.8		8.9 \
 		wpd-stream-0.8	8.9
@@ -20,6 +20,8 @@ PERMIT_PACKAGE_CDROM=   Yes
 WANTLIB += bz2 c ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gsf-1
 WANTLIB += gthread-2.0 iconv intl lzma m pcre pthread ${COMPILER_LIBCXX} xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libwpd/}
 
 
diff --git a/textproc/lq-sp/Makefile b/textproc/lq-sp/Makefile
index 7efdc25bec5..e104fd0ddc8 100644
--- a/textproc/lq-sp/Makefile
+++ b/textproc/lq-sp/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2017/07/26 22:45:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	SGML parser and entity manager
 
 DISTNAME=	lq-sp-1.3.4.12
-REVISION =	2
+REVISION =	3
 CATEGORIES=	textproc
 HOMEPAGE=	http://www.htmlhelp.com/tools/validator/offline/
 
@@ -11,8 +11,11 @@ MAINTAINER=	Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
 
 # BSD-like
 PERMIT_PACKAGE_CDROM=	Yes
+
 WANTLIB=		c m ${COMPILER_LIBCXX} 
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${HOMEPAGE}
 
 MAKE_FLAGS=	CXX="${CXX}" \
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 7978b6447fa..7eaf060e800 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.31 2017/11/21 00:13:04 naddy Exp $
+# $OpenBSD: Makefile,v 1.32 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	object-oriented DSSSL engine
 
 DISTNAME=	openjade-1.3.3-pre1
 PKGNAME=	openjade-1.3.3pre1
-REVISION=	5
+REVISION=	6
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openjade/}
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 LIB_DEPENDS=		textproc/opensp
 WANTLIB=		c iconv intl m pthread ${COMPILER_LIBCXX} osp
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=	gnu
 USE_GMAKE=		Yes
 
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index d9423bf6797..71d59afc946 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2017/11/21 00:13:04 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	object-oriented SGML parser
 
 DISTNAME=	OpenSP-1.5.2
 PKGNAME=	${DISTNAME:L}
 CATEGORIES=	textproc
-REVISION=	2
+REVISION=	3
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openjade/}
 
@@ -16,8 +16,12 @@ HOMEPAGE=	http://openjade.sourceforge.net/
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
-MODULES=	textproc/intltool
 WANTLIB=	c iconv intl m pthread ${COMPILER_LIBCXX}
+
+MODULES=	textproc/intltool
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	devel/gettext
 USE_GMAKE=	Yes
 CONFIGURE_STYLE=gnu
diff --git a/textproc/p5-Encode-Detect/Makefile b/textproc/p5-Encode-Detect/Makefile
index 1c3c5c3793c..8b4cd7e49e4 100644
--- a/textproc/p5-Encode-Detect/Makefile
+++ b/textproc/p5-Encode-Detect/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT =	Encode::Encoding subclass that detects the encoding of data
 
 MODULES =	cpan
 DISTNAME =	Encode-Detect-1.01
-REVISION =	6
+REVISION =	7
 CATEGORIES =	textproc
 
 # Perl
@@ -12,6 +12,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += c perl ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE =	modbuild
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-Aspell/Makefile b/textproc/p5-Text-Aspell/Makefile
index 986d8540ecb..39869d5ea0a 100644
--- a/textproc/p5-Text-Aspell/Makefile
+++ b/textproc/p5-Text-Aspell/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.21 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	interface to the GNU aspell library
 
 MODULES=	cpan
 DISTNAME=	Text-Aspell-0.09
-REVISION =	9
+REVISION =	10
 CATEGORIES=	devel textproc
 
 # Perl
@@ -12,6 +12,9 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c perl ${COMPILER_LIBCXX} aspell>=16
 
+# XXX hardcoded -lstdc++
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	textproc/aspell/core
 
 CONFIGURE_ARGS=	LIBS="-L${LOCALBASE}/lib -laspell -lstdc++" \
diff --git a/textproc/pplatex/Makefile b/textproc/pplatex/Makefile
index aec929e517f..1b3135c7ff9 100644
--- a/textproc/pplatex/Makefile
+++ b/textproc/pplatex/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/12/07 15:55:12 pirofti Exp $
+# $OpenBSD: Makefile,v 1.2 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT =	pretty print LaTeX messages
 
@@ -8,6 +8,7 @@ GH_COMMIT =	5cec891ad6aec0115081cdd114ae1cc4f1ed7c06
 
 DISTNAME =	pplatex
 PKGNAME =	pplatex-1.0-rc2
+REVISION =	0
 
 CATEGORIES =	textproc
 
@@ -22,6 +23,8 @@ MODULES =	devel/cmake
 
 WANTLIB += ${COMPILER_LIBCXX} c m pcre pcreposix
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =	devel/pcre
 
 do-install:
diff --git a/textproc/pugixml/Makefile b/textproc/pugixml/Makefile
index 1ef744ec416..b8e910dc6d4 100644
--- a/textproc/pugixml/Makefile
+++ b/textproc/pugixml/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	light-weight, simple and fast XML parser for C++
 
 V=		1.7
 DISTNAME=	pugixml-$V
-REVISION =	2
+REVISION =	3
 
 SHARED_LIBS +=	pugixml                   0.0 # 1.7
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://github.com/zeux/pugixml/releases/download/v$V/
 
 MODULES=	devel/cmake
diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile
index 4db5e70b7cf..48aca0e942d 100755
--- a/textproc/rarian/Makefile
+++ b/textproc/rarian/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.27 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=		documentation metadata library
 
 GNOME_PROJECT=		rarian
 GNOME_VERSION=		0.8.1
 EXTRACT_SUFX=		.tar.bz2
-REVISION =		16
+REVISION =		17
 
 SHARED_LIBS +=	rarian               0.0      # .0.0
 
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		x11/gnome
 
 BUILD_DEPENDS=		textproc/libxslt
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index 259b9fa4b72..8b01ab4e0bc 100755
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2017/11/12 15:17:47 naddy Exp $
+# $OpenBSD: Makefile,v 1.28 2018/10/24 14:28:11 sthen Exp $
 
 MULTI_PACKAGES=		-main -mysql -pgsql
 
@@ -12,9 +12,9 @@ PKGNAME-main=		redland-$V
 PKGNAME-mysql=		redland-mysql-$V
 PKGNAME-pgsql=		redland-pgsql-$V
 
-REVISION-main=		5
-REVISION-mysql=		6
-REVISION-pgsql=		6
+REVISION-main=		6
+REVISION-mysql=		7
+REVISION-pgsql=		7
 
 CATEGORIES=		textproc
 
@@ -30,6 +30,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += crypto curl gcrypt gmp gpg-error iconv intl ltdl lzma m mpfr
 WANTLIB += nghttp2 pcre pthread raptor2 rasqal ssl uuid xml2 xslt yajl z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		devel/libtool,-ltdl \
 			textproc/raptor \
 			textproc/rasqal
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index a9897618678..77cdfcef14c 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.46 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.47 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT =	fast, compact and portable XSL/XSLT processor
 
 V =		1.0.3
 DISTNAME =	Sablot-${V}
 PKGNAME =	sablotron-${V}
-REVISION =	4
+REVISION =	5
 SHARED_LIBS =	sablot	103.0	# .100.3
 CATEGORIES =	textproc
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =	c expat iconv m ncurses readline ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	http://www.arcane-labs.net/download/OpenBSD/
 
 LIB_DEPENDS =	converters/libiconv
diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index df0ce338fa3..494ed2929e2 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.29 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	create a document with syntax highlighting
 
 DISTNAME=	source-highlight-3.1.8
 SHARED_LIBS +=	source-highlight     1.1      # 4.1
 CATEGORIES=	textproc
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	https://www.gnu.org/software/src-highlite/
 
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=   Yes
 
 WANTLIB=	c m ${COMPILER_LIBCXX} boost_regex-mt pthread
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_GNU:=src-highlite/}
 
 LIB_DEPENDS=	devel/boost
diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile
index ef5487514b5..c77ac69f55d 100644
--- a/textproc/sp/Makefile
+++ b/textproc/sp/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.28 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	OO toolkit for SGML parsing and entity management
 
 DISTNAME=	sp-1.3.4
-REVISION =	4
+REVISION =	5
 CATEGORIES=	textproc
 HOMEPAGE=	http://www.jclark.com/sp/
 
@@ -11,8 +11,11 @@ MAINTAINER=	Gerardo Santana Gomez Garrido <gerardo.santana@gmail.com>
 
 # BSD-like
 PERMIT_PACKAGE_CDROM=	Yes
+
 WANTLIB=		c m ${COMPILER_LIBCXX} 
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	ftp://ftp.jclark.com/pub/sp/
 
 MAKE_FLAGS=	CXX="${CXX}" \
diff --git a/textproc/sphinx/Makefile b/textproc/sphinx/Makefile
index 408bf6e4b52..36cfc85a7ad 100644
--- a/textproc/sphinx/Makefile
+++ b/textproc/sphinx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT =	free open-source SQL full-text search engine
 BROKEN-hppa =	internal compiler error: internal consistency failure
@@ -10,7 +10,7 @@ VERSION =	2.2.9
 DISTNAME =	sphinx-${VERSION}-release
 PKGNAME =	sphinx-${VERSION}
 CATEGORIES =	textproc
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	http://www.sphinxsearch.com/
 
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c expat iconv m pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${HOMEPAGE}/files/
 
 MODULES =		lang/php
diff --git a/textproc/tinyxml/Makefile b/textproc/tinyxml/Makefile
index 63a3ea5d137..a3d3ef1a737 100644
--- a/textproc/tinyxml/Makefile
+++ b/textproc/tinyxml/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	simple and small C++ XML parser
 
 V=		2.6.2
-REVISION =	2
+REVISION =	3
 DISTNAME=	tinyxml_${V:S/./_/g}
 PKGNAME=	tinyxml-${V}
 EXTRACT_SUFX=	.zip
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tinyxml/}
 
 WRKDIST=	${WRKDIR}/tinyxml
diff --git a/textproc/tinyxml2/Makefile b/textproc/tinyxml2/Makefile
index 2fd6e418e8e..d3891ce5a74 100644
--- a/textproc/tinyxml2/Makefile
+++ b/textproc/tinyxml2/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT =		simple, small and efficient C++ XML parser
 
-V =			4.0.1
-DISTNAME =		tinyxml2-$V
-REVISION =		1
+GH_ACCOUNT =		leethomason
+GH_PROJECT =		tinyxml2
+GH_TAGNAME =		4.0.1
+REVISION =		2
 
 SHARED_LIBS +=		tinyxml2	1.0 # 3.0
 
@@ -17,9 +18,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB +=		m ${COMPILER_LIBCXX}
 
-GH_ACCOUNT =		leethomason
-GH_PROJECT =		tinyxml2
-GH_TAGNAME =		$V
+COMPILER =		base-clang ports-gcc base-gcc
 
 MODULES =		devel/cmake
 
diff --git a/textproc/uchardet/Makefile b/textproc/uchardet/Makefile
index bc111004944..f8cf29977ca 100644
--- a/textproc/uchardet/Makefile
+++ b/textproc/uchardet/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2017/10/05 09:51:10 landry Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	universal charset detection library and tool
 
 DISTNAME=	uchardet-0.0.6
 EXTRACT_SUFX=	.tar.xz
+REVISION=	0
 
 SHARED_LIBS +=	uchardet                  0.0 # 0.0
 
@@ -16,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	https://www.freedesktop.org/software/uchardet/releases/
 
 MODULES=	devel/cmake
diff --git a/textproc/wkhtmltopdf/Makefile b/textproc/wkhtmltopdf/Makefile
index f0e181b0f4a..b8f888be64e 100644
--- a/textproc/wkhtmltopdf/Makefile
+++ b/textproc/wkhtmltopdf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2018/07/24 12:03:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:11 sthen Exp $
 
 ONLY_FOR_ARCHS =	amd64 i386
 USE_WXNEEDED =		Yes
@@ -14,6 +14,7 @@ QT_COMMIT =		5db36ec76b29712eb2c5bd0625c2c77d7468b3fc
 MASTER_SITES0 =		https://github.com/wkhtmltopdf/qt/archive/
 DISTFILES =		${DISTNAME}.tar.gz \
 			wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz:0
+REVISION =		0
 
 SHARED_LIBS =		wkhtmltox 0.0 # 0.12
 
@@ -31,6 +32,8 @@ WANTLIB += png pthread ${COMPILER_LIBCXX} z
 
 WANTLIB += icui18n # dlopen()d via QLibrary
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		converters/libiconv \
 			graphics/png \
 			graphics/jpeg \
diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile
index 67315e0fdac..3b96cc3a147 100644
--- a/textproc/xerces-c/Makefile
+++ b/textproc/xerces-c/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2018/03/13 21:07:42 jasper Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT =	validating XML parser written in a portable subset of C++
 
 DISTNAME =	xerces-c-3.2.1
 CATEGORIES =	textproc devel
+REVISION =	0
 
 SHARED_LIBS +=  xerces-c             0.0
 
@@ -14,6 +15,8 @@ MASTER_SITES =	https://www.apache.org/dist/xerces/c/3/sources/
 
 WANTLIB += ${COMPILER_LIBCXX} icudata icui18n icuuc m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =		textproc/icu4c
 
 CONFIGURE_STYLE =	gnu
diff --git a/textproc/xpdf/Makefile b/textproc/xpdf/Makefile
index 0b12acb1664..88c661ce608 100644
--- a/textproc/xpdf/Makefile
+++ b/textproc/xpdf/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.91 2017/11/08 18:30:24 kili Exp $
+# $OpenBSD: Makefile,v 1.92 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	PDF viewer for X11
 
 DISTNAME=	xpdf-3.04
 CATEGORIES=	textproc x11
 EPOCH=		0
+REVISION=	0
 
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		http://mirror.ctan.org/support/xpdf/
@@ -30,6 +31,8 @@ RUN_DEPENDS=	print/ghostscript/gnu-fonts
 WANTLIB=	ICE SM X11 Xext Xpm Xt freetype Xm \
 		c m png pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 NO_TEST=	Yes
 
 post-install:
diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile
index bf3cd7c9162..68263aa1ad8 100644
--- a/textproc/xxdiff/Makefile
+++ b/textproc/xxdiff/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.43 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.44 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	graphical file comparator and merge tool
 
 DISTNAME=	xxdiff-4.0.1
 CATEGORIES=	textproc x11
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://furius.ca/xxdiff/
 
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=   Yes
 WANTLIB += ICE QtGui SM X11 Xext Xi Xinerama Xrender c fontconfig
 WANTLIB += freetype m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=xxdiff/}
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index e0a0bfd93a9..01a95caaba6 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.86 2018/07/01 18:33:38 espie Exp $
+# $OpenBSD: Makefile,v 1.87 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=		HTML editor for experienced web designers
 
 DISTNAME =		bluefish-2.2.10
 CATEGORIES=		www editors
 HOMEPAGE=		http://bluefish.openoffice.nl/
-REVISION =		4
+REVISION =		5
 
 MASTER_SITES=		http://www.bennewitz.com/bluefish/stable/source/
 
@@ -22,6 +22,8 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
 WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util xcb xcb-render
 WANTLIB += xcb-shm xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		lang/python \
 			textproc/intltool
 
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index 1f37bed5032..0276e31a37f 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.26 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.27 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	c++ compliant CGI applications libraries
 
 DISTNAME=	cgicc-3.2.16
-REVISION =	1
+REVISION =	2
 
 CATEGORIES=	www devel
 SHARED_LIBS=	cgicc	5.0
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile
index 7be53b04b15..767aa43a59c 100644
--- a/www/dansguardian/Makefile
+++ b/www/dansguardian/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.21 2018/01/11 19:27:11 rpe Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:11 sthen Exp $
 
 # note, this isn't really maintained upstream any more
 # see e2guardian.org for a maintained fork
 
 COMMENT =	content scanning web filter
 DISTNAME =	dansguardian-2.12.0.3
-REVISION =	2
+REVISION =	3
 EXTRACT_SUFX =	.tar.bz2
 CATEGORIES =	www net
 
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c m pcre pcreposix ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=dansguardian/}
 
 LIB_DEPENDS =		devel/pcre
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 6994b832e57..f7b44726c63 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.57 2018/06/27 21:04:05 espie Exp $
+# $OpenBSD: Makefile,v 1.58 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT =		fast and light graphical web browser
 
 DISTNAME =		dillo-3.0.5
 CATEGORIES =		www
-REVISION =		3
+REVISION =		4
 
 HOMEPAGE =		https://www.dillo.org/
 
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xinerama c crypto
 WANTLIB += fltk fontconfig iconv jpeg m png pthread ssl ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	https://www.dillo.org/download/
 
 EXTRACT_SUFX =	.tar.bz2
diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index 5c0d7ddd0db..ce24094d620 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=		FastCGI Development Kit
 
 DISTNAME=		fcgi-2.4.0
-REVISION =		14
+REVISION =		15
 CATEGORIES=		www
 SHARED_LIBS +=	fcgi                 0.0      # .0.0
 SHARED_LIBS +=	fcgi++               1.0      # .1.0
@@ -22,6 +22,8 @@ PERMIT_PACKAGE_CDROM=   Yes
 WANTLIB=		c m ${COMPILER_LIBCXX}
 WANTLIB += perl # uses perl ABI
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${HOMEPAGE}/dist/
 
 
diff --git a/www/havp/Makefile b/www/havp/Makefile
index d93dbf777a9..f241490d69d 100644
--- a/www/havp/Makefile
+++ b/www/havp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2018/01/11 19:27:11 rpe Exp $
+# $OpenBSD: Makefile,v 1.23 2018/10/24 14:28:11 sthen Exp $
 
 COMMENT=	web proxy with antivirus filter
 
@@ -6,7 +6,7 @@ DISTNAME=	havp-0.92a
 CATEGORIES=	www
 MASTER_SITES=	${HOMEPAGE}/download/
 
-REVISION=	5
+REVISION=	6
 
 HOMEPAGE=	http://www.server-side.de/
 
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		c m pthread ${COMPILER_LIBCXX} clamav
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		security/clamav
 
 CONFIGURE_STYLE= gnu
diff --git a/www/larbin/Makefile b/www/larbin/Makefile
index 2feeb29d342..e4d92fd8806 100644
--- a/www/larbin/Makefile
+++ b/www/larbin/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2017/07/26 22:45:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=	little and fast Web crawler
 
 DISTNAME=	larbin-2.6.3
-REVISION=	2
+REVISION=	3
 CATEGORIES=	www
 
 HOMEPAGE=	http://larbin.sourceforge.net/index-eng.html
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += adns>=1 c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=larbin/}
 
 LIB_DEPENDS=		net/adns
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index d5c495fe772..f1cc8946b97 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.106 2018/08/06 19:47:15 bket Exp $
+# $OpenBSD: Makefile,v 1.107 2018/10/24 14:28:12 sthen Exp $
 
 BROKEN-i386=		hangs during build while running g-ir-scanner
 
@@ -6,6 +6,7 @@ COMMENT=		simple GTK desktop news aggregator
 
 V=			1.12.4
 DISTNAME=		liferea-${V}
+REVISION=		0
 
 CATEGORIES=		www news x11
 
@@ -32,6 +33,8 @@ WANTLIB += webp webpdemux woff2common woff2dec xcb xcb-dri2 xcb-dri3
 WANTLIB += xcb-glx xcb-present xcb-render xcb-shm xcb-sync xcb-xfixes
 WANTLIB += xml2 xshmfence xslt z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		https://github.com/lwindolf/liferea/releases/download/v${V}/
 
 EXTRACT_SUFX=		.tar.bz2
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 45d8abbdc89..2798311fe2b 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.153 2018/10/17 08:34:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.154 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=	secure, fast, compliant, and very flexible web-server
 
@@ -6,6 +6,7 @@ DISTNAME=	lighttpd-1.4.51
 CATEGORIES=	www net
 MASTER_SITES=	https://download.lighttpd.net/lighttpd/releases-1.4.x/
 EXTRACT_SUFX=	.tar.xz
+REVISION=	0
 
 HOMEPAGE=	https://www.lighttpd.net/
 
@@ -16,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c crypto m pcre ssl z ${MODLUA_WANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	lang/lua
 MODLUA_SA=	Yes
 
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 400aeb906ff..3c7bb7e1b81 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.124 2018/09/28 14:36:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.125 2018/10/24 14:28:12 sthen Exp $
 
 BROKEN-hppa=	src/core/ngx_rwlock.c:116:2: error: \#error ngx_atomic_cmp_set() is not defined!
 
@@ -31,7 +31,7 @@ PKGNAME-lua=		nginx-lua-${VERSION}
 PKGNAME-headers_more=	nginx-headers-more-${VERSION}
 PKGNAME-perl=		nginx-perl-${VERSION}
 PKGNAME-passenger=	nginx-passenger-${VERSION}
-REVISION=		1
+REVISION=		2
 
 MASTER_SITES=	https://nginx.org/download/
 MASTER_SITES0=	https://github.com/simpl/ngx_devel_kit/archive/
@@ -61,6 +61,8 @@ MULTI_PACKAGES =	-main -image_filter -geoip -xslt -mailproxy -stream \
 FLAVOR ?=
 PSEUDO_FLAVORS =	no_lua no_passenger
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 .include <bsd.port.arch.mk>
 
 WANTLIB-main=		c z pcre ssl crypto
diff --git a/www/pecl-pecl_http/Makefile b/www/pecl-pecl_http/Makefile
index f0e2955decd..c61ec104927 100644
--- a/www/pecl-pecl_http/Makefile
+++ b/www/pecl-pecl_http/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2018/04/28 11:32:04 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2018/10/24 14:28:12 sthen Exp $
 
 BROKEN= problems picking up libcurl
 
 COMMENT=	extended HTTP support
 
 DISTNAME=	pecl_http-3.1.0
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://pecl.php.net/package/pecl_http
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += ${COMPILER_LIBCXX} event_core event_extra iconv icudata
 WANTLIB += icui18n icuuc idn intl m z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	lang/php/pecl
 MODPECL_V=	7
 
diff --git a/www/ruby-capybara-webkit/Makefile b/www/ruby-capybara-webkit/Makefile
index 6c4d7760483..f3279711a3e 100644
--- a/www/ruby-capybara-webkit/Makefile
+++ b/www/ruby-capybara-webkit/Makefile
@@ -1,22 +1,26 @@
-# $OpenBSD: Makefile,v 1.24 2018/08/09 22:45:59 jeremy Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT =	capybara driver that uses WebKit
 
 DISTNAME =	capybara-webkit-1.15.0
 CATEGORIES =	www
+REVISION =	0
 
 HOMEPAGE=	https://github.com/thoughtbot/capybara-webkit
 
 # MIT
 PERMIT_PACKAGE_CDROM =	Yes
 
+WANTLIB +=	GL Qt5Core Qt5Gui Qt5Network Qt5WebKit Qt5WebKitWidgets
+WANTLIB +=	Qt5Widgets ${COMPILER_LIBCXX}
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =	lang/ruby
 CONFIGURE_STYLE = ruby gem ext
 
 USE_WXNEEDED =	Yes
 MAKE_ENV =	QMAKE=qmake-qt5 LDFLAGS="-Wl,-z,wxneeded"
-WANTLIB +=	GL Qt5Core Qt5Gui Qt5Network Qt5WebKit Qt5WebKitWidgets
-WANTLIB +=	Qt5Widgets ${COMPILER_LIBCXX}
 
 BUILD_DEPENDS =	${RUN_DEPENDS}
 RUN_DEPENDS =	www/ruby-capybara,${MODRUBY_FLAVOR}>=2.3.0,<4.0
diff --git a/www/ruby-passenger/Makefile b/www/ruby-passenger/Makefile
index 0e165b88e36..c9c223c5639 100644
--- a/www/ruby-passenger/Makefile
+++ b/www/ruby-passenger/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.59 2018/07/05 09:08:30 kn Exp $
+# $OpenBSD: Makefile,v 1.60 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT =		ruby web application server/nginx module
 BROKEN-alpha =		.got subsegment exceeds 64K (size 83312)
@@ -7,7 +7,7 @@ BROKEN-hppa =		rake fails when linking PassengerHelperAgent
 PASS_VERSION =		5.1.11
 NGINX_VERSION =		1.12.1
 DISTNAME =		passenger-${PASS_VERSION}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =	www
 DISTFILES =	${DISTNAME}.gem \
@@ -25,6 +25,8 @@ CONFIGURE_STYLE =	gem ext
 
 WANTLIB =	${MODRUBY_WANTLIB} crypto curl kvm nghttp2 pcre pthread ssl ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # Make devel/gmake a BUILD_DEPEND instead of USE_GMAKE, as the port also uses
 # BSD make. Depend on gsed as embedded libuv picks it up if present.
 BUILD_DEPENDS =		${RUN_DEPENDS} \
diff --git a/www/sassc/Makefile b/www/sassc/Makefile
index b0059b05426..4f22ab2e0d8 100644
--- a/www/sassc/Makefile
+++ b/www/sassc/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2018/04/24 12:27:08 jasper Exp $
+# $OpenBSD: Makefile,v 1.3 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT =		libsass command line driver
 
 GH_ACCOUNT =		sass
 GH_PROJECT =		sassc
 GH_TAGNAME =		3.5.0
+REVISION =		0
 
 MAINTAINER =		Jasper Lievisse Adriaanse <jasper@openbsd.org>
 
@@ -15,6 +16,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} c m sass
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =		${MODGNU_AUTOCONF_DEPENDS} \
 			${MODGNU_AUTOMAKE_DEPENDS} \
 			devel/libtool
diff --git a/www/slowhttptest/Makefile b/www/slowhttptest/Makefile
index 61c784467e9..9ad73641d82 100644
--- a/www/slowhttptest/Makefile
+++ b/www/slowhttptest/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2018/04/25 20:13:04 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=	test tool for slow HTTP reads/posts
 
 DISTNAME =	slowhttptest-1.6
-REVISION =	2
+REVISION =	3
 
 CATEGORIES=	www security
 
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c crypto m ssl ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${HOMEPAGE}files/
 
 SEPARATE_BUILD=	simple
diff --git a/www/sqtop/Makefile b/www/sqtop/Makefile
index bf05a47b29a..9761c6e52c0 100644
--- a/www/sqtop/Makefile
+++ b/www/sqtop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2018/04/17 07:51:35 gonzalo Exp $
+# $OpenBSD: Makefile,v 1.11 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=		top-like monitor for Squid
 
@@ -6,6 +6,7 @@ PKGNAME=		sqtop-2015.02.08
 GH_ACCOUNT=		paleg
 GH_PROJECT=		sqtop
 GH_TAGNAME=		v2015-02-08
+REVISION=		0
 
 CATEGORIES=		www
 FIX_EXTRACT_PERMISSIONS=Yes
@@ -17,6 +18,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} c curses m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=	gnu
 
 .include <bsd.port.mk>
diff --git a/www/xapian-omega/Makefile b/www/xapian-omega/Makefile
index 800d21d90af..48109bfb337 100644
--- a/www/xapian-omega/Makefile
+++ b/www/xapian-omega/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.22 2017/12/14 05:54:18 jca Exp $
+# $OpenBSD: Makefile,v 1.23 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=	web search application
 
 V=		1.4.5
 PORTROACH=	limitw:1,even
 DISTNAME=	xapian-omega-${V}
+REVISION=	0
 
 CATEGORIES=	www textproc
 
@@ -19,7 +20,7 @@ MASTER_SITES=	http://oligarchy.co.uk/xapian/${V}/
 EXTRACT_SUFX=	.tar.xz
 
 # C++11
-COMPILER=       base-clang ports-gcc ports-clang
+COMPILER=       base-clang ports-gcc base-gcc
 
 LIB_DEPENDS=	databases/xapian-core>=${V} \
 		devel/pcre \
diff --git a/x11/bbdate/Makefile b/x11/bbdate/Makefile
index 6071d6d17b5..bb8521e2056 100644
--- a/x11/bbdate/Makefile
+++ b/x11/bbdate/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2017/11/15 21:28:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=	displays the date and resembles the toolbar
 
 DISTNAME=	bbdate-0.2.4
-REVISION=	3
+REVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bbtools/}
 HOMEPAGE=	http://bbtools.sourceforge.net/download.php?file=3
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += ICE SM X11 c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE= gnu
 
 .include <bsd.port.mk>
diff --git a/x11/bbkeys/Makefile b/x11/bbkeys/Makefile
index 2f86de16b9c..313a882d1ec 100644
--- a/x11/bbkeys/Makefile
+++ b/x11/bbkeys/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.34 2017/12/02 18:18:21 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.35 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=		X keygrabber for blackbox
 
 DISTNAME=		bbkeys-0.9.1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bbkeys/}
+REVISION=		0
 
 HOMEPAGE=		http://bbkeys.sourceforge.net/
 
@@ -13,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} ICE SM X11 Xext Xft c iconv m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		converters/libiconv
 
 BUILD_DEPENDS=		x11/blackbox
diff --git a/x11/bbpager/Makefile b/x11/bbpager/Makefile
index 213f5a6628e..6182b8bb7a9 100644
--- a/x11/bbpager/Makefile
+++ b/x11/bbpager/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.26 2017/10/23 17:11:03 sthen Exp $
+# $OpenBSD: Makefile,v 1.27 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT =	pager for the Blackbox window manager
 
 DISTNAME =	bbpager-0.4.7
-REVISION =	5
+REVISION =	6
 
 CATEGORIES =	x11
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=bbtools/}
@@ -22,6 +22,8 @@ LIB_DEPENDS =	converters/libiconv
 WANTLIB =	ICE SM X11 Xau Xdmcp Xext Xft Xrender c expat fontconfig \
 		freetype iconv m ${COMPILER_LIBCXX} z xcb
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE = gnu
 
 .ifdef DEBUG
diff --git a/x11/blackbox/Makefile b/x11/blackbox/Makefile
index 9c44164c494..271a4496597 100644
--- a/x11/blackbox/Makefile
+++ b/x11/blackbox/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.60 2017/10/23 17:11:03 sthen Exp $
+# $OpenBSD: Makefile,v 1.61 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=	small & pretty window manager for 8 and more bits displays
 
 DISTNAME=		blackbox-0.70.1
-REVISION =		9
+REVISION =		10
 CATEGORIES=		x11
 
 HOMEPAGE=		http://blackboxwm.sourceforge.net/
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += X11 Xext Xft Xrender c expat fontconfig freetype iconv m
 WANTLIB += ${COMPILER_LIBCXX} xcb z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		converters/libiconv
 
 LIBTOOL_FLAGS=		--tag=disable-shared
diff --git a/x11/compiz/core/Makefile b/x11/compiz/core/Makefile
index c6d3b12a647..52a20355620 100644
--- a/x11/compiz/core/Makefile
+++ b/x11/compiz/core/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.35 2018/09/04 12:46:27 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT =	OpenGL window and compositing manager
 
 V =		0.8.8
 DISTNAME =	compiz-${V}
-REVISION =	6
+REVISION =	7
 
 SHARED_LIBS =	decoration	1.0
 
@@ -21,6 +21,8 @@ WANTLIB += pcre pixman-1 png pthread rsvg-2
 WANTLIB += startup-notification-1 ${COMPILER_LIBCXX} wnck-1 xcb xcb-dri2 xcb-glx
 WANTLIB += xcb-render xcb-shm xcb-util xml2 xslt z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	http://releases.compiz.org/${V}/
 
 MODULES =	devel/gconf2 \
diff --git a/x11/compiz/libcompizconfig/Makefile b/x11/compiz/libcompizconfig/Makefile
index 7b1cab77f4f..196a383588a 100644
--- a/x11/compiz/libcompizconfig/Makefile
+++ b/x11/compiz/libcompizconfig/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2017/07/26 22:45:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT =	compiz configuration system library
 
 V =		0.8.8
 DISTNAME =	libcompizconfig-${V}
-REVISION =	1
+REVISION =	2
 
 SHARED_LIBS =	compizconfig	0.0 # 0.0
 
@@ -12,6 +12,8 @@ MASTER_SITES =	http://releases.compiz.org/${V}/
 
 WANTLIB += X11 iconv lzma m pthread ${COMPILER_LIBCXX} xcb xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =	textproc/intltool
 
 BUILD_DEPENDS =	x11/compiz/core
diff --git a/x11/e17/evas/Makefile b/x11/e17/evas/Makefile
index e56df7bee4f..0cb628a211e 100644
--- a/x11/e17/evas/Makefile
+++ b/x11/e17/evas/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.58 2018/08/11 04:58:47 naddy Exp $
+# $OpenBSD: Makefile,v 1.59 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT =		canvas API for X
 
 VERSION =		1.7.10
 DISTNAME =		evas-${VERSION}
 EPOCH =			2
-REVISION =		10
+REVISION =		11
 
 SHARED_LIBS +=	evas                 4.0      # 8.10
 
@@ -18,6 +18,8 @@ WANTLIB += fribidi gif glapi glib-2.0 graphite2 harfbuzz iconv intl jpeg
 WANTLIB += m pcre png pthread ssl ${COMPILER_LIBCXX} tiff xcb
 WANTLIB += xcb-dri2 xcb-glx z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		x11/e17
 
 MODE17_PURGE_LA =	lib/evas/modules
diff --git a/x11/ede/desktop/Makefile b/x11/ede/desktop/Makefile
index 3c47387973d..db3da1cf7b9 100644
--- a/x11/ede/desktop/Makefile
+++ b/x11/ede/desktop/Makefile
@@ -1,15 +1,17 @@
-# $OpenBSD: Makefile,v 1.21 2018/07/01 18:33:38 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT =		Equinox desktop environment
 
 DISTNAME =		ede-${V}
-REVISION =		11
+REVISION =		12
 
 WANTLIB += X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xinerama Xpm c crypto
 WANTLIB += curl dbus-1 edelib edelib_dbus edelib_gui fltk fltk_images
 WANTLIB += fontconfig jpeg m nghttp2 png pthread ssl
 WANTLIB += startup-notification-1 ${COMPILER_LIBCXX} xkbfile z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		lang/python
 BUILD_DEPENDS =		devel/gettext-tools \
 			devel/jam \
diff --git a/x11/ede/lib/Makefile b/x11/ede/lib/Makefile
index 15390161474..525e8be4d02 100644
--- a/x11/ede/lib/Makefile
+++ b/x11/ede/lib/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2017/07/26 22:45:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT =		equinox desktop library
 
 DISTNAME =		edelib-${V}
-REVISION =		8
+REVISION =		9
 
 API_VER =		1.0
 .for l in edelib edelib_dbus edelib_gui
@@ -13,6 +13,8 @@ SHARED_LIBS +=		$l	${API_VER}
 WANTLIB += X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xinerama c dbus-1
 WANTLIB += fltk fltk_images fontconfig jpeg m png pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		lang/python
 BUILD_DEPENDS =		devel/jam
 LIB_DEPENDS =		x11/fltk \
diff --git a/x11/fleditor/Makefile b/x11/fleditor/Makefile
index 30e176b5295..1676affd920 100644
--- a/x11/fleditor/Makefile
+++ b/x11/fleditor/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.32 2017/07/26 22:45:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.33 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=		text editor widget for FLTK
 
 V=			0.4.5
 DISTNAME=		fl_editor-${V}
 PKGNAME=		fleditor-${V}
-REVISION =		7
+REVISION =		8
 
 SHARED_LIBS=		fleditor 3.0
 CATEGORIES=		x11
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		http://www.robertk.com/source/fl_editor/
 EXTRACT_SUFX=		.tgz
 
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index d005f13eaf1..e28b926360a 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2017/07/26 22:45:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.56 2018/10/24 14:28:12 sthen Exp $
 
 # no libGL (toolchain issue)
 NOT_FOR_ARCHS=	m88k
@@ -8,7 +8,7 @@ COMMENT=	Fast-Light Tool Kit
 VER=		1.3.3
 DISTNAME=	fltk-${VER}-source
 PKGNAME=	fltk-${VER}
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	x11
 
@@ -26,6 +26,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += GL GLU X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xinerama
 WANTLIB += c fontconfig jpeg m png pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://fltk.org/pub/fltk/${VER}/
 
 LIB_DEPENDS=	graphics/jpeg \
diff --git a/x11/fluxbox/Makefile b/x11/fluxbox/Makefile
index a91eac97e8f..a5ea1adcd66 100644
--- a/x11/fluxbox/Makefile
+++ b/x11/fluxbox/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.86 2017/07/26 22:45:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.87 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT =	window manager based on the original Blackbox code
 DISTNAME =	fluxbox-1.3.7
 CATEGORIES =	x11
-REVISION =	3
+REVISION =	4
 
 HOMEPAGE =	http://fluxbox.org/
 
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB += Imlib2 X11 Xext Xft Xinerama Xpm Xrandr Xrender c fontconfig
 WANTLIB += freetype fribidi iconv m ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 
 LIB_DEPENDS=	converters/libiconv \
diff --git a/x11/fluxter/Makefile b/x11/fluxter/Makefile
index fee2041a90e..3dd05ecf1c3 100644
--- a/x11/fluxter/Makefile
+++ b/x11/fluxter/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2017/07/26 22:45:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=		slit pager for fluxbox window manager
 
 DISTNAME=		fluxter-0.1.0
-REVISION =		1
+REVISION =		2
 CATEGORIES=		x11
 
 MAINTAINER=		D. Adam Karim <adam@akarsoft.com>
@@ -17,6 +17,8 @@ MASTER_SITES=		http://benedict.isomedia.com/homes/stevencooper/files/
 
 WANTLIB=		m ICE X11 c SM ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 RUN_DEPENDS=		x11/fluxbox
 
 USE_GMAKE=		Yes
diff --git a/x11/flwm/Makefile b/x11/flwm/Makefile
index aa96f775984..6fd79fcf1f9 100644
--- a/x11/flwm/Makefile
+++ b/x11/flwm/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.35 2017/07/26 22:45:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.36 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=	fast-light window manager
 
 DISTNAME=	flwm-1.02
 PKGNAME=	flwm-1.0.2
-REVISION=	1
+REVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${HOMEPAGE}
 
@@ -22,6 +22,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += X11 Xext c fltk m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 NO_TEST=	Yes
 
 .include <bsd.port.mk>
diff --git a/x11/gaia/Makefile b/x11/gaia/Makefile
index 4c14ebf3472..d97e5112afb 100644
--- a/x11/gaia/Makefile
+++ b/x11/gaia/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2017/07/26 22:45:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=	3D earth viewer with GPS support
 
 DISTNAME=	gaia-0.1.2
-REVISION=	11
+REVISION=	12
 CATEGORIES=	x11 geo
 
 EXTRACT_SUFX=	.tar.bz2
@@ -16,6 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += GL GLU SDL c crypto curl gps jpeg m nghttp2 png pthread ssl
 WANTLIB += ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaia-clean/}
 
 MODULES=	devel/scons
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index 3a715e4e3ae..11a66cd4ebe 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2017/07/26 22:45:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=		X11 program launcher
 
 DISTNAME=		gmrun-0.9.2
-REVISION=		5
+REVISION=		6
 
 CATEGORIES=		x11
 
@@ -20,6 +20,8 @@ WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
 WANTLIB += gtk-x11-2.0 intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += popt pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gmrun/}
 
 LIB_DEPENDS=		x11/gtk+2 \
diff --git a/x11/gnome/calendar/Makefile b/x11/gnome/calendar/Makefile
index 3e24e886a67..efdef6393fe 100644
--- a/x11/gnome/calendar/Makefile
+++ b/x11/gnome/calendar/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.41 2018/07/06 06:04:44 espie Exp $
+# $OpenBSD: Makefile,v 1.42 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT =		GNOME calendar
 
 GNOME_PROJECT =		gnome-calendar
 GNOME_VERSION =		3.28.2
-REVISION =		2
+REVISION =		3
 
 # GPLv3+
 PERMIT_PACKAGE_CDROM =	Yes
@@ -14,6 +14,8 @@ WANTLIB += gdk-3 gio-2.0 glib-2.0 goa-1.0 gobject-2.0 gtk-3 ical
 WANTLIB += intl m pango-1.0 pangocairo-1.0 soup-2.4
 WANTLIB += dazzle-1.0 geoclue-2 gweather-3 ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =		devel/dconf \
 			devel/meson \
 			x11/gnome
diff --git a/x11/gnome/color-manager/Makefile b/x11/gnome/color-manager/Makefile
index 851c7c1dffb..eebb611657f 100755
--- a/x11/gnome/color-manager/Makefile
+++ b/x11/gnome/color-manager/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.63 2018/06/29 22:16:23 espie Exp $
+# $OpenBSD: Makefile,v 1.64 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=		color profile manager for GNOME
 
 GNOME_PROJECT=		gnome-color-manager
 GNOME_VERSION=		3.28.0
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		graphics
 
@@ -16,6 +16,8 @@ WANTLIB += colord-gtk colordprivate exif exiv2 gdk-3 gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 intl lcms2 pango-1.0
 WANTLIB += tiff vte-2.91
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/meson \
 			x11/gnome
 
diff --git a/x11/gnome/contacts/Makefile b/x11/gnome/contacts/Makefile
index 4ee28235d12..1c2ba7d52d0 100644
--- a/x11/gnome/contacts/Makefile
+++ b/x11/gnome/contacts/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.72 2018/07/06 06:04:44 espie Exp $
+# $OpenBSD: Makefile,v 1.73 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=		contacts manager for GNOME
 
 GNOME_PROJECT=		gnome-contacts
 GNOME_VERSION=		3.28.2
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		productivity
 
@@ -16,6 +16,8 @@ WANTLIB += folks-eds gdk-3 gdk_pixbuf-2.0 gee-0.8 gio-2.0 glib-2.0
 WANTLIB += gnome-desktop-3 goa-1.0 gobject-2.0 gtk-3 intl m pango-1.0
 WANTLIB += ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/meson \
 			x11/gnome \
 			devel/dconf
diff --git a/x11/gnome/initial-setup/Makefile b/x11/gnome/initial-setup/Makefile
index a0d2f08c184..119433761d5 100644
--- a/x11/gnome/initial-setup/Makefile
+++ b/x11/gnome/initial-setup/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.47 2018/05/15 13:27:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.48 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=		initial-setup firstboot-like tool
 
 GNOME_PROJECT=		gnome-initial-setup
 GNOME_VERSION=		3.28.0
-REVISION=		0
+REVISION=		1
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
@@ -29,6 +29,8 @@ WANTLIB += webp webpdemux woff2common woff2dec xcb xcb-dri2 xcb-glx
 WANTLIB += xcb-render xcb-shm xcb-xfixes xml2 xslt z aspell
 WANTLIB += heimdal/lib/heimsqlite
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/dconf \
 			security/heimdal \
 			x11/gnome
diff --git a/x11/gnome/libgda/Makefile b/x11/gnome/libgda/Makefile
index 01e5c3ae2a2..e569f71bff7 100644
--- a/x11/gnome/libgda/Makefile
+++ b/x11/gnome/libgda/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.127 2018/09/29 08:08:19 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.128 2018/10/24 14:28:12 sthen Exp $
 
 PORTROACH=		skipv:5.90.1
 
@@ -19,6 +19,11 @@ PKGNAME-ldap=		libgda-ldap-${GNOME_VERSION}
 PKGNAME-mysql=		libgda-mysql-${GNOME_VERSION}
 PKGNAME-pgsql=		libgda-pgsql-${GNOME_VERSION}
 PKGNAME-ui=		libgda-ui-${GNOME_VERSION}
+REVISION-ldap=		0
+REVISION-main=		0
+REVISION-mysql=		0
+REVISION-pgsql=		0
+REVISION-ui=		0
 
 EPOCH-main=		2
 EPOCH-ldap=		0
@@ -43,6 +48,8 @@ WANTLIB += m pcre z gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 lzma
 WANTLIB += gthread-2.0 xml2 gcrypt secret-1 gpg-error ffi pthread
 WANTLIB += iconv intl
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # /libgda-5.1.2_writes_to_HOME/.cache/g-ir-scanner
 PORTHOME=		${WRKDIST}
 
diff --git a/x11/gnome/online-accounts/Makefile b/x11/gnome/online-accounts/Makefile
index 13e0df9f866..9b09efd1c06 100644
--- a/x11/gnome/online-accounts/Makefile
+++ b/x11/gnome/online-accounts/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.109 2018/07/06 06:04:45 espie Exp $
+# $OpenBSD: Makefile,v 1.110 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=	interfaces for interacting with online accounts
 
 GNOME_PROJECT=	gnome-online-accounts
 GNOME_VERSION=	3.28.0
-REVISION=	2
+REVISION=	3
 
 SHARED_LIBS +=  goa-1.0              4.0      # .0.0
 SHARED_LIBS +=  goa-backend-1.0      4.0      # .1.0
@@ -30,6 +30,8 @@ WANTLIB += xcb-shm xcb-xfixes xml2 xslt z tasn1 aspell
 WANTLIB += GLESv2 gstallocators-1.0 gstgl-1.0 fribidi
 WANTLIB += brotlicommon brotlidec webpdemux woff2common woff2dec
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/dconf \
 			x11/gnome
 
diff --git a/x11/gnome/tepl/Makefile b/x11/gnome/tepl/Makefile
index ba4be3792d6..f252102d705 100644
--- a/x11/gnome/tepl/Makefile
+++ b/x11/gnome/tepl/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2018/07/17 07:03:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=		Text Editor Product Line
 
 GNOME_PROJECT=		tepl
 GNOME_VERSION=		4.2.0
+REVISION=		0
 
 CATEGORIES=		devel
 
@@ -21,6 +22,8 @@ WANTLIB += gtksourceview-4 harfbuzz iconv intl lzma m pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png uchardet
 WANTLIB += xcb xcb-render xcb-shm xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		x11/gnome
 
 MODGNOME_TOOLS= 	gobject-introspection
diff --git a/x11/gnome/tracker-miners/Makefile b/x11/gnome/tracker-miners/Makefile
index 40d3e615bcf..ab63fd31f71 100644
--- a/x11/gnome/tracker-miners/Makefile
+++ b/x11/gnome/tracker-miners/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2018/07/17 11:18:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2018/10/24 14:28:12 sthen Exp $
 
 TRACKER_API=		2.0
 SUBST_VARS=		TRACKER_API
@@ -7,7 +7,7 @@ COMMENT=		tracker miners and metadata extractors
 
 GNOME_PROJECT=		tracker-miners
 GNOME_VERSION=		2.0.5
-REVISION=		1
+REVISION=		2
 
 SHARED_LIBS +=  tracker-extract           1.0 # 0.0
 
@@ -30,6 +30,8 @@ WANTLIB += tracker-miner-${TRACKER_API}
 WANTLIB += lib/tracker-${TRACKER_API}/tracker-common                            
 WANTLIB += lib/tracker-${TRACKER_API}/tracker-data
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/dconf \
 			lang/python \
 			x11/gnome
diff --git a/x11/gnome/tracker/Makefile b/x11/gnome/tracker/Makefile
index 0b6a9efb0ea..15cf6233186 100644
--- a/x11/gnome/tracker/Makefile
+++ b/x11/gnome/tracker/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.233 2018/07/06 06:04:46 espie Exp $
+# $OpenBSD: Makefile,v 1.234 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=		metadata database and search tool
 
@@ -8,7 +8,7 @@ GNOME_VERSION=		2.0.4
 # there is already audio/tracker, so this port has to live
 # as meta-tracker
 PKGNAME=		meta-tracker-${VERSION}
-REVISION=		0
+REVISION=		1
 
 # NOTE: when TRACKER_API changes, increment accordingly and bump:
 # x11/gnome/grilo-plugins
@@ -32,6 +32,8 @@ WANTLIB += ${COMPILER_LIBCXX} c ffi gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 iconv icudata icui18n icuuc intl json-glib-1.0
 WANTLIB += kvm lzma m pcre soup-2.4 sqlite3 uuid xml2 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/dconf \
 			lang/python \
 			x11/gnome
diff --git a/x11/gnome/yelp/Makefile b/x11/gnome/yelp/Makefile
index a8560a16dae..fa04392bafa 100644
--- a/x11/gnome/yelp/Makefile
+++ b/x11/gnome/yelp/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.131 2018/07/06 06:04:47 espie Exp $
+# $OpenBSD: Makefile,v 1.132 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=		GNOME help browser
 
 GNOME_PROJECT=		yelp
 GNOME_VERSION=		3.28.1
-REVISION=		2
+REVISION=		3
 
 SHARED_LIBS +=  yelp                 0.0      # unknown
 
@@ -28,6 +28,8 @@ WANTLIB += tasn1 webkit2gtk-4.0 webp webpdemux woff2common woff2dec
 WANTLIB += xcb xcb-dri2 xcb-glx xcb-render xcb-shm xcb-xfixes
 WANTLIB += xml2 xslt z aspell
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/dconf \
 			x11/gnome
 
diff --git a/x11/goggles/Makefile b/x11/goggles/Makefile
index 7ffd34b61cc..90720f0609c 100644
--- a/x11/goggles/Makefile
+++ b/x11/goggles/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.27 2017/10/23 17:11:04 sthen Exp $
+# $OpenBSD: Makefile,v 1.28 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=	gui for ogle
 CATEGORIES=	x11
 
 DISTNAME=	goggles-0.9.1
-REVISION=	5
+REVISION=	6
 
 EXTRACT_SUFX=	.tar.bz2
 MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=gogglesmm/}
@@ -51,4 +51,6 @@ WANTLIB += FOX-1.6>=1 GL GLU X11 Xau Xcursor Xdmcp Xext Xfixes Xft
 WANTLIB += Xrandr Xrender bz2 c dvdcontrol expat fontconfig freetype
 WANTLIB += jpeg m msgevents png pthread ${COMPILER_LIBCXX} tiff xcb z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 .include <bsd.port.mk>
diff --git a/x11/grantlee/Makefile b/x11/grantlee/Makefile
index 94aca521193..cfdfb9c90bb 100644
--- a/x11/grantlee/Makefile
+++ b/x11/grantlee/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.12 2018/08/18 15:04:39 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT =		template and text document library for Qt4
 PKG_VERSION =		0.5.1
-REVISION =		3
+REVISION =		4
 PLIST_VERSION =		${PKG_VERSION:R}
 DISTNAME =		grantlee-${PKG_VERSION}
 CATEGORIES =		devel x11
@@ -19,6 +19,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} lib/qt4/QtGui lib/qt4/QtScript c m
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://downloads.grantlee.org/ \
 			http://www.loegria.net/grantlee/
 
diff --git a/x11/gtk-engines2/Makefile b/x11/gtk-engines2/Makefile
index a732a7134ba..91134310e16 100644
--- a/x11/gtk-engines2/Makefile
+++ b/x11/gtk-engines2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.65 2017/11/21 00:13:04 naddy Exp $
+# $OpenBSD: Makefile,v 1.66 2018/10/24 14:28:12 sthen Exp $
 
 PORTROACH=		limit:^2\.20
 
@@ -10,7 +10,7 @@ EXTRACT_SUFX=		.tar.bz2
 
 # warning: PKGNAME does not default to ${DISTNAME}
 PKGNAME=		gtk-engines2-${GNOME_VERSION}
-REVISION=		9
+REVISION=		10
 
 CATEGORIES=		x11
 
@@ -25,6 +25,8 @@ WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread ${COMPILER_LIBCXX} xcb
 WANTLIB += xcb-render xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	x11/gtk+2
 
 MODULES=		x11/gnome
diff --git a/x11/gtk2-aurora-engine/Makefile b/x11/gtk2-aurora-engine/Makefile
index fa5e348eb5c..205038e5dd9 100644
--- a/x11/gtk2-aurora-engine/Makefile
+++ b/x11/gtk2-aurora-engine/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2017/11/21 00:13:04 naddy Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=	Aurora GTK+2 engine
 
 V=		1.5.1
 DISTNAME=	56438-aurora-${V}
 PKGNAME=	gtk2-aurora-engine-${V}
-REVISION=	8
+REVISION=	9
 
 EXTRACT_SUFX=	.tar.bz2
 
@@ -24,6 +24,8 @@ WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread ${COMPILER_LIBCXX} xcb
 WANTLIB += xcb-render xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://gnome-look.org/CONTENT/content-files/
 
 LIB_DEPENDS=	x11/gtk+2
diff --git a/x11/gtk2-equinox-engine/Makefile b/x11/gtk2-equinox-engine/Makefile
index 505f56c1e4e..c7a70201974 100644
--- a/x11/gtk2-equinox-engine/Makefile
+++ b/x11/gtk2-equinox-engine/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.21 2017/11/21 00:13:04 naddy Exp $
+# $OpenBSD: Makefile,v 1.22 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT=	Equinox GTK+2 engine
 
 V=		1.50
 DISTNAME=	121881-equinox-${V}
 PKGNAME=	gtk2-equinox-engine-${V}
-REVISION=	6
+REVISION=	7
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		140449-equinox-themes-${V}${EXTRACT_SUFX}
@@ -25,6 +25,8 @@ WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread ${COMPILER_LIBCXX} xcb
 WANTLIB += xcb-render xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://gnome-look.org/CONTENT/content-files/
 
 LIB_DEPENDS=	x11/gtk+2
diff --git a/x11/gtk2-nodoka-engine/Makefile b/x11/gtk2-nodoka-engine/Makefile
index 54ba791ffb2..e34e6f84c80 100644
--- a/x11/gtk2-nodoka-engine/Makefile
+++ b/x11/gtk2-nodoka-engine/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2018/06/03 10:54:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:12 sthen Exp $
 
 COMMENT =	GTK+2 engine from Fedora
 
 VERSION =	0.7.5
 DISTNAME =	gtk-nodoka-engine-${VERSION}
 PKGNAME =	gtk2-nodoka-engine-${VERSION}
-REVISION=	7
+REVISION=	8
 
 CATEGORIES =	x11
 
@@ -22,6 +22,8 @@ WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread ${COMPILER_LIBCXX} xcb
 WANTLIB += xcb-render xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	http://bsdforge.com/projects/source/x11-themes/gtk-nodoka-engine/
 
 LIB_DEPENDS =	x11/gtk+2
diff --git a/x11/gtk2-oxygen-engine/Makefile b/x11/gtk2-oxygen-engine/Makefile
index 3b0c0bd5e8b..6f706a8b62a 100644
--- a/x11/gtk2-oxygen-engine/Makefile
+++ b/x11/gtk2-oxygen-engine/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2017/11/21 00:13:05 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:12 sthen Exp $
 COMMENT =		KDE Oxygen widget theme for GTK
 
 V =			1.4.5
 DISTNAME =		oxygen-gtk2-${V}
 PKGNAME =		gtk2-oxygen-engine-${V}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		x11
 HOMEPAGE =		https://projects.kde.org/projects/playground/artwork/oxygen-gtk/
@@ -20,6 +20,8 @@ WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
 WANTLIB += gtk-x11-2.0 iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		http://download.kde.org/stable/oxygen-gtk2/${V}/src/
 
 EXTRACT_SUFX =		.tar.bz2
diff --git a/x11/gtk3-oxygen-engine/Makefile b/x11/gtk3-oxygen-engine/Makefile
index 9b2b7b0683c..6413f2bc9de 100644
--- a/x11/gtk3-oxygen-engine/Makefile
+++ b/x11/gtk3-oxygen-engine/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2017/11/21 00:13:05 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2018/10/24 14:28:13 sthen Exp $
 COMMENT =		KDE Oxygen widget theme for GTK+3
 
 V =			1.3.5
 DISTNAME =		oxygen-gtk3-${V}
 PKGNAME =		gtk3-oxygen-engine-${V}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		x11
 HOMEPAGE =		https://projects.kde.org/projects/playground/artwork/oxygen-gtk/
@@ -19,6 +19,8 @@ WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3
 WANTLIB += iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread
 WANTLIB += ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_KDE:=stable/oxygen-gtk3/${V}/src/}
 
 EXTRACT_SUFX =		.tar.bz2
diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile
index 088f99608ff..64c6a64c801 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.50 2017/11/21 00:13:05 naddy Exp $
+# $OpenBSD: Makefile,v 1.51 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=		OpenGL widget for GTK+2 GUI toolkit
 
 GNOME_PROJECT=		gtkglarea
 GNOME_VERSION=		2.0.1
-REVISION=		8
+REVISION=		9
 
 SHARED_LIBS +=  gtkgl-2.0      0.0               # .1.1
 
@@ -22,6 +22,8 @@ WANTLIB += xcb xcb-shm z
 WANTLIB += X11-xcb Xxf86vm drm ffi glapi graphite2 gthread-2.0
 WANTLIB += harfbuzz pthread ${COMPILER_LIBCXX} xcb-dri2 xcb-glx xcb-render
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 EXTRACT_SUFX=		.tar.bz2
 
 MODULES=		x11/gnome
diff --git a/x11/icewm/Makefile b/x11/icewm/Makefile
index 514d4524a77..3b4cffce206 100644
--- a/x11/icewm/Makefile
+++ b/x11/icewm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.63 2018/06/01 15:44:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.64 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=	small and fast window manager
 
 DISTNAME=	icewm-1.3.8
-REVISION=	5
+REVISION=	6
 CATEGORIES=	x11
 
 HOMEPAGE=	http://www.icewm.org/
@@ -16,6 +16,8 @@ WANTLIB += freetype gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 iconv intl m pthread ${COMPILER_LIBCXX}
 WANTLIB += z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=icewm/}
 
 BUILD_DEPENDS=	devel/gettext-tools
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index 38b262c0c56..d7d8521f3fe 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.18 2017/10/23 17:11:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=		put clickable icons on the desktop
 
 MAINTAINER=		D. Adam Karim <adam@akarsoft.com>
 
 DISTNAME=		idesk-0.7.5
-REVISION =		5
+REVISION =		6
 CATEGORIES=		x11
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=idesk/}
@@ -20,6 +20,8 @@ EXTRACT_SUFX=		.tar.bz2
 WANTLIB=		ICE ${COMPILER_LIBCXX} c X11 Xrender Xau Xdmcp expat z m Imlib2 \
 			SM Xft freetype fontconfig Xext xcb
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		graphics/imlib2
 
 USE_GMAKE=		Yes
diff --git a/x11/irrlicht/Makefile b/x11/irrlicht/Makefile
index c51a1ccb819..d8304426b78 100644
--- a/x11/irrlicht/Makefile
+++ b/x11/irrlicht/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.19 2017/07/26 22:45:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT =		fast, real time 3D engine
 DISTNAME =		irrlicht-1.8.4
-REVISION =		2
+REVISION =		3
 
 SO_VERSION =		3.0
 SHARED_LIBS =		Irrlicht ${SO_VERSION}
@@ -18,6 +18,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += 		GL Xxf86vm bz2 jpeg m png ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=irrlicht/}
 
 EXTRACT_SUFX =		.zip
diff --git a/x11/kde/accessibility3/Makefile b/x11/kde/accessibility3/Makefile
index 2b6cf1b68f4..5ce15ea8682 100644
--- a/x11/kde/accessibility3/Makefile
+++ b/x11/kde/accessibility3/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.66 2018/06/29 22:16:25 espie Exp $
+# $OpenBSD: Makefile,v 1.67 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT = 		X11 toolkit, accessibility aids
 CATEGORIES =		x11 x11/kde
 VERSION =		3.5.10
-REVISION =		25
+REVISION =		26
 DISTNAME =		kdeaccessibility-${VERSION}
 MODKDE_VERSION ?=	3.5.8
 SHARED_LIBS +=	KTTSD_Lib            1.0      # .0.1
@@ -32,6 +32,8 @@ WANTLIB +=	qtmcop sndio soundserver_idl ${COMPILER_LIBCXX} util
 WANTLIB +=	vorbis vorbisenc vorbisfile xcb z
 WANTLIB += 	X11-xcb Xau Xdmcp glapi xcb-dri2 xcb-glx
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${MODKDE_HTML_SUBDIR}/en/common
 	rm -Rf ${PREFIX}/share/icons/mono
diff --git a/x11/kde/arts3/Makefile b/x11/kde/arts3/Makefile
index dd0ccaf572f..d4851197650 100644
--- a/x11/kde/arts3/Makefile
+++ b/x11/kde/arts3/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.85 2017/11/21 00:13:05 naddy Exp $
+# $OpenBSD: Makefile,v 1.86 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT =		K Desktop Environment, aRTs
 CATEGORIES =		x11 x11/kde
 VERSION =		3.5.10
-REVISION =		12
+REVISION =		13
 DISTNAME =		arts-1.5.10
 MODKDE_VERSION =	3.5.8
 
@@ -46,6 +46,8 @@ WANTLIB += mad mng ogg pcre png pthread sndio ${COMPILER_LIBCXX} vorbis
 WANTLIB += vorbisenc vorbisfile xcb xcb-glx z FLAC X11-xcb Xau Xdmcp glapi
 WANTLIB += xcb-dri2
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 post-patch:
 	cp ${FILESDIR}/audioiosndio.cc ${WRKSRC}/flow
 		
diff --git a/x11/kde/base3/Makefile b/x11/kde/base3/Makefile
index b4f78a2d4b6..b872f5df569 100644
--- a/x11/kde/base3/Makefile
+++ b/x11/kde/base3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.163 2018/09/04 12:46:28 espie Exp $
+# $OpenBSD: Makefile,v 1.164 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT-main =		K Desktop Environment, basic applications
 COMMENT-samba =		K Desktop Environment, samba support
@@ -13,10 +13,10 @@ PKGNAME-en_US =		kde3-locale-en_US-${VERSION}
 PKGNAME-locale =	kde3-locale-${VERSION}
 PKG_ARCH-en_US =	*
 PKG_ARCH-locale =	*
-REVISION-main =		58
-REVISION-samba =	28
-REVISION-en_US =	6
-REVISION-locale =	5
+REVISION-main =		59
+REVISION-samba =	29
+REVISION-en_US =	7
+REVISION-locale =	6
 
 MODKDE_VERSION =	3.5.8
 
@@ -65,6 +65,8 @@ LIB_DEPENDS-samba =	${LIB_DEPENDS} \
 			x11/kde/libs3 \
 			net/samba,-main
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 WANTLIB =  crypto expat iconv intl m pthread ssl ${COMPILER_LIBCXX} util z
 WANTLIB += ICE SM X11 Xext Xfixes Xrender Xt freetype fontconfig xcb
 WANTLIB += ${KDE}/DCOP ${KDE}/kdecore>=6 ${KDE}/kdefx ${KDE}/kdesu
diff --git a/x11/kde/games3/Makefile b/x11/kde/games3/Makefile
index bf5276c241a..b013a467fd5 100644
--- a/x11/kde/games3/Makefile
+++ b/x11/kde/games3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.81 2018/06/29 22:16:25 espie Exp $
+# $OpenBSD: Makefile,v 1.82 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT =		K Desktop Environment, games
 
@@ -19,19 +19,21 @@ RUN_DEPENDS +=	devel/desktop-file-utils \
 LIB_DEPENDS = 	x11/kde/libs3
 SEPARATE_BUILD =	flavored
 
-REVISION =	22
-WANTLIB = GL ICE SM X11 Xau Xcursor Xdamage Xdmcp Xext Xfixes Xft Xi Xinerama \
-	Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 artsflow artsflow_idl \
-	audiofile c drm expat fam fontconfig freetype glib-2.0 gmodule-2.0 \
-	gthread-2.0 idn jpeg kmedia2_idl kwalletclient lcms lib/kde3/DCOP \
-	lib/kde3/artskde lib/kde3/kdecore>=6 lib/kde3/kdefx lib/kde3/kdeprint \
-	lib/kde3/kdesu lib/kde3/kdeui lib/kde3/kdnssd lib/kde3/kio \
-	lib/kde3/kparts m mad mcop mng ogg pcre png pthread \
-	qtmcop sndio soundserver_idl ${COMPILER_LIBCXX} util vorbis vorbisenc vorbisfile \
-	xcb z
-WANTLIB += avahi-client avahi-common dbus-1 dns_sd iconv intl
+REVISION =	23
+
+WANTLIB += GL ICE SM X11 Xau Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 artsflow
+WANTLIB += artsflow_idl audiofile c drm expat fam fontconfig freetype glib-2.0
+WANTLIB += gmodule-2.0 gthread-2.0 idn jpeg kmedia2_idl kwalletclient lcms
+WANTLIB += lib/kde3/DCOP lib/kde3/artskde lib/kde3/kdecore>=6 lib/kde3/kdefx
+WANTLIB += lib/kde3/kdeprint lib/kde3/kdesu lib/kde3/kdeui lib/kde3/kdnssd
+WANTLIB += lib/kde3/kio lib/kde3/kparts m mad mcop mng ogg pcre png pthread
+WANTLIB += qtmcop sndio soundserver_idl ${COMPILER_LIBCXX} util vorbis vorbisenc
+WANTLIB += vorbisfile xcb z avahi-client avahi-common dbus-1 dns_sd iconv intl
 WANTLIB += FLAC X11-xcb glapi xcb-dri2 xcb-glx
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${MODKDE_HTML_SUBDIR}/en/common
 
diff --git a/x11/kde/libs3/Makefile b/x11/kde/libs3/Makefile
index 95463ce79c4..47040b0ae62 100644
--- a/x11/kde/libs3/Makefile
+++ b/x11/kde/libs3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.162 2018/08/29 14:01:44 espie Exp $
+# $OpenBSD: Makefile,v 1.163 2018/10/24 14:28:13 sthen Exp $
 
 BROKEN-alpha =		.got subsegment exceeds 64K
 BROKEN-mips64 =		.got subsegment exceeds 64K
@@ -12,8 +12,8 @@ PKGNAME-main =		${DISTNAME}
 PKGSPEC-main =		kdelibs->=3,<4
 PKGNAME-langlist =	kde3-langlist-${VERSION}
 PKG_ARCH-langlist =	*
-REVISION-main =		50
-REVISION-langlist =	2
+REVISION-main =		51
+REVISION-langlist =	3
 
 MODKDE_VERSION =	3.5.8
 
@@ -71,6 +71,8 @@ WANTLIB-main += xcb-glx xml2 xslt z
 WANTLIB-main += crypto ssl xcb-dri3 xcb-present xcb-sync xshmfence
 WANTLIB-langlist =
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MULTI_PACKAGES =	-main -langlist
 
 MODULES =		x11/kde
diff --git a/x11/mate/atril/Makefile b/x11/mate/atril/Makefile
index c501fab4eab..a81a613b1be 100644
--- a/x11/mate/atril/Makefile
+++ b/x11/mate/atril/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2018/09/20 11:15:18 robert Exp $
+# $OpenBSD: Makefile,v 1.23 2018/10/24 14:28:13 sthen Exp $
 
 USE_WXNEEDED=		Yes
 
 COMMENT=		document viewer for the MATE desktop
+REVISION=		0
 
 CATEGORIES=		graphics
 
@@ -37,6 +38,8 @@ WANTLIB += brotlicommon brotlidec fribidi webpdemux woff2common
 WANTLIB += woff2dec
 WANTLIB += xcb-dri3 xcb-present xcb-sync xshmfence zstd
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/dconf \
 			x11/gnome
 
diff --git a/x11/mate/pluma/Makefile b/x11/mate/pluma/Makefile
index dafd7c4b207..5cb53b97562 100644
--- a/x11/mate/pluma/Makefile
+++ b/x11/mate/pluma/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2018/09/20 11:16:33 robert Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:28:13 sthen Exp $
 
 USE_WXNEEDED=		Yes
 
 COMMENT=		powerful text editor for the MATE desktop
+REVISION=		0
 
 CATEGORIES=		textproc
 
@@ -22,6 +23,8 @@ WANTLIB += enchant gdk-3 gdk_pixbuf-2.0 girepository-1.0 graphite2
 WANTLIB += gtk-3 gtksourceview-3.0 harfbuzz lzma pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 peas-1.0 peas-gtk-1.0 png xml2
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/dconf \
 			x11/gnome
 
diff --git a/x11/mate/system-monitor/Makefile b/x11/mate/system-monitor/Makefile
index 120cd211ec4..5c72bb159fa 100644
--- a/x11/mate/system-monitor/Makefile
+++ b/x11/mate/system-monitor/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.4 2018/09/20 11:16:56 robert Exp $
+# $OpenBSD: Makefile,v 1.5 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=		MATE system monitor
+REVISION=		0
 
 MATE_PROJECT=		mate-system-monitor
 MATE_VERSION=		1.20.1
@@ -23,6 +24,8 @@ WANTLIB += lzma rsvg-2 xcb-util xml2
 WANTLIB += atkmm-1.6 gdkmm-3.0 cairomm-1.0 giomm-2.4 glibmm-2.4 gtkmm-3.0
 WANTLIB += pangomm-1.4 sigc-2.0 startup-notification-1 wnck-3
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		devel/dconf \
 			x11/gnome
 
diff --git a/x11/mplayer/Makefile b/x11/mplayer/Makefile
index 32c6cccc75d..4192ef6f533 100644
--- a/x11/mplayer/Makefile
+++ b/x11/mplayer/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.291 2018/09/24 08:11:27 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.292 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=	movie player supporting many formats
 
 V=		20180916
 FFMPEG_V=	2.8.15
 DISTNAME=	mplayer-${V}
-REVISION=	0
+REVISION=	1
 CATEGORIES=	x11 multimedia
 MASTER_SITES=	http://comstyle.com/source/
 EXTRACT_SUFX=	.tar.xz
@@ -25,7 +25,7 @@ WANTLIB=	EGL GL SDL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass \
 		postproc pthread sndio ssl ${COMPILER_LIBCXX} swscale \
 		swresample util x264 xvidcore z
 
-COMPILER=	base-clang base-gcc
+COMPILER=	base-clang ports-gcc base-gcc
 COMPILER_LANGS=	c
 
 LIB_DEPENDS=	archivers/bzip2 \
diff --git a/x11/nx/nxcomp/Makefile b/x11/nx/nxcomp/Makefile
index f35dc90cb89..6f4f8c949ef 100644
--- a/x11/nx/nxcomp/Makefile
+++ b/x11/nx/nxcomp/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2017/07/26 22:45:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=		library to compress the standard X protocol
 
 DASHVERSION=		2
-REVISION=		3
+REVISION=		4
 DISTNAME=		nxcomp-${MAJOR_VERSION}-${DASHVERSION}
 PKGNAME=		nxcomp-${MAJOR_VERSION}.${DASHVERSION}
 SHARED_LIBS=		Xcomp	1.0
@@ -12,6 +12,8 @@ MASTER_SITES=		${MASTER_SITES_NX:=nxcomp/}
 
 WANTLIB += jpeg m png ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		graphics/jpeg \
 			graphics/png
 
diff --git a/x11/nx/nxproxy/Makefile b/x11/nx/nxproxy/Makefile
index eeadd11793d..4ce3aeb8ef0 100644
--- a/x11/nx/nxproxy/Makefile
+++ b/x11/nx/nxproxy/Makefile
@@ -1,15 +1,18 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/26 22:45:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=		NX X proxy support tool
 
 DASHVERSION=		1
 DISTNAME=		nxproxy-${MAJOR_VERSION}-${DASHVERSION}
 PKGNAME=		nxproxy-${MAJOR_VERSION}.${DASHVERSION}
-REVISION =		3
+REVISION =		4
 
 MASTER_SITES=	${MASTER_SITES_NX:=nxproxy/}
 
 WANTLIB += c m ${COMPILER_LIBCXX} Xcomp
+
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		x11/nx/nxcomp
 
 CONFIGURE_STYLE=        gnu
diff --git a/x11/nx/nxssh/Makefile b/x11/nx/nxssh/Makefile
index ccd7a9fa363..e911c7a4a12 100644
--- a/x11/nx/nxssh/Makefile
+++ b/x11/nx/nxssh/Makefile
@@ -1,16 +1,18 @@
-# $OpenBSD: Makefile,v 1.25 2017/07/26 22:45:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=	OpenSSH client and daemon for NX
 
 DASH_VER=	2
 DISTNAME=	nxssh-${MAJOR_VERSION}-${DASH_VER}
 PKGNAME=	nxssh-${MAJOR_VERSION}.${DASH_VER}
-REVISION =	9
+REVISION =	10
 
 CATEGORIES=	net
 
 WANTLIB += Xcomp c crypto jpeg m png ${COMPILER_LIBCXX} util z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	https://distfiles.nl/
 
 LIB_DEPENDS=	x11/nx/nxcomp
diff --git a/x11/nx/opennx/Makefile b/x11/nx/opennx/Makefile
index b5bfc473d80..883642f93dc 100644
--- a/x11/nx/opennx/Makefile
+++ b/x11/nx/opennx/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.48 2018/09/04 12:46:28 espie Exp $
+# $OpenBSD: Makefile,v 1.49 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=		OSS replacement for the Nomachine nxclient
 
 DISTNAME=		opennx-0.16.0.729
 CATEGORIES=		sysutils
-REVISION=		11
+REVISION=		12
 
 HOMEPAGE=		http://opennx.sourceforge.net/
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=opennx/}
@@ -21,6 +21,8 @@ WANTLIB += wx_base_net wx_base_xml wx_gtk2_adv wx_gtk2_core wx_gtk2_html
 WANTLIB += wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc xcb xcb-render
 WANTLIB += xcb-shm z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		x11/wxWidgets \
 			net/curl
 BUILD_DEPENDS=		archivers/zip \
diff --git a/x11/p5-Wx/Makefile b/x11/p5-Wx/Makefile
index d4cc4888228..ed463cfa670 100644
--- a/x11/p5-Wx/Makefile
+++ b/x11/p5-Wx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2017/07/26 22:45:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT =	interface to the wxWidgets cross-platform GUI toolkit
 
@@ -6,7 +6,7 @@ MODULES =	cpan
 DISTNAME =	Wx-0.9932
 CATEGORIES =	x11 devel
 CPAN_AUTHOR =	MDOOTSON
-REVISION =	0
+REVISION =	1
 
 # perl
 PERMIT_PACKAGE_CDROM =	Yes
@@ -15,6 +15,8 @@ WANTLIB += c m perl pthread ${COMPILER_LIBCXX} wx_base wx_base_net wx_base_xml
 WANTLIB += wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_html wx_gtk2_media
 WANTLIB += wx_gtk2_richtext wx_gtk2_stc wx_gtk2_xrc
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =	devel/p5-Alien-wxWidgets \
 		devel/p5-ExtUtils-XSpp
 
diff --git a/x11/pekwm/Makefile b/x11/pekwm/Makefile
index 94dc37fae3d..93f8b9bc5cb 100755
--- a/x11/pekwm/Makefile
+++ b/x11/pekwm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.34 2017/12/20 17:22:37 jca Exp $
+# $OpenBSD: Makefile,v 1.35 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=	aewm++ based pretty themable window manager
 
 DISTNAME=	pekwm-0.1.17
-REVISION=	3
+REVISION=	4
 CATEGORIES=	x11
 
 HOMEPAGE=	https://www.pekwm.org/
@@ -17,6 +17,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c iconv jpeg m png z
 WANTLIB += ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${HOMEPAGE}/files/
 EXTRACT_SUFX=	.tar.bz2
 LIB_DEPENDS=	converters/libiconv \
diff --git a/x11/polkit-qt/Makefile b/x11/polkit-qt/Makefile
index eda4aaf7cfc..272a8d4d162 100644
--- a/x11/polkit-qt/Makefile
+++ b/x11/polkit-qt/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2017/07/27 10:15:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=	PolicyKit authentication agent for Qt
 
 V=		0.112.0
 DISTNAME=	polkit-qt-1-${V}
-REVISION =	6
+REVISION =	7
 
 SHARED_LIBS +=  polkit-qt-agent-1         2.0 # 0.99
 SHARED_LIBS +=  polkit-qt-core-1          2.0 # 0.99
@@ -29,6 +29,8 @@ WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += gthread-2.0 m polkit-agent-1 polkit-gobject-1
 WANTLIB += ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_KDE:=stable/apps/KDE4.x/admin/}
 
 FLAVORS=	qt5
diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index 8c0d90d4161..0f6c8b16dba 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2017/11/12 15:17:47 naddy Exp $
+# $OpenBSD: Makefile,v 1.52 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT-main=	python Qt4 bindings
 COMMENT-docs=	py-qt4 documentation
@@ -12,8 +12,8 @@ PKGNAME=	py-qt4-${V}
 PKGNAME-main=	py-qt4-${V}
 PKGNAME-docs=	py-qt4-docs-${V}
 EPOCH=		0
-REVISION-docs=	0
-REVISION-main=	1
+REVISION-docs=	1
+REVISION-main=	2
 
 CATEGORIES=	x11 devel
 
@@ -28,6 +28,8 @@ WANTLIB += QtWebKit QtXml QtXmlPatterns SM X11 Xext Xi Xinerama Xrender
 WANTLIB += c dbus-1 fontconfig freetype m phonon pthread ${COMPILER_LIBCXX}
 WANTLIB += ${MODPY_WANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MULTI_PACKAGES=	-main -docs
 
 WANTLIB-docs=
diff --git a/x11/py-wxPython/Makefile b/x11/py-wxPython/Makefile
index f8b904e245b..6ba2cec2de8 100644
--- a/x11/py-wxPython/Makefile
+++ b/x11/py-wxPython/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2017/07/26 22:45:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=	Python bindings for wxWidgets C++ class library
 
 V=		2.8.12.0
-REVISION=	4
+REVISION=	5
 DISTNAME=	wxPython-src-$V
 PKGNAME=	py-wxPython-$V
 CATEGORIES=	x11 devel
@@ -25,6 +25,8 @@ WANTLIB +=	wx_gtk2_aui wx_gtk2_richtext wx_gtk2_gizmos wx_gtk2_stc \
 		wx_gtk2_gl wx_base wx_gtk2_adv wx_gtk2_xrc wx_gtk2_core \
 		wx_base_net wx_gtk2_dbgrid m pthread ${COMPILER_LIBCXX} ${MODPY_WANTLIB}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 WRKSRC=		${WRKDIST}/wxPython
 
 SUBST_VARS +=	WRKINST
diff --git a/x11/qrfcview/Makefile b/x11/qrfcview/Makefile
index e8e0776b5e4..d48ccd86ad8 100755
--- a/x11/qrfcview/Makefile
+++ b/x11/qrfcview/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2017/07/26 22:45:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=	viewer for IETF RFCs
 
@@ -12,13 +12,15 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
 WANTLIB += QtGui QtNetwork c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # requires qmake fix
 BUILD_DEPENDS=	x11/qt4>=4.8.7p6
 
 GH_ACCOUNT=	saghul
 GH_PROJECT=	qrfcview-osx
 GH_TAGNAME=	1.0.0
-REVISION=	0
+REVISION=	1
 
 MODULES=	devel/qmake x11/qt4
 
diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile
index d137cf2e256..546c8498f3c 100644
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.125 2018/07/29 15:15:16 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.126 2018/10/24 14:28:13 sthen Exp $
 
 # no libGL (toolchain issue)
 NOT_FOR_ARCHS= m88k
@@ -19,12 +19,12 @@ FULLPKGNAME-html=	qt3-html-${VERSION}
 FULLPKGPATH-html=	x11/qt3,-html
 PKGNAME-sqlite2=	qt3-sqlite2-${VERSION}
 
-REVISION-mysql=		12
-REVISION-postgresql=	9
-REVISION-main=		15
-REVISION-html=		4
-REVISION-examples=	5
-REVISION-sqlite2=	9
+REVISION-mysql=		13
+REVISION-postgresql=	10
+REVISION-main=		16
+REVISION-html=		5
+REVISION-examples=	6
+REVISION-sqlite2=	10
 
 # the qt-mt library version number is used in a directory name.
 # when bumping, be sure to also bump MODQT3_PLUGINS in qt3.port.mk
@@ -48,7 +48,6 @@ MASTER_SITES=	https://download.qt.io/archive/qt/3/
 # Old official site
 MASTER_SITES0=	ftp://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/
 
-
 PATCHFILES=	qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2:0
 PATCH_DIST_STRIP=	-p1
 
@@ -67,6 +66,8 @@ FLAVOR?=
 # GPL/QPL
 PERMIT_PACKAGE_CDROM=	Yes
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 USE_GROFF =	Yes
 MAKE_ENV=	QTDIR="${WRKDIST}" EXTRA_SAMPLES="${EXTRA_SAMPLES}" \
 		SYS_CXX="${CXX}" SYS_CXXFLAGS="${CXXFLAGS}" \
diff --git a/x11/qt4/Makefile b/x11/qt4/Makefile
index 1c784da2b1a..68bd2875027 100644
--- a/x11/qt4/Makefile
+++ b/x11/qt4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.154 2018/08/27 03:54:57 tb Exp $
+# $OpenBSD: Makefile,v 1.155 2018/10/24 14:28:13 sthen Exp $
 
 USE_WXNEEDED =		Yes # QtWebKit
 
@@ -25,14 +25,14 @@ PKGNAME-main =		qt4-${PKGVERSION}
 PKGNAME-debug =		qt4-debug-${PKGVERSION}
 FULLPKGNAME-html =	qt4-html-${PKGVERSION}
 FULLPKGPATH-html =	${BASE_PKGPATH},-html
-REVISION-main =		17
-REVISION-mysql =	4
-REVISION-postgresql =	4
-REVISION-sqlite2 =	4
-REVISION-tds =		4
+REVISION-main =		18
+REVISION-mysql =	5
+REVISION-postgresql =	5
+REVISION-sqlite2 =	5
+REVISION-tds =		5
 REVISION-debug =	2
-REVISION-examples =	5
-REVISION-html =		1
+REVISION-examples =	6
+REVISION-html =		2
 
 # XXX qmake include parser is bogus
 DPB_PROPERTIES =	parallel	nojunk
@@ -82,6 +82,8 @@ MAKE_ENV =	QTDIR="${WRKDIST}" EXTRA_SAMPLES="${EXTRA_SAMPLES}" \
 		SYS_CXX="${CXX}" SYS_CXXFLAGS="${CXXFLAGS}" \
 		LD_LIBRARY_PATH="${WRKDIST}/lib"
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 # For qsettings to write its setup
 PORTHOME =	${WRKDIST}
 
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index bb1e5d43015..1db45622ebc 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2018/05/28 18:47:00 landry Exp $
+# $OpenBSD: Makefile,v 1.27 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT-main =		Qt Widgets for Technical Applications
 COMMENT-common =	common files for the qwt packages
@@ -9,7 +9,7 @@ SHARED_LIBS =		qwt${QTLIBSUFFIX} 7.0
 PKGNAME-main =	qwt-${VERSION}
 FULLPKGNAME-common =	qwt-common-${VERSION}
 FULLPKGPATH-common =	x11/qwt,-common
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		x11
 EXTRACT_SUFX =		.tar.bz2
@@ -30,6 +30,8 @@ MULTI_PACKAGES=		-main -common
 FLAVORS =		qt5
 FLAVOR ?=
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 .if ${FLAVOR:Mqt5}
 PKGSPEC-main =	qwt-*-qt5
 MODULES +=	x11/qt5
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 4e026142e56..a5e4390204a 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.43 2018/09/04 12:46:28 espie Exp $
+# $OpenBSD: Makefile,v 1.44 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT =	clone of rxvt with Unicode and Xft support
 
 DISTNAME =	rxvt-unicode-9.22
-REVISION =	6
+REVISION =	7
 CATEGORIES =	x11
 FIX_EXTRACT_PERMISSIONS=Yes
 
@@ -22,6 +22,8 @@ WANTLIB += ${COMPILER_LIBCXX} X11 Xft Xmu Xrender Xt c fontconfig
 WANTLIB += freetype gdk_pixbuf-2.0 glib-2.0 gobject-2.0 intl m
 WANTLIB += perl startup-notification-1 z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS =	devel/gettext \
 		devel/startup-notification \
 		graphics/gdk-pixbuf2
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index c6a6469ebf6..b61af0f532f 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.52 2018/09/04 12:46:28 espie Exp $
+# $OpenBSD: Makefile,v 1.53 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=	simple login manager
 
 DISTNAME=	slim-1.3.6
-REVISION=	22
+REVISION=	23
 
 SHARED_LIBS=	slim	0.0 # 1.3
 
@@ -25,6 +25,8 @@ LIB_DEPENDS=	graphics/jpeg \
 WANTLIB += X11 Xft Xmu Xrandr Xrender c ck-connector dbus-1
 WANTLIB += fontconfig freetype jpeg m png pthread ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_ARGS= -DUSE_CONSOLEKIT:Bool=Yes
 
 pre-configure:
diff --git a/x11/treewm/Makefile b/x11/treewm/Makefile
index 10b9964df3e..bbb8aa7f9de 100644
--- a/x11/treewm/Makefile
+++ b/x11/treewm/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.23 2018/05/25 13:01:42 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=		tree window manager
 DISTNAME=		treewm-0.4.5
-REVISION=		6
+REVISION=		7
 CATEGORIES=		x11
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=treewm/}
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += ICE SM X11 Xau Xdmcp Xext Xmu Xpm Xt Xxf86vm c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS=		devel/imake
 
 USE_GMAKE=		Yes
diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile
index 237b897b667..89c1f4a41d7 100644
--- a/x11/vlc/Makefile
+++ b/x11/vlc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.220 2018/09/16 06:05:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.221 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT-main=	VideoLAN client; multimedia player
 COMMENT-jack=	JACK audio output module for VLC
@@ -10,7 +10,7 @@ PKGNAME-jack=	vlc-jack-${V}
 CATEGORIES=	x11
 MASTER_SITES=	https://download.videolan.org/pub/videolan/vlc/${V}/
 EXTRACT_SUFX=	.tar.xz
-REVISION-main=	2
+REVISION=	3
 
 SHARED_LIBS=	vlc	3.0 \
 		vlccore	3.0
@@ -49,7 +49,7 @@ AUTOMAKE_VERSION= 1.15
 
 MODULES=	x11/qt4
 
-COMPILER =	base-clang base-gcc
+COMPILER =	base-clang ports-gcc base-gcc
 
 WANTLIB-main += ${COMPILER_LIBCXX}
 
diff --git a/x11/waimea/Makefile b/x11/waimea/Makefile
index bb87d80cfbb..8ee7fca15a9 100644
--- a/x11/waimea/Makefile
+++ b/x11/waimea/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=		virtual desktop manager for X11
 
 VERSION=		0.4.0
 DISTNAME=		waimea-${VERSION}
-REVISION =		8
+REVISION =		9
 CATEGORIES=		x11
 
 HOMEPAGE=		http://www.freedesktop.org/wiki/Software/waimea
@@ -18,6 +18,8 @@ WANTLIB += ICE SM X11 Xau Xdmcp Xext Xft Xinerama Xrandr Xrender
 WANTLIB += c expat fontconfig freetype m ${COMPILER_LIBCXX}
 WANTLIB += xcb z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 AUTOCONF_VERSION=	2.52
 CONFIGURE_STYLE=	autoconf
 CONFIGURE_ARGS=		--disable-pixmap
diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index 25c2a3259f0..55195738725 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2018/06/27 21:04:23 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT =		Mac OS-X style lightweight application launcher
 
 DISTNAME =		wbar-2.3.4
 EXTRACT_SUFX =		.tgz
-REVISION =		6
+REVISION =		7
 
 CATEGORIES=		x11
 
@@ -15,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += Imlib2 X11 Xext c freetype intl m ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=wbar/}
 
 MODULES =		textproc/intltool
diff --git a/x11/wm2/Makefile b/x11/wm2/Makefile
index 24147fb0b6a..15e2ca6c0b6 100644
--- a/x11/wm2/Makefile
+++ b/x11/wm2/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2017/07/26 22:45:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=		stylish window manager
 
 DISTNAME=		wm2-4
-REVISION =		2
+REVISION =		3
 CATEGORIES=		x11
 
 HOMEPAGE=		http://www.all-day-breakfast.com/wm2/
@@ -13,6 +13,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		X11 Xext Xau Xdmcp c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=		http://www.all-day-breakfast.com/wm2/
 
 FAKE_FLAGS=		PREFIX="${PREFIX}"
diff --git a/x11/wmi/Makefile b/x11/wmi/Makefile
index 8517b271fc1..49bc0a47f05 100644
--- a/x11/wmi/Makefile
+++ b/x11/wmi/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2018/05/25 13:01:41 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=	window manager improved - key driven window manager
 
 DISTNAME=	wmi-10
-REVISION =	8
+REVISION =	9
 CATEGORIES=	x11
 
 # MIT
@@ -11,6 +11,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += ICE SM X11 Xft c m ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	http://dl.suckless.org/misc/
 
 SEPARATE_BUILD=	Yes
diff --git a/x11/wmx/Makefile b/x11/wmx/Makefile
index e925fb76eac..abd91680548 100644
--- a/x11/wmx/Makefile
+++ b/x11/wmx/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.28 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=	minimal window manager
 
 DISTNAME=	wmx-8
 CATEGORIES=	x11
-REVISION =	3
+REVISION =	4
 
 HOMEPAGE=	http://www.all-day-breakfast.com/wmx/
 MASTER_SITES=	${HOMEPAGE}
@@ -16,6 +16,8 @@ PERMIT_DISTFILES_FTP=	no license
 WANTLIB += ICE SM X11 Xau Xcomposite Xdmcp Xext Xft Xpm Xrender c expat
 WANTLIB += fontconfig freetype m ${COMPILER_LIBCXX} xcb z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=	gnu
 
 NO_TEST=	Yes
diff --git a/x11/wxSVG/Makefile b/x11/wxSVG/Makefile
index 6d789369703..db3f60a561d 100644
--- a/x11/wxSVG/Makefile
+++ b/x11/wxSVG/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2018/04/26 21:03:29 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.44 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=		C++ library to create, manipulate and render SVG files
 
@@ -7,6 +7,7 @@ EPOCH=			0
 CATEGORIES=		x11 graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wxsvg/}
 EXTRACT_SUFX=		.tar.bz2
+REVISION=		0
 
 SHARED_LIBS+=		wxsvg	3.3
 
@@ -35,6 +36,8 @@ WANTLIB += x264 x265 xcb xcb-render xcb-shm xvidcore z
 WANTLIB += $(LIBECXX)
 .endif
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		graphics/cairo \
 			graphics/ffmpeg \
 			graphics/libexif \
diff --git a/x11/wxWidgets/Makefile b/x11/wxWidgets/Makefile
index ad1e10d48fa..8d73eb356d8 100644
--- a/x11/wxWidgets/Makefile
+++ b/x11/wxWidgets/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.60 2018/04/08 20:23:44 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.61 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT-main =	C++ cross-platform GUI toolkit
 COMMENT-media =	wxMediaCtrl class for wxWidgets
@@ -7,8 +7,8 @@ V =		2.8.12
 DISTNAME =	wxWidgets-${V}
 PKGNAME-main =	wxWidgets-gtk2-${V}
 PKGNAME-media =	wxWidgets-media-${V}
-REVISION-main =	16
-REVISION-media =11
+REVISION-main =	17
+REVISION-media =12
 CATEGORIES =	x11
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=wxwindows/}
 
@@ -42,6 +42,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 MULTI_PACKAGES = -main -media
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 BUILD_DEPENDS =	devel/cppunit \
 		devel/gettext-tools
 LIB_DEPENDS =	devel/gettext \
diff --git a/x11/x2goclient/Makefile b/x11/x2goclient/Makefile
index 8fa7537ef13..07b16bd399e 100644
--- a/x11/x2goclient/Makefile
+++ b/x11/x2goclient/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2018/10/23 19:28:47 jasper Exp $
+# $OpenBSD: Makefile,v 1.10 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT =	Qt4 client for the X2Go system
 
 DISTNAME =	x2goclient-4.1.2.1
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	x11
 
@@ -18,6 +18,8 @@ WANTLIB += ${COMPILER_LIBCXX} ICE QtGui QtNetwork QtSvg SM X11
 WANTLIB += Xext Xi Xinerama Xpm Xrender c cups fontconfig freetype
 WANTLIB += ldap m ssh
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES =	https://code.x2go.org/releases/source/x2goclient/
 
 MODULES +=	x11/qt4
diff --git a/x11/xchm/Makefile b/x11/xchm/Makefile
index 7ef60596ebb..4ee31e14802 100644
--- a/x11/xchm/Makefile
+++ b/x11/xchm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2018/06/27 21:04:23 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=	display chm files
 
 DISTNAME=	xchm-1.23
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	devel textproc x11
 
@@ -23,6 +23,8 @@ WANTLIB += m c ${COMPILER_LIBCXX} pthread chm wx_base_xml wx_gtk2_qa wx_base_odb
 WANTLIB += wx_gtk2_html wx_base wx_gtk2_adv wx_gtk2_xrc wx_gtk2_core
 WANTLIB += wx_base_net wx_gtk2_dbgrid wx_gtk2_aui wx_gtk2_richtext
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
diff --git a/x11/xfce4/orage/Makefile b/x11/xfce4/orage/Makefile
index bd1b38096ab..3ac8928083b 100644
--- a/x11/xfce4/orage/Makefile
+++ b/x11/xfce4/orage/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.56 2018/06/29 22:16:35 espie Exp $
+# $OpenBSD: Makefile,v 1.57 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=	Xfce4 advanced calendar
 
 XFCE_GOODIE=	orage
 XFCE_VERSION=	4.12.1
-REVISION=	6
+REVISION=	7
 
 HOMEPAGE=	http://www.kolumbus.fi/~w408237/orage/
 # GPLv2
@@ -29,4 +29,6 @@ WANTLIB=	X11 Xcomposite Xcursor Xdamage Xext xcb-render \
 		xcb-shm xfce4panel-1.0 notify dbus-1 dbus-glib-1 graphite2 \
 		harfbuzz icui18n icuuc iconv intl ${COMPILER_LIBCXX} db icudata
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 .include <bsd.port.mk>
diff --git a/x11/xfce4/parole/Makefile b/x11/xfce4/parole/Makefile
index 26935db0a6c..3fe8907af8b 100644
--- a/x11/xfce4/parole/Makefile
+++ b/x11/xfce4/parole/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.48 2018/06/29 22:16:35 espie Exp $
+# $OpenBSD: Makefile,v 1.49 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT =	Xfce4 media player
 
 XFCE_VERSION =	1.0.1
 XFCE_GOODIE =	parole
 CATEGORIES +=	audio
-REVISION =	1
+REVISION =	2
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
@@ -21,6 +21,8 @@ WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread
 WANTLIB += startup-notification-1 ${COMPILER_LIBCXX} tag tag_c xcb xcb-render
 WANTLIB += xcb-shm xcb-util xfce4ui-2 xfce4util xfconf-0 z iconv intl
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES =	x11/xfce4
 MODXFCE_DESKTOP_FILE =	Yes
 MODXFCE_ICON_CACHE=	Yes
diff --git a/x11/xfce4/thunar-media-tags/Makefile b/x11/xfce4/thunar-media-tags/Makefile
index 93235292121..c7dd27cfe98 100644
--- a/x11/xfce4/thunar-media-tags/Makefile
+++ b/x11/xfce4/thunar-media-tags/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.29 2017/10/23 17:11:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=	Thunar media tags plugin
 
 XFCE_VERSION=	0.2.1
 THUNAR_PLUGIN=	thunar-media-tags-plugin
-REVISION =	2
+REVISION =	3
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
@@ -20,6 +20,8 @@ WANTLIB=	X11 Xcomposite Xcursor Xdamage Xext \
 		thunarx-2 tag tag_c xcb-render xcb-shm \
 		harfbuzz pthread graphite2 iconv intl
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=	x11/xfce4/thunar \
 		audio/taglib
 
diff --git a/x11/xfce4/tumbler/Makefile b/x11/xfce4/tumbler/Makefile
index 9f24e539460..0d56b4b681b 100644
--- a/x11/xfce4/tumbler/Makefile
+++ b/x11/xfce4/tumbler/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.33 2018/09/13 14:17:49 landry Exp $
+# $OpenBSD: Makefile,v 1.34 2018/10/24 14:28:13 sthen Exp $
 
 COMMENT=	D-Bus thumbnailing service
 
 XFCE_VERSION=	0.2.3
 XFCE_GOODIE=	tumbler
+REVISION=	0
 
 SHARED_LIBS+=	tumbler-1 0.0
 
@@ -21,6 +22,8 @@ WANTLIB += ${COMPILER_LIBCXX} ass avfilter avresample fribidi
 WANTLIB += gsm mp3lame opus postproc speex swresample vorbisenc
 WANTLIB += vpx x264 x265 xvidcore
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	x11/xfce4
 MODXFCE_PURGE_LA =	lib/tumbler-1/plugins lib/tumbler-1/plugins/cache
 
diff --git a/x11/xfce4/xfce4-whiskermenu/Makefile b/x11/xfce4/xfce4-whiskermenu/Makefile
index eb104f9907d..b414f7bcf88 100644
--- a/x11/xfce4/xfce4-whiskermenu/Makefile
+++ b/x11/xfce4/xfce4-whiskermenu/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.27 2018/10/01 19:59:46 landry Exp $
+# $OpenBSD: Makefile,v 1.28 2018/10/24 14:28:14 sthen Exp $
 
 COMMENT =	Xfce4 alternative applications menu panel plugin
 
 XFCE_VERSION =	2.3.0
 XFCE_PLUGIN =	whiskermenu
+REVISION =	0
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -18,4 +19,6 @@ MODXFCE_WANTLIB=	xfce4panel-2.0
 WANTLIB +=	cairo exo-2 garcon-1 gdk_pixbuf-2.0 gdk-3 gio-2.0 glib-2.0
 WANTLIB +=	gobject-2.0 gtk-3 xfce4ui-2 xfce4util ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 .include <bsd.port.mk>
diff --git a/x11/xfe/Makefile b/x11/xfe/Makefile
index ee8c2b88132..a0288a16106 100644
--- a/x11/xfe/Makefile
+++ b/x11/xfe/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.50 2018/10/03 13:38:16 bcallah Exp $
+# $OpenBSD: Makefile,v 1.51 2018/10/24 14:28:14 sthen Exp $
 
 COMMENT=	MS-Explorer like file manager for X
 
 DISTNAME=	xfe-1.43.1
 CATEGORIES=	x11
+REVISION=	0
 
 HOMEPAGE=	http://roland65.free.fr/xfe/
 MAINTAINER=	Brian Callahan <bcallah@openbsd.org>
@@ -14,6 +15,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += ${COMPILER_LIBCXX} FOX-1.6 X11 X11-xcb Xft Xrandr c
 WANTLIB += fontconfig freetype m png util xcb xcb-util z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xfe/}
 
 MODULES=	textproc/intltool
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index 4e1e0b284da..1df548cdc97 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.76 2018/05/17 10:23:12 espie Exp $
+# $OpenBSD: Makefile,v 1.77 2018/10/24 14:28:14 sthen Exp $
 
 COMMENT=	display the Earth on X11
 
@@ -9,7 +9,7 @@ HOMEPAGE=	http://www.shaderwrangler.com/xglobe/
 MASTER_SITES=	https://distfiles.nl/
 DISTNAME=	xglobe-0.5p2
 PKGNAME=	xglobe-0.5
-REVISION=	42
+REVISION=	43
 
 MAINTAINER=	Marc Espie <espie@openbsd.org>
 
@@ -17,6 +17,8 @@ MAINTAINER=	Marc Espie <espie@openbsd.org>
 PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=		X11 c m pthread ${COMPILER_LIBCXX}
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=		x11/qt3
 
 MAKE_FLAGS=	XGLOBE_DIR=${PREFIX}
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index 6e076f9c631..3be1d0eeffb 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.59 2017/07/26 22:45:35 sthen Exp $
+# $OpenBSD: Makefile,v 1.60 2018/10/24 14:28:14 sthen Exp $
 
 COMMENT=	draw pictures of the earth textured by an image
 
 DISTNAME=	xplanet-1.3.0
-REVISION=	2
+REVISION=	3
 CATEGORIES=	astro geo x11
 
 MAINTAINER=	Robert Nagy <robert@openbsd.org>
@@ -18,6 +18,8 @@ WANTLIB += X11 c charset fontconfig freetype gif glib-2.0 gobject-2.0
 WANTLIB += iconv intl jpeg m pango-1.0 pangoft2-1.0 png pthread
 WANTLIB += ${COMPILER_LIBCXX} z
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 LIB_DEPENDS=		devel/gettext \
 			devel/pango \
 			graphics/giflib \
diff --git a/x11/xsettingsd/Makefile b/x11/xsettingsd/Makefile
index fd0902c84d0..c78f60a9dfa 100644
--- a/x11/xsettingsd/Makefile
+++ b/x11/xsettingsd/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2018/04/11 13:25:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2018/10/24 14:28:14 sthen Exp $
 
 COMMENT=	lightweight XSETTINGS daemon
 
 GH_ACCOUNT=	derat
 GH_PROJECT=	xsettingsd
 GH_TAGNAME=	v1.0.0
+REVISION=	0
 
 CATEGORIES=	x11
 
@@ -13,6 +14,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += X11 Xau Xdmcp c m ${COMPILER_LIBCXX} xcb
 
+COMPILER =		base-clang ports-gcc base-gcc
+
 MODULES=	devel/scons
 
 MAKE_ENV=	${MODSCONS_ENV} \