12 files changed, 16 insertions, 16 deletions

diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index 1de8cbc2b628..c461777f6882 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -58,7 +58,7 @@ CONFIG+=	no-bonjour
 
 .include <bsd.port.pre.mk>
 # PCH is broken on GCC
-.if ${COMPILER_TYPE} == gcc
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 CONFIG+=	no-pch
 .endif
 
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index ff0c224d9cd8..e4338dd954f3 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -184,7 +184,7 @@ PLIST_SHAREDDIR_LIST=	share/mimelnk/application \
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD
-.if ${OSVERSION} < 1000000 || ${COMPILER_TYPE} == "gcc"
+.if ${OSVERSION} < 1000000 || ${CHOSEN_COMPILER_TYPE} == gcc
   IGNORE= builds only on greater than 10 and with clang
 .endif
 .endif
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 1d373c5307ee..67a04f28ce9b 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -55,7 +55,7 @@ USE_LDCONFIG=	yes
 
 LOCCROOT=	OpenCAS
 OCCROOT=	${PREFIX}/${LOCCROOT}
-PLIST_SUB=	OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${COMPILER_TYPE}
+PLIST_SUB=	OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE}
 
 VIS_CMAKE_ON=		-DUSE_FREEIMAGE:BOOL=ON -DUSE_GL2PS:BOOL=ON	\
 			-DUSE_FREETYPE:BOOL=ON
@@ -110,17 +110,17 @@ post-build-DOCS-on:
 	(cd ${WRKSRC} && ./gendoc -overview)
 
 post-install:
-	${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${COMPILER_TYPE}/bin/DRAWEXE	\
+	${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/bin/DRAWEXE	\
 		${STAGEDIR}${PREFIX}/bin/
 	(cd ${STAGEDIR}${PREFIX}/bin &&							\
-	${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bsd${BITS}/${COMPILER_TYPE}/bin/DRAWEXE)
-	${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${COMPILER_TYPE}/lib/lib*.so	\
+	${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/bin/DRAWEXE)
+	${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/lib/lib*.so	\
 		${STAGEDIR}${PREFIX}/lib/
 	(cd ${STAGEDIR}${PREFIX}/lib							\
 	&& for l in lib*.so; do								\
 	${MV} $${l} $${l}.0;								\
 	${LN} -sf $${l}.0 $${l};							\
-	${LN} -sf $${l}.0 ${STAGEDIR}${OCCROOT}/bsd${BITS}/${COMPILER_TYPE}/lib/$${l};	\
+	${LN} -sf $${l}.0 ${STAGEDIR}${OCCROOT}/bsd${BITS}/${CHOSEN_COMPILER_TYPE}/lib/$${l};	\
 	done)
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/OpenCASCADE
 	(cd ${STAGEDIR}${OCCROOT}/inc && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/OpenCASCADE)
diff --git a/devel/sdl2pp/Makefile b/devel/sdl2pp/Makefile
index a952a2ff41c8..1ae71bcf5d05 100644
--- a/devel/sdl2pp/Makefile
+++ b/devel/sdl2pp/Makefile
@@ -30,7 +30,7 @@ DOXYGEN_IMPLIES=	DOCS
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} == gcc
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 CXXFLAGS+=	-D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD
 .endif
 
diff --git a/games/libretro-cores/Makefile b/games/libretro-cores/Makefile
index ae49fb38d06e..00988ba9eaab 100644
--- a/games/libretro-cores/Makefile
+++ b/games/libretro-cores/Makefile
@@ -104,7 +104,7 @@ DOS2UNIX_FILES=	hatari/Makefile.libretro
 .include <bsd.port.pre.mk>
 
 # Avoid a lot of patching for 9.
-.if ${COMPILER_TYPE} == gcc
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 USE_CXXSTD=	gnu++11
 .endif
 
diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile
index 238b43da65db..20064d47bc57 100644
--- a/games/stonesoup/Makefile
+++ b/games/stonesoup/Makefile
@@ -70,7 +70,7 @@ LUA_MAKE_ARGS_OFF=	NO_LUA_BINDINGS=yes
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} != clang
+.if ${CHOSEN_COMPILER_TYPE} != clang
 CFLAGS+=	-D_GLIBCXX_USE_C99
 .endif
 
diff --git a/games/wyrmgus/Makefile b/games/wyrmgus/Makefile
index b8336f0a2e03..3efc992e566f 100644
--- a/games/wyrmgus/Makefile
+++ b/games/wyrmgus/Makefile
@@ -69,7 +69,7 @@ PHYSFS_CMAKE_OFF=	-DWITH_PHYSFS:BOOL=OFF
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} == gcc
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 CXXFLAGS+=	-D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD
 .endif
 
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index 6005e1410a9e..17fdba96bcf6 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -78,7 +78,7 @@ CAIRO_MAKE_ARGS_OFF=	CAIRO=False
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} == gcc
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 CXXFLAGS+=	-D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD
 .endif
 
diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile
index 562a1843fab3..79982692b134 100644
--- a/multimedia/assimp/Makefile
+++ b/multimedia/assimp/Makefile
@@ -23,7 +23,7 @@ CMAKE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=ON -DASSIMP_BUILD_TESTS:BOOL=OFF
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} == gcc
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 # GCC C++11 support is broken on FreeBSD (see PR 193528 for details)
 CXXFLAGS+=	-D_GLIBCXX_USE_C99
 .endif
diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile
index 9008fe295d88..8f08d2a75e70 100644
--- a/net-p2p/libtorrent/Makefile
+++ b/net-p2p/libtorrent/Makefile
@@ -38,7 +38,7 @@ KQUEUE_CONFIGURE_WITH=	kqueue
 # Disable amd64 atomic ops on i386 when using gcc
 # undefined reference to __sync_add_and_fetch_8
 # undefined reference to __sync_fetch_and_and_8
-.if ${ARCH} == "i386" && ${COMPILER_TYPE} == "gcc"
+.if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == gcc
 CONFIGURE_ARGS+=--disable-instrumentation
 .endif
 
diff --git a/x11-fm/wcmcommander/Makefile b/x11-fm/wcmcommander/Makefile
index 5f486b6c14b3..d55d3b977655 100644
--- a/x11-fm/wcmcommander/Makefile
+++ b/x11-fm/wcmcommander/Makefile
@@ -35,7 +35,7 @@ SSH_CMAKE_BOOL=		WITH_LIBSSH2
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} == gcc
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 CXXFLAGS+=	-D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD
 .endif
 
diff --git a/x11-toolkits/wxgtk30/Makefile b/x11-toolkits/wxgtk30/Makefile
index 922115bc8daf..fc2cc32ccbae 100644
--- a/x11-toolkits/wxgtk30/Makefile
+++ b/x11-toolkits/wxgtk30/Makefile
@@ -58,7 +58,7 @@ WEBKIT_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 .include <bsd.port.pre.mk>
 
 # PR 196703, 197031
-.if ${COMPILER_TYPE} == "gcc"
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 CONFIGURE_ARGS+=--disable-precomp-headers
 .endif