diff --git a/audio/funktrackergold/Makefile b/audio/funktrackergold/Makefile
index 8c9d39bd5594..a2ae51dabb95 100644
--- a/audio/funktrackergold/Makefile
+++ b/audio/funktrackergold/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	funktrackergold
 DISTVERSION=	1.5-2
 PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	SUNSITE/apps/sound/players
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Curses MOD/FNK music tracker
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_armv6=		fails to compile: function definition is not allowed here
 BROKEN_armv7=		fails to compile: function definition is not allowed here
 
 USES=		compiler:nestedfct ncurses tar:tgz
 
 WRKSRC=		${WRKDIR}/funkgold
 MAKE_ARGS=	EXTRA_LDFLAGS="-lpthread"
 
 PORTDOCS=	INSTALL
 PLIST_FILES=	bin/funkgold
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE:Mgcc}
+.if ${CHOSEN_COMPILER_TYPE:Mgcc}
 CFLAGS+=	-fnested-functions
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/funkgold ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for docs in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/devel/freebsd-gcc12/Makefile b/devel/freebsd-gcc12/Makefile
index 0157738b60a1..222138952b50 100644
--- a/devel/freebsd-gcc12/Makefile
+++ b/devel/freebsd-gcc12/Makefile
@@ -1,150 +1,150 @@
 PORTNAME=	gcc
 PORTVERSION=	12.1.0
 CATEGORIES=	devel
 MASTER_SITES=	GCC
 PKGNAMEPREFIX=	${TARGETARCH}-
 PKGNAMESUFFIX=	${SUFFIX}
 
 MAINTAINER=	jhb@FreeBSD.org
 COMMENT=	Cross GNU Compiler Collection for ${TARGETARCH}
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${BU_FLAVOR} \
 		objdump:devel/binutils
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 RUN_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${BU_FLAVOR}
 
 FLAVORS=	aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 riscv64
 TARGETARCH=	${FLAVOR}
 
 USES=		compiler:c++11-lang cpe gmake iconv libtool makeinfo tar:xz
 CPE_VENDOR=	gnu
 
 PLIST_SUB=	OPSYS=${OPSYS:tl} \
 		SUFFIX=${SUFFIX} \
 		TARGETARCH=${TARGETARCH} \
 		GCC_TARGET=${GCC_TARGET} \
 		GCC_VERSION=${PORTVERSION}
 
 SUB_FILES=	xtoolchain.mk
 SUB_LIST=	BU_PREFIX=${BU_PREFIX} \
 		GCC_TARGET=${GCC_TARGET} \
 		SUFFIX=${SUFFIX}
 
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \
 		--enable-gnu-indirect-function \
 		--enable-initfini-array \
 		--program-prefix=${GCC_TARGET}- \
 		--program-suffix=${SUFFIX} \
 		--without-headers \
 		--with-gmp=${LOCALBASE} \
 		--with-pkgversion="FreeBSD Ports Collection for ${PKGNAMEPREFIX:C/-//g}" \
 		--with-system-zlib \
 		--without-zstd \
 		--with-gxx-include-dir=/usr/include/c++/v1/ \
 		--with-sysroot="/" \
 		--with-as=${LOCALBASE}/bin/${BU_PREFIX}-as \
 		--with-ld=${LOCALBASE}/bin/${BU_PREFIX}-ld
 
 .if ${TARGETARCH:Mpowerpc64*}
 CONFIGURE_ARGS+=--with-abi=elfv2
 .endif
 
 ALL_TARGET=	all-gcc
 INSTALL_TARGET=	install-gcc
 
 .include <bsd.port.pre.mk>
 
 .if ${TARGETARCH:Marm*}
 TARGET_ABI=	gnueabi
 BU_FLAVOR=	arm_${TARGET_ABI}
 BU_PREFIX=	arm-${TARGET_ABI}-${OPSYS:tl}${OSREL}
 .else
 TARGET_ABI=	unknown
 BU_FLAVOR=	${TARGETARCH}
 BU_PREFIX=	${GCC_TARGET}
 .endif
 GCC_TARGET=	${TARGETARCH:S/amd64/x86_64/}-${TARGET_ABI}-${OPSYS:tl}${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e '/LIBSTDCXX/ s/stdc\+\+/c\+\+/g ' \
 		${WRKSRC}//gcc/cp/g++spec.cc
 	@${REINPLACE_CMD} -e '/LOCAL_INCLUDE_DIR/ d ' \
 		${WRKSRC}//gcc/Makefile.in
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-unknown-${OPSYS:tl}${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-unknown-${OPSYS:tl}${OSREL}
 .endif
 
 .if ${TARGETARCH:Marm*} || ${TARGETARCH} == "aarch64"
-. if ${COMPILER_TYPE} == clang
+. if ${CHOSEN_COMPILER_TYPE} == clang
 MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
 . endif
 .endif
 
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "powerpc64"
 CONFIGURE_ARGS+=--enable-multilib
 .endif
 
 .if ${ARCH} == "aarch64"
 PLIST_SUB+=	PLUGINS="@comment plugin does not build"
 .else
 PLIST_SUB+=	PLUGINS=""
 .endif
 
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 PLIST_SUB+=	FLOAT_H="@comment "
 .else
 PLIST_SUB+=	FLOAT_H=""
 .endif
 
 PLIST=		${.CURDIR}/pkg-plist
 
 .if ${TARGETARCH} == "aarch64"
 PLIST+=		${.CURDIR}/pkg-plist.aarch64
 .endif
 .if ${TARGETARCH} == "aarch64" || ${TARGETARCH:Marm*}
 PLIST+=		${.CURDIR}/pkg-plist.arm
 .endif
 .if ${TARGETARCH:Marm*}
 PLIST+=		${.CURDIR}/pkg-plist.arm_gnueabi
 .endif
 .if ${TARGETARCH} == "amd64"
 PLIST+=		${.CURDIR}/pkg-plist.amd64
 .endif
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 PLIST+=		${.CURDIR}/pkg-plist.i386
 .endif
 .if ${TARGETARCH:Mpowerpc64*}
 PLIST+=		${.CURDIR}/pkg-plist.powerpc64
 .elif ${TARGETARCH:Mpowerpc*}
 PLIST+=		${.CURDIR}/pkg-plist.powerpc
 .endif
 .if ${TARGETARCH:Mriscv*}
 PLIST+=		${.CURDIR}/pkg-plist.riscv
 .endif
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
 	@${RM} ${STAGEDIR}${PREFIX}/share/info/*
 	@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 	# Conflicts with sys/x86/include/float.h
 	${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h
 .endif
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
 	${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
 		${STAGEDIR}${PREFIX}/share/toolchains/${TARGETARCH}-gcc${SUFFIX}.mk
 
 .include <bsd.port.post.mk>
diff --git a/devel/freebsd-gcc6/Makefile b/devel/freebsd-gcc6/Makefile
index 6ba04426c00d..e60672b2ef1b 100644
--- a/devel/freebsd-gcc6/Makefile
+++ b/devel/freebsd-gcc6/Makefile
@@ -1,131 +1,131 @@
-PORTNAME=	gcc
+
 PORTVERSION=	6.5.0
 PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	GCC
 PKGNAMEPREFIX=	${TARGETARCH}-
 PKGNAMESUFFIX=	${SUFFIX}
 
 MAINTAINER=	jhb@FreeBSD.org
 COMMENT=	Cross GNU Compiler Collection for ${TARGETARCH}
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${TARGETARCH} \
 		objdump:devel/binutils
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 RUN_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${TARGETARCH}
 
 FLAVORS=	aarch64 amd64 i386 mips mips64 powerpc64 sparc64
 TARGETARCH=	${FLAVOR}
 
 USES=		compiler:c++11-lang cpe gmake iconv libtool makeinfo tar:xz
 CPE_VENDOR=	gnu
 
 CONFLICTS=	${TARGETARCH}-gcc
 
 PLIST_SUB=	OPSYS=${OPSYS:tl} \
 		SUFFIX=${SUFFIX} \
 		TARGETARCH=${TARGETARCH} \
 		GCC_TARGET=${GCC_TARGET} \
 		GCC_VERSION=${PORTVERSION}
 
 SUB_FILES=	xtoolchain.mk
 SUB_LIST=	GCC_TARGET=${GCC_TARGET}
 
 GCC_TARGET=	${FLAVOR:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 BU_PREFIX=	${GCC_TARGET}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \
 		--enable-gnu-indirect-function \
 		--enable-initfini-array \
 		--program-prefix=${GCC_TARGET}- \
 		--program-suffix=${SUFFIX} \
 		--without-headers \
 		--with-gmp=${LOCALBASE} \
 		--with-pkgversion="FreeBSD Ports Collection for ${PKGNAMEPREFIX:C/-//g}" \
 		--with-system-zlib \
 		--with-gxx-include-dir=/usr/include/c++/v1/ \
 		--with-sysroot="/" \
 		--with-as=${LOCALBASE}/bin/${BU_PREFIX}-as \
 		--with-ld=${LOCALBASE}/bin/${BU_PREFIX}-ld
 
 ALL_TARGET=	all-gcc
 INSTALL_TARGET=	install-gcc
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e '/LIBSTDCXX/ s/stdc\+\+/c\+\+/g ' \
 		${WRKSRC}//gcc/cp/g++spec.c
 	@${REINPLACE_CMD} -e '/LOCAL_INCLUDE_DIR/ d ' \
 		${WRKSRC}//gcc/Makefile.in
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-unknown-${OPSYS:tl}${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-unknown-${OPSYS:tl}${OSREL}
 .endif
 
 .if ${TARGETARCH} == "armv6" || ${TARGETARCH} == "aarch64"
-. if ${COMPILER_TYPE} == clang
+. if ${CHOSEN_COMPILER_TYPE} == clang
 MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
 . endif
 .endif
 
 .if ${ARCH} == "aarch64"
 PLIST_SUB+=	PLUGINS="@comment plugin does not build"
 .else
 PLIST_SUB+=	PLUGINS=""
 .endif
 
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 PLIST_SUB+=	FLOAT_H="@comment "
 .else
 PLIST_SUB+=	FLOAT_H=""
 .endif
 
 PLIST=		${.CURDIR}/pkg-plist ${.CURDIR}/pkg-plist.common
 
 .if ${TARGETARCH} == "aarch64"
 PLIST+=		${.CURDIR}/pkg-plist.aarch64
 .endif
 .if ${TARGETARCH} == "aarch64" || ${TARGETARCH:Marm*}
 PLIST+=		${.CURDIR}/pkg-plist.arm
 .endif
 .if ${TARGETARCH} == "amd64"
 PLIST+=		${.CURDIR}/pkg-plist.amd64
 .endif
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 PLIST+=		${.CURDIR}/pkg-plist.i386
 .endif
 .if ${TARGETARCH:Mmips*}
 PLIST+=		${.CURDIR}/pkg-plist.mips
 .endif
 .if ${TARGETARCH:Mpowerpc*}
 PLIST+=		${.CURDIR}/pkg-plist.powerpc
 .endif
 .if ${TARGETARCH} == "sparc64"
 PLIST+=		${.CURDIR}/pkg-plist.sparc64
 .endif
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
 	@${RM} ${STAGEDIR}${PREFIX}/share/info/*
 	@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 	# Conflicts with sys/x86/include/float.h
 	${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h
 .endif
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
 	${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
 		${STAGEDIR}${PREFIX}/share/toolchains/${TARGETARCH}-gcc${SUFFIX}.mk
 
 .include <bsd.port.post.mk>
diff --git a/devel/freebsd-gcc9/Makefile b/devel/freebsd-gcc9/Makefile
index ed873a1de38b..1b6b07b3cfa9 100644
--- a/devel/freebsd-gcc9/Makefile
+++ b/devel/freebsd-gcc9/Makefile
@@ -1,156 +1,156 @@
 PORTNAME=	gcc
 PORTVERSION=	9.5.0
 CATEGORIES=	devel
 MASTER_SITES=	GCC
 PKGNAMEPREFIX=	${TARGETARCH}-
 PKGNAMESUFFIX=	${SUFFIX}
 
 MAINTAINER=	jhb@FreeBSD.org
 COMMENT=	Cross GNU Compiler Collection for ${TARGETARCH}
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${BU_FLAVOR} \
 		objdump:devel/binutils
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 RUN_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${BU_FLAVOR}
 
 FLAVORS=	aarch64 amd64 armv6 armv7 i386 mips mips64 powerpc powerpc64 riscv64 sparc64
 TARGETARCH=	${FLAVOR}
 
 USES=		compiler:c++11-lang cpe gmake iconv libtool makeinfo tar:xz
 CPE_VENDOR=	gnu
 
 PLIST_SUB=	OPSYS=${OPSYS:tl} \
 		SUFFIX=${SUFFIX} \
 		TARGETARCH=${TARGETARCH} \
 		GCC_TARGET=${GCC_TARGET} \
 		GCC_VERSION=${PORTVERSION}
 
 SUB_FILES=	xtoolchain.mk
 SUB_LIST=	BU_PREFIX=${BU_PREFIX} \
 		GCC_TARGET=${GCC_TARGET} \
 		SUFFIX=${SUFFIX}
 
 SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \
 		--enable-gnu-indirect-function \
 		--enable-initfini-array \
 		--program-prefix=${GCC_TARGET}- \
 		--program-suffix=${SUFFIX} \
 		--without-headers \
 		--with-gmp=${LOCALBASE} \
 		--with-pkgversion="FreeBSD Ports Collection for ${PKGNAMEPREFIX:C/-//g}" \
 		--with-system-zlib \
 		--without-zstd \
 		--with-gxx-include-dir=/usr/include/c++/v1/ \
 		--with-sysroot="/" \
 		--with-as=${LOCALBASE}/bin/${BU_PREFIX}-as \
 		--with-ld=${LOCALBASE}/bin/${BU_PREFIX}-ld
 
 .if ${TARGETARCH:Mpowerpc64*}
 CONFIGURE_ARGS+=--with-abi=elfv2
 .endif
 
 ALL_TARGET=	all-gcc
 INSTALL_TARGET=	install-gcc
 
 .include <bsd.port.pre.mk>
 
 .if ${TARGETARCH:Marm*}
 TARGET_ABI=	gnueabi
 BU_FLAVOR=	arm_${TARGET_ABI}
 BU_PREFIX=	arm-${TARGET_ABI}-${OPSYS:tl}${OSREL}
 .else
 TARGET_ABI=	unknown
 BU_FLAVOR=	${TARGETARCH}
 BU_PREFIX=	${GCC_TARGET}
 .endif
 GCC_TARGET=	${TARGETARCH:S/amd64/x86_64/}-${TARGET_ABI}-${OPSYS:tl}${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e '/LIBSTDCXX/ s/stdc\+\+/c\+\+/g ' \
 		${WRKSRC}//gcc/cp/g++spec.c
 	@${REINPLACE_CMD} -e '/LOCAL_INCLUDE_DIR/ d ' \
 		${WRKSRC}//gcc/Makefile.in
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-unknown-${OPSYS:tl}${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-unknown-${OPSYS:tl}${OSREL}
 .endif
 
 .if ${TARGETARCH:Marm*} || ${TARGETARCH} == "aarch64"
-. if ${COMPILER_TYPE} == clang
+. if ${CHOSEN_COMPILER_TYPE} == clang
 MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
 . endif
 .endif
 
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "powerpc64"
 CONFIGURE_ARGS+=--enable-multilib
 .endif
 
 .if ${ARCH} == "aarch64"
 PLIST_SUB+=	PLUGINS="@comment plugin does not build"
 .else
 PLIST_SUB+=	PLUGINS=""
 .endif
 
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 PLIST_SUB+=	FLOAT_H="@comment "
 .else
 PLIST_SUB+=	FLOAT_H=""
 .endif
 
 PLIST=		${.CURDIR}/pkg-plist
 
 .if ${TARGETARCH} == "aarch64"
 PLIST+=		${.CURDIR}/pkg-plist.aarch64
 .endif
 .if ${TARGETARCH} == "aarch64" || ${TARGETARCH:Marm*}
 PLIST+=		${.CURDIR}/pkg-plist.arm
 .endif
 .if ${TARGETARCH:Marm*}
 PLIST+=		${.CURDIR}/pkg-plist.arm_gnueabi
 .endif
 .if ${TARGETARCH} == "amd64"
 PLIST+=		${.CURDIR}/pkg-plist.amd64
 .endif
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 PLIST+=		${.CURDIR}/pkg-plist.i386
 .endif
 .if ${TARGETARCH:Mmips*}
 PLIST+=		${.CURDIR}/pkg-plist.mips
 .endif
 .if ${TARGETARCH:Mpowerpc64*}
 PLIST+=		${.CURDIR}/pkg-plist.powerpc64
 .elif ${TARGETARCH:Mpowerpc*}
 PLIST+=		${.CURDIR}/pkg-plist.powerpc
 .endif
 .if ${TARGETARCH:Mriscv*}
 PLIST+=		${.CURDIR}/pkg-plist.riscv
 .endif
 .if ${TARGETARCH} == "sparc64"
 PLIST+=		${.CURDIR}/pkg-plist.sparc64
 .endif
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
 	@${RM} ${STAGEDIR}${PREFIX}/share/info/*
 	@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 	# Conflicts with sys/x86/include/float.h
 	${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h
 .endif
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
 	${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
 		${STAGEDIR}${PREFIX}/share/toolchains/${TARGETARCH}-gcc${SUFFIX}.mk
 
 .include <bsd.port.post.mk>
diff --git a/devel/fuzzylite/Makefile b/devel/fuzzylite/Makefile
index 3ed0ef671cbc..4fc3ca828816 100644
--- a/devel/fuzzylite/Makefile
+++ b/devel/fuzzylite/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	fuzzylite
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.0
 PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Fuzzy logic control library in C++
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake compiler:c++11-lang
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	FL_BUILD_STATIC FL_BUILD_TESTS
 CMAKE_SOURCE_PATH=	${WRKSRC}/${PORTNAME}
 PLIST_SUB=	SHLIB_VER=${DISTVERSION}
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} == clang
+.if ${CHOSEN_COMPILER_TYPE} == clang
 CFLAGS+=	-Wno-error=varargs
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/google-perftools/Makefile b/devel/google-perftools/Makefile
index ac25a1c3b919..46589074d60f 100644
--- a/devel/google-perftools/Makefile
+++ b/devel/google-perftools/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	google-perftools
 DISTVERSIONPREFIX=	gperftools-
 DISTVERSION=	2.10
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/gperftools/gperftools/releases/download/gperftools-${PORTVERSION}/
 DISTNAME=	gperftools-${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast, multi-threaded malloc() and nifty performance analysis tools
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_armv7=	error: use of undeclared identifier '_URC_NO_REASON', see https://github.com/gperftools/gperftools/issues/1360
 BROKEN_riscv64=	error: Cannot calculate stack trace: will need to write for your environment, see https://github.com/gperftools/gperftools/issues/1359
 
 USES=		compiler:c11 gmake libtool localbase:ldflags
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 TEST_TARGET=	check
 
 LIBS+=		-lexecinfo
 
 DOCSDIR=	${PREFIX}/share/doc/gperftools
 
 OPTIONS_DEFINE=			DOCS PROFILER
 OPTIONS_SINGLE=			PAGESIZE ALIGN
 OPTIONS_SINGLE_ALIGN=		ALIGN8 ALIGN16
 OPTIONS_SINGLE_PAGESIZE=	PAGE8K PAGE32K PAGE64K
 OPTIONS_DEFAULT=		PAGE8K ALIGN16
 OPTIONS_DEFAULT_aarch64=	# PROFILER  is disabled: WARNING: Could not find the PC. Will not try to compile libprofiler, see https://github.com/gperftools/gperftools/issues/1362
 OPTIONS_DEFAULT_amd64=		PROFILER
 OPTIONS_DEFAULT_armv6=		# PROFILER is disabled: WARNING: Could not find the PC. Will not try to compile libprofiler.
 OPTIONS_DEFAULT_armv7=		# PROFILER is disabled: WARNING: Could not find the PC. Will not try to compile libprofiler.
 OPTIONS_DEFAULT_i386=		PROFILER
 OPTIONS_DEFAULT_powerpc=	PROFILER
 OPTIONS_DEFAULT_powerpc64=	PROFILER
 OPTIONS_DEFAULT_powerpc64le=	PROFILER
 OPTIONS_DEFAULT_riscv64=	PROFILER
 OPTIONS_SUB=		yes
 
 PROFILER_DESC=		Enable CPU profiler
 PROFILER_CONFIGURE_ENABLE=	cpu-profiler
 
 ALIGN_DESC=	The tcmalloc allocation alignment
 ALIGN8_DESC=	8 bytes allocation alignment
 ALIGN16_DESC=	16 bytes allocation alignment
 PAGESIZE_DESC=	The tcmalloc internal page size
 PAGE8K_DESC=	8K page size
 PAGE32K_DESC=	32K page size
 PAGE64K_DESC=	64K page size
 
 ALIGN8_CONFIGURE_ON=	--with-tcmalloc-alignment=8
 ALIGN16_CONFIGURE_ON=	--with-tcmalloc-alignment=16
 PAGE8K_CONFIGURE_ON=	--with-tcmalloc-pagesize=8
 PAGE32K_CONFIGURE_ON=	--with-tcmalloc-pagesize=32
 PAGE64K_CONFIGURE_ON=	--with-tcmalloc-pagesize=64
 
 PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} == "clang" && !defined(USE_GCC)
+.if ${CHOSEN_COMPILER_TYPE} == "clang" && !defined(USE_GCC)
 # clang cannot disable builtins individually
 CXXFLAGS+=	-fno-builtin
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_ARGS+=--enable-frame-pointers
 .endif
 
 # keep in sync with all platforms where libunwind is available
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 LIBS+=		-lunwind
 .endif
 
 post-build:
 	@${ECHO}
 	@${ECHO} "Please run 'make check' (requires bash)."
 	@${ECHO} "Two testcases are known to fail. Testsuite is known to be"
 	@${ECHO} "unreliable and give false positives and negatives (PR#661)."
 	@${ECHO}
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/bin/pprof ${STAGEDIR}${PREFIX}/bin/perftools-pprof
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
 
 .include <bsd.port.post.mk>
diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index c731a081a9ac..1e67d97fd4e5 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -1,272 +1,272 @@
 PORTNAME=	llvm
 PORTVERSION=	${LLVM_MAJOR}.0.d${SNAPDATE}
 PORTREVISION=	2
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT?=	LLVM and Clang with support for the CHERI architecture
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "${.PARSEDIR}/../llvm-devel/Makefile.LICENSE"
 LICENSE:=       ${LICENSE:NARM}
 LICENSE+=	LLVM2
 LICENSE_FILE_LLVM2=	${LICENSE_DIR}/LICENSE.TXT
 LICENSE_NAME_LLVM2=	Apache License 2.0 with LLVM Exceptions
 LICENSE_PERMS_LLVM2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 NOT_FOR_ARCHS=		i386 armv6 armv7 powerpc mips
 NOT_FOR_ARCHS_REASON=	No one will develop CHERI from 32-bit
 
 LLVM_SUFFIX?=	-cheri
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 COMMAND_SUFFIX=	${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 
 USES=		cmake compiler:c++11-lib cpe libedit perl5 \
 		shebangfix
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
 SHEBANG_FILES=	\
 		clang/tools/clang-format/git-clang-format \
 		clang/tools/clang-format/clang-format-diff.py \
 		clang/tools/scan-build-py/bin/analyze-build \
 		clang/tools/scan-build-py/bin/intercept-build \
 		clang/tools/scan-build-py/bin/scan-build \
 		clang/tools/scan-build-py/libexec/analyze-cc \
 		clang/tools/scan-build-py/libexec/analyze-c++ \
 		clang/tools/scan-build-py/libexec/intercept-cc \
 		clang/tools/scan-build-py/libexec/intercept-c++ \
 		clang/tools/scan-view/bin/scan-view \
 		clang/utils/hmaptool/hmaptool \
 		llvm/tools/opt-viewer/optrecord.py \
 		llvm/tools/opt-viewer/opt-diff.py \
 		llvm/tools/opt-viewer/opt-stats.py \
 		llvm/tools/opt-viewer/opt-viewer.py \
 		llvm/utils/lit/lit.py \
 		llvm/utils/llvm-lit/llvm-lit.in
 
 SUB_FILES=	llvm-wrapper.sh
 SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
 
 CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
 CMAKE_SOURCE_PATH=	${WRKSRC}/llvm
 CMAKE_ARGS+=	-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON
 CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
 CMAKE_ARGS+=	-DLLVM_PARALLEL_LINK_JOBS=1
 CMAKE_ARGS+=	-DLLVM_ENABLE_Z3_SOLVER=OFF
 CMAKE_ARGS+=	-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS}"
 
 .ifndef MASTERDIR
 USE_GITHUB=	yes
 GH_PROJECT=	llvm-project
 GH_ACCOUNT=	CTSRD-CHERI
 GH_TAGNAME=	${LLVM_COMMIT}
 .endif
 
 .ifndef SNAPDATE
 .sinclude "${.PARSEDIR}/Makefile.snapshot"
 .endif
 
 OPTIONS_DEFINE=	CLANG DOCS LIT LLD
 OPTIONS_DEFAULT=	CLANG LIT LLD
 OPTIONS_SUB=	yes
 
 CLANG_DESC=		Build clang
 CLANG_PORTDOCS=		clang
 PLIST_FILES+=		share/toolchains/llvm${LLVM_SUFFIX}.mk
 SUB_FILES+=		xtoolchain.mk
 CLANG_USE=		GNOME=libxml2
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
 DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
 			-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
 			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
 			-DLLVM_BUILD_DOCS=ON
 DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
 DOCS_PORTDOCS=		llvm
 LIT_DESC=		Install lit and FileCheck test tools
 LLD_DESC=		Install lld linker
 LLD_PORTDOCS=		lld
 LLDB_DESC=		Install lldb, the LLVM debugger
 LLDB_BUILD_DEPENDS=	swig:devel/swig
 
 LLVM_TARGETS?=		AArch64;ARM;Mips;PowerPC;RISCV;X86
 
 PLIST_SUB+=	COMMAND_SUFFIX=${COMMAND_SUFFIX} \
 		LLVM_MAJOR=${LLVM_MAJOR} \
 		LLVM_RELEASE=${LLVM_RELEASE} \
 		LLVM_SUFFIX=${LLVM_SUFFIX}
 
 COMMANDS=	${LLVM_COMMANDS}
 FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
 
 MAN1SRCS+=	${LLVM_MAN1SRCS}
 
 STRIP_LIBS=	BugpointPasses.so \
 		LLVMHello.so \
 		${LIBNAME}.0 \
 		libLTO.so
 
 .include <bsd.port.options.mk>
 
 # keep in sync with /usr/src/lib/clang/clang.build.mk
 CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
 
 .if ${PORT_OPTIONS:MCLANG}
 LLVM_ENABLE_PROJECTS+=	clang
 COMMANDS+=	${CLANG_COMMANDS}
 MAN1SRCS+=	${CLANG_MAN1SRCS}
 USES+=		gnome
 .endif
 
 .if ${PORT_OPTIONS:MLIT}
 MAN1SRCS+=	${LIT_MAN1SRCS}
 _USES_PYTHON=	python:3.6+
 .endif
 
 .if ${PORT_OPTIONS:MLLD}
 LLVM_ENABLE_PROJECTS+=	lld
 COMMANDS+=	${LLD_COMMANDS}
 .endif
 
 .if ${PORT_OPTIONS:MLLDB}
 LLVM_ENABLE_PROJECTS+=	lldb
 COMMANDS+=	${LLDB_COMMANDS}
 MAN1SRCS+=	${LLDB_MAN1SRCS}
 _USES_PYTHON=	python:3.6+
 .endif
 
 .if defined(LLVM_ENABLE_PROJECTS)
 CMAKE_ARGS+=	-DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
 .endif
 
 _USES_PYTHON?=	python:3.6+,build
 USES+=		${_USES_PYTHON}
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/Makefile.COMMANDS"
 .include "${.CURDIR}/Makefile.MAN1SRCS"
 
 post-patch:
 	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
 	    -e 's|from lit|from lit${LLVM_SUFFIX}|' \
 	    -e 's|lit\.|lit${LLVM_SUFFIX}.|' \
 	    ${WRKSRC}/llvm/utils/lit/lit.py ${WRKSRC}/llvm/utils/lit/lit/*.py
 
 post-patch-LLD-on:
 		${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \
 			${PATCH_WRKSRC}/lld/docs/conf.py
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
 	${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
 	    ${STAGEDIR}${PREFIX}/share/toolchains/llvm${LLVM_SUFFIX}.mk
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
 	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${FIRST_COMMAND}${COMMAND_SUFFIX}
 .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${FIRST_COMMAND}${COMMAND_SUFFIX} \
 	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${command}${COMMAND_SUFFIX}
 .endfor
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/llvm/CHERI/cheri-compressed-cap/.github/workflows
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/llvm/CHERI/cheri-compressed-cap/.github
 
 post-install-DOCS-on:
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR}
 .for _man in ${MAN1SRCS}
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
 	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
 .endfor
 .if ! ${PORT_OPTIONS:MLIT}
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
 .endif
 #.if ${PORT_OPTIONS:MCLANG}
 #	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1 \
 #	    ${STAGEDIR}${MANPREFIX}/man/man1/scan-build${LLVM_SUFFIX}.1
 #.endif
 .if !${PORT_OPTIONS:MLLDB}
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lldb-tblgen.1
 .endif
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/mlir-tblgen.1
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
 
 post-install-LLD-on:
 	${LN} -s ld.lld ${STAGEDIR}${LLVM_PREFIX}/bin/ld
 
 post-install-LLDB-on:
-.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang
+.if ${OPSYS} != "FreeBSD" || ${CHOSEN_COMPILER_TYPE} == clang
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib
 .endif
 
 post-install-CLANG-on:
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
 
 post-install-LIT-on:
 	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/llvm/utils/lit/lit.py \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/lit
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
 	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}lit${COMMAND_SUFFIX}
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
 	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}llvm-lit${COMMAND_SUFFIX}
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
 	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/*.py \
 	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
 	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}FileCheck${COMMAND_SUFFIX}
 
 TEST_CMD=	'(cd ${WRKSRC}/llvm/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 do-test:
 	if [ `${ID} -u` = 0 ]; then \
 		${CHOWN} -R nobody ${WRKSRC}/llvm/test; \
 		su -m nobody -c ${TEST_CMD}; \
 	else \
 		${SH} -c ${TEST_CMD}; \
 	fi
 
 build-plist:
 	${RM} ${PLIST} ${PLIST}.tmp
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${COMMAND_PREFIX}${command}%%COMMAND_SUFFIX%% >> ${PLIST}.tmp
 .endfor
 .for command in ${LIT_COMMANDS}
 	${ECHO_CMD} %%LIT%%bin/${COMMAND_PREFIX}${command}%%COMMAND_SUFFIX%% >> ${PLIST}.tmp
 	${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||:S|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp
 .endfor
 	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
 	    ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \
 	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
 	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' \
 	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
 	    -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' \
 	    -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' \
 	    | ${SORT} >> ${PLIST}.tmp
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
 	    -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' \
 	    -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' \
 	    | ${SORT} >> ${PLIST}.tmp
 	awk '{ \
 	    if ($$0 ~ /clang/ && $$0 !~ /omp.h/) {printf "%%%%CLANG%%%%"} \
 	    if ($$0 ~ /(bin\/(ld|lld|wasm-ld))|liblld[^b]|\/lld\// && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
 	    if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} \
 	    print \
 	}' \${PLIST}.tmp >> ${PLIST}
 	${ECHO_CMD} '@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
 	${ECHO_CMD} '@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
 	${RM} ${PLIST}.tmp
 
 check-commands:
 .for command in ${COMMANDS}
 	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/security/botan2/Makefile b/security/botan2/Makefile
index a85ace4811ba..17de941e4d76 100644
--- a/security/botan2/Makefile
+++ b/security/botan2/Makefile
@@ -1,102 +1,102 @@
 PORTNAME=	botan
 DISTVERSION=	2.19.2
 PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://botan.randombit.net/releases/
 PKGNAMESUFFIX=	2
 DISTNAME=	Botan-${PORTVERSION}
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Portable, easy to use and efficient C++ crypto library
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 BROKEN_armv6=	include/arm_neon.h:28:2: error: "NEON support not enabled"
 
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs
 
 USES=		compiler:c++11-lang cpe gmake shebangfix tar:xz
 CPE_VENDOR=	${PORTNAME}_project
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	configure.py src/python/botan2.py src/scripts/install.py
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	configure.py
-CONFIGURE_ARGS=		--cc=${COMPILER_TYPE} \
+CONFIGURE_ARGS=		--cc=${CHOSEN_COMPILER_TYPE} \
 			--prefix=${PREFIX:Q} \
 			--with-boost \
 			--with-bzip2 \
 			--with-external-includedir=${LOCALBASE}/include \
 			--with-external-libdir=${LOCALBASE}/lib \
 			--with-lzma \
 			--with-zlib
 LDFLAGS+=		-pthread
 
 DOCSDIR=	${LOCALBASE}/share/doc/${PORTNAME}-${PORTVERSION}
 
 _SOABIVER=	19
 _SHLIBVER=	${DISTVERSION:S/./ /g:[2]}
 _SHLIBVERPATCH=	${DISTVERSION:S/./ /g:[3]}
 PLIST_SUB=	SHLIBVER=${_SHLIBVER} \
 		SHLIBVERPATCH=${_SHLIBVERPATCH} \
 		SOABIVER=${_SOABIVER}
 PORTDOCS=	*
 
 OPTIONS_DEFINE=			DOCS MANPAGES PYTHON SQLITE3
 OPTIONS_DEFINE_aarch64=		OPENMP
 OPTIONS_DEFINE_amd64=		OPENMP
 OPTIONS_DEFINE_i386=		OPENMP
 OPTIONS_DEFINE_powerpc64=	OPENMP
 OPTIONS_DEFINE_powerpc64le=	OPENMP
 OPTIONS_DEFINE_riscv64=		OPENMP
 OPTIONS_DEFAULT=		MANPAGES
 OPTIONS_DEFAULT_aarch64=	OPENMP
 OPTIONS_DEFAULT_amd64=		OPENMP
 OPTIONS_DEFAULT_powerpc64=	OPENMP
 OPTIONS_DEFAULT_powerpc64le=	OPENMP
 OPTIONS_DEFAULT_riscv64=	OPENMP
 OPTIONS_SUB=			yes
 
 MANPAGES_BUILD_DEPENDS=		${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
 MANPAGES_CONFIGURE_WITH=	sphinx
 
 OPENMP_CONFIGURE_ON=	--with-openmp
 
 PYTHON_USES=		python:3.6+
 PYTHON_USES_OFF=	python:3.6+,build
 PYTHON_CONFIGURE_ON=	--with-python-versions=${PYTHON_VER}
 PYTHON_CONFIGURE_OFF=	--no-install-python-module
 
 SQLITE3_USES=		sqlite
 SQLITE3_CONFIGURE_WITH=	sqlite3
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64
 CONFIGURE_ARGS+=	--cc-abi="-march=armv8-a+crypto"
 .elif ${ARCH:Mpowerpc64*}
 CONFIGURE_ARGS+=	--cpu="ppc64"
 .endif
 
 .if ${ARCH} == i386 || ${ARCH} == amd64
 PLIST_SUB+=	HAS_RDRAND_RNG=""
 .else
 PLIST_SUB+=	HAS_RDRAND_RNG="@comment "
 .endif
 
 .if ${ARCH} == i386 || ${ARCH} == amd64 || ${ARCH:Mpowerpc64*}
 PLIST_SUB+=	HAS_PROCESSOR_RNG=""
 .else
 PLIST_SUB+=	HAS_PROCESSOR_RNG="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^optimization_flags .*|optimization_flags "${CXXFLAGS}"|' \
 		${WRKSRC}/src/build-data/cc/clang.txt
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/botan ${STAGEDIR}${PREFIX}/lib/libbotan-2.so.${_SOABIVER}.${_SHLIBVER}.${_SHLIBVERPATCH}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index a346e120df66..9f1680e3a467 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -1,96 +1,96 @@
 PORTNAME=	wx
 PORTVERSION=	2.8.12
 PORTREVISION?=	10
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/wxwindows/${PORTVERSION}
 PKGNAMESUFFIX=	28-${WXGTK_FLAVOR}
 DISTNAME=	wxGTK-${PORTVERSION}
 
 MAINTAINER?=	desktop@FreeBSD.org
 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-lang gl gmake gnome iconv jpeg localbase \
 		pkgconfig tar:bzip2 xorg
 USE_CXXSTD=	gnu++98
 USE_XORG=	x11 sm xxf86vm xinerama
 USE_GL=		glu
 USE_GNOME=	gtk20 pangox-compat
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libpng=sys\
 		--with-libjpeg=sys\
 		--with-libtiff=sys\
 		--with-zlib=sys\
 		--with-expat=sys\
 		--with-opengl\
 		--with-mspack\
 		--with-gtk\
 		--disable-mediactrl \
 		--disable-backtrace\
 		--enable-graphics_ctx
 CONFIGURE_ENV=	X11BASE="${LOCALBASE}"
 PLIST=		${.CURDIR}/pkg-plist
 
 WXGTK_FLAVOR?=	gtk2
 
 OPTIONS_DEFINE=	MSPACK
 OPTIONS_DEFAULT=	MSPACK
 MSPACK_DESC=	MS archives support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMSPACK}
 CONFIGURE_ARGS+=--with-libmspack
 LIB_DEPENDS+=	libmspack.so:archivers/libmspack
 .else
 CONFIGURE_ARGS+=--without-libmspack
 .endif
 
 .if ${WXGTK_FLAVOR} != "gtk2-common"
 RUN_DEPENDS=	${LOCALBASE}/include/wx-2.8/wx/wx.h:x11-toolkits/wxgtk28-common
 .endif
 
 .if ${WXGTK_FLAVOR:M*-common} != ""
 NO_BUILD=	yes
 INSTALL_TARGET=	install-common
 USES+=		gettext-tools
 .else
 USE_LDCONFIG=	yes
 .endif # *-common
 
 .if ${WXGTK_FLAVOR:M*-contrib*} != ""
 BUILD_WRKSRC=	${WRKSRC}/contrib
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 .if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
 USE_WX=		2.8
 RUN_DEPENDS=	${LOCALBASE}/include/wx-2.8/wx/stc/stc.h:x11-toolkits/wxgtk28-contrib-common
 
 pre-configure:
 	@${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
 		-e "s|@CXXFLAGS@|${CFLAGS} `${WX_CONFIG} --cxxflags`|" \
 		-e "s|@CFLAGS@|${CFLAGS} `${WX_CONFIG} --cflags`|" \
 		-e "s|@CPPFLAGS@||"
 
 .endif # !gtk2-contrib-common
 .endif # *-contrib*
 
 CONFIGURE_ARGS+=--enable-unicode
 
 .include <bsd.port.pre.mk>
 
 # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
-.if ${COMPILER_TYPE} == gcc
+.if ${CHOSEN_COMPILER_TYPE} == gcc
 CONFIGURE_ARGS+=	--disable-precomp-headers
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|pkg_config_args --cflags|pkg_config_args pangox --cflags|g ; \
 		s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
 		-e 's|png_check_sig|png_sig_cmp|g' \
 			${WRKSRC}/configure
 
 .include <bsd.port.post.mk>