diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk
index 18c8dec90cf5..6e03765f2a50 100644
--- a/Mk/Uses/compiler.mk
+++ b/Mk/Uses/compiler.mk
@@ -1,209 +1,199 @@
 # Allows to determine the compiler being used
 #
 # Feature:	compiler
 # Usage:	USES=compiler or USES=compiler:ARGS
-# Valid ARGS:	env (default, implicit) c++0x c++11-lib c++11-lang c11 openmp nestedfct features
+# Valid ARGS:	env (default, implicit) c++0x c++11-lib c++11-lang c11 nestedfct features
 #
 # c++0x:	The port needs a compiler understanding C++0X
 # c++11-lang:	The port needs a compiler understanding C++11
 # c++14-lang:	The port needs a compiler understanding C++14
 # c++17-lang:	The port needs a compiler understanding C++17
 # gcc-c++11-lib:The port needs g++ compiler with a C++11 library
 # c++11-lib:	The port needs a compiler understanding C++11 and with a C++11 ready standard library
 # c11:		The port needs a compiler understanding C11
-# openmp:	The port needs a compiler understanding openmp
 # nestedfct:	The port needs a compiler understanding nested functions
 # features:	The port will determine the features supported by the default compiler
 #
 # Variable to test after <bsd.port.pre.mk>
 #
 # COMPILER_TYPE:	can be gcc or clang
 # ALT_COMPILER_TYPE:	can be gcc or clang depending on COMPILER_TYPE, only set if the base system has 2 compilers
 # COMPILER_VERSION:	first 2 digits of the version: 33 for clang 3.3.*, 47 for gcc 4.7.*
 # ALT_COMPILER_VERSION:	first 2 digits of the version: 33 for clang 3.3.*, 47 for gcc 4.7.* of the ALT_COMPILER_TYPE
 #
 # COMPILER_FEATURES:	the list of features supported by the compiler includes the standard C++ library.
 # CHOSEN_COMPILER_TYPE:	can be gcc or clang (type of compiler chosen by the framework)
 #
 # MAINTAINER: portmgr@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_COMPILER_MK)
 _INCLUDE_USES_COMPILER_MK=	yes
 
 .if empty(compiler_ARGS)
 compiler_ARGS=	env
 .endif
 
-VALID_ARGS=	c++11-lib c++11-lang c++14-lang c++17-lang c11 features openmp env nestedfct c++0x gcc-c++11-lib
+VALID_ARGS=	c++11-lib c++11-lang c++14-lang c++17-lang c11 features env nestedfct c++0x gcc-c++11-lib
 
 _CC_hash:=	${CC:hash}
 _CXX_hash:=	${CXX:hash}
 
 .if ${compiler_ARGS} == gcc-c++11-lib
 _COMPILER_ARGS+=	features gcc-c++11-lib
 .elif ${compiler_ARGS} == c++11-lib
 _COMPILER_ARGS+=	features c++11-lib
 .elif ${compiler_ARGS} == c++0x
 _COMPILER_ARGS+=	features c++0x
 .elif ${compiler_ARGS} == c++11-lang
 _COMPILER_ARGS+=	features c++11-lang
 .elif ${compiler_ARGS} == c++14-lang
 _COMPILER_ARGS+=	features c++14-lang
 .elif ${compiler_ARGS} == c++17-lang
 _COMPILER_ARGS+=	features c++17-lang
 .elif ${compiler_ARGS} == c11
 _COMPILER_ARGS+=	features c11
 .elif ${compiler_ARGS} == features
 _COMPILER_ARGS+=	features
 .elif ${compiler_ARGS} == env
 _COMPILER_ARGS+=	env
-.elif ${compiler_ARGS} == openmp
-_COMPILER_ARGS+=	env openmp
 .elif ${compiler_ARGS} == nestedfct
 _COMPILER_ARGS+=	env nestedfct
 .else
 IGNORE=	Invalid argument "${compiler_ARGS}", valid arguments are: ${VALID_ARGS}
 _COMPILER_ARGS=	#
 .endif
 
 .if ${_COMPILER_ARGS:Mc++*} || ${_COMPILER_ARGS:Mc11}
 _COMPILER_ARGS+=	features
 .endif
 
 .if defined(_CCVERSION_${_CC_hash})
 _CCVERSION=	${_CCVERSION_${_CC_hash}}
 .else
 _CCVERSION!=	${CC} --version
 _CCVERSION_${_CC_hash}=	${_CCVERSION}
 PORTS_ENV_VARS+=	_CCVERSION_${_CC_hash}
 .endif
 COMPILER_VERSION=	${_CCVERSION:M[0-9]*.[0-9]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
 .if ${_CCVERSION:Mclang}
 COMPILER_TYPE=	clang
 .else
 COMPILER_TYPE=	gcc
 .endif
 
 ALT_COMPILER_VERSION=	0
 ALT_COMPILER_TYPE=	none
 _ALTCCVERSION=		none
 .if defined(_ALTCCVERSION_${_CC_hash})
 _ALTCCVERSION=	${_ALTCCVERSION_${_CC_hash}}
 .else
 .if ${COMPILER_TYPE} == gcc && exists(/usr/bin/clang)
 .if ${ARCH} == amd64 || ${ARCH} == i386 # clang often non-default for a reason
 _ALTCCVERSION!=	/usr/bin/clang --version
 .endif
 .elif ${COMPILER_TYPE} == clang && exists(/usr/bin/gcc)
 _ALTCCVERSION!=	/usr/bin/gcc --version
 .endif
 _ALTCCVERSION_${_CC_hash}=	${_ALTCCVERSION}
 PORTS_ENV_VARS+=		_ALTCCVERSION_${_CC_hash}
 .endif
 
 ALT_COMPILER_VERSION=	${_ALTCCVERSION:M[0-9]*.[0-9]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
 .if ${_ALTCCVERSION:Mclang}
 ALT_COMPILER_TYPE=	clang
 .elif ${_ALTCCVERSION} != none
 ALT_COMPILER_TYPE=	gcc
 .endif
 
 CHOSEN_COMPILER_TYPE=	${COMPILER_TYPE}
 
-.if ${_COMPILER_ARGS:Mopenmp}
-.if ${COMPILER_TYPE} == clang
-USE_GCC=	yes
-CHOSEN_COMPILER_TYPE=	gcc
-.endif
-.endif
-
 .if ${_COMPILER_ARGS:Mnestedfct}
 .if ${COMPILER_TYPE} == clang
 USE_GCC=	any
 CHOSEN_COMPILER_TYPE=	gcc
 .endif
 .endif
 
 .if ${_COMPILER_ARGS:Mfeatures}
 .if defined(_CXXINTERNAL_${_CXX_hash})
 _CXXINTERNAL=	${_CXXINTERNAL_${_CXX_hash}}
 .else
 _CXXINTERNAL!=	${CXX} -\#\#\# /dev/null 2>&1
 _CXXINTERNAL_${_CXX_hash}=	${_CXXINTERNAL}
 PORTS_ENV_VARS+=	_CXXINTERNAL_${_CXX_hash}
 .endif
 .if ${_CXXINTERNAL:M\"-lc++\"}
 COMPILER_FEATURES=	libc++
 .else
 COMPILER_FEATURES=	libstdc++
 .endif
 
 CSTD=	c89 c99 c11 gnu89 gnu99 gnu11
 CXXSTD=	c++98 c++0x c++11 c++14 c++17 gnu++98 gnu++11 gnu++14 gnu++17
 
 .for std in ${CSTD} ${CXXSTD}
 _LANG=c
 .if ${CXXSTD:M${std}}
 _LANG=c++
 .endif
 .if defined(CC_OUTPUT_${_CC_hash}_${std:hash})
 OUTPUT_${std}=	${CC_OUTPUT_${_CC_hash}_${std:hash}}
 .else
 OUTPUT_${std}!=	if ${CC} -std=${std} -c -x ${_LANG} /dev/null -o /dev/null 2>&1; then echo yes; fi; echo
 CC_OUTPUT_${_CC_hash}_${std:hash}=	${OUTPUT_${std}}
 PORTS_ENV_VARS+=			CC_OUTPUT_${_CC_hash}_${std:hash}
 .endif
 .if !${OUTPUT_${std}:M*error*}
 COMPILER_FEATURES+=	${std}
 .endif
 .endfor
 .endif
 
 .if ${_COMPILER_ARGS:Mc++11-lib}
 .if !${COMPILER_FEATURES:Mc++11}
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .elif ${COMPILER_TYPE} == clang && ${COMPILER_FEATURES:Mlibstdc++}
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .endif
 .endif
 
 .if (${_COMPILER_ARGS:Mc++17-lang} && !${COMPILER_FEATURES:Mc++17}) || \
 (${_COMPILER_ARGS:Mc++14-lang} && !${COMPILER_FEATURES:Mc++14}) || \
 (${_COMPILER_ARGS:Mc++11-lang} && !${COMPILER_FEATURES:Mc++11}) || \
 (${_COMPILER_ARGS:Mc++0x} && !${COMPILER_FEATURES:Mc++0x}) || \
 (${_COMPILER_ARGS:Mc11} && !${COMPILER_FEATURES:Mc11})
 .if (defined(FAVORITE_COMPILER) && ${FAVORITE_COMPILER} == gcc) || (${ARCH} != amd64 && ${ARCH} != i386) # clang not always supported on Tier-2
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .elif ${COMPILER_TYPE} == gcc
 .if ${ALT_COMPILER_TYPE} == clang
 CPP=	clang-cpp
 CC=	clang
 CXX=	clang++
 CHOSEN_COMPILER_TYPE=	clang
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang10:devel/llvm10
 CPP=	${LOCALBASE}/bin/clang-cpp10
 CC=	${LOCALBASE}/bin/clang10
 CXX=	${LOCALBASE}/bin/clang++10
 CHOSEN_COMPILER_TYPE=	clang
 .endif
 .endif
 .endif
 
 .if ${_COMPILER_ARGS:Mgcc-c++11-lib}
 USE_GCC=	yes
 CHOSEN_COMPILER_TYPE=	gcc
 .if ${COMPILER_FEATURES:Mlibc++}
 CXXFLAGS+=	-nostdinc++ -isystem /usr/include/c++/v1
 LDFLAGS+=	-L${WRKDIR}
 
 _USES_configure+=	200:gcc-libc++-configure
 gcc-libc++-configure:
 	@${LN} -fs /usr/lib/libc++.so ${WRKDIR}/libstdc++.so
 .endif
 .endif
 
 .endif
diff --git a/archivers/pxz/Makefile b/archivers/pxz/Makefile
index 9f31be6ddfb6..0e6a5793ca2a 100644
--- a/archivers/pxz/Makefile
+++ b/archivers/pxz/Makefile
@@ -1,31 +1,31 @@
 # Created by: mm
 
 PORTNAME=	pxz
 PORTVERSION=	0.20141018
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	archivers
 MASTER_SITES=	LOCAL/delphij
 DISTNAME=	pxz-git-${PORTVERSION:S/0.//}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Parallel LZMA compressor using liblzma
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		cpe compiler:openmp tar:xz
+USES=		cpe tar:xz
 PLIST_FILES=	bin/pxz share/man/man1/pxz.1.gz
 
 CPE_VENDOR=	pxz_project
 
 MAKE_ENV+=	BINDIR=${PREFIX}/bin \
 		MANDIR=${PREFIX}/share/man
 
 MAKE_ARGS+=	CC="${CC}"
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pxz
 
 .include <bsd.port.mk>
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index b34e6aadd90c..605deb742b68 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -1,88 +1,89 @@
 # Created by: Greg Lewis <glewis@FreeBSD.org>
 
 PORTNAME=	rpm
 PORTVERSION=	4.16.1.3
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://ftp.rpm.org/releases/rpm-4.16.x/
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Red Hat Package Manager
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsed:textproc/gsed
 LIB_DEPENDS=	libpopt.so:devel/popt \
 		libnss3.so:security/nss \
 		libzstd.so:archivers/zstd \
 		libgcrypt.so:security/libgcrypt
 RUN_DEPENDS=	bash:shells/bash \
 		gxargs:misc/findutils
 
-USES=		alias bdb sqlite compiler:openmp cpe gmake iconv libarchive libtool \
+USES=		alias bdb sqlite cpe gmake iconv libarchive libtool \
 		lua:52+ pathfix pkgconfig shebangfix tar:bzip2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 SHEBANG_FILES=	scripts/brp-python-bytecompile scripts/check-prereqs \
 		scripts/check-rpaths-worker scripts/pkgconfigdeps.sh \
 		scripts/fontconfig.prov scripts/perl.prov scripts/perl.req  \
 		scripts/pythondistdeps.py scripts/find-lang.sh scripts/ocamldeps.sh \
 		scripts/find-debuginfo.sh
 CONFIGURE_ARGS=	--enable-sqlite=yes\
 		--with-popt-prefix="${LOCALBASE}" \
 		--sysconfdir=${PREFIX}/etc \
 		--localstatedir=/var \
 		--without-javaglue \
 		am_cv_python_version=${PYTHON_VER}${PYTHON_ABIVER} \
 		ac_cv_lib_elf_gelf_getvernaux=no  # otherwise fails to build in presence of devel/elfutils
 CONFIGURE_ENV=	LUA_CFLAGS=-I${LUA_INCDIR} \
 		LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER} -lm"
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/nspr -I${LOCALBASE}/include/nss/nss \
 		-I${BDB_INCLUDE_DIR} -I${LUA_INCDIR}
 LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/nss \
 		-L${BDB_LIB_DIR} -L${LUA_LIBDIR}
 
 PLIST_SUB=	VERSION=${PORTVERSION} \
 		OPSYS=${OPSYS:tl}
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	PYTHON PLUGINS NLS DOCS
 OPTIONS_DEFAULT=PYTHON
 OPTIONS_SUB=	yes
 
 PYTHON_CONFIGURE_ENABLE=python
 PYTHON_USES=		python
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 NLS_LIBS=		-lintl
 
 PLUGINS_CONFIGURE_ENABLE=plugins
 PLUGINS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's/ __GLIBC__.*/& || defined(__FreeBSD__)/' \
 		${WRKSRC}/system.h
 	@${REINPLACE_CMD} -e 's/\<xargs\>/gxargs/g' ${WRKSRC}/scripts/brp-python-bytecompile \
 		${WRKSRC}/scripts/brp-strip-static-archive \
 		${WRKSRC}/scripts/check-buildroot \
 		${WRKSRC}/scripts/check-rpaths \
 		${WRKSRC}/scripts/find-debuginfo.sh \
 		${WRKSRC}/scripts/vpkg-provides.sh
 
 post-install-PYTHON-off:
 	@${RM} ${STAGEDIR}${PREFIX}/lib/rpm/pythondistdeps.py
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} librpm/html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/biology/pooler/Makefile b/biology/pooler/Makefile
index f674ed8d0e6f..8236638d0c4a 100644
--- a/biology/pooler/Makefile
+++ b/biology/pooler/Makefile
@@ -1,26 +1,25 @@
 PORTNAME=		pooler
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.78
+PORTREVISION=		1
 CATEGORIES=		biology
 
 MAINTAINER=	ssb22@cam.ac.uk
 COMMENT=	Optimise DNA sequencing primer-set combinations
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/LICENSE
 
-# Not needed on x86, aarch64, or ppc64-13.x
-# Might need gcc on 32-bit ARM/PPC
-USES=		compiler:openmp
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	ssb22
 GH_PROJECT=	PrimerPooler
 
 WRKSRC_SUBDIR=	pooler
 CFLAGS+=	-fopenmp
 
 INSTALL_TARGET=	install-strip
 PLIST_FILES=	bin/pooler man/man1/pooler.1.gz share/applications/pooler.desktop
 
 .include <bsd.port.mk>
+
diff --git a/biology/seqan-apps/Makefile b/biology/seqan-apps/Makefile
index 01879b514c32..57a78e8657df 100644
--- a/biology/seqan-apps/Makefile
+++ b/biology/seqan-apps/Makefile
@@ -1,44 +1,44 @@
 # Created by: Hannes Hauswedell <h2+fbsdports@fsfe.org>
 
 PORTNAME=	seqan-apps
 DISTVERSIONPREFIX=	seqan-v
 DISTVERSION=	2.4.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	biology
 
 MAINTAINER=	h2+fbsdports@fsfe.org
 COMMENT=	Official bioinformatic applications based on the SeqAn library
 
 LICENSE=	BSD3CLAUSE LGPL3 GPLv3
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
 
-USES=		cmake compiler:openmp # once #199603 is resolved, add c++14-lang
+USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	seqan
 GH_PROJECT=	seqan
 CMAKE_ARGS=	-DSEQAN_BUILD_SYSTEM="SEQAN_RELEASE_APPS"
 
 OPTIONS_RADIO=		ARCH
 OPTIONS_RADIO_ARCH=	SSE4 AVX2 NATIVE
 SSE4_DESC=		Use SSE4 and POPCNT instructions
 SSE4_CMAKE_ON=		-DSEQAN_ARCH_SSE4:BOOL=TRUE
 AVX2_DESC=		Use SSE4, AVX2 and POPCNT instructions
 AVX2_CMAKE_ON=		-DSEQAN_ARCH_AVX2:BOOL=TRUE
 NATIVE_DESC=		Use all available instruction sets (-march=native)
 NATIVE_CMAKE_ON=	-DSEQAN_ARCH_NATIVE:BOOL=TRUE
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "armv7" || ${ARCH} == "i386" || ${ARCH} == "powerpc"
 PLIST_SUB+=	RM_I386="@comment "
 .else
 PLIST_SUB+=	RM_I386=""
 .endif
 
 .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
 USE_GCC=	yes
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/cad/calculix-ccx/Makefile b/cad/calculix-ccx/Makefile
index c5733de025f5..3807d9a7ea8d 100644
--- a/cad/calculix-ccx/Makefile
+++ b/cad/calculix-ccx/Makefile
@@ -1,86 +1,86 @@
 # Created by: Pedro Giffuni
 
 PORTNAME=	ccx
 PORTVERSION=	2.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 PKGNAMEPREFIX=	CalculiX-
 DISTFILES=	${DIST_SOURCES}
 DIST_SUBDIR=	calculix
 EXTRACT_ONLY=	${DIST_SOURCES}
 
 MAINTAINER=	pfg@FreeBSD.org
 COMMENT=	Three-Dimensional Structural Finite Element Program
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libarpack.so:math/arpack-ng	\
 		libspooles.so:math/spooles
 
-USES=		blaslapack compiler:openmp fortran gmake perl5 tar:bzip2
+USES=		blaslapack fortran gmake perl5 tar:bzip2
 USE_PERL5=	build
 
 DIST_SOURCES=	ccx_${PORTVERSION}.src${EXTRACT_SUFX}
 DIST_HTM=	ccx_${PORTVERSION}.htm${EXTRACT_SUFX}
 DIST_PS=	ccx_${PORTVERSION}.ps${EXTRACT_SUFX}
 DIST_EXAMPLES=	ccx_${PORTVERSION}.test${EXTRACT_SUFX}
 
 ALL_TARGET=	#Empty
 
 CCX_VER=	ccx_${PORTVERSION}
 WRKSRC=		${WRKDIR}/CalculiX/${CCX_VER}/src
 DOCSDIR=	${PREFIX}/share/doc/CalculiX
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${DIST_HTM} ${DIST_PS}
 EXTRACT_ONLY+=	${DIST_HTM} ${DIST_PS}
 .endif
 
 .if $(PORT_OPTIONS:MEXAMPLES)
 DISTFILES+=	${DIST_EXAMPLES}
 EXTRACT_ONLY+=	${DIST_EXAMPLES}
 .endif
 
 .if ${ARCH} == "sparc64"
 CFLAGS+=	-fPIC
 FFLAGS+=	-fPIC
 .else
 CFLAGS+=	-fpic
 FFLAGS+=	-fpic
 .endif
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Missing actual argument for argument '_formal_15' at (1)
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 pre-build:
 	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%CC%%+${CC}+g ; \
 	s+%%BLAS_LIBS%%+${BLASLIB}+ ; \
 	s+%%LAPACK_LIBS%%+${LAPACKLIB}+ ; \
 	s+%%LOCALBASE%%+${LOCALBASE}+g;' \
 		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${CCX_VER} \
 	  ${STAGEDIR}${PREFIX}/bin/ccx
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKDIR}/CalculiX/${CCX_VER}/doc/ccx && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${DOCSDIR}/ccx)
 	${INSTALL_DATA} ${WRKDIR}/CalculiX/${CCX_VER}/doc/${CCX_VER}.ps \
 		${STAGEDIR}${DOCSDIR}
 	@${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/${CCX_VER}.ps
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKDIR}/CalculiX/${CCX_VER}/test && ${COPYTREE_SHARE} . \
 	  ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile
index f013c0906b14..fca01f41e974 100644
--- a/graphics/ImageMagick6/Makefile
+++ b/graphics/ImageMagick6/Makefile
@@ -1,368 +1,367 @@
 PORTNAME=	ImageMagick
 DISTVERSION=	6.9.12-12
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	https://www.imagemagick.org/download/ \
 		https://www.imagemagick.org/download/releases/ \
 		http://servingzone.com/mirrors/ImageMagick/ \
 		http://mirror.checkdomain.de/imagemagick/ \
 		http://imagemagick.spd.co.il/ \
 		http://www.champground.com/imagemagick/ \
 		http://ftp.surfnet.nl/pub/ImageMagick/ \
 		http://mirror.searchdaimon.com/ImageMagick/ \
 		http://mirror.is.co.za/pub/imagemagick/ \
 		http://imagemagick.mirrorcatalogs.com/ \
 		ftp://ftp.imagemagick.org/pub/ImageMagick/ \
 		ftp://mirror.aarnet.edu.au/pub/imagemagick/ \
 		ftp://mirror.checkdomain.de/imagemagick/ \
 		ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ \
 		ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org/ \
 		ftp://ftp.nluug.nl/pub/ImageMagick/ \
 		ftp://mirror.searchdaimon.com/ImageMagick/ \
 		ftp://sunsite.icm.edu.pl/packages/ImageMagick/ \
 		ftp://ftp.tpnet.pl/pub/graphics/ImageMagick/ \
 		ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \
 		ftp://ftp.is.co.za/pub/imagemagick/ \
 		ftp://ftp.fifi.org/pub/ImageMagick/
 PKGNAMESUFFIX=	6
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Image processing tools (legacy version)
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 TESTS_DEPENDS=	gsfonts>=0:print/gsfonts
 
 PORTSCOUT?=	limit:^6\.9\.
 
 CONFLICTS_INSTALL=	ImageMagick7 ImageMagick7-nox11 # bin/Magick++-config
 
 # This port uses .la files, keep libtool:keepla! (magick/module.c)
 USES=		compiler:c++11-lang cpe gettext-runtime gmake gnome libtool:keepla \
 		localbase pathfix perl5 pkgconfig:both shebangfix tar:xz
 CPE_PRODUCT=	imagemagick
 CPE_VENDOR=	imagemagick
 SHEBANG_FILES=	www/source/examples.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKE=${MAKE_CMD}
 CONFIGURE_ARGS=	--without-dps \
 		--without-flif \
 		--without-zstd
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 
 SAMPLE_FILES=	coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \
 		policy.xml quantization-table.xml thresholds.xml type-apple.xml \
 		type-dejavu.xml type-ghostscript.xml type-urw-base35.xml \
 		type-windows.xml type.xml
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	BZIP2 DOCS DJVU FFMPEG FFTW FONTCONFIG FPX FREETYPE \
 		GRAPHVIZ GSLIB HEIF JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES \
 		OPENEXR OPENMP PANGO PDF PERL PNG RAQM SVG TESTS TIFF WEBP WMF \
 		THREADS X11 16BIT_PIXEL HDRI RAW
 OPTIONS_DEFAULT=	16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE \
 		JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG RAQM SVG \
 		TIFF WEBP WMF THREADS X11 RAW
 
 DJVU_DESC=		DJVU format support (needs THREADS)
 GSLIB_DESC=		libgs (Postscript SHLIB) support
 TESTS_DESC=		Run bundled self-tests after build
 #SIMD_CONFIGURE_WITH=	gcc-arch
 CONFIGURE_ARGS+=	--without-gcc-arch
 
 16BIT_PIXEL_DESC=	16bit pixel support
 16BIT_PIXEL_CONFIGURE_OFF=--with-quantum-depth=8
 16BIT_PIXEL_VARS=	_QBIT=Q16
 16BIT_PIXEL_VARS_OFF=	_QBIT=Q8
 PLIST_SUB+=		QBIT=${_QBIT}
 
 # Produce BZip compressed MIFF images
 BZIP2_DESC=		bzip2 compressed MIFF images
 BZIP2_CONFIGURE_WITH=	bzlib
 
 FFMPEG_DESC=		Video CODEC support from FFmpeg
 
 FFTW_CONFIGURE_WITH=	fftw
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 FONTCONFIG_CONFIGURE_WITH=	fontconfig
 FONTCONFIG_LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig
 
 FREETYPE_CONFIGURE_WITH=	freetype
 FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
 
 # FPX (FlashPIX) images
 FPX_CONFIGURE_WITH=	fpx
 FPX_LIB_DEPENDS=	libfpx.so:graphics/libfpx
 
 GRAPHVIZ_CONFIGURE_WITH=	gvc
 GRAPHVIZ_LIB_DEPENDS=	libgvc.so:graphics/graphviz
 GRAPHVIZ_CFLAGS=	-I${LOCALBASE}/include/graphviz
 GRAPHVIZ_LDFLAGS=	-L${LOCALBASE}/lib/graphviz
 
 HEIF_DESC=		ISO/IEC 23008-12:2017 HEIF file format support
 HEIF_CONFIGURE_WITH=	heic
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 
 HDRI_DESC=		High dynamic range images support
 HDRI_CONFIGURE_ENABLE=	hdri
 HDRI_VARS=		_HDRI=HDRI
 HDRI_VARS_OFF=		_HDRI=""
 PLIST_SUB+=		HDRI=${_HDRI}
 
 # JBIG images (lossless compression for bi-level images)
 JBIG_CONFIGURE_WITH=	jbig
 JBIG_LIB_DEPENDS=	libjbig.so:graphics/jbigkit
 
 JPEG_CONFIGURE_WITH=	jpeg
 JPEG_USES=		jpeg
 
 # JPEG2000 images (wavelet-based lossy compression)
 JPEG2000_DESC=		OpenJPEG 2000 support via openjpeg
 JPEG2000_CONFIGURE_WITH=openjp2
 JPEG2000_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 
 LCMS2_CONFIGURE_WITH=	lcms
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 
 LQR_CONFIGURE_WITH=	lqr
 LQR_LIB_DEPENDS=	liblqr-1.so:graphics/liblqr-1
 LQR_USE=		gnome=glib20
 
 LZMA_CONFIGURE_WITH=	lzma
 
 # Loadable coders, smaller executable, but PerlMagick not really works
 # ('make test' there works)
 MODULES_DESC=		Modules support
 MODULES_CONFIGURE_WITH=	modules
 
 PANGO_CONFIGURE_WITH=	pango
 PANGO_USE=		gnome=pango
 PANGO_IMPLIES=		X11
 
 PNG_CONFIGURE_WITH=	png
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 RAQM_DESC=		Complex text layout support
 RAQM_CONFIGURE_WITH=	raqm
 RAQM_LIB_DEPENDS=	libraqm.so:print/libraqm
 
 # libraw is by default liked to lcms2, whichs also ends up in IM regardless
 # of the IM LCMS option.
 RAW_DESC=		RAW format support (implies the lcms2 option)
 RAW_CONFIGURE_WITH=	raw
 RAW_LIB_DEPENDS=	libraw_r.so:graphics/libraw
 RAW_IMPLIES=		LCMS2
 
 SVG_DESC=		SVG vector image format support (via librsvg, implies the x11 option)
 SVG_CONFIGURE_WITH=	rsvg
 SVG_USE=		gnome=cairo,gdkpixbuf2,librsvg2
 SVG_IMPLIES=		X11
 
 TIFF_CONFIGURE_WITH=	tiff
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 X11_CONFIGURE_WITH=	x
 X11_USES=		xorg
 X11_USE=		xorg=ice,sm,x11,xext,xt
 X11_VARS=		CONFLICTS_INSTALL+="ImageMagick-nox11-6* ImageMagick6-nox11-6*" \
 			CONFLICTS+=display-[0-9]*
 X11_VARS_OFF=		CONFLICTS_INSTALL+="ImageMagick-6* ImageMagick6-6*" \
 			PKGNAMESUFFIX=6-nox11
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTHREADS}
 _IMAGEMAGICK_THREADS=yes
 _IMAGEMAGICK_THREADS_MSG=with threads
 . if exists(${PERL})
 PERL_THREADED!=	${SH} -c 'case `perl --version` in *freebsd-thread*) ${ECHO_CMD} yes ;; esac'; ${ECHO_CMD}
 . else
 # if ${PERL} doesn't exists, assume we dealing with threaded perl.
 PERL_THREADED=	yes
 . endif
 .else
 _IMAGEMAGICK_THREADS=no
 _IMAGEMAGICK_THREADS_MSG=without threads
 _IMAGEMAGICK_THREADS_IGNORE_MSG=. Define WITH_THREADS
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
 CONFIGURE_ARGS+=	--with-perl=${PERL} \
 			--with-perl-options="MAKE=${MAKE_CMD}"
 PLIST_SUB+=		WITH_PERL=''
 # PerlMagick does not work with threads, if perl is not threaded, and vice versa
 . if defined(PERL_THREADED)
 _IMAGEMAGICK_THREADS_PERL_MSG=Perl is threaded
 _IMAGEMAGICK_THREADS=yes
 . else
 _IMAGEMAGICK_THREADS_PERL_MSG=Perl is non-threaded
 _IMAGEMAGICK_THREADS_IGNORE_MSG=. ${_IMAGEMAGICK_THREADS_PERL_MSG}. Reinstall Perl with threads or undefine WITH_IMAGEMAGICK_PERL
 .  if ${_IMAGEMAGICK_THREADS} == "yes"
 IGNORE=${_IMAGEMAGICK_THREADS_IGNORE_MSG} or undefine WITH_THREADS
 .  endif
 _IMAGEMAGICK_THREADS=no
 . endif
 .else
 CONFIGURE_ARGS+=	--without-perl
 PLIST_SUB+=		WITH_PERL='@comment '
 .endif
 
 .if ${_IMAGEMAGICK_THREADS} == "yes"
 CONFIGURE_ARGS+=	--with-threads
 CONFIGURE_ENV+=		PTHREAD_LIBS="-lpthread"
 LDFLAGS+=		-lpthread
 .else
 CONFIGURE_ARGS+=	--without-threads
 _IMAGEMAGICK_THREADS=no
 .endif
 
 # OpenMP
 .if ${PORT_OPTIONS:MOPENMP}
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=OpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . else
-CONFIGURE_ARGS+=	--enable-openmp
-USES+=		compiler:openmp
+CONFIGURE_ARGS+=       --enable-openmp
 . endif
 .else
-CONFIGURE_ARGS+=	--disable-openmp
+CONFIGURE_ARGS+=       --disable-openmp
 .endif
 
 .if defined(WITH_WINDOWS_FONT_DIR)
 CONFIGURE_ARGS+=	--with-windows-font-dir=${WITH_WINDOWS_FONT_DIR}
 .endif
 
 .if ${PORT_OPTIONS:MOPENEXR}
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . else
 LIB_DEPENDS+=		libOpenEXR.so:graphics/openexr \
 			libImath.so:math/Imath
 PLIST_SUB+=		OPENEXR=""
 . endif
 .else
 CONFIGURE_ARGS+=	--without-openexr
 PLIST_SUB+=		OPENEXR="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDJVU}
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=DjVu requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . endif
 LIB_DEPENDS+=		libdjvulibre.so:graphics/djvulibre
 PLIST_SUB+=		DJVU=""
 .else
 CONFIGURE_ARGS+=	--without-djvu
 PLIST_SUB+=		DJVU="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
 BUILD_DEPENDS+=		ffmpeg:multimedia/ffmpeg
 RUN_DEPENDS+=		ffmpeg:multimedia/ffmpeg
 .endif
 
 .if ${PORT_OPTIONS:MGSLIB}
 CONFIGURE_ARGS+=	--with-gslib
 . if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript:x11
 . else
 USES+=		ghostscript
 . endif
 .else
 CONFIGURE_ARGS+=	--without-gslib
 .endif
 
 # WMF (Windows Meta File) images
 .if ${PORT_OPTIONS:MWMF}
 . if ${PORT_OPTIONS:MX11}
 LIB_DEPENDS+=		libwmf.so:graphics/libwmf
 . else
 LIB_DEPENDS+=		libwmf.so:graphics/libwmf-nox11
 . endif
 CONFIGURE_ARGS+=	--with-wmf=yes
 PLIST_SUB+=		WMF=""
 .else
 CONFIGURE_ARGS+=	--without-wmf
 PLIST_SUB+=		WMF="@comment "
 .endif
 
 # PDF (Adobe Portable Document Format) support
 .if ${PORT_OPTIONS:MPDF}
 . if ${PORT_OPTIONS:MX11}
 USES+=			ghostscript:x11
 . else
 USES+=			ghostscript
 . endif
 .endif
 
 .if ${PORT_OPTIONS:MPDF} || ${PORT_OPTIONS:MGSLIB}
 RUN_DEPENDS+=	gsfonts>=0:print/gsfonts
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET=	install-strip install-docDATA install-data-html
 .else
 INSTALL_TARGET=	install-strip
 .endif
 
 .if ${PORT_OPTIONS:MTESTS}
 . if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript:x11,build
 . else
 USES+=		ghostscript:build
 . endif
 .endif
 
 post-patch:
 # strip library name of variable parts that can change due to
 # the HDRI and Q16 option
 	@${REINPLACE_CMD}  -e 's|_@MAGICK_ABI_SUFFIX@||g; \
 		s|\.@MAGICK_ABI_SUFFIX@||g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|@\.@MAGICK_ABI_SUFFIX@|@|g' \
 		${WRKSRC}/PerlMagick/Makefile.PL.in \
 		${WRKSRC}/PerlMagick/quantum/Makefile.PL.in \
 		${WRKSRC}/Magick++/bin/Magick++-config.in \
 		${WRKSRC}/Magick++/lib/Magick++.pc.in \
 		${WRKSRC}/Magick++/lib/ImageMagick++.pc.in \
 		${WRKSRC}/magick/ImageMagick.pc.in \
 		${WRKSRC}/magick/MagickCore-config.in \
 		${WRKSRC}/magick/MagickCore.pc.in \
 		${WRKSRC}/wand/Wand.pc.in \
 		${WRKSRC}/wand/MagickWand-config.in \
 		${WRKSRC}/wand/MagickWand.pc.in
 
 pre-configure:
 .if defined(_IMAGEMAGICK_THREADS_PERL_MSG)
 	@${ECHO_CMD} '###################################################################'
 	@${ECHO_CMD} NOTICE: ${_IMAGEMAGICK_THREADS_PERL_MSG}. Building ImageMagick ${_IMAGEMAGICK_THREADS_MSG}.
 	@${ECHO_CMD} '###################################################################'
 .endif
 
 .if ${PORT_OPTIONS:MSVG} && ! ${PORT_OPTIONS:MX11}
 	@${ECHO_CMD} NOTICE: SVG format support disabled, requires X11
 .endif
 
 post-install:
 .for i in ${SAMPLE_FILES}
 	@${MV} ${STAGEDIR}${PREFIX}/etc/ImageMagick-6/${i} \
 		${STAGEDIR}${PREFIX}/etc/ImageMagick-6/${i}.sample
 .endfor
 
 post-install-TESTS-on: test
 
 do-test:
 	-cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} ${_MAKE_JOBS} check
 
 .include <bsd.port.mk>
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index 630fa460b5d6..8df8dca03fd3 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -1,364 +1,362 @@
 PORTNAME=	ImageMagick
 DISTVERSION=	7.0.11-12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics perl5
 MASTER_SITES=	https://www.imagemagick.org/download/ \
 		https://www.imagemagick.org/download/releases/ \
 		http://servingzone.com/mirrors/ImageMagick/ \
 		http://mirror.checkdomain.de/imagemagick/ \
 		http://imagemagick.spd.co.il/ \
 		http://www.champground.com/imagemagick/ \
 		http://ftp.surfnet.nl/pub/ImageMagick/ \
 		http://mirror.searchdaimon.com/ImageMagick/ \
 		http://mirror.is.co.za/pub/imagemagick/ \
 		http://imagemagick.mirrorcatalogs.com/ \
 		ftp://ftp.imagemagick.org/pub/ImageMagick/ \
 		ftp://mirror.aarnet.edu.au/pub/imagemagick/ \
 		ftp://mirror.checkdomain.de/imagemagick/ \
 		ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ \
 		ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org/ \
 		ftp://ftp.nluug.nl/pub/ImageMagick/ \
 		ftp://mirror.searchdaimon.com/ImageMagick/ \
 		ftp://sunsite.icm.edu.pl/packages/ImageMagick/ \
 		ftp://ftp.tpnet.pl/pub/graphics/ImageMagick/ \
 		ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \
 		ftp://ftp.is.co.za/pub/imagemagick/ \
 		ftp://ftp.fifi.org/pub/ImageMagick/
 PKGNAMESUFFIX=	7
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Image processing tools
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl	\
 		libzip.so:archivers/libzip
 
 TESTS_DEPENDS=	gsfonts>=0:print/gsfonts
 
 # bin/Magick++-config
 CONFLICTS_INSTALL=	ImageMagick ImageMagick-nox11 ImageMagick6 ImageMagick6-nox11
 
 # This port uses .la files, keep libtool:keepla! (magick/module.c)
 USES=		cpe gettext-runtime gmake gnome libtool:keepla \
 		localbase pathfix perl5 pkgconfig:both shebangfix tar:xz
 CPE_PRODUCT=	imagemagick
 CPE_VENDOR=	imagemagick
 SHEBANG_FILES=	www/source/examples.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKE=${MAKE_CMD}
 CONFIGURE_ARGS=	--without-dps \
 		--without-flif \
 		--without-zstd
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 
 SAMPLE_FILES=	colors.xml delegates.xml log.xml mime.xml policy.xml \
 		quantization-table.xml thresholds.xml type-apple.xml \
 		type-dejavu.xml type-ghostscript.xml type-urw-base35.xml \
 		type-windows.xml type.xml
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	BZIP2 DOCS DJVU FFMPEG FFTW FONTCONFIG FPX FREETYPE \
 		GRAPHVIZ GSLIB JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES \
 		OPENEXR OPENMP PANGO PDF PERL PNG RAQM SVG TESTS TIFF WEBP WMF \
 		THREADS X11 16BIT_PIXEL HDRI HEIF RAW
 OPTIONS_DEFAULT=	16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE \
 		JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG RAQM SVG \
 		TIFF WEBP WMF THREADS X11 HDRI RAW
 
 DJVU_DESC=		DJVU format support (needs THREADS)
 GSLIB_DESC=		libgs (Postscript SHLIB) support
 FFMPEG_DESC=		VIDEO codec support as FFmpeg
 TESTS_DESC=		Run bundled self-tests after build
 #SIMD_CONFIGURE_WITH=	gcc-arch
 CONFIGURE_ARGS+=	--without-gcc-arch
 
 16BIT_PIXEL_DESC=	16bit pixel support
 16BIT_PIXEL_CONFIGURE_OFF=--with-quantum-depth=8
 16BIT_PIXEL_VARS=	_QBIT=Q16
 16BIT_PIXEL_VARS_OFF=	_QBIT=Q8
 PLIST_SUB+=		QBIT=${_QBIT}
 
 # Produce BZip compressed MIFF images
 BZIP2_DESC=		bzip2 compressed MIFF images
 BZIP2_CONFIGURE_WITH=	bzlib
 
 FFTW_CONFIGURE_WITH=	fftw
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 FONTCONFIG_CONFIGURE_WITH=	fontconfig
 FONTCONFIG_LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig
 
 FREETYPE_CONFIGURE_WITH=	freetype
 FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
 
 # FPX (FlashPIX) images
 FPX_CONFIGURE_WITH=	fpx
 FPX_LIB_DEPENDS=	libfpx.so:graphics/libfpx
 
 GRAPHVIZ_CONFIGURE_WITH=	gvc
 GRAPHVIZ_LIB_DEPENDS=	libgvc.so:graphics/graphviz
 GRAPHVIZ_CFLAGS=	-I${LOCALBASE}/include/graphviz
 GRAPHVIZ_LDFLAGS=	-L${LOCALBASE}/lib/graphviz
 
 HEIF_DESC=		ISO/IEC 23008-12:2017 HEIF file format support
 HEIF_CONFIGURE_WITH=	heic
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 
 HDRI_DESC=		High dynamic range images support
 HDRI_CONFIGURE_ENABLE=	hdri
 HDRI_VARS=		_HDRI=HDRI
 HDRI_VARS_OFF=		_HDRI=""
 PLIST_SUB+=		HDRI=${_HDRI}
 
 # JBIG images (lossless compression for bi-level images)
 JBIG_CONFIGURE_WITH=	jbig
 JBIG_LIB_DEPENDS=	libjbig.so:graphics/jbigkit
 
 JPEG_CONFIGURE_WITH=	jpeg
 JPEG_USES=		jpeg
 
 # JPEG2000 images (wavelet-based lossy compression)
 JPEG2000_DESC=		OpenJPEG 2000 support via openjpeg
 JPEG2000_CONFIGURE_WITH=openjp2
 JPEG2000_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 
 LCMS2_CONFIGURE_WITH=	lcms
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 
 LQR_CONFIGURE_WITH=	lqr
 LQR_LIB_DEPENDS=	liblqr-1.so:graphics/liblqr-1
 LQR_USE=		gnome=glib20
 
 LZMA_CONFIGURE_WITH=	lzma
 
 # Loadable coders, smaller executable, but PerlMagick not really works
 # ('make test' there works)
 MODULES_DESC=		Modules support
 MODULES_CONFIGURE_WITH=	modules
 
 PANGO_CONFIGURE_WITH=	pango
 PANGO_USE=		gnome=pango
 PANGO_IMPLIES=		X11
 
 PNG_CONFIGURE_WITH=	png
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 RAQM_DESC=		Complex text layout support
 RAQM_CONFIGURE_WITH=	raqm
 RAQM_LIB_DEPENDS=	libraqm.so:print/libraqm
 
 # libraw is by default liked to lcms2, whichs also ends up in IM regardless
 # of the IM LCMS option.
 RAW_DESC=		RAW format support (implies the lcms2 option)
 RAW_CONFIGURE_WITH=	raw
 RAW_LIB_DEPENDS=	libraw_r.so:graphics/libraw
 RAW_IMPLIES=		LCMS2
 
 SVG_DESC=		SVG vector image format support (via librsvg, implies the x11 option)
 SVG_CONFIGURE_WITH=	rsvg
 SVG_USE=		gnome=cairo,gdkpixbuf2,librsvg2
 SVG_IMPLIES=		X11
 
 TIFF_CONFIGURE_WITH=	tiff
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 X11_CONFIGURE_WITH=	x
 X11_USES=		xorg
 X11_USE=		xorg=ice,sm,x11,xext,xt
 X11_VARS=		CONFLICTS_INSTALL+="ImageMagick7-nox11-* \
 			CONFLICTS+=display-[0-9]*
 X11_VARS_OFF=		CONFLICTS_INSTALL+="ImageMagick7-*" \
 			PKGNAMESUFFIX=7-nox11
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTHREADS}
 _IMAGEMAGICK_THREADS=yes
 _IMAGEMAGICK_THREADS_MSG=with threads
 . if exists(${PERL})
 PERL_THREADED!=	${SH} -c 'case `perl --version` in *freebsd-thread*) ${ECHO_CMD} yes ;; esac'; ${ECHO_CMD}
 . else
 # if ${PERL} doesn't exists, assume we dealing with threaded perl.
 PERL_THREADED=	yes
 . endif
 .else
 _IMAGEMAGICK_THREADS=no
 _IMAGEMAGICK_THREADS_MSG=without threads
 _IMAGEMAGICK_THREADS_IGNORE_MSG=. Define WITH_THREADS
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
 CONFIGURE_ARGS+=	--with-perl=${PERL} \
 			--with-perl-options="MAKE=${MAKE_CMD}"
 PLIST_SUB+=		WITH_PERL=''
 # PerlMagick does not work with threads, if perl is not threaded, and vice versa
 . if defined(PERL_THREADED)
 _IMAGEMAGICK_THREADS_PERL_MSG=Perl is threaded
 _IMAGEMAGICK_THREADS=yes
 . else
 _IMAGEMAGICK_THREADS_PERL_MSG=Perl is non-threaded
 _IMAGEMAGICK_THREADS_IGNORE_MSG=. ${_IMAGEMAGICK_THREADS_PERL_MSG}. Reinstall Perl with threads or undefine WITH_IMAGEMAGICK_PERL
 .  if ${_IMAGEMAGICK_THREADS} == "yes"
 IGNORE=${_IMAGEMAGICK_THREADS_IGNORE_MSG} or undefine WITH_THREADS
 .  endif
 _IMAGEMAGICK_THREADS=no
 . endif
 .else
 CONFIGURE_ARGS+=	--without-perl
 PLIST_SUB+=		WITH_PERL='@comment '
 .endif
 
 .if ${_IMAGEMAGICK_THREADS} == "yes"
 CONFIGURE_ARGS+=	--with-threads
 CONFIGURE_ENV+=		PTHREAD_LIBS="-lpthread"
 LDFLAGS+=		-lpthread
 .else
 CONFIGURE_ARGS+=	--without-threads
 _IMAGEMAGICK_THREADS=no
 .endif
 
 # OpenMP
 .if ${PORT_OPTIONS:MOPENMP}
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=OpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . else
-CONFIGURE_ARGS+=	--enable-openmp
-USES+=		compiler:openmp
+CONFIGURE_ARGS+=       --enable-openmp
 . endif
 .else
-CONFIGURE_ARGS+=	--disable-openmp
+CONFIGURE_ARGS+=       --disable-openmp
 .endif
-
 .if defined(WITH_WINDOWS_FONT_DIR)
 CONFIGURE_ARGS+=	--with-windows-font-dir=${WITH_WINDOWS_FONT_DIR}
 .endif
 
 .if ${PORT_OPTIONS:MOPENEXR}
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . else
 LIB_DEPENDS+=		libOpenEXR.so:graphics/openexr \
 			libImath.so:math/Imath
 PLIST_SUB+=		OPENEXR=""
 . endif
 .else
 CONFIGURE_ARGS+=	--without-openexr
 PLIST_SUB+=		OPENEXR="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDJVU}
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=DjVu requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . endif
 LIB_DEPENDS+=		libdjvulibre.so:graphics/djvulibre
 PLIST_SUB+=		DJVU=""
 .else
 CONFIGURE_ARGS+=	--without-djvu
 PLIST_SUB+=		DJVU="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGSLIB}
 CONFIGURE_ARGS+=	--with-gslib
 . if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript:x11
 . else
 USES+=		ghostscript
 . endif
 .else
 CONFIGURE_ARGS+=	--without-gslib
 .endif
 
 # WMF (Windows Meta File) images
 .if ${PORT_OPTIONS:MWMF}
 . if ${PORT_OPTIONS:MX11}
 LIB_DEPENDS+=		libwmf.so:graphics/libwmf
 . else
 LIB_DEPENDS+=		libwmf.so:graphics/libwmf-nox11
 . endif
 CONFIGURE_ARGS+=	--with-wmf=yes
 PLIST_SUB+=		WMF=""
 .else
 CONFIGURE_ARGS+=	--without-wmf
 PLIST_SUB+=		WMF="@comment "
 .endif
 
 # PDF (Adobe Portable Document Format) support
 .if ${PORT_OPTIONS:MPDF}
 . if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript:x11
 . else
 USES+=		ghostscript
 . endif
 .endif
 
 .if ${PORT_OPTIONS:MPDF} || ${PORT_OPTIONS:MGSLIB}
 RUN_DEPENDS+=	gsfonts>=0:print/gsfonts
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
 BUILD_DEPENDS+=		ffmpeg:multimedia/ffmpeg
 RUN_DEPENDS+=		ffmpeg:multimedia/ffmpeg
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET=	install-strip install-docDATA install-data-html
 .else
 INSTALL_TARGET=	install-strip
 .endif
 
 .if ${PORT_OPTIONS:MTESTS}
 . if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript:x11,build
 . else
 USES+=		ghostscript:build
 . endif
 .endif
 
 post-patch:
 # strip library name of variable parts that can change due to
 # the HDRI and Q16 option
 	@${REINPLACE_CMD}  -e 's|_@MAGICK_ABI_SUFFIX@||g; \
 		s|\.@MAGICK_ABI_SUFFIX@||g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|@\.@MAGICK_ABI_SUFFIX@|@|g' \
 		${WRKSRC}/PerlMagick/Makefile.PL.in \
 		${WRKSRC}/PerlMagick/quantum/Makefile.PL.in \
 		${WRKSRC}/Magick++/bin/Magick++-config.in \
 		${WRKSRC}/Magick++/lib/Magick++.pc.in \
 		${WRKSRC}/MagickCore/MagickCore-config.in \
 		${WRKSRC}/MagickCore/MagickCore.pc.in \
 		${WRKSRC}/MagickCore/ImageMagick.pc.in \
 		${WRKSRC}/MagickWand/MagickWand-config.in \
 		${WRKSRC}/MagickWand/MagickWand.pc.in
 
 pre-configure:
 .if defined(_IMAGEMAGICK_THREADS_PERL_MSG)
 	@${ECHO_CMD} '###################################################################'
 	@${ECHO_CMD} NOTICE: ${_IMAGEMAGICK_THREADS_PERL_MSG}. Building ImageMagick ${_IMAGEMAGICK_THREADS_MSG}.
 	@${ECHO_CMD} '###################################################################'
 .endif
 
 .if ${PORT_OPTIONS:MSVG} && ! ${PORT_OPTIONS:MX11}
 	@${ECHO_CMD} NOTICE: SVG format support disabled, requires X11
 .endif
 
 post-install:
 .for i in ${SAMPLE_FILES}
 	@${MV} ${STAGEDIR}${PREFIX}/etc/ImageMagick-7/${i} \
 		${STAGEDIR}${PREFIX}/etc/ImageMagick-7/${i}.sample
 .endfor
 
 post-install-TESTS-on: test
 
 do-test:
 	-cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} ${_MAKE_JOBS} check
 
 .include <bsd.port.mk>
diff --git a/graphics/aaphoto/Makefile b/graphics/aaphoto/Makefile
index 18f8dfcb8d3d..f6d67a94764c 100644
--- a/graphics/aaphoto/Makefile
+++ b/graphics/aaphoto/Makefile
@@ -1,37 +1,37 @@
 # Created by: Andras Horvath <han@log69.com>
 
 PORTNAME=	aaphoto
 PORTVERSION=	0.43.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics
 
 MAINTAINER=	mail@log69.com
 COMMENT=	Auto Adjust Photo, automatic color correction of photos
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libjasper.so:graphics/jasper \
 		libpng.so:graphics/png
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	log69
 
 GNU_CONFIGURE=	yes
-USES=		compiler:openmp jpeg
+USES=		jpeg
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/aaphoto
 
 .include <bsd.port.pre.mk>
 
-.if (${ARCH} == amd64 || ${ARCH} == i386) && ${CHOSEN_COMPILER_TYPE} == gcc
+.if (${ARCH} == amd64 || ${ARCH} == i386)
 CFLAGS+=	-fopenmp -D__OPENMP__
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/aaphoto ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.post.mk>
diff --git a/math/hmat-oss/Makefile b/math/hmat-oss/Makefile
index e54cb7d5ed35..cd215947f434 100644
--- a/math/hmat-oss/Makefile
+++ b/math/hmat-oss/Makefile
@@ -1,38 +1,33 @@
 PORTNAME=	hmat-oss
 DISTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Hierarchical matrix C/C++ library
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 
-USES=		cmake compiler:openmp
+USES=		cmake
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jeromerobert
 
 CMAKE_ARGS=	-DBLAS_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so \
 		-DLAPACK_LIBRARIES:STRING=${LOCALBASE}/lib/libopenblas.so
 CMAKE_OFF=	HMAT_GIT_VERSION
 
 LDFLAGS+=	-lexecinfo
 
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-USE_GCC=	yes
-.endif
-
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_EXAMPLES:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${REINPLACE_CMD} "s|#define OPENBLAS_DISABLE_THREADS|\/\/&|" ${BUILD_WRKSRC}/config.h && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/librsb/Makefile b/math/librsb/Makefile
index 187ead3b681a..a98c55792372 100644
--- a/math/librsb/Makefile
+++ b/math/librsb/Makefile
@@ -1,35 +1,36 @@
 # Created by: stephen@FreeBSD.org
 
 PORTNAME=	librsb
 PORTVERSION=	1.2.0.10
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/librsb
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/-rc/}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Sparse matrix library
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsed:textproc/gsed \
 		bash:shells/bash
 
-USES=		fortran compiler:openmp gmake shebangfix libtool
+USES=		fortran gmake shebangfix libtool
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	qtests
 GNU_CONFIGURE=	yes
 CFLAGS+=	-fPIC
 CONFIGURE_ARGS=	--enable-fortran-module-install \
 		--enable-matrix-types="double, double complex"
 SHEBANG_FILES=	scripts/*.sh examples/make.sh.in
 USE_LDCONFIG=	yes
 
 MANUAL_PACKAGE_BUILD=	Optimizes for the local machine
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -E s/sed/gsed/g ${WRKSRC}/scripts/*.sh
 
 .include <bsd.port.mk>
diff --git a/math/py-theano/Makefile b/math/py-theano/Makefile
index 99c7e6c4c77f..85a928551040 100644
--- a/math/py-theano/Makefile
+++ b/math/py-theano/Makefile
@@ -1,31 +1,32 @@
 # Created by: Dmitry Sivachenko <demon@FreeBSD.org>
 
 PORTNAME=	theano
 DISTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Theano-${DISTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Optimizing compiler for evaluating math expressions on CPUs and GPUs
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.8.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
 
-USES=		compiler:openmp python:3.6+
+USES=		python:3.6+
 USE_PYTHON=	concurrent distutils autoplist
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	CXX=${CXX}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|; s|python |${PYTHON_CMD} |' \
 		${WRKSRC}/theano/misc/check_blas_many.sh
 
 .include <bsd.port.mk>
diff --git a/math/tmv/Makefile b/math/tmv/Makefile
index 1783cfc1dd68..9ec06912099c 100644
--- a/math/tmv/Makefile
+++ b/math/tmv/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	tmv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.75
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast, intuitive linear algebra library for C++
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/TMV_LICENSE
 
-USES=		compiler:openmp gmake blaslapack:netlib localbase
+USES=		gmake blaslapack:netlib localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	rmjarvis
 USE_LDCONFIG=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 MAKEFILE=	${FILESDIR}/Makefile
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/TMV_Documentation.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/viennacl/Makefile b/math/viennacl/Makefile
index 4eaabd71266d..d10341decf3d 100644
--- a/math/viennacl/Makefile
+++ b/math/viennacl/Makefile
@@ -1,22 +1,22 @@
 # Created by: Pedro Giffuni <pfg@FreeBSD.org>
 
 PORTNAME=	viennacl
 PORTVERSION=	1.7.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/1.7.x/
 DISTNAME=	ViennaCL-${PORTVERSION}
 
 MAINTAINER=	pfg@FreeBSD.org
 COMMENT=	Linear algebra and solver library using CUDA, OpenCL, and OpenMP
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:devel/opencl
 LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 RUN_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:devel/opencl
 
-USES=		cmake compiler:openmp localbase
+USES=		cmake localbase
 
 .include <bsd.port.mk>