Index: head/audio/murmur/Makefile
===================================================================
--- head/audio/murmur/Makefile	(revision 425967)
+++ head/audio/murmur/Makefile	(revision 425968)
@@ -1,90 +1,90 @@
 # Created by: Ayumi M <ayu@commun.jp>
 # $FreeBSD$
 
 PORTNAME=	murmur
 PORTVERSION=	1.2.10
 PORTREVISION=	1
 CATEGORIES=	audio net
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Murmur is the server component of Mumble
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:devel/boost-libs
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USERS=		murmur
 GROUPS=		murmur
 USES=		compiler:c++11-lang qmake pkgconfig
 USE_QT4=	moc_build corelib network xml sql sql-sqlite3_run
 
 USE_OPENSSL=	YES
 
 USE_GITHUB=	YES
 GH_ACCOUNT=	mumble-voip
 GH_PROJECT=	mumble
 
 CONFIG=		no-client
 QMAKE_ARGS=	"CONFIG+=${CONFIG}"
 
 USE_RC_SUBR=	murmur
 SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
 
 OPTIONS_DEFINE=	ICE DBUS BONJOUR DOCS
 OPTIONS_DEFAULT=	BONJOUR
 ICE_DESC=	Ice Support
 BONJOUR_DESC=	Bonjour Support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MICE}
 LIB_DEPENDS+=	libIce.so:devel/ice
 .else
 CONFIG+=	no-ice
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
 USE_QT4+=	dbus
 .else
 CONFIG+=	no-dbus
 .endif
 
 .if ${PORT_OPTIONS:MBONJOUR}
 LIB_DEPENDS+=	libdns_sd.so:net/mDNSResponder
 .else
 CONFIG+=	no-bonjour
 .endif
 
 .include <bsd.port.pre.mk>
 # PCH is broken on GCC
-.if ${COMPILER_TYPE} == gcc
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 CONFIG+=	no-pch
 .endif
 
 .if ${OSVERSION} < 1000510
 EXTRA_PATCHES=	${FILESDIR}/FreeBSD9-patch-src_SSL.cpp
 .endif
 
 post-patch:
 	@${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro
 
 pre-install:
 	${SED} -i '' -e 's|database=.*|database=/var/db/murmur/murmur.sqlite|' ${WRKSRC}/scripts/murmur.ini
 	${SED} -i '' -e 's|#pidfile=.*|pidfile=/var/run/murmur/murmur.pid|' ${WRKSRC}/scripts/murmur.ini
 	${SED} -i '' -e 's|#logfile=.*|logfile=/var/log/murmur/murmur.log|' ${WRKSRC}/scripts/murmur.ini
 	${SED} -i '' -e 's|#host=.*|host=0.0.0.0|' ${WRKSRC}/scripts/murmur.ini
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${STAGEDIR}${PREFIX}/etc/murmur.ini.sample
 	${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${CP} ${WRKSRC}/man/murmurd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in CHANGES INSTALL LICENSE README README.Linux
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.post.mk>
Index: head/cad/kicad-devel/Makefile
===================================================================
--- head/cad/kicad-devel/Makefile	(revision 425967)
+++ head/cad/kicad-devel/Makefile	(revision 425968)
@@ -1,192 +1,192 @@
 # Created by: Michael Reifenberger <mr@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_SRC_DATE}
 #PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	LOCAL/mr
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=		${PORTNAME}
 
 MAINTAINER=		mr@FreeBSD.org
 COMMENT=		Schematic and PCB editing software
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libcurl.so:ftp/curl
 
 CONFLICTS=	kicad-2014*
 
 DOCVERSION=	1.1
 LIBVERSION=	1.0
 
 #CXXFLAGS+=	-std=c++11
 CXXFLAGS+=	-msse
 USE_GL=		glew glu gl
 USE_WX=		3.0
 WX_COMPS=	wx
 WX_UNICODE=	yes
 USE_GNOME=	atk cairo	# Required by libwx_gtk2_aui-2.8.so
 
 OPTIONS_DEFINE=	DOCS
 
 PLIST_SUB=	OPSYS=${OPSYS}	\
 		DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
 
 BINS=		cvpcb eeschema gerbview kicad pcbnew
 EXTRAS2RM=	linux-non_unicode linux wings3d LINUX.README	\
 		contrib_makefiles.txt running_kicad_under_W98.txt
 USES=		desktop-file-utils shared-mime-info compiler:c++11-lib tar:bzip2 cmake \
 		gettext python ssl
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Debug" \
 		-DKICAD_TESTING_VERSION=ON \
 		-DKICAD_BUILD_VERSION=${DISTVERSION} \
 		-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \
 		-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \
 		-DKICAD_SKIP_BOOST=YES
 
 .if exists(${LOCALBASE}/bin/konqueror)
 RUN_DEPENDS+=	konqueror:x11/kde4-baseapps
 .else
 RUN_DEPENDS+=	xpdf:graphics/xpdf
 .endif
 
 .if defined(BOOTSTRAP)
 BOOST_RELEASE=	1.54.0
 BOOST_VERS=	${BOOST_RELEASE:S|.|_|g}
 
 GIT_SRC_HASH=`cd ${WRKDIR}/kicad; git log -n 1 --pretty=format:"%H"`
 GIT_SRC_DATE=`cd "${WRKDIR}/kicad"; git log -n 1 --date=iso-local -n 1 --pretty=format:"%cd" | \
 	cut -c '1-19' | sed -e 's,-,,g' -e 's,:,,g' -e 's, ,,g'`
 
 .else
 .include "Makefile.git_rev"
 .endif
 
 showversions:
 	@${ECHO} "BOOST_RELEASE: ${BOOST_RELEASE}"
 	@${ECHO} "BOOST_VERS: ${BOOST_VERS}"
 	@${ECHO} "GIT_SRC_HASH: ${GIT_SRC_HASH}"
 	@${ECHO} "GIT_SRC_DATE: ${GIT_SRC_DATE}"
 	@${ECHO} "DISTDIR: ${DISTDIR}"
 	@${ECHO} "DIST_SUBDIR: ${DIST_SUBDIR}"
 	@${ECHO} "DISTNAME: ${DISTNAME}"
 	@${ECHO} "DISTVERSION: ${DISTVERSION}"
 
 .if defined(BOOTSTRAP)
 
 # Updating to new rev:
 # make do-fetch BOOTSTRAP=YES && make do-revisions BOOTSTRAP=YES && make do-distfile BOOTSTRAP=YES
 # make makesum && make clean
 # make && make makeplist && make generate-plist && make check-plist
 # < Check PLIST_FILE_LIST below >
 
 FETCH_DEPENDS+=	svn:devel/subversion
 BUILD_DEPENDS+=	git:devel/git
 FETCH_DEPENDS+=	git:devel/git
 
 do-distfile:
 	@if [ \! -d "${WRKDIR}/kicad-r${GIT_SRC_DATE}" ]; then \
 	  cd ${WRKDIR}; \
 	  mkdir "${WRKDIR}/kicad-r${GIT_SRC_DATE}"; \
 	  cd kicad; \
 	  find . -type d -name .git -prune -o -print | cpio -pdamuv "../kicad-r${GIT_SRC_DATE}"; \
 	fi;
 	@cd ${WRKDIR}; \
 	  tar xvf master.zip; \
 	  tar cvfy ${DISTDIR}/${DIST_SUBDIR}/kicad-r${GIT_SRC_DATE}.tar.bz2 \
 	    kicad-r${GIT_SRC_DATE} kicad-library-master
 
 do-revisions:
 	echo "BOOST_RELEASE=  ${BOOST_RELEASE}" > ${MASTERDIR}/Makefile.git_rev
 	echo "BOOST_VERS=  ${BOOST_VERS}"   >> ${MASTERDIR}/Makefile.git_rev
 	echo "GIT_SRC_HASH=  ${GIT_SRC_HASH}"   >> ${MASTERDIR}/Makefile.git_rev
 	echo "GIT_SRC_DATE=  ${GIT_SRC_DATE}"   >> ${MASTERDIR}/Makefile.git_rev
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	@${ECHO} ${WRKSRC}
 	@if [ \! -d "${WRKDIR}/kicad" ]; then \
 	  cd ${WRKDIR}; \
 	  echo git clone https://git.launchpad.net/kicad; \
 	fi;
 	@if [ \! -f "${WRKDIR}/master.zip" ]; then \
 	  ${FETCH_CMD} --no-verify-peer -o ${WRKDIR}/master.zip https://github.com/KiCad/kicad-library/archive/master.zip; \
 	fi;
 
 .endif
 
 tmp:
 	echo "${DATADIR} ${DATADIR:H}"
 
 post-configure:
 	${REINPLACE_CMD} -e 's|#define HAVE_ISO646_H|//#define HAVE_ISO646_H|'     \
 		${WRKSRC}/config.h
 	for f in `${FIND} ${WRKSRC} -name \*.make -o -name link.txt` ; do				\
 		${REINPLACE_CMD}						\
 		-e 's|CC = gcc|#CC = gcc|'             				\
 		-e 's|LD = gcc|LD = ${CC}|'                     		\
 		-e 's|LD = g++|LD = ${CXX}|'                    		\
 		-e 's|wx-config|${WX_CONFIG}|'                  		\
 		-e 's|CXX_FLAGS =|CXX_FLAGS = -I${LOCALBASE}/include|'		\
 		-e 's|C_FLAGS =|C_FLAGS = -I${LOCALBASE}/include|'		\
 		-e 's|LDFLAGS =|LDFLAGS += -L${LOCALBASE}/lib|' 		\
 		-e 's|gcc -D|${CC} -D|'						\
 		-e 's/-pthread;-D_THREAD_SAFE/-pthread -D_THREAD_SAFE/g'	\
 		$$f ;								\
 	done
 
 pre-install:
 	@echo "${DATADIR}, ${DOCSDIR}"
 
 post-install:
 .for subdir in library modules template
 	${CP} -Rp ${WRKDIR}/kicad-library-master/${subdir} ${STAGEDIR}${DATADIR}
 .endfor
 #.for subdir in internat
 #	${CP} -Rp ${WRKDIR}/kicad-doc/${subdir} ${STAGEDIR}${DOCSDIR}
 #.endfor
 
 PLIST_FILE_LIST=	bin/freeroute.jnlp \
 			bin/cvpcb \
 			bin/eeschema \
 			bin/gerbview \
 			bin/kicad \
 			bin/pcbnew \
 			bin/pl_editor \
 			bin/bitmap2component \
 			bin/pcb_calculator \
 			share/mimelnk/application/x-kicad-schematic.desktop \
 			share/mimelnk/application/x-kicad-project.desktop \
 			share/icons/hicolor/24x24/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/48x48/apps/kicad.png \
 			share/icons/hicolor/48x48/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/scalable/apps/kicad.svg \
 			share/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg \
 			share/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/32x32/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/22x22/mimetypes/application-x-kicad-project.png \
 			share/mime/packages/kicad.xml \
 			share/applications/kicad.desktop \
 			share/applications/eeschema.desktop
 
 PLIST_DIR_LIST=		lib/kicad
 
 PLIST_SHAREDDIR_LIST=	share/mimelnk/application \
 			share/mimelnk
 
 .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
 
 .include <bsd.port.post.mk>
Index: head/cad/opencascade/Makefile
===================================================================
--- head/cad/opencascade/Makefile	(revision 425967)
+++ head/cad/opencascade/Makefile	(revision 425968)
@@ -1,145 +1,145 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
 
 PORTNAME=	opencascade
 PORTVERSION=	6.9.1
 PORTREVISION=	4
 CATEGORIES=	cad science
 MASTER_SITES=	LOCAL/thierry
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Open CASCADE Technology, 3D modeling & numerical simulation
 
 LICENSE=	OCTPL
 LICENSE_NAME=	LGPL21 with exception
 LICENSE_FILE=	${WRKSRC}/OCCT_LGPL_EXCEPTION.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libtbb.so:devel/tbb		\
 		libvtksys-${VTKVER}.so:math/vtk6
 RUN_DEPENDS=	bash:shells/bash
 
 # Check ${WRKSRC}/dox/overview/Overview.md
 # and ${WRKSRC}/dox/dev_guides/building
 USES=		alias:10 bison cmake compiler:c++11-lib dos2unix gmake \
 		shebangfix tk tar:tgz
 USE_XORG=	xmu
 DOS2UNIX_FILES=	adm/templates/*
 SHEBANG_FILES=	adm/templates/env.sh.in adm/templates/draw.sh		\
 		adm/templates/custom.sh.in adm/templates/custom.sh.main	\
 		adm/start.tcl draw.sh xcode.sh env.sh custom.sh.in	\
 		gendoc codeblocks.sh
 VTKVER=		6.2
 
 OPTIONS_DEFINE=	VIS DOCS
 VIS_DESC=	Build Visualizazion module (requires OpenGL, freetype, ftgl and gl2ps)
 OPTIONS_DEFAULT=VIS
 OPTIONS_SUB=	yes
 
 REINPLACE_ARGS=	-i ""
 CFLAGS+=	-I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}
 LDFLAGS+=	-L${LOCALBASE}/lib -L${TCL_LIBDIR} -L${TK_LIBDIR}
 CMAKE_ARGS+=	-D3RDPARTY_TCL_INCLUDE_DIR=${TCL_INCLUDEDIR}	\
 		-D3RDPARTY_TCL_LIBRARY=${TCL_LIBDIR}		\
 		-D3RDPARTY_TBB_DIR=${LOCALBASE}			\
 		-D3RDPARTY_TBB_LIBRARY_DIR=${LOCALBASE}/lib	\
 		-DINSTALL_DIR=${OCCROOT}/ -DUSE_TBB:BOOL=ON	\
 		-D3RDPARTY_TBBMALLOC_LIBRARY=${LOCALBASE}/lib/libtbbmalloc.so	\
 		-D3RDPARTY_TBB_LIBRARY=${LOCALBASE}/lib/libtbb.so	\
 		-D3RDPARTY_TBBMALLOC_LIBRARY_DIR=${LOCALBASE}/lib	\
 		-DUSE_VTK:BOOL=ON -D3RDPARTY_VTK_DIR=${LOCALBASE}	\
 		-D3RDPARTY_VTK_INCLUDE_DIR=${LOCALBASE}/include/vtk-${VTKVER}	\
 		-D3RDPARTY_VTK_LIBRARY_DIR=${LOCALBASE}/lib/vtk-${VTKVER}
 
 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
 VIS_CMAKE_OFF=		-DUSE_FREEIMAGE:BOOL=OFF -DUSE_GL2PS:BOOL=OFF	\
 			-DUSE_FREETYPE:BOOL=OFF
 VIS_USE=		GL=glu
 VIS_LIB_DEPENDS=	libftgl.so:graphics/ftgl		\
 			libfreetype.so:print/freetype2	\
 			libgl2ps.so:print/gl2ps		\
 			libfreeimageplus.so:graphics/freeimage
 
 VIS_CMAKE_ON=	-D3RDPARTY_FREETYPE_DIR=${LOCALBASE}	\
 		-D3RDPARTY_FREEIMAGE_DIR=${LOCALBASE}	\
 		-D3RDPARTY_GL2PS_DIR=${LOCALBASE}
 
 DOCS_USE=	TEX=latex:build
 DOCS_BUILD_DEPENDS=	bash:shells/bash		\
 			doxygen:devel/doxygen	\
 			dot:graphics/graphviz	\
 			inkscape:graphics/inkscape
 DOCS_RUN_DEPENDS=	${LOCALBASE}/www/MathJax/MathJax.js:www/mathjax
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 BITS=	32
 .else
 BITS=	64
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Warning: to build OpenCascade, you should have at least"
 	@${ECHO_MSG} "2.6 Gb of free disk space in build area!"
 	@${ECHO_MSG}
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|tclsh|${TCLSH}|' ${WRKSRC}/gendoc
 .for mod in TKDraw TKViewerTest
 	${REINPLACE_CMD} -e 's|tcl8.6|tcl${TCL_VER:C|\.||}|;s|tk8.6|tk${TK_VER:C|\.||}|'	\
 		${WRKSRC}/adm/cmake/${mod}/CMakeLists.txt
 .endfor
 .for mod in TKIVtk TKIVtkDraw
 	${REINPLACE_CMD} -E 's/(vtk[[:alnum:]]+)\-6.1/\1\-${VTKVER}/'	\
 		${WRKSRC}/adm/cmake/${mod}/CMakeLists.txt
 .endfor
 .for es in env.sh adm/templates/env.sh.in
 	${REINPLACE_CMD} -e 's|lin|bsd|' ${WRKSRC}/${es}
 .endfor
 
 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)
 	${RM} -r ${STAGEDIR}${OCCROOT}/inc
 	${LN} -sf ${PREFIX}/include/OpenCASCADE ${STAGEDIR}${OCCROOT}/inc
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} tests ${STAGEDIR}${OCCROOT})
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/overview && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${RMDIR} ${STAGEDIR}${DOCSDIR}/latex
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 	${MKDIR} /tmp/testOCC
 	bash -c "\
 	cd ${OCCROOT} && . ${OCCROOT}/env.sh &&	\
 	CSF_TestScriptsPath=${OCCROOT}/tests	\
 	CSF_TestDataPath=${OCCROOT}/data	\
 	DRAWEXE -f ${FILESDIR}/regtest "
 .endif
 
 .include <bsd.port.mk>
Index: head/devel/sdl2pp/Makefile
===================================================================
--- head/devel/sdl2pp/Makefile	(revision 425967)
+++ head/devel/sdl2pp/Makefile	(revision 425968)
@@ -1,44 +1,44 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sdl2pp
 PORTVERSION=	0.12.0
 CATEGORIES=	devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	C++11 bindings/wrapper for SDL2
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libSDL2pp
 GH_PROJECT=	libSDL2pp
 
 USES=		compiler:c++11-lib cmake
 CMAKE_ARGS=	-DSDL2PP_ENABLE_LIVE_TESTS=OFF \
 		-DSDL2PP_WITH_WERROR=ON
 USE_SDL=	sdl2 image2 mixer2 ttf2
 TEST_TARGET=	test
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS DOXYGEN
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_ALL_TARGET=	all doxygen
 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
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
 
 post-install-DOXYGEN-on:
 	cd ${CONFIGURE_WRKSRC} && ${COPYTREE_SHARE} doxygen ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.post.mk>
Index: head/games/libretro-cores/Makefile
===================================================================
--- head/games/libretro-cores/Makefile	(revision 425967)
+++ head/games/libretro-cores/Makefile	(revision 425968)
@@ -1,152 +1,152 @@
 # Created by: Yuri Victorovich <yuri@rawbw.com>
 # $FreeBSD$
 
 PORTNAME=	libretro-cores
 PORTVERSION=	0.20151110
 PORTREVISION=	2
 CATEGORIES=	games
 
 MAINTAINER=	yuri@rawbw.com
 COMMENT=	Core pack for RetroArch
 
 BUILD_DEPENDS=	cmake:devel/cmake
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 # core list (complete list that libretro distributes: http://buildbot.libretro.com/nightly/linux/x86_64/latest/)
 ALL_CORES+=	libretro:libretro-2048:2048:d69235a:x
 ALL_CORES+=	libretro:4do-libretro:4do:cbd700e:x
 ALL_CORES+=	libretro:blueMSX-libretro:bluemsx:ee4ff9c:x
 ALL_CORES+=	libretro:bsnes-libretro:bsnes:ee95143:accuracy,balanced,performance
 ALL_CORES+=	libretro:CATSFC-libretro:catsfc:5907687:x
 ALL_CORES+=	libretro:desmume:desmume:cae5945:x
 ALL_CORES+=	libretro:Dinothawr:dinothawr:b49d969:x
 ALL_CORES+=	libretro:dosbox-libretro:dosbox:bc5d578:x
 ALL_CORES+=	libretro:emux:emux:be9022b:chip8,gb,nes,sms
 ALL_CORES+=	libretro:fba_cores_cps1:fb_alpha_cps1:5614a9a:x
 ALL_CORES+=	libretro:fba_cores_cps2:fb_alpha_cps2:f806c77:x
 ALL_CORES+=	libretro:fbalpha:fbalpha:2a3256e:x
 ALL_CORES+=	libretro:libretro-fceumm:fceumm:70ee9e6:x
 ALL_CORES+=	libretro:fmsx-libretro:fmsx:4651948:x
 ALL_CORES+=	libretro:fuse-libretro:fuse:c871953:x
 ALL_CORES+=	libretro:gambatte-libretro:gambatte:59fb6a6:x
 ALL_CORES+=	libretro:Genesis-Plus-GX:genesis_plus_gx:7d8d5f1:x
 ALL_CORES+=	libretro:gpsp:gpsp:f1d14fb:x
 ALL_CORES+=	libretro:gw-libretro:gw:95e3c4d:x
 ALL_CORES+=	libretro:libretro-handy:handy:13d86fb:x
 ALL_CORES+=	libretro:hatari:hatari:204dc6e:x
 ALL_CORES+=	libretro:imageviewer-libretro:imageviewer:ae1465c:x
 #ALL_CORES+=	libretro:mame:mame:a9d5a09:x BROKEN: missing file: https://github.com/libretro/mame/issues/38
 ALL_CORES+=	libretro:mame2014-libretro:mame2014:6d370c1:x
 ALL_CORES+=	libretro:beetle-gba-libretro:mednafen_gba:5110115:x
 ALL_CORES+=	libretro:beetle-lynx-libretro:mednafen_lynx:a29513a:x
 ALL_CORES+=	libretro:beetle-ngp-libretro:mednafen_ngp:f18354e:x
 ALL_CORES+=	libretro:beetle-pce-fast-libretro:mednafen_pce_fast:6e2eaf7:x
 ALL_CORES+=	libretro:beetle-pcfx-libretro:mednafen_pcfx:5b62ae8:x
 ALL_CORES+=	libretro:beetle-psx-libretro:mednafen_psx:83b4b48:x
 ALL_CORES+=	libretro:beetle-bsnes-libretro:mednafen_snes:7d9be82:x
 ALL_CORES+=	libretro:beetle-supergrafx-libretro:mednafen_supergrafx:c6d3488:x
 ALL_CORES+=	libretro:beetle-vb-libretro:mednafen_vb:085e0b6:x
 ALL_CORES+=	libretro:beetle-wswan-libretro:mednafen_wswan:b850831:x
 ALL_CORES+=	libretro:meteor-libretro:meteor:38b10c0:x
 ALL_CORES+=	mgba-emu:mgba:mgba:b3d08ec:x
 #ALL_CORES+=	libretro:mupen64plus-libretro:mupen64plus:7db9296:x BROKEN: needs GLES,GL....
 ALL_CORES+=	libretro:nestopia:nestopia:dcaed96:x
 ALL_CORES+=	libretro:nxengine-libretro:nxengine:4723600:x
 ALL_CORES+=	libretro:libretro-o2em:o2em:c54042e:x
 ALL_CORES+=	libretro:pcsx_rearmed:pcsx_rearmed:ce36c10:x
 ALL_CORES+=	libretro:picodrive:picodrive:e912fdf:x
 #ALL_CORES+=	libretro:pocketsnes-libretro:pocketsnes:5339c79:x BROKEN: asm
 #ALL_CORES+=	libretro:libretro-ppsspp:ppsspp:ea17e27:x BROKEN: requires multiple distfiles?
 ALL_CORES+=	libretro:libretro-prboom:prboom:d34af3f:x
 ALL_CORES+=	libretro:prosystem-libretro:prosystem:7c8059c:x
 ALL_CORES+=	libretro:QuickNES_Core:quicknes:518638b:x
 #ALL_CORES+=	libretro:libretro-remotejoy:remotejoy:2e99718:x BROKEN: needs linux USB, is this linux-only?
 ALL_CORES+=	libretro:scummvm:scummvm:c3e719a:x
 ALL_CORES+=	libretro:snes9x:snes9x:ccf1ee2:x
 # broken for now
 ALL_CORES+=	libretro:snes9x2010:snes9x2010:dfb7eef:x
 ALL_CORES+=	libretro:stella-libretro:stella:96619e4:x
 ALL_CORES+=	libretro:tgbdual-libretro:tgbdual:b1bf294:x
 ALL_CORES+=	libretro:tyrquake:tyrquake:8261e19:x
 #ALL_CORES+=	libretro:libretro-uae:uae:7cbc230:x BROKEN: compile error https://github.com/libretro/libretro-uae/issues/4
 ALL_CORES+=	libretro:vba-next:vba_next:0c20cd9:x
 ALL_CORES+=	libretro:vbam-libretro:vbam:bedddba:x
 ALL_CORES+=	libretro:libretro-vecx:vecx:be67ef1:x
 ALL_CORES+=	libretro:virtualjaguar-libretro:virtualjaguar:ffec5c7:x
 ALL_CORES+=	libretro:yabause:yabause:b121882:x
 
 USE_GITHUB=	nodefault
 
 # variables that depend on ALL_CORES
 GH_TUPLE=	${ALL_CORES:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\1:\2:\4:\3,}
 CORE_DIRS=	${ALL_CORES:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\2,}
 
 #PLIST_FILES+=	${ALL_CORES:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),libexec/libretro/\3_libretro.so,}
 .for CORE in ${ALL_CORES}
 .for A in ${CORE:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\5,:S/,/ /g}
 PLIST_FILES+=	libexec/libretro/${CORE:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\3,}_${A}_libretro.so
 .endfor
 GIT_REV+=	GIT_REV_${CORE:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\3,}=$$(git ls-remote https://github.com/${CORE:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\1,}/${CORE:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\2,}.git | ${GREP} HEAD | ${SED} -E "s/^(.......).*/\\1/g") &&
 GIT_REV_ECHO+=	echo "GIT_REV_${CORE:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\3,}=$${GIT_REV_${CORE:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\3,}}" &&
 GIT_REV_CHANGE+=	if [ "${CORE:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\4,}" != "$${GIT_REV_${CORE:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\3,}}" ]; then echo "upstream revision changed: core=${CORE:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\3,} old=${CORE:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\4,}  new=$${GIT_REV_${CORE:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\3,}}"; fi &&
 .endfor
 
 PLIST_FILES:=	${PLIST_FILES:S/_x_libretro/_libretro/}
 
 WRKSRC=		${WRKDIR}/all-cores
 
 USES=		compiler:c++11-lib dos2unix gmake lua:53 python:2
 USE_LDCONFIG=	yes
 USE_GL=		gl
 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
 
 post-extract:
 	@${MKDIR} ${WRKSRC}
 .for dir in ${ALL_CORES:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\2:\3,}
 	@${MV} ${WRKSRC_${dir:C/^([^:]*):([^:]*)/\2/}} ${WRKSRC}/${dir:C/^([^:]*):([^:]*)/\1/}
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/"__VA_ARGS__/" __VA_ARGS__/' \
 		${WRKSRC}/desmume/desmume/src/wifi.cpp
 
 do-build:
 	@for dir in ${CORE_DIRS}; do \
 	  ${ECHO_MSG} "===>  Building for ${PKGNAME}: core $${dir} ($$(date))"; \
 	  cd ${WRKSRC}/$${dir}; \
 	  if [ -f Makefile.freebsd ]; then \
 	    ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile.freebsd ${_MAKE_JOBS} ${MAKE_ARGS}; \
 	  elif [ -f Makefile.libretro ]; then \
 	    ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile.libretro ${_MAKE_JOBS} ${MAKE_ARGS}; \
 	  else \
 	    ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${_MAKE_JOBS} ${MAKE_ARGS}; \
 	  fi; \
 	done;
 
 do-install:
 	@${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/libretro;
 	@for dir in ${CORE_DIRS}; do \
 	  ${INSTALL_LIB} $$(find ${WRKSRC}/$${dir}/ -name "*.so") ${STAGEDIR}/${PREFIX}/libexec/libretro; \
 	done;
 
 print-upstream-revisions:
 	@${ECHO} "--begin print upstream revisions--" && \
 		${GIT_REV} \
 		${GIT_REV_ECHO} \
 	${ECHO} "--end print upstream revisions--"
 
 print-updated-revisions:
 	@${ECHO} "--begin print updated revisions--" && \
 		${GIT_REV} \
 		${GIT_REV_CHANGE} \
 	${ECHO} "--end print updated revisions--"
 
 .include <bsd.port.post.mk>
Index: head/games/stonesoup/Makefile
===================================================================
--- head/games/stonesoup/Makefile	(revision 425967)
+++ head/games/stonesoup/Makefile	(revision 425968)
@@ -1,101 +1,101 @@
 # Created by: Tobias Rehbein <tobias.rehbein@web.de>
 # $FreeBSD$
 
 PORTNAME=	stonesoup
 PORTVERSION=	0.18.1
 PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/crawl-ref/Stone%20Soup/${PORTVERSION}
 MASTER_SITES=	http://crawl.develz.org/release/
 DISTNAME=	stone_soup-${PORTVERSION}-nodeps
 
 MAINTAINER=	lifanov@mail.lifanov.com
 COMMENT=	Dungeon Crawl Stone Soup - a fun, free rogue-like game
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../licence.txt
 
 BROKEN_powerpc64=	Does not build
 
 USES=		bison compiler:c++11-lib gmake lua:51 perl5 pkgconfig \
 		shebangfix sqlite tar:xz
 
 USE_PERL5=	build
 SHEBANG_FILES=	util/gen-mi-enum \
 		util/good-depfile
 
 SAVEDIR=	\~/.stonesoup
 WRKSRC=		${WRKDIR}/stone_soup-${PORTVERSION}/source/
 
 SUB_FILES=	README.FreeBSD
 PLIST_SUB=	SAVEDIR="${SAVEDIR}"
 
 MAKE_ARGS=	prefix=${PREFIX} \
 		DATADIR=${DATADIR} \
 		SAVEDIR=${SAVEDIR} \
 		DESTDIR=${STAGEDIR} \
 		INSTALL_UGRP=root:games \
 		NO_AUTO_OPT=YesPlease \
 		NO_OPTIMIZE=YesPlease \
 		NO_TRY_GOLD=YesPlease \
 		POSIX=YesPlease \
 		SQLITE_INCLUDE_DIR=${LOCALBASE}/include \
 		SQLITE_LIB=-lsqlite3 \
 		V=yes
 
 OPTIONS_DEFINE=	SDL SOUND NOWIZARD LUA DOCS EXAMPLES
 OPTIONS_DEFAULT=LUA
 OPTIONS_SUB=	yes
 
 SOUND_DESC=	Sound support
 NOWIZARD_DESC=	Disable Wizard mode
 LUA_DESC=	Bindings for LUA user scripts
 
 SDL_CONFLICTS=	${PORTNAME}-[0-9]*
 SDL_USE=	sdl=sdl2,image2 gl=gl,glu
 SDL_USES_OFF=	ncurses
 SDL_MAKE_ARGS=	TILES=y
 SDL_BUILD_DEPENDS=	\
 		fc-list:x11-fonts/fontconfig \
 		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
 SDL_RUN_DEPENDS=	\
 		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
 SDL_LIB_DEPENDS=libpng.so:graphics/png \
 		libfreetype.so:print/freetype2
 SDL_CONFLICTS_OFF=	${PORTNAME}-sdl-[0-9]*
 
 NOWIZARD_MAKE_ARGS=	NOWIZARD=y
 SOUND_RUN_DEPENDS=	sox:audio/sox
 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
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
 MAKE_ARGS+=	NO_YACC=YesPlease
 CFLAGS+=	-std=c++11
 LDFLAGS:=	-Wl,-rpath=${_GCC_RUNTIME} ${LDFLAGS}
 .endif
 
 post-patch-SOUND-on:
 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h
 	@${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h
 
 post-patch-SOUND-off:
 	@${REINPLACE_CMD} -e "s,%%SOUND%%,// ," ${WRKSRC}/AppHdr.h
 
 pre-install:
 	@${FIND} ${WRKSRC}/dat -type f -name '*.orig' -delete
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/settings/init.txt ${STAGEDIR}${EXAMPLESDIR}/sample.crawlrc
 
 .include <bsd.port.post.mk>
Index: head/games/wyrmgus/Makefile
===================================================================
--- head/games/wyrmgus/Makefile	(revision 425967)
+++ head/games/wyrmgus/Makefile	(revision 425968)
@@ -1,80 +1,80 @@
 # Created by: Travis Poppe <tlp@liquidx.org>
 # $FreeBSD$
 
 PORTNAME=	wyrmgus
 PORTVERSION=	1.9.9
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Modified Stratagus engine for Wyrmsun
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtolua++-${LUA_VER}.so:lang/tolua++
 
 USE_GITHUB=     yes
 GH_ACCOUNT=     Andrettin
 GH_PROJECT=     Wyrmgus
 
 USE_GL=		gl glu
 USE_SDL=	sdl
 USES=		compiler:c++11-lib cmake:outsource lua:51 pkgconfig sqlite
 CMAKE_ARGS=	-DGAMEDIR:STRING="bin" \
 		-DTOLUA++_APP:STRING="tolua++-${LUA_VER}" \
 		-DTOLUA++_INCLUDE_DIR:STRING="${LUA_INCDIR}" \
 		-DTOLUA++_LIBRARY:STRING="${LUA_LIBDIR}/libtolua++.so" \
 		-DENABLE_USEGAMEDIR:BOOL=OFF
 
 PORTDOCS=	*
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/wyrmsun.ico
 
 OPTIONS_DEFINE=	MIKMOD MNG THEORA VORBIS X11 FLUIDSYNTH PHYSFS DOCS
 OPTIONS_DEFAULT=VORBIS X11
 
 MIKMOD_LIB_DEPENDS=	libmikmod.so:audio/libmikmod
 MIKMOD_CMAKE_ON=	-DWITH_MIKMOD:BOOL=ON
 MIKMOD_CMAKE_OFF=	-DWITH_MIKMOD:BOOL=OFF
 
 MNG_DESC=		MNG image library support
 MNG_LIB_DEPENDS=	libmng.so:graphics/libmng
 MNG_CMAKE_ON=		-DWITH_MNG:BOOL=ON
 MNG_CMAKE_OFF=		-DWITH_MNG:BOOL=OFF
 
 THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 THEORA_CMAKE_ON=	-DWITH_THEORA:BOOL=ON
 THEORA_CMAKE_OFF=	-DWITH_THEORA:BOOL=OFF
 
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CMAKE_ON=	-DWITH_OGGVORBIS:BOOL=ON
 VORBIS_CMAKE_OFF=	-DWITH_OGGVORBIS:BOOL=OFF
 
 X11_DESC=		X11 clipboard pasting support
 X11_USE=		XORG=x11
 X11_CMAKE_ON=		-DWITH_X11:BOOL=ON
 X11_CMAKE_OFF=		-DWITH_X11:BOOL=OFF
 
 FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CMAKE_ON=	-DWITH_FLUIDSYNTH:BOOL=ON
 FLUIDSYNTH_CMAKE_OFF=	-DWITH_FLUIDSYNTH:BOOL=OFF
 
 PHYSFS_DESC=		PhysFS support
 PHYSFS_LIB_DEPENDS=	libphysfs.so:devel/physfs
 PHYSFS_CMAKE_ON=	-DWITH_PHYSFS:BOOL=ON
 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
 
 do-install:
 	${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/stratagus ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/src/win32/wyrmsun.ico ${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .include <bsd.port.post.mk>
Index: head/graphics/mapnik/Makefile
===================================================================
--- head/graphics/mapnik/Makefile	(revision 425967)
+++ head/graphics/mapnik/Makefile	(revision 425968)
@@ -1,111 +1,111 @@
 # Created by: Wen Heping <wenheping@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	mapnik
 PORTVERSION=	3.0.9
 DISTVERSIONPREFIX=	v
 PORTREVISION=	4
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/
 
 MAINTAINER=	littlesavage@rambler.ru
 COMMENT=	Free Toolkit For Developing Mapping Applications
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libboost_system.so:devel/boost-libs \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz
 
 BROKEN_powerpc=	does not install: runs out of virtual memory
 BROKEN_FreeBSD_9=	does not build: lack of c++11 support
 
 USES=		compiler:c++11-lib pkgconfig python scons tar:bzip2
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 MAKE_ARGS=	INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} | ${TR} ' ' ,`" \
 		CUSTOM_CFLAGS="${CFLAGS}" CUSTOM_CXXFLAGS="${CXXFLAGS}" \
 		CUSTOM_LDFLAGS="${LDFLAGS}"
 
 PORTDOCS=	*
 
 INPUT_PLUGINS=	csv raster shape geojson topojson
 
 OPTIONS_DEFINE=	CAIRO JPEG PNG TIFF WEBP PROJ
 OPTIONS_DEFAULT=CAIRO GDAL OGR POSTGIS PGRASTER SQLITE3 JPEG PNG TIFF PROJ WEBP
 OPTIONS_GROUP=	INPUT
 OPTIONS_GROUP_INPUT=	GDAL OGR POSTGIS PGRASTER SQLITE3
 OPTIONS_SUB=	yes
 
 INPUT_DESC=	Input plugins
 GDAL_DESC=	GDAL input plugin
 OGR_DESC=	OGR input plugin
 POSTGIS_DESC=	PostGIS input plugin
 PGRASTER_DESC=	PGraster input plugin
 SQLITE3_DESC=	SQLite input plugin
 
 PROJ_DESC=	proj4 support
 
 CAIRO_DESC=	Enable cairo rendering
 
 GDAL_VARS=		INPUT_PLUGINS+=gdal
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 OGR_VARS=		INPUT_PLUGINS+=ogr
 OGR_LIB_DEPENDS=	libgdal.so:graphics/gdal
 POSTGIS_VARS=		INPUT_PLUGINS+=postgis
 POSTGIS_USES=		pgsql
 PGRASTER_VARS=		INPUT_PLUGINS+=pgraster
 PGRASTER_USES=		pgsql
 SQLITE3_VARS=		INPUT_PLUGINS+=sqlite
 SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_MAKE_ARGS_OFF=	PNG=False
 JPEG_USES=		jpeg
 JPEG_MAKE_ARGS_OFF=	JPEG=False
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_MAKE_ARGS_OFF=	TIFF=False
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_MAKE_ARGS_OFF=	WEBP=False
 PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 PROJ_MAKE_ARGS_OFF=	PROJ=False
 
 CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
 CAIRO_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:graphics/py-cairo
 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
 
 pre-configure-SQLITE3-on:
 	@if ! ${LOCALBASE}/bin/sqlite3 :memory: 'create virtual table foo using rtree(pkid, xmin, xmax, ymin, ymax)' > /dev/null 2>&1; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "The SQLite plugin requires libsqlite3 built with RTREE support"; \
 		${ECHO_MSG} "Please, reinstall 'databases/sqlite3' port with R*Tree module enabled"; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \
 		-e 's#/usr/include#${LOCALBASE}/include#g' \
 		${WRKSRC}/SConstruct
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mapnik-index \
 		${STAGEDIR}${PREFIX}/bin/mapnik-render \
 		${STAGEDIR}${PREFIX}/bin/shapeindex
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mapnik/input/*.input
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS.md CHANGELOG.md README.md docs" \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
Index: head/multimedia/assimp/Makefile
===================================================================
--- head/multimedia/assimp/Makefile	(revision 425967)
+++ head/multimedia/assimp/Makefile	(revision 425968)
@@ -1,38 +1,38 @@
 # Created by: Yuri <yuri@tsoft.com>
 # $FreeBSD$
 
 PORTNAME=	assimp
 PORTVERSION=	3.3.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	multimedia
 
 MAINTAINER=	yuri@rawbw.com
 COMMENT=	Library to import various 3D model formats in a uniform manner
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_powerpc64=	Does not build
 
 USES=		cmake compiler:c++11-lib pkgconfig
 USE_GITHUB=		yes
 USE_LDCONFIG=	yes
 
 # CMAKE_ARGS instructs cmake to skip runtime path removal during install
 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
 
 post-patch: .SILENT
 	${REINPLACE_CMD} -e '/zzip-zlib-config/d' \
 		${WRKSRC}/cmake-modules/FindZLIB.cmake
 	${REINPLACE_CMD} -e '/working branch$$/,/^)/d ; /minizip/d ; \
 		s|$${ASSIMP_LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \
 		${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.post.mk>
Index: head/net-p2p/libtorrent/Makefile
===================================================================
--- head/net-p2p/libtorrent/Makefile	(revision 425967)
+++ head/net-p2p/libtorrent/Makefile	(revision 425968)
@@ -1,63 +1,63 @@
 # $FreeBSD$
 
 PORTNAME=	libtorrent
 PORTVERSION=	0.13.6
 PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://rtorrent.net/downloads/
 
 MAINTAINER=	pipfstarrd@openmailbox.org
 COMMENT=	BitTorrent Library written in C++
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS_INSTALL=	rblibtorrent-[0-9]* rblibtorrent-devel-[0-9]*
 
 USES=		compiler:c++11-lang libtool pathfix pkgconfig ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug
 CONFIGURE_ENV=	OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" OPENSSL_CFLAGS="-I\
 								${OPENSSLINC}"
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	IPV6 KQUEUE
 OPTIONS_DEFAULT=KQUEUE
 KQUEUE_DESC=	Use kqueue(2) support
 
 # This makes sure that /usr/local/lib appears before /usr/lib when
 # linking libtorrent to avoid linking with base's libcrypto.
 MAKE_ARGS=	LDFLAGS="${LDFLAGS}"
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 KQUEUE_CONFIGURE_WITH=	kqueue
 
 .include <bsd.port.pre.mk>
 
 # 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
 
 # Workaround to build on >= 10.x
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
 USE_CXXSTD=	c++11
 EXTRA_PATCHES+=	${FILESDIR}/extra-clang
 .endif
 
 post-patch:
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
 	@${FIND} ${WRKSRC} \( -name '*.h' -o -name '*.cc' \) -type f \
 		-exec ${REINPLACE_CMD} -e 's/tr1::/std::/g' {} \; \
 		-exec ${REINPLACE_CMD} -e 's/std::std::/std::/g' {} \; \
 		-exec ${REINPLACE_CMD} -e '/namespace tr1/d' {} \; \
 		-exec ${REINPLACE_CMD} -e '/include/s,tr1/,,' {} \;
 	@${REINPLACE_CMD} -e 's/\.assign/.fill/' \
 		${WRKSRC}/src/torrent/utils/extents.h \
 		${WRKSRC}/src/torrent/utils/log.cc
 .endif
 
 .include <bsd.port.post.mk>
Index: head/x11-fm/wcmcommander/Makefile
===================================================================
--- head/x11-fm/wcmcommander/Makefile	(revision 425967)
+++ head/x11-fm/wcmcommander/Makefile	(revision 425968)
@@ -1,48 +1,48 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	wcmcommander
 PORTVERSION=	0.20.0
 DISTVERSIONPREFIX=	release-
 PORTREVISION=	1
 CATEGORIES=	x11-fm
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Multi-platform open source file manager
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	corporateshark
 GH_PROJECT=	WCMCommander
 
 USES=		compiler:c++11-lib cmake:outsource
 CMAKE_ARGS=	-DDATADIR="${DATADIR_REL}"
 USE_XORG=	x11
 
 PORTDOCS=	CHANGELOG.txt README.md readme_eng.txt
 
 OPTIONS_DEFINE=	FREETYPE SMB SSH DOCS
 OPTIONS_DEFAULT=FREETYPE SMB SSH
 
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CMAKE_BOOL=	WITH_FREETYPE
 SMB_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
 SMB_CMAKE_BOOL=		WITH_SMBCLIENT
 SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
 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
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/x11-toolkits/wxgtk30/Makefile
===================================================================
--- head/x11-toolkits/wxgtk30/Makefile	(revision 425967)
+++ head/x11-toolkits/wxgtk30/Makefile	(revision 425968)
@@ -1,65 +1,65 @@
 # $FreeBSD$
 
 PORTNAME=	wx
 PORTVERSION=	3.0.2
 PORTREVISION?=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/wxwindows/${PORTVERSION}
 PKGNAMESUFFIX=	30-gtk2
 DISTNAME=	wxWidgets-${PORTVERSION}
 
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	The wxWidgets GUI toolkit with GTK+ bindings
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libexpat.so:textproc/expat2
 
 USES=		compiler:c++11-lib execinfo gmake iconv jpeg pkgconfig tar:bzip2
 USE_XORG=	x11 sm xxf86vm xinerama
 USE_GL=		glu
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libpng=sys \
 		--with-libjpeg=sys \
 		--with-libtiff=sys \
 		--with-zlib=sys \
 		--with-expat=sys \
 		--with-opengl \
 		--with-gtk \
 		--enable-backtrace \
 		--enable-graphics_ctx \
 		--enable-compat26 \
 		--enable-compat28
 CONFIGURE_ENV=	X11BASE="${LOCALBASE}" \
 		ac_cv_header_sys_inotify_h=no
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-std=c++11
 LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	GSTREAMER MSPACK NLS WEBKIT
 OPTIONS_DEFAULT=GSTREAMER MSPACK WEBKIT
 MSPACK_DESC=	Microsoft archives support
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 GSTREAMER_CONFIGURE_ENABLE=	mediactrl
 GSTREAMER_USE=	GNOME=gconf2 GSTREAMER=yes
 
 MSPACK_CONFIGURE_WITH=	libmspack
 MSPACK_LIB_DEPENDS=	libmspack.so:archivers/libmspack
 
 WEBKIT_CONFIGURE_ENABLE=	webview
 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
 
 .include <bsd.port.post.mk>