diff --git a/Mk/Uses/gmake.mk b/Mk/Uses/gmake.mk
index 3aa9bae0efac..776591c11643 100644
--- a/Mk/Uses/gmake.mk
+++ b/Mk/Uses/gmake.mk
@@ -1,19 +1,19 @@
 # Provide support to use the GNU make
 #
 # Feature:		gmake
 # Usage:		USES=gmake
 #
 # MAINTAINER: tijl@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GMAKE_MK)
 _INCLUDE_USES_GMAKE_MK=	yes
 
 .  if !empty(gmake_ARGS)
 IGNORE=	Incorrect 'USES+= gmake:${gmake_ARGS}' gmake takes no arguments
 .  endif
 
 BUILD_DEPENDS+=		gmake>=4.4.1:devel/gmake
-CONFIGURE_ENV+=		MAKE=gmake
-MAKE_CMD=		gmake
+CONFIGURE_ENV+=		MAKE=${GMAKE}
+MAKE_CMD=		${GMAKE}
 
 .endif
diff --git a/Mk/bsd.commands.mk b/Mk/bsd.commands.mk
index 8ab99a18e22b..4f0381d7bdd3 100644
--- a/Mk/bsd.commands.mk
+++ b/Mk/bsd.commands.mk
@@ -1,136 +1,136 @@
 # bsd.commands.mk - Common commands used within the ports infrastructure
 #
 #
 # DO NOT COMMIT CHANGES TO THIS FILE BY YOURSELF, EVEN IF YOU DID NOT GET
 # A RESPONSE FROM THE MAINTAINER(S) WITHIN A REASONABLE TIMEFRAME! ALL
 # UNAUTHORISED CHANGES WILL BE UNCONDITIONALLY REVERTED!
 #
 
 COMMANDS_Include_MAINTAINER=	portmgr@FreeBSD.org
 
 .if !defined(_COMMANDSMKINCLUDED)
 
 _COMMANDSMKINCLUDED=	yes
 
 AWK?=			/usr/bin/awk
 BASENAME?=		/usr/bin/basename
 BRANDELF?=		/usr/bin/brandelf
 BSDMAKE?=		/usr/bin/make
 BZCAT?=			/usr/bin/bzcat
 BZIP2_CMD?=		/usr/bin/bzip2
 CAT?=			/bin/cat
 CHGRP?=			/usr/bin/chgrp
 CHMOD?=			/bin/chmod
 CHOWN?=			/usr/sbin/chown
 CHROOT?=		/usr/sbin/chroot
 COMM?=			/usr/bin/comm
 CP?=			/bin/cp
 CPIO?=			/usr/bin/cpio
 CUT?=			/usr/bin/cut
 DC?=			/usr/bin/dc
 .  if exists(/usr/bin/dialog)
 DIALOG?=		/usr/bin/dialog
 .  else
 DIALOG?=		/usr/bin/bsddialog
 .  endif
 DIALOG4PORTS?=		${LOCALBASE}/bin/portconfig
 DIFF?=			/usr/bin/diff
 DIRNAME?=		/usr/bin/dirname
 EGREP?=			/usr/bin/egrep
 ELFCTL?=		/usr/bin/elfctl
 EXPR?=			/bin/expr
 FALSE?=			false	# Shell builtin
 FILE?=			/usr/bin/file
 FIND?=			/usr/bin/find
 FLEX?=			/usr/bin/flex
 FMT?=			/usr/bin/fmt
 FMT_80?=		${FMT} 75 79
-GMAKE?=			gmake
+GMAKE?=			${LOCALBASE}/bin/gmake
 GREP?=			/usr/bin/grep
 GUNZIP_CMD?=		/usr/bin/gunzip -f
 GZCAT?=			/usr/bin/gzcat
 GZIP?=			-9
 GZIP_CMD?=		/usr/bin/gzip -nf ${GZIP}
 HEAD?=			/usr/bin/head
 ID?=			/usr/bin/id
 IDENT?=			/usr/bin/ident
 JOT?=			/usr/bin/jot
 LDCONFIG?=		/sbin/ldconfig
 LHA_CMD?=		${LOCALBASE}/bin/lha
 LN?=			/bin/ln
 LS?=			/bin/ls
 MKDIR?=			/bin/mkdir -p
 MKTEMP?=		/usr/bin/mktemp
 MOUNT?=			/sbin/mount
 MOUNT_DEVFS?=		${MOUNT} -t devfs devfs
 # XXX: this is a work-around for an obscure bug where
 # mount -t nullfs returns zero status on errors within
 # a make target
 MOUNT_NULLFS?=		/sbin/mount_nullfs
 MV?=			/bin/mv
 NPROC?=			/bin/nproc
 OBJCOPY?=		/usr/bin/objcopy
 OBJDUMP?=		/usr/bin/objdump
 PASTE?=			/usr/bin/paste
 PAX?=			/bin/pax
 PRINTF?=		/usr/bin/printf
 PS_CMD?=		/bin/ps
 PW?=			/usr/sbin/pw
 READELF?=		/usr/bin/readelf
 REALPATH?=		/bin/realpath
 RLN?=			${INSTALL} -l rs
 RM?=			/bin/rm -f
 RMDIR?=			/bin/rmdir
 SED?=			/usr/bin/sed
 SETENV?=		/usr/bin/env
 SETENVI?=		/usr/bin/env -i
 SH?=			/bin/sh
 SORT?=			/usr/bin/sort
 STRIP_CMD?=		/usr/bin/strip
 STAT?=			/usr/bin/stat
 # Command to run commands as privileged user
 # Example: "/usr/local/bin/sudo -E sh -c" to use "sudo" instead of "su"
 SU_CMD?=		/usr/bin/su root -c
 SYSCTL?=		/sbin/sysctl
 TAIL?=			/usr/bin/tail
 TEST?=			test	# Shell builtin
 TR?=			/usr/bin/tr
 TRUE?=			true	# Shell builtin
 UMOUNT?=		/sbin/umount
 UNAME?=			/usr/bin/uname
 UNMAKESELF_CMD?=	${LOCALBASE}/bin/unmakeself
 UNZIP_CMD?=		${LOCALBASE}/bin/unzip
 UNZIP_NATIVE_CMD?=	/usr/bin/unzip
 WHICH?=			/usr/bin/which
 XARGS?=			/usr/bin/xargs
 XMKMF?=			${LOCALBASE}/bin/xmkmf
 YACC?=			/usr/bin/yacc
 
 XZ?=			-Mmax
 XZCAT=			/usr/bin/xzcat ${XZ}
 XZ_CMD?=		/usr/bin/xz ${XZ}
 
 MD5?=			/sbin/md5
 SHA256?=		/sbin/sha256
 SOELIM?=		/usr/bin/soelim
 
 # ECHO is defined in /usr/share/mk/sys.mk, which can either be "echo",
 # or "true" if the make flag -s is given.  Use ECHO_CMD where you mean
 # the echo command.
 ECHO_CMD?=		echo	# Shell builtin
 
 # Used to print all the '===>' style prompts - override this to turn them off.
 ECHO_MSG?=		${ECHO_CMD}
 
 .elif !defined(_PKGTOOLSDEFINED)
 _PKGTOOLSDEFINED=	yes
 PKG_BIN?=		${LOCALBASE}/sbin/pkg-static
 PKG_REGISTER?=		${PKG_BIN} register
 PKG_DELETE?=		${PKG_BIN} delete -y
 PKG_INFO?=		${PKG_BIN} info -g
 PKG_VERSION?=		${PKG_BIN} version
 PKG_CREATE?=		${PKG_BIN} create
 PKG_ADD?=		${PKG_BIN} add
 PKG_QUERY?=		${PKG_BIN} query
 
 .endif
diff --git a/audio/linux-c7-alsa-plugins-oss/Makefile b/audio/linux-c7-alsa-plugins-oss/Makefile
index d2d0fcaab550..325172df9140 100644
--- a/audio/linux-c7-alsa-plugins-oss/Makefile
+++ b/audio/linux-c7-alsa-plugins-oss/Makefile
@@ -1,111 +1,107 @@
 PORTNAME=	alsa-plugins
 PORTVERSION=	1.1.6
 DISTVERSIONSUFFIX=	-1.el7
 PORTREVISION=	4
 CATEGORIES=	audio linux
 MASTER_SITES=	CENTOS_LINUX
 MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/Source/SPackages/ \
 			centos/${LINUX_DIST_VER}/updates/Source/SPackages/
 PKGNAMEPREFIX=	linux-c7-
 PKGNAMESUFFIX=	-oss
 EXTRACT_SUFX=	.src.rpm
 DIST_SUBDIR=	centos
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	OSS plugin for ALSA (Linux CentOS ${LINUX_DIST_VER})
 WWW=		https://www.alsa-project.org/
 
 LICENSE=	LGPL21+
 
 USES=		autoreconf:build gmake libtool:build linux:c7 pkgconfig
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib:build,run alsa-lib-devel:build base:build devtools:build
 USE_LINUX_PREFIX=yes
 
 RPM_PATCHES=	alsa-plugins-1.1.6-post.patch \
 		alsa-plugins-1.1.6-speexdsp.patch
 CONFIG_ARGS=	--disable-static --disable-mix --disable-usbstream \
 		--disable-arcamav --disable-jack --disable-pulseaudio \
 		--disable-samplerate --disable-libav --disable-a52 \
 		--disable-lavrate --disable-speexdsp --with-speex=no
 CPPFLAGS+=	-DFREEBSD_OSS -DFREEBSD_OSS_USE_IO_PTR
 CFLAGS+=	--sysroot=${LINUXBASE}
 COMPAT32_CFLAGS_amd64=	-m32
 LIBDIR_aarch64=	/usr/lib64
 LIBDIR_amd64=	/usr/lib64
 LIBDIR_i386=	/usr/lib
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WRKSRC32=	${WRKDIR}/32/${PORTNAME}-${PORTVERSION}
 
 CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 PLIST=		${PKGDIR}/pkg-plist.${ARCH}
 
 .include <bsd.port.options.mk>
 
 post-extract:
 .if !empty(COMPAT32_CFLAGS_${ARCH})
 	@${MKDIR} ${WRKDIR}/32
 	@(cd ${WRKDIR}/32 && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		../${PORTNAME}-${PORTVERSION}.tar.bz2 ${EXTRACT_AFTER_ARGS})
 .endif
 	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${PORTNAME}-${PORTVERSION}.tar.bz2 ${EXTRACT_AFTER_ARGS})
 
 do-patch:
 	@${REINPLACE_CMD} 's/mkdir -p/$$(MKDIR_P)/' \
 		${WRKDIR}/alsa-plugins-1.1.6-post.patch
 .for p in ${RPM_PATCHES}
 .if !empty(COMPAT32_CFLAGS_${ARCH})
 	@${PATCH} -d ${WRKSRC32} --forward --quiet -E -p1 < ${WRKDIR}/${p}
 .endif
 	@${PATCH} -d ${WRKSRC} --forward --quiet -E -p1 < ${WRKDIR}/${p}
 .endfor
 .if !empty(COMPAT32_CFLAGS_${ARCH})
 	@${CAT} ${PATCHDIR}/patch-* | ${PATCH} -d ${WRKSRC32} --forward \
 		--quiet -E -p0
 .endif
 	@${CAT} ${PATCHDIR}/patch-* | ${PATCH} -d ${WRKSRC} --forward \
 		--quiet -E -p0
 
 do-configure:
 .if !empty(COMPAT32_CFLAGS_${ARCH})
 	@(cd ${WRKSRC32} && ${AUTORECONF} -f -i && ${SETENV} \
 		PATH=${LINUXBASE}/usr/bin ./configure CPPFLAGS="${CPPFLAGS}" \
 		CFLAGS="${CFLAGS:N-march=*} ${COMPAT32_CFLAGS_${ARCH}}" \
-		LDFLAGS="${LDFLAGS}" MAKE="${LOCALBASE}/bin/gmake" \
+		LDFLAGS="${LDFLAGS}" MAKE="${MAKE_CMD}" \
 		MKDIR_P="${MKDIR}" PKG_CONFIG="${LOCALBASE}/bin/pkgconf" \
 		PKG_CONFIG_PATH=${LINUXBASE}/usr/lib/pkgconfig \
 		${CONFIG_ARGS})
 .endif
 	@(cd ${WRKSRC} && ${AUTORECONF} -f -i && ${SETENV} \
 		PATH=${LINUXBASE}/usr/bin ./configure CPPFLAGS="${CPPFLAGS}" \
 		CFLAGS="${CFLAGS:N-march=*}" LDFLAGS="${LDFLAGS}" \
-		MAKE="${LOCALBASE}/bin/gmake" MKDIR_P="${MKDIR}" \
+		MAKE="${MAKE_CMD}" MKDIR_P="${MKDIR}" \
 		PKG_CONFIG="${LOCALBASE}/bin/pkgconf" \
 		PKG_CONFIG_PATH=${LINUXBASE}${LIBDIR_${ARCH}}/pkgconfig \
 		--libdir ${LIBDIR_${ARCH}} ${CONFIG_ARGS})
 
 do-build:
 .if !empty(COMPAT32_CFLAGS_${ARCH})
-	@(cd ${WRKSRC32} && ${SETENV} PATH=${LINUXBASE}/usr/bin \
-		${LOCALBASE}/bin/gmake)
+	@(cd ${WRKSRC32} && ${SETENV} PATH=${LINUXBASE}/usr/bin ${MAKE_CMD})
 .endif
-	@(cd ${WRKSRC} && ${SETENV} PATH=${LINUXBASE}/usr/bin \
-		${LOCALBASE}/bin/gmake)
+	@(cd ${WRKSRC} && ${SETENV} PATH=${LINUXBASE}/usr/bin ${MAKE_CMD})
 
 do-install:
 .if !empty(COMPAT32_CFLAGS_${ARCH})
 	@(cd ${WRKSRC32} && ${SETENV} PATH=${LINUXBASE}/usr/bin \
-		${LOCALBASE}/bin/gmake install-strip \
-		DESTDIR=${STAGEDIR}${LINUXBASE})
+		${MAKE_CMD} install-strip DESTDIR=${STAGEDIR}${LINUXBASE})
 	${RM} -r ${STAGEDIR}${LINUXBASE}/usr/lib/alsa-lib/*.la
 .endif
 	@(cd ${WRKSRC} && ${SETENV} PATH=${LINUXBASE}/usr/bin \
-		${LOCALBASE}/bin/gmake install-strip \
-		DESTDIR=${STAGEDIR}${LINUXBASE})
+		${MAKE_CMD} install-strip DESTDIR=${STAGEDIR}${LINUXBASE})
 	${RM} -r ${STAGEDIR}${LINUXBASE}${LIBDIR_${ARCH}}/alsa-lib/*.la
 	${LN} -sf ../../../usr/share/alsa/alsa.conf.d/50-oss.conf \
 		${STAGEDIR}${LINUXBASE}/etc/alsa/conf.d
 
 .include <bsd.port.mk>
diff --git a/biology/abyss/Makefile b/biology/abyss/Makefile
index 866362583846..2b189670b288 100644
--- a/biology/abyss/Makefile
+++ b/biology/abyss/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	abyss
 DISTVERSION=	2.3.10
 CATEGORIES=	biology
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Assembly By Short Sequences: parallel, paired-end sequence assembler
 WWW=		https://www.bcgsc.ca/resources/software/abyss/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	result of comparison of constant 18446744073709551615 with expression of type 'size_t', see https://github.com/bcgsc/abyss/issues/310
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/version.hpp:devel/boost-libs \
 		ghc:lang/ghc \
 		pandoc:textproc/hs-pandoc # pandoc is required just for one man page: abyss-sealer
 LIB_DEPENDS=	libbtllib.so:biology/btllib \
 		libffi.so:devel/libffi \
 		libgmp.so:math/gmp \
 		libmpich.so:net/mpich # binaries aren't linked with libmpich.so for some reason
 RUN_DEPENDS=	bash:shells/bash \
 		gmake:devel/gmake
 
 USES=		autoreconf compiler:c++11-lang gmake iconv:wchar_t localbase:ldflags shebangfix sqlite
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bcgsc
 
 SHEBANG_FILES=	bin/${PORTNAME}-* DataBase/abyss-db-txt
 SHEBANG_LANG=	make
 make_OLD_CMD=	/usr/bin/make
-make_CMD=	${PREFIX}/bin/gmake
+make_CMD=	${GMAKE}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-sparsehash # configure fails to find std::hash, reported to the ML: https://groups.google.com/forum/#!topic/trans-abyss/SZDBKR5bKxs
 
 TEST_TARGET=	check
 
 PORTSCOUT=	limit:^[0-9\.]*$$ # to ignore alpha-numeric tags
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 TESTING_UNSAFE=	yes # tests fail to compile, see https://github.com/bcgsc/abyss/issues/453
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD
 CFLAGS+=	-Wno-error=unused-but-set-variable
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile
index 206906a14402..a5c344b391e8 100644
--- a/devel/coccinelle/Makefile
+++ b/devel/coccinelle/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	coccinelle
 DISTVERSION=	1.3
 CATEGORIES=	devel
 MASTER_SITES=	https://coccinelle.gitlabpages.inria.fr/website/distrib/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	Program matching and transformation engine
 WWW=		https://coccinelle.gitlabpages.inria.fr/website/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 BUILD_DEPENDS=	menhir:devel/menhir \
 		ocaml-parmap>=0:devel/ocaml-parmap \
 		ocaml-pcre>=0:devel/ocaml-pcre
 LIB_DEPENDS=	libpcre.so:devel/pcre
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf gmake perl5 pkgconfig:build python shebangfix
 USE_GITHUB=	nodefault
 # until coccinelle/stdcompat releases with ocaml 5.2 support.
 GH_TUPLE=	thierry-martinez:stdcompat:d53390d788027fe0a2282c4745eb3d1626341f99:stdcompat
 USE_OCAML=	3.0+
 USE_OCAML_CAMLP4=	yes
 USE_PERL5=	build
 SHEBANG_FILES=	tools/pycocci scripts/cpptests.sh
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PYTHON="${PYTHON_CMD}" PYVER="${PYTHON_VER}"
 MAKE_ARGS=	PYTHON_VERSION="${PYTHON_VER}"
-BINARY_ALIAS=	make=${LOCALBASE}/bin/gmake
+BINARY_ALIAS=	make=${GMAKE}
 TEST_TARGET=	check check-cpp
 
 OPTIONS_DEFINE=		EMACS VIM
 OPTIONS_DEFAULT=	EMACS VIM
 OPTIONS_SUB=	yes
 
 EMACS_DESC=	Emacs plugin
 VIM_DESC=	Vim plugin
 
 EMACS_USES=	emacs
 EMACS_NO_DEPENDS=	yes
 
 post-extract:
 	${RM} -r ${WRKSRC}/bundles/stdcompat/stdcompat-current
 	(cd ${WRKSRC_stdcompat} && ${COPYTREE_SHARE} . \
 		${WRKSRC}/bundles/stdcompat/stdcompat-current)
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spatch
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spgen
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/coccinelle/*.so
 
 post-install-EMACS-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/cocci
 	cd ${WRKSRC}/editors/emacs && \
 		${INSTALL_DATA} cocci-ediff.el cocci.el \
 		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/cocci
 
 post-install-VIM-on:
 .for d in ftdetect syntax
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles/${d}
 	${INSTALL_DATA} ${WRKSRC}/editors/vim/${d}/cocci.vim \
 		${STAGEDIR}${PREFIX}/share/vim/vimfiles/${d}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/rcs57/Makefile b/devel/rcs57/Makefile
index ed4336fd8f0c..cac8ead4ff7d 100644
--- a/devel/rcs57/Makefile
+++ b/devel/rcs57/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	rcs
 PORTVERSION=	5.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	57
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Version control system (as was in FreeBSD prior to removal)
 WWW=		https://www.gnu.org/software/rcs/
 
 LICENSE=	GPLv2
 
 CONFLICTS=	rcs
 
 OPTIONS_DEFINE=	FREEBSD
 OPTIONS_DEFAULT=	FREEBSD
 FREEBSD_DESC=	Apply FreeBSD patches
 
-USES=		desthack gmake
+USES=		autoreconf desthack gmake
+USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 
 FREEBSD_EXTRA_PATCHES+=	${FILESDIR}/freebsd-src-ident.c \
 		${FILESDIR}/freebsd-src-maketime.c \
 		${FILESDIR}/freebsd-src-rcsbase.h \
 		${FILESDIR}/freebsd-src-rcsedit.c \
 		${FILESDIR}/freebsd-src-rcsfnms.c \
 		${FILESDIR}/freebsd-src-rcskeep.c \
 		${FILESDIR}/freebsd-src-rcskeys.c \
 		${FILESDIR}/freebsd-src-rcsrev.c \
 		${FILESDIR}/freebsd-src-rcsutil.c \
 		${FILESDIR}/freebsd-src-rcsdiff.c \
 		${FILESDIR}/freebsd-src-rlog.c
 
 .include <bsd.port.mk>
diff --git a/devel/rcs57/files/patch-configure.in b/devel/rcs57/files/patch-configure.in
new file mode 100644
index 000000000000..07b30eb3dde0
--- /dev/null
+++ b/devel/rcs57/files/patch-configure.in
@@ -0,0 +1,12 @@
+--- configure.in.orig	1995-06-16 06:19:24 UTC
++++ configure.in
+@@ -246,9 +246,6 @@ PATH=$ac_save_path
+ PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH
+ AC_PATH_PROGS(SENDMAIL, sendmail mail mailx)
+ PATH=$ac_save_path
+-case $SENDMAIL in
+-?*) SENDMAIL=\"$SENDMAIL\"
+-esac
+ 
+ # Use the GNU pic -n option if available; it avoids GNU extensions,
+ # which is need for proper operation to generate a portable man page.
diff --git a/devel/rcs57/files/patch-src-conf.sh b/devel/rcs57/files/patch-src-conf.sh
index c205dd8b9e1d..f90fea2a3dca 100644
--- a/devel/rcs57/files/patch-src-conf.sh
+++ b/devel/rcs57/files/patch-src-conf.sh
@@ -1,20 +1,38 @@
---- src/conf.sh.orig	1995-06-15 23:19:24.000000000 -0700
-+++ src/conf.sh	2013-10-05 20:29:37.323219649 -0700
-@@ -73,17 +73,6 @@
+--- src/conf.sh.orig	1995-06-16 06:19:24 UTC
++++ src/conf.sh
+@@ -43,7 +43,7 @@ Id='$Id: conf.sh,v 5.25 1995/06/16 06:19:24 eggert Exp
+ : ${DIFF_L=1}
+ : ${DIFF_SUCCESS=0} ${DIFF_FAILURE=1} ${DIFF_TROUBLE=2}
+ : ${ED=/bin/ed}
+-: ${SENDMAIL='"/usr/lib/sendmail"'}
++: ${SENDMAIL=/usr/lib/sendmail}
+ # : ${LDFLAGS=} ${LIBS=} tickles old shell bug
+ 
+ C="$CC $ALL_CFLAGS"
+@@ -73,17 +73,6 @@ esac
  	ech='echo -n' dots='... '
  esac
  
 -$ech >&3 "$0: testing permissions $dots"
 -rm -f a.d &&
 -date >a.d &&
 -chmod 0 a.d &&
 -{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && {
 -	echo >&3 "$n$0: This command should not be run with superuser permissions."
 -	exit 1
 -}
 -echo >&3 OK
 -rm -f a.d || exit
 -
  $ech >&3 "$0: testing compiler for plausibility $dots"
  echo 'main() { return 0; }' >a.c
  rm -f a.exe a.out || exit
+@@ -2053,7 +2042,7 @@ esac
+ '') a='/* ' z='*/ ';;
+ *) a= z=
+ esac
+-echo "$a#define SENDMAIL $SENDMAIL $z/* how to send mail */"
++echo "$a#define SENDMAIL \"$SENDMAIL\" $z/* how to send mail */"
+ 
+ : configuring TZ_must_be_set
+ echo "#define TZ_must_be_set 0 /* Must TZ be set for gmtime() to work?  */"
diff --git a/devel/rcs57/files/patch-src_Makefile.in b/devel/rcs57/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..bf610ef2d180
--- /dev/null
+++ b/devel/rcs57/files/patch-src_Makefile.in
@@ -0,0 +1,44 @@
+--- src/Makefile.in.orig	1995-06-16 06:19:24 UTC
++++ src/Makefile.in
+@@ -125,8 +125,8 @@ RCSTEST = \
+ # Install RCS and (if applicable) GNU diff before running these tests.
+ # To test RCS before installing it, see the file INSTALL.RCS.
+ RCSTEST = \
+-	ALL_CFLAGS='$(ALL_CFLAGS)' CC='$(CC)' DIFF='$(DIFF)' \
+-	LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
++	ALL_CFLAGS="$(ALL_CFLAGS)" CC="$(CC)" DIFF="$(DIFF)" \
++	LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
+ 	PATH=$(bindir):$$PATH \
+ 	sh $(srcdir)/rcstest
+ installcheck ::
+@@ -153,18 +153,18 @@ conf.h : conf.sh Makefile
+ #(Unix
+ conf.h : conf.sh Makefile
+ 	$(REMOVE) a.*
+-	ALL_CFLAGS='$(ALL_CFLAGS)' \
+-	CC='$(CC)' \
+-	COMPAT2='$(COMPAT2)' \
+-	DIFF3='$(DIFF3)' DIFF3_BIN='$(DIFF3_BIN)' \
+-	DIFF='$(DIFF)' DIFFFLAGS='$(DIFFFLAGS)' DIFF_L='$(DIFF_L)' \
+-	DIFF_SUCCESS='$(DIFF_SUCCESS)' \
+-	DIFF_FAILURE='$(DIFF_FAILURE)' \
+-	DIFF_TROUBLE='$(DIFF_TROUBLE)' \
+-	ED='$(ED)' \
+-	LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
+-	RCSPREFIX='$(RCSPREFIX)' \
+-	SENDMAIL='$(SENDMAIL)' \
++	ALL_CFLAGS="$(ALL_CFLAGS)" \
++	CC="$(CC)" \
++	COMPAT2="$(COMPAT2)" \
++	DIFF3="$(DIFF3)" DIFF3_BIN="$(DIFF3_BIN)" \
++	DIFF="$(DIFF)" DIFFFLAGS="$(DIFFFLAGS)" DIFF_L="$(DIFF_L)" \
++	DIFF_SUCCESS="$(DIFF_SUCCESS)" \
++	DIFF_FAILURE="$(DIFF_FAILURE)" \
++	DIFF_TROUBLE="$(DIFF_TROUBLE)" \
++	ED="$(ED)" \
++	LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
++	RCSPREFIX="$(RCSPREFIX)" \
++	SENDMAIL="$(SENDMAIL)" \
+ 	$(SHELL) -x $(srcdir)/conf.sh 3>&1 >a.h 2>conf.err
+ 	mv a.h $@
+ 	$(REMOVE) a.* core core.* *.core
diff --git a/lang/gnu-cobol/Makefile b/lang/gnu-cobol/Makefile
index 6277b81e0fa8..a3ca109c6931 100644
--- a/lang/gnu-cobol/Makefile
+++ b/lang/gnu-cobol/Makefile
@@ -1,44 +1,40 @@
 PORTNAME=	gnucobol
 PORTVERSION=	3.2
 PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	GNU/gnucobol
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Free/libre COBOL compiler
 WWW=		https://www.gnu.org/software/gnucobol/
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
+BUILD_DEPENDS=	help2man:misc/help2man
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libcjson.so:devel/libcjson
 
-USES=		bdb gmake gnome libtool ncurses tar:xz
+USES=		autoreconf bdb gmake gnome libtool ncurses tar:xz
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	MATH_LIBS=-lm
 
 TEST_TARGET=	check
 TEST_ENV=	TESTSUITEFLAGS=--jobs=${MAKE_JOBS_NUMBER}
 
 INFO=		gnucobol
 DATADIR=	${PREFIX}/share/gnucobol
 
 INSTALL_TARGET=	install-strip
 SSP_CFLAGS?=	-fstack-protector # XXX -strong fails to build
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=nls
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lcurses|-lncurses|g ; \
-		s|-R$$found_dir|-Wl,-rpath,$$found_dir|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/lang/gnu-cobol/files/patch-configure.ac b/lang/gnu-cobol/files/patch-configure.ac
new file mode 100644
index 000000000000..b8c0b2d330fc
--- /dev/null
+++ b/lang/gnu-cobol/files/patch-configure.ac
@@ -0,0 +1,34 @@
+--- configure.ac.orig	2023-07-28 17:16:37 UTC
++++ configure.ac
+@@ -54,6 +54,8 @@ AC_CONFIG_FILES([tests/run_prog_manual.sh],
+ AC_CONFIG_FILES([tests/run_prog_manual.sh],
+   [chmod +x tests/run_prog_manual.sh])
+ 
++AC_PATH_PROGS([MAKE], [gmake gnumake make])
++
+ # In general: don't export/setenv but pass as option to configure
+ #             this has the benefit that re-runs will take the same and "sudo"
+ #             or later "make" (possibly as different user) will use the same
+@@ -291,22 +293,6 @@ AC_DEFINE_UNQUOTED([MAX_CALL_FIELD_PARAMS], [$with_max
+ 
+ 
+ # Basic capability tests
+-
+-configured_make=""
+-if test -z "$MAKE"; then
+-  AC_CHECK_PROGS([configured_make], [make gmake gnumake])
+-  if test -z "$configured_make"; then
+-	AC_MSG_ERROR([make not found])
+-  else
+-	MAKE=$configured_make
+-	AC_SUBST(MAKE)
+-  fi
+-else
+-  AC_CHECK_PROG([configured_make], [$MAKE], [$MAKE])
+-  if test -z "$configured_make"; then
+-	AC_MSG_ERROR([make, configured as "$MAKE", was not found])
+-  fi
+-fi
+ 
+ AC_MSG_CHECKING([whether ${MAKE} can handle common constructs])
+ rm -f confmake.out
diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index 25b4cf7ac3e2..c240cc0e4e4c 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -1,244 +1,243 @@
 PORTNAME=	atlas
 PORTVERSION=	3.10.3
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/math-${PORTNAME}/Stable/${PORTVERSION}
 PKGNAMESUFFIX=	-math
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatically Tuned Linear Algebra Software (ATLAS)
 WWW=		https://math-atlas.sourceforge.net/
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${NONEXISTENT}:math/lapack:checksum
 
 USES=		fortran gmake tar:bzip2
 USE_GCC=	yes
 
 CONFLICTS=	cblas
 CONFLICTS_INSTALL=	openblas	# $PREFIX/include/cblas.h
 MANUAL_PACKAGE_BUILD=	Optimizes for the local machine.
 
 OPTIONS_DEFINE=		DOCS DATA ARCHDEF TSC WALL_TIMER
 OPTIONS_DEFAULT=	DATA
 ARCHDEF_DESC=		Use a specified architectural default
 DATA_DESC=		Install tuning data and logs from the build
 TSC_DESC=		If WALL_TIMER is enabled, use the TSC
 WALL_TIMER_DESC=	Use less robust timing with higher resolution
 
 PORTSCOUT=	limitw:1,even
 WRKSRC=		${WRKDIR}/ATLAS
 
 .include <bsd.port.options.mk>
 
 #Increase ATLAS_MAXMALLOC if the atlas threaded libraries perform poorly on large problems:
 # http://math-atlas.sourceforge.net/errata.html#MaxMalloc
 ATLAS_MAXMALLOC?=	67108864
 
 .if !empty(ARCH:M*64*)
 POINTER?=	64
 .else
 POINTER?=	32
 .endif
 
 .if defined(MAINTAINER_MODE)
 LIB_DEPENDS+=	libblas.so:math/blas
 .endif
 
 .if ${PORT_OPTIONS:MDATA}
 PORTDATA=	*
 .endif
 PORTDOCS=	*
 
 .if ${PORT_OPTIONS:MARCHDEF}
 .  if defined(ARCHDEF)
 .    if ${ARCHDEF} == "NONE"
 ARCHDEFFLAG=	-Si archdef 0
 .    endif
 .  else
 IGNORE=		you have set WITH_ARCHDEF, but have not defined ARCHDEF
 .  endif
 .endif
 
 USE_LDCONFIG=	yes
 
 EXTRA_FLAGS?=	${PICFLAG} -Wl,-rpath=${_GCC_RUNTIME}
 SHARED_FLAGS=	${PICFLAG} -DPIC
 SHARED_LAPACK_WRKSRC=	WRKSRC
 STATIC_LAPACK_WRKSRC=	WRKSRC
 PICFLAG?=	-fPIC
 CFLAGS+=	${PICFLAG}
 CONFIGURE_ENV+=	PATH="${WRKDIR}/.bin:${PATH}"
 MAKE_ENV+=	MAKE=${GMAKE} PATH="${WRKDIR}/.bin:${PATH}"
-BINARY_ALIAS=	make=${LOCALBASE}/bin/gmake	\
-		gcc=${CC} gfortran=${FC} f77=${FC}
+BINARY_ALIAS=	make=${GMAKE} gcc=${CC} gfortran=${FC} f77=${FC}
 
 pre-everything::
 	@${CAT} ${FILESDIR}/tuning-message
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|$$(ARCH)|$$(ATLAS_ARCH)|g' \
 		${WRKSRC}/Make.top \
 		${WRKSRC}/makes/Make.bin \
 		${WRKSRC}/makes/Make.lib \
 		${WRKSRC}/makes/Make.sysinfo \
 		${WRKSRC}/CONFIG/src/Makefile \
 		${WRKSRC}/CONFIG/ARCHS/Makefile
 	${REINPLACE_CMD} -e "\|OS=ALL|{N; \
 		s|-mavx|-msse3|;s|'| ${EXTRA_FLAGS}'|4;}" \
 		${WRKSRC}/CONFIG/src/atlcomp.txt
 	${REINPLACE_CMD} -E -e \
 	"\|(#define ATL_MaxMalloc[[:blank:]]+)([[:digit:]]+)|s||\1${ATLAS_MAXMALLOC}|" \
 		${WRKSRC}/include/atlas_lvl3.h
 	${REINPLACE_CMD} -e 's|%%WRKBIN%%|${WRKDIR}/.bin|'	\
 		${WRKSRC}/CONFIG/src/probe_comp.c
 
 do-configure:
 	echo "PATH=${PATH} *****************************************"
 	if [ ${PORT_OPTIONS:MWALL_TIMER} ] ; then \
 		TIMEFLAG= ; \
 		if [ \( ${ARCH} = "i386" -o ${ARCH} = "amd64" \) -a ${PORT_OPTIONS:MTSC} ] ; then \
 			freq=`${SYSCTL} -ni machdep.tsc_freq` ; \
 			if [ "x$${freq}" != "x" ] ; then \
 				if [ $${freq} -gt 1000000 ] ; then \
 					MHZ=$$(($${freq}/1000000)) ; \
 					TIMEFLAG="-D c -DPentiumCPS=$${MHZ}" ; \
 				fi ; \
 			fi ; \
 		fi ; \
 		if [ "x$${TIMEFLAG}" = "x" ] ; then \
 			TIMEFLAG="-D c -DWALL" ; \
 		fi ; \
 	fi ; \
 	${ECHO_CMD} "TIMEFLAG = $${TIMEFLAG}" \
 		> ${WRKSRC}/saved_flags ; \
 	${ECHO_CMD} "Dummy configuration of ATLAS to obtain compiler flags:" ; \
 	${MKDIR} ${WRKSRC}/static ; cd ${WRKSRC}/static ; \
 		${SETENV} ${CONFIGURE_ENV} ../configure --cc="${CC}" --cflags="${CFLAGS}" \
 		--prefix="${PREFIX}" -v 2 $${TIMEFLAG} ${ARCHDEFFLAG} \
 		-Ss f77lib " " -Ss pmake "${MAKE} ${_MAKE_JOBS}" \
 		-Fa alg "${STATIC_FLAGS} " -b ${POINTER}
 	${SED} -ne "\|F77FLAGS =|p" ${WRKSRC}/static/Make.inc \
 		>> ${WRKSRC}/saved_flags
 
 post-configure:
 	@${RM} -r ${WRKSRC}/static
 
 do-build:
 .for opt in shared static
 	@${ECHO_CMD} "Building the LAPACK archives with ${opt} ATLAS flags:"
 	F77FLAGS="`${MAKE} -f ${WRKSRC}/saved_flags -V F77FLAGS` ${EXTRA_FLAGS}" ; \
 	LW=`${MAKE} -C ${PORTSDIR}/math/lapack -V ${${opt:tu}_LAPACK_WRKSRC}` ; \
 	${MAKE} -C ${PORTSDIR}/math/lapack WITH=${opt:tu} clean patch ; \
 	${REINPLACE_CMD} -e 's|-O0|-O0 ${EXTRA_FLAGS}|'	$${LW}/make.inc ; \
 	cd $${LW} ; ${SETENV} ${MAKE_ENV:NFFLAGS=*} EXTRAFLAGS="${${opt:tu}_FLAGS} ${PICFLAG} " \
 		FFLAGS="-pipe $${F77FLAGS}" ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} \
 		ARCH="${AR}" lapacklib ; \
 	TIMEFLAG=`${MAKE} -f ${WRKSRC}/saved_flags -V TIMEFLAG` ; \
 	${MKDIR} ${WRKSRC}/${opt}/lib ; cd ${WRKSRC}/${opt} ; \
 	${MV} $${LW}/liblapack.a liblapack_${opt}.a ; \
 	${AR} -dv liblapack_${opt}.a lsame.o xerbla.o csrot.o zdrot.o ; \
 	${CP} liblapack_${opt}.a lib/liblapack.a ; \
 	${MAKE} -C ${PORTSDIR}/math/lapack clean ; \
 	${ECHO_CMD} "Configuring ${opt} ATLAS:" ; \
 		${SETENV} ${CONFIGURE_ENV} ../configure --cc="${CC}" --cflags="${CFLAGS}" \
 		--prefix="${PREFIX}" -v 2 $${TIMEFLAG} ${ARCHDEFFLAG} \
 		-Ss flapack "${WRKSRC}/${opt}/liblapack_${opt}.a" \
 		-Ss f77lib " " -Ss pmake "${MAKE_CMD} ${_MAKE_JOBS}" \
 		-Si lapackref 1 -D c -DATL_FULL_LAPACK \
 		-Fa alg "${${opt:tu}_FLAGS} " -b ${POINTER} ; \
 	if [ "x${WITH_ARCHDEF}" != "x" ] ; then \
 		if [ "x${ARCHDEF}" != "xNONE" ] ; then \
 			if [ -f ${ARCHDEF} ] ; then \
 				${CP} -f ${ARCHDEF} ${WRKSRC}/CONFIG/ARCHS/ ; \
 			elif [ ! -f ${WRKSRC}/CONFIG/ARCHS/${ARCHDEF} ] ; then \
 				${ECHO_CMD} \
 				"==> ${PKGNAME} : ARCHDEF \"${ARCHDEF}\" does not exist" ; \
 				exit 1 ; \
 			fi ; \
 			${REINPLACE_CMD} -E -e \
 			"\|[[:blank:]]*ARCH =|s|=.*|= ${ARCHDEF:T:S/.tgz$//}|" \
 			${WRKSRC}/${opt}/Make.inc ; \
 		fi ; \
 	fi ; \
 	${ECHO_CMD} "Building ${opt} ATLAS:" ; cd ${WRKSRC}/${opt} ; \
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all
 .endfor
 
 L1=	${FC} $${F77FLAGS} ${SHARED_FLAGS} ${LDFLAGS} -shared -Wl,-x \
 	-Wl,--whole-archive -Wl,-soname,
 L2=	-Wl,--no-whole-archive -Wl,--as-needed -lpthread
 
 post-build:
 .for opt in shared static
 	@${ECHO_CMD} "Timing ${opt} ATLAS:"
 	(cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} time ; \
 		cd ARCHS ; ${SETENV} ${MAKE_ENV} \
 			${MAKE_CMD} ${MAKE_ARGS} ArchNew tarfile)
 .endfor
 	@${ECHO_CMD} "Building ATLAS shared libraries:"
 	F77FLAGS="`${MAKE} -f ${WRKSRC}/saved_flags -V F77FLAGS` ${EXTRA_FLAGS}" ; \
 	cd ${WRKSRC}/shared/lib ; \
 	${L1}libatlas.so.2 -o libatlas.so.2 libatlas.a ${L2} ; \
 	${L1}libf77blas.so.2 -o libf77blas.so.2 libf77blas.a ${L2} libatlas.so.2 ; \
 	${L1}libptf77blas.so.2 -o libptf77blas.so.2 libptf77blas.a ${L2} libatlas.so.2 ; \
 	${L1}libcblas.so.2 -o libcblas.so.2 libcblas.a ${L2} libatlas.so.2 ; \
 	${L1}libptcblas.so.2 -o libptcblas.so.2 libptcblas.a ${L2} libatlas.so.2 ; \
 	${L1}libalapack.so.2 -o libalapack.so.2 liblapack.a ${L2} libatlas.so.2
 
 .if defined(MAINTAINER_MODE)
 STATIC_BLAS=	${LOCALBASE}/lib/libblas.a
 SHARED_BLAS=	-L${LOCALBASE}/lib -lblas
 
 test: build
 .  for opt in shared static
 	@${ECHO_CMD} "Testing ${opt} ATLAS:"
 	@cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} BLAS="${${opt:tu}_BLAS}" \
 	${MAKE_CMD} ${MAKE_ARGS} check ptcheck error_report
 .  endfor
 .endif
 
 do-install:
 .for i in libatlas libcblas libf77blas liblapack libptcblas libptf77blas
 	${INSTALL_DATA} ${WRKSRC}/static/lib/${i}.a \
 		${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}.a
 	${INSTALL_DATA} ${WRKSRC}/shared/lib/${i}.a \
 		${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}_pic.a
 	${INSTALL_LIB} ${WRKSRC}/shared/lib/${i:S|lapack|alapack|}.so.2 \
 		${STAGEDIR}${PREFIX}/lib
 	${LN} -sf ${i:S|lapack|alapack|}.so.2 \
 		${STAGEDIR}${PREFIX}/lib/${i:S|lapack|alapack|}.so
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/cblas.h ${WRKSRC}/include/clapack.h \
 		${STAGEDIR}${PREFIX}/include
 .for opt in shared static
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/atlas/${opt}
 	${INSTALL_DATA} ${WRKSRC}/${opt}/include/* \
 		${STAGEDIR}${PREFIX}/include/atlas/${opt}
 .    if ${PORT_OPTIONS:MDATA}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${opt}
 	(cd ${WRKSRC}/${opt}/bin; \
 		${COPYTREE_SHARE} INSTALL_LOG ${STAGEDIR}${DATADIR}/${opt})
 	(cd ${WRKSRC}/${opt}/ARCHS; \
 		${COPYTREE_SHARE} "*" ${STAGEDIR}${DATADIR}/${opt} \
 		"! -name Makefile -and ! -name *.tgz")
 	@${FIND} ${STAGEDIR}${DATADIR}/${opt} -type d -empty -delete
 .    endif
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 .endif
 
 post-install:
 .for d in shared static
 .  for f in xnegmm xnegmv xnegr1
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/${d}/${f}
 .  endfor
 .endfor
 
 .include <bsd.port.mk>
diff --git a/math/unuran/Makefile b/math/unuran/Makefile
index 4b4921c7d805..012118d0ff02 100644
--- a/math/unuran/Makefile
+++ b/math/unuran/Makefile
@@ -1,48 +1,43 @@
 PORTNAME=	unuran
 PORTVERSION=	1.11.0
 CATEGORIES=	math
 MASTER_SITES=	http://statmath.wu-wien.ac.at/unuran/
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Universal Non-Uniform RANdom number generators
 WWW=		http://statmath.wu-wien.ac.at/unuran/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	librngstreams.so:math/rngstreams
 
 USES=		gmake libtool localbase:ldflags
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-urng-rngstream --with-urng-default=rngstream \
 		--enable-info
-MAKE_ENV=	MAKE="${MAKE_CMD}"
 
 USE_LDCONFIG=	yes
 INFO=		unuran
 PORTDOCS=	unuran.pdf unuran.txt
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e '/UNURANFULLCHECK=true make check/s/make/${MAKE_CMD}/' \
-		${WRKSRC}/Makefile.in
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for DD in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${DD} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .ifdef(MAINTAINER_MODE)
 CONFIGURE_ARGS+=	--enable-check-struct --enable-logging
 
 do-test:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check)
 
 fullcheck: build
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} fullcheck)
 
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile
index e4238d56fc7e..9586c93063e8 100644
--- a/net-mgmt/kismet/Makefile
+++ b/net-mgmt/kismet/Makefile
@@ -1,93 +1,92 @@
 PORTNAME=	kismet
 DISTVERSION=	2016-07-R1
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kismetwireless.net/code/
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	802.11 layer2 wireless network detector, sniffer, and IDS
 WWW=		https://www.kismetwireless.net/
 
 LICENSE=	GPLv2
 
 USES=		gmake localbase:ldflags tar:xz
 USE_CXXSTD=	c++14
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 WRKSRC=	${WRKDIR}/${DISTNAME:S/a$$//}
 
 PORTDOCS=	README
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		PCRE PLUGINS SETUID DOCS EXAMPLES
 OPTIONS_DEFAULT=	PCRE PLUGINS SETUID
 OPTIONS_SUB=		yes
 
 SETUID_DESC=		Use privilege separation
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CONFIGURE_ENABLE=	pcre
 PLUGINS_USES=	ssl
 PLUGINS_ALL_TARGET=	depend all all-plugins
 PLUGINS_INSTALL_TARGET=	all-plugins-install
 SETUID_CONFIGURE_ON=--with-suidgroup=wheel
 SETUID_CONFIGURE_OFF=--without-suidgroup
 SETUID_INSTALL_TARGET=		suidinstall
 SETUID_INSTALL_TARGET_OFF=		install
 SETUID_SUB_FILES=	suid_pkg-message
 SETUID_PLIST_SUB=	SUID="" SUIDGROUP="${GROUPS}"
 SETUID_PLIST_SUB_OFF=	SUID="@comment " SUIDGROUP=""
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSETUID}
 GROUPS=		kismet
 PKGMESSAGE=	${WRKDIR}/suid_pkg-message
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-restricted-plugin-ptw_aircrack-crypto.cc
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "/gps=/s/true/false/" \
 		-e "/ouifile=/{/wireshark/d;s|/etc|${DOCSDIR}|;}" \
 			${WRKSRC}/conf/kismet.conf.in \
 			${WRKSRC}/conf/kismet_drone.conf
 	@${REINPLACE_CMD} -e "s/plugin-/plugin-[aps]/" \
-		-e "s/make/${MAKE_CMD}/" \
-		-e "s/\$$(MAKE)/${MAKE_CMD}/" \
+		-e 's/make/$$(MAKE)/' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s/CXXFLAGS/CPPFLAGS/" \
 		${WRKSRC}/plugin-alertsyslog/Makefile
 	@${FIND} ${WRKSRC} -type f -name 'Makefile' -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -E \
 		'/C(XX)?FLAGS[[:blank:]]*\+=/s/ -g / /'
 	@${FIND} ${WRKSRC} -type f \( -name Makefile -o -name Makefile.in \) -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e 's,-o $$(INSTUSR) -g $$(INSTGRP),,' \
 		-e 's,-o $$(INSTUSR) -g $$(MANGRP),,' \
 		-e 's,-o $$(INSTUSR) -g $$(SUIDGROUP) -m 4550,,'
 
 post-build:
 	cd ${WRKSRC}; ${STRIP_CMD} kismet_client kismet_drone kismet_server */*.so
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/ruby/* ${STAGEDIR}${EXAMPLESDIR}
 .endif
 	${MV} ${STAGEDIR}${PREFIX}/etc/kismet.conf \
 		${STAGEDIR}${PREFIX}/etc/kismet.conf.sample
 	${MV} ${STAGEDIR}${PREFIX}/etc/kismet_drone.conf \
 		${STAGEDIR}${PREFIX}/etc/kismet_drone.conf.sample
 
 .include <bsd.port.post.mk>
diff --git a/security/klee/Makefile b/security/klee/Makefile
index a759d3585714..c6e9456f0734 100644
--- a/security/klee/Makefile
+++ b/security/klee/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	klee
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1
 CATEGORIES=	security devel
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Symbolic virtual machine built on top of LLVM
 WWW=		https://klee.github.io/
 
 LICENSE=	NCSA
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 NOT_FOR_ARCHS=	i386 powerpc
 
 BUILD_DEPENDS=	gmake:devel/gmake
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}
 
 USES=		cmake compiler:c++14-lang llvm:min=12,max=16,build,run,noexport localbase \
 		pkgconfig python:run shebangfix sqlite
 USE_GITHUB=	yes
 SHEBANG_FILES=	tools/klee-stats/klee-stats tools/ktest-tool/ktest-tool tools/klee-zesti/klee-zesti
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	ENABLE_POSIX_RUNTIME ENABLE_UNIT_TESTS ENABLE_SYSTEM_TESTS
 CMAKE_ARGS=	-DLLVM_CONFIG_BINARY=${LOCALBASE}/bin/${LLVM_CONFIG} \
-		-DMAKE_BINARY=${LOCALBASE}/bin/gmake
+		-DMAKE_BINARY=${GMAKE}
 
 OPTIONS_DEFINE=		TCMALLOC
 OPTIONS_DEFAULT=	TCMALLOC Z3 STP
 OPTIONS_MULTI=		BACKEND
 OPTIONS_MULTI_BACKEND=	Z3 STP
 
 TCMALLOC_DESC=		Use tcmalloc library for memory management
 TCMALLOC_CMAKE_BOOL=	ENABLE_TCMALLOC
 TCMALLOC_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
 
 Z3_DESC=		Enable Z3 SMT solver
 Z3_CMAKE_BOOL=		ENABLE_SOLVER_Z3
 Z3_BUILD_DEPENDS=	z3:math/z3
 Z3_RUN_DEPENDS=		z3:math/z3
 
 STP_DESC=		Enable STP SMT solver
 STP_CMAKE_BOOL=		ENABLE_SOLVER_STP
 STP_LIB_DEPENDS=	libstp.so:math/stp \
 			libcryptominisat5.so:math/cryptominisat
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64le || ${ARCH} == aarch64
 PLIST_SUB=	32BIT="@comment " \
 		64BIT=""
 .else
 PLIST_SUB=	32BIT="" \
 		64BIT=""
 .endif
 
 .include <bsd.port.mk>
diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile
index d7b80d3aa821..7939d1e76884 100644
--- a/shells/bash-completion/Makefile
+++ b/shells/bash-completion/Makefile
@@ -1,65 +1,60 @@
 PORTNAME=	bash-completion
 PORTVERSION=	2.14.0
 PORTEPOCH=	2
 CATEGORIES=	shells
 MASTER_SITES=	https://github.com/scop/bash-completion/releases/download/${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Programmable completion library for Bash
 WWW=		https://github.com/scop/bash-completion
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 TEST_DEPENDS=	runtest:misc/dejagnu \
 		${LOCALBASE}/lib/tcllib/cmdline/cmdline.tcl:devel/tcllib
 
 USES=		autoreconf gmake pathfix tar:xz
 
 GNU_CONFIGURE=	yes
 NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	RUNFILE=${DATADIR}/bash_completion.sh
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
 OPTIONS_DEFINE=	CMAKE_MODULES FREEBSD
 OPTIONS_SINGLE=	BASH
 OPTIONS_SINGLE_BASH=	BASH_SHARED BASH_STATIC
 OPTIONS_DEFAULT=BASH_SHARED CMAKE_MODULES FREEBSD
 OPTIONS_SUB=	yes
 BASH_SHARED_DESC=	Use shells/bash as backend
 BASH_STATIC_DESC=	Use shells/bash-static as backend
 CMAKE_MODULES_DESC=	Install bash-completion modules for cmake
 FREEBSD_DESC=		Add FreeBSD-specific completion
 
 BASH_SHARED_RUN_DEPENDS=bash:shells/bash
 BASH_STATIC_RUN_DEPENDS=bash:shells/bash-static
 FREEBSD_RUN_DEPENDS=	bash-completion-freebsd>=0:shells/bash-completion-freebsd
 
-.include <bsd.port.pre.mk>
-
-# See PR 248829 for details
-MAKE_CMD=	${LOCALBASE}/bin/gmake
-
 post-configure:
 	@${REINPLACE_CMD} \
 		-e 's|/etc/ssl/openssl.cnf|${PREFIX}& &|g' \
 		-e 's|/usr/lib\(/aspell\)|${PREFIX}/share\1|g' \
 		-e 's|/usr/local|${PREFIX}|g' \
 		-e 's|/usr/ports|${PORTSDIR}|g' \
 		-e 's|/usr\(/sbin/postconf\)|${PREFIX}\1|g' \
 		-e 's|/usr/share/info|&:${PREFIX}/info|g' \
 		-e 's|/var\(/lib/rpm/macros\)|${PREFIX}\1|g' \
 			${WRKSRC}/completions/*
 
 post-install:
 	${RM} ${STAGEDIR}${DATADIR}/completions/makepkg
 
 do-test:
 .for test in runCompletion runInstall runUnit
 	-cd ${WRKSRC}/test && bash ${test}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile
index ab9a1dd1647f..5b1947c88b2d 100644
--- a/sysutils/edk2/Makefile
+++ b/sysutils/edk2/Makefile
@@ -1,224 +1,224 @@
 PORTNAME=	edk2
 PORTVERSION=	g202308
 PORTREVISION=	5
 CATEGORIES=	sysutils
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 
 MAINTAINER=	uboot@FreeBSD.org
 COMMENT=	EDK2 Firmware for ${FLAVOR}
 WWW=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/
 
 LICENSE=	BSD3CLAUSE
 
 ONLY_FOR_ARCHS=		aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	only provides firmware for aarch64 and amd64
 
 PKGNAMESUFFIX=	-${FLAVOR:C/_/-/g}
 FLAVORS=	macchiatobin fvp rpi3 rpi4 xen_x64 bhyve qemu_x64 qemu_i386
 
 USES=	cpe gmake python:build
 CPE_VENDOR=	tianocore
 USE_GCC=	yes:build
 
 BUILD_DEPENDS+=	dtc>=1.4.1:sysutils/dtc \
 		bash:shells/bash
 
 # Both platform and non-osi repository don't have release, use latest known to work tag
 PLATFORM_TAG=	e509ac5a72
 NONOSI_TAG=	8c09bd0955
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tianocore
 GH_TAGNAME=	edk2-stable202308
 GH_TUPLE=	tianocore:edk2-platforms:${PLATFORM_TAG}:platforms \
 		tianocore:edk2-non-osi:${NONOSI_TAG}:nonosi \
 		google:brotli:v1.0.9-35-gf4153a0:brotli/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli \
 		google:googletest:release-1.8.0-2983-g86add134:googletest/UnitTestFrameworkPkg/Library/GoogleTestLib/googletest \
 		MIPI-Alliance:public-mipi-sys-t:v1.1+edk2:mipisyst/MdePkg/Library/MipiSysTLib/mipisyst \
 		openssl:openssl:openssl-3.0.9:openssl/CryptoPkg/Library/OpensslLib/openssl \
 		tianocore:edk2-cmocka:cmocka-1.1.5-23-g1cc9cde:cmocka/UnitTestFrameworkPkg/Library/CmockaLib/cmocka
 
 .include <bsd.port.pre.mk>
 
 # Heavily dependent on bsd.port.pre.mk definitions for lang/gcc* details:
-BINARY_ALIAS=	make=${LOCALBASE}/bin/gmake \
+BINARY_ALIAS=	make=${GMAKE} \
 		dtc=${LOCALBASE}/bin/dtc \
 		ar=${AR} \
 		gcc=${LOCALBASE}/bin/${CC} \
 		gcc-ar=${LOCALBASE}/bin/${CC:S/gcc/&-ar/} \
 		g++=${LOCALBASE}/bin/${CXX} \
 		python3=${PYTHON_CMD} python=${PYTHON_CMD}
 
 # Avoid: "ld-elf.so.1: /lib/libgcc_s.so.1: version GCC_4.5.0
 #         required by /usr/local/lib/gcc11/libstdc++.so.6 not found"
 # (that is from /lib/libgcc_s.so.1 having incomplete/inaccurate
 # coverage for aarch64 g++ code generation's use of libgcc_s.so.1 ):
 EXTRA_LDFLAGS+=	-Wl,-rpath=${_GCC_RUNTIME}
 
 # Global args
 PLAT_ARGS=	-D NETWORK_IP6_ENABLE
 
 .if ${FLAVOR} == fvp
 PLAT=		fvp
 PLAT_ARCH=	AARCH64
 PLAT_ARGS+=	-D X64EMU_ENABLE=FALSE -D CAPSULE_ENABLE=FALSE
 PLAT_TARGET=	RELEASE
 PLATFILE=	Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
 PLAT_RESULT=	ArmVExpress-FVP-AArch64/${PLAT_TARGET}_GCC5/FV/FVP_AARCH64_EFI.fd
 PLAT_FILENAME=	FVP_AARCH64_EFI.fd
 .endif
 
 .if ${FLAVOR} == macchiatobin
 PLAT=		macchiatobin
 PLAT_ARCH=	AARCH64
 PLAT_ARGS+=	-D X64EMU_ENABLE=TRUE -D CAPSULE_ENABLE=FALSE
 PLAT_TARGET=	RELEASE
 PLATFILE=	Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
 PLAT_RESULT=	Armada80x0McBin-AARCH64/${PLAT_TARGET}_GCC5/FV/ARMADA_EFI.fd
 PLAT_FILENAME=	ARMADA_EFI.fd
 .endif
 
 .if ${FLAVOR} == rpi3
 PLAT=		rpi3
 PLAT_ARCH=	AARCH64
 PLAT_ARGS+=	-D X64EMU_ENABLE=FALSE -D CAPSULE_ENABLE=FALSE
 PLAT_TARGET=	RELEASE
 PLATFILE=	Platform/RaspberryPi/RPi3/RPi3.dsc
 PLAT_RESULT=	RPi3/${PLAT_TARGET}_GCC5/FV/RPI_EFI.fd
 PLAT_FILENAME=	RPI_EFI.fd
 .endif
 
 .if ${FLAVOR} == rpi4
 PLAT=		rpi4
 PLAT_ARCH=	AARCH64
 PLAT_ARGS+=	-D X64EMU_ENABLE=FALSE -D CAPSULE_ENABLE=FALSE
 PLAT_TARGET=	RELEASE
 PLATFILE=	Platform/RaspberryPi/RPi4/RPi4.dsc
 PLAT_RESULT=	RPi4/${PLAT_TARGET}_GCC5/FV/RPI_EFI.fd
 PLAT_FILENAME=	RPI_EFI.fd
 .endif
 
 .if ${FLAVOR} == xen_x64
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	Do not compile on hardware other than amd64
 PLAT=		xen
 PLAT_ARCH=	X64
 PLAT_TARGET=	RELEASE
 PLATFILE=	OvmfPkg/OvmfXen.dsc
 PLAT_RESULT=	OvmfXen/${PLAT_TARGET}_GCC5/FV/OVMF.fd
 PLAT_FILENAME=	XEN_X64_EFI.fd
 .endif
 
 .if ${FLAVOR} == bhyve
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	Bhyve only runs on x64
 PLAT=		bhyve
 PLAT_ARCH=	X64
 PLAT_ARGS+=	-D SECURE_BOOT_ENABLE=TRUE -D TPM2_ENABLE=TRUE
 PLAT_TARGET=	RELEASE
 PLATFILE=	OvmfPkg/Bhyve/BhyveX64.dsc
 PLAT_RESULT=	BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE.fd
 PLAT_RESULT_CODE=	BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE_CODE.fd
 PLAT_RESULT_VARS=	BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE_VARS.fd
 PLAT_FILENAME=	BHYVE_UEFI.fd
 PLAT_FILENAME_CODE=	BHYVE_UEFI_CODE.fd
 PLAT_FILENAME_VARS=	BHYVE_UEFI_VARS.fd
 PATCHFILES=	ffce430d2b65d508a1604dc986ba16db3583943d.patch:-p1
 .endif
 
 .if ${FLAVOR} == qemu_x64
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	Do not compile on hardware other than amd64
 PLAT=		qemu
 PLAT_ARCH=	X64
 PLAT_TARGET=	RELEASE
 PLATFILE=	OvmfPkg/OvmfPkgX64.dsc
 PLAT_RESULT=	OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF.fd
 PLAT_RESULT_CODE=	OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF_CODE.fd
 PLAT_RESULT_VARS=	OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF_VARS.fd
 PLAT_FILENAME=	QEMU_UEFI-x86_64.fd
 PLAT_FILENAME_CODE=	QEMU_UEFI_CODE-x86_64.fd
 PLAT_FILENAME_VARS=	QEMU_UEFI_VARS-x86_64.fd
 .endif
 
 .if ${FLAVOR} == qemu_i386
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	Do not compile on hardware other than amd64
 PLAT=		qemu
 PLAT_ARCH=	IA32
 PLAT_TARGET=	RELEASE
 PLATFILE=	OvmfPkg/OvmfPkgIa32.dsc
 PLAT_RESULT=	OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF.fd
 PLAT_RESULT_CODE=	OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF_CODE.fd
 PLAT_RESULT_VARS=	OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF_VARS.fd
 PLAT_FILENAME=	QEMU_UEFI-i386.fd
 PLAT_FILENAME_CODE=	QEMU_UEFI_CODE-i386.fd
 PLAT_FILENAME_VARS=	QEMU_UEFI_VARS-i386.fd
 .endif
 
 PLIST_FILES=	${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME}
 .if defined(PLAT_FILENAME_CODE)
 PLIST_FILES+=	${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_CODE}
 .endif
 .if defined(PLAT_FILENAME_VARS)
 PLIST_FILES+=	${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_VARS}
 .endif
 .if ${FLAVOR} == bhyve
 PLIST_FILES+=	${PREFIX}/share/uefi-firmware/${PLAT_FILENAME}
 PLIST_FILES+=	${PREFIX}/share/uefi-firmware/${PLAT_FILENAME_CODE}
 PLIST_FILES+=	${PREFIX}/share/uefi-firmware/${PLAT_FILENAME_VARS}
 .endif
 
 # Emulate source edk2/edksetup.sh
 MAKE_ENV+=	WORKSPACE=${WRKDIR} \
 		PACKAGES_PATH=${WRKDIR}/edk2-${GH_TAGNAME}:${WRKDIR}/edk2-platforms-${PLATFORM_TAG}:${WRKDIR}/edk2-non-osi-${NONOSI_TAG} \
 		CONF_PATH=${WRKDIR}/edk2-${GH_TAGNAME}/Conf \
 		EDK_TOOLS_PATH=${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools \
 		PATH=${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/BinWrappers/PosixLike:${PATH} \
 		PYTHON_COMMAND=python3 \
 		PYTHONHASHSEED=1 \
 		EXTRA_LDFLAGS=${EXTRA_LDFLAGS}
 
 .if ${PLAT_ARCH} == AARCH64 && ${ARCH} != aarch64
 BUILD_DEPENDS+=	aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc
 MAKE_ENV+=	GCC5_AARCH64_PREFIX=aarch64-none-elf-
 .endif
 
 .if ${PLAT_ARCH} == X64 || ${PLAT_ARCH} == IA32
 BUILD_DEPENDS+=	nasm:devel/nasm
 .endif
 
 # We can't have two submodule with the same origin in GH_TUPLE
 post-extract:
 	(cd ${WRKDIR}/edk2-${GH_TAGNAME}/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli && tar cf - * | tar xf - -C ../../../../BaseTools/Source/C/BrotliCompress/brotli)
 
 do-build:
 	# This is normaly done during source edksetup.sh
 	(cp ${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/Conf/build_rule.template ${WRKDIR}/edk2-${GH_TAGNAME}/Conf/build_rule.txt)
 	(cp ${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/Conf/tools_def.template ${WRKDIR}/edk2-${GH_TAGNAME}/Conf/tools_def.txt)
 	(cp ${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/Conf/target.template ${WRKDIR}/edk2-${GH_TAGNAME}/Conf/target.txt)
 	# Build the basetools
 	(cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C edk2-${GH_TAGNAME}/BaseTools ${_MAKE_JOBS})
 	# Build EDK2
 	(cd ${WRKDIR}/edk2-${GH_TAGNAME} && ${SETENV} ${MAKE_ENV} BaseTools/BinWrappers/PosixLike/build -a ${PLAT_ARCH} -p ${PLATFILE} -n ${MAKE_JOBS_NUMBER} -t GCC5 -b ${PLAT_TARGET} ${PLAT_ARGS})
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 	${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME}
 .if defined(PLAT_FILENAME_CODE)
 	${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT_CODE} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_CODE}
 .endif
 .if defined(PLAT_FILENAME_VARS)
 	${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT_VARS} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_VARS}
 .endif
 .if ${FLAVOR} == bhyve
 	${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT_CODE} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME}
 	# For backwards compatibility
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/
 	${RLN} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/${PLAT_FILENAME}
 	${RLN} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_CODE} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/${PLAT_FILENAME_CODE}
 	${RLN} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME_VARS} ${STAGEDIR}/${PREFIX}/share/uefi-firmware/${PLAT_FILENAME_VARS}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/ibus-typing-booster/Makefile b/textproc/ibus-typing-booster/Makefile
index bdc6c1157359..104f6dcbadd6 100644
--- a/textproc/ibus-typing-booster/Makefile
+++ b/textproc/ibus-typing-booster/Makefile
@@ -1,100 +1,100 @@
 PORTNAME=	ibus-typing-booster
 PORTVERSION=	2.25.9
 PORTREVISION=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Faster typing by context sensitive completion
 WWW=		https://mike-fabian.github.io/ibus-typing-booster/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR}		\
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 LIB_DEPENDS=	libibus-1.0.so:textproc/ibus	\
 		libm17n.so:devel/m17n-lib
 RUN_DEPENDS=	CLDR>0:textproc/CLDR	\
 		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR}		\
 		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}		\
 		${PYTHON_PKGNAMEPREFIX}hunspell>0:textproc/py-hunspell@${PY_FLAVOR}	\
 		${PYTHON_PKGNAMEPREFIX}pycountry>0:textproc/py-pycountry@${PY_FLAVOR}	\
 		${LOCALBASE}/share/unicode/ucd/Index.txt:textproc/UCD			\
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 TEST_DEPENDS=	${LOCALBASE}/share/hunspell/cs_CZ.dic:textproc/cs-hunspell	\
 		${LOCALBASE}/share/hunspell/de_DE.dic:german/hunspell		\
 		${LOCALBASE}/share/hunspell/en_US.aff:textproc/en-hunspell	\
 		${LOCALBASE}/share/hunspell/es_ES.dic:textproc/es-hunspell	\
 		${LOCALBASE}/share/hunspell/it_IT.dic:textproc/it-hunspell	\
 		${LOCALBASE}/share/hunspell/ko_KR.aff:korean/hunspell		\
 		${LOCALBASE}/share/hunspell/sv_SE.dic:textproc/sv-hunspell	\
 		${LOCALBASE}/libexec/ibus-engine-m17n:textproc/ibus-m17n	\
 		${LOCALBASE}/share/m17n/hi-inscript2.mim:devel/m17n-inscript2	\
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}	\
 		gmake:devel/gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mike-fabian
 
 USES=		autoreconf desktop-file-utils gettext gmake gnome iconv pathfix	\
 		pkgconfig python shebangfix
 SHEBANG_FILES=	engine/emoji-picker.in engine/ibus-engine-typing-booster.in	\
 		setup/ibus-setup-typing-booster.in
 SHEBANG_LANG=	sh
 sh_OLD_CMD=	/usr/bin/sh
 sh_CMD=		${SH}
 USE_GNOME=	glib20 gtk30 pygobject3
 USE_LOCALE=	en_US.UTF-8
 GNU_CONFIGURE=	yes
 NO_ARCH=	yes
 GLIB_SCHEMAS=	org.freedesktop.ibus.engine.typing-booster.gschema.xml
 
 TEST_TARGET=	check
-TEST_ENV=	MAKE_CMD=${LOCALBASE}/bin/gmake LC_ALL=en_US.UTF-8	\
+TEST_ENV=	${MAKE_ENV} \
 		IBUS_TYPING_BOOSTER_DEBUG_LEVEL=1
 
 OPTIONS_DEFINE=	HUNSPELL
 OPTIONS_DEFAULT=HUNSPELL
 
 HUNSPELL_RUN_DEPENDS=	hunspell:textproc/hunspell
 
 SPELL2FIX=	engine/itb_util.py setup/user_transliteration.py
 PY2FIX=		setup/user_transliteration.py tests/test_m17n_db_info.py	\
 		tests/test_itb.py tests/test_compose_sequences.py		\
 		tests/test_hunspell_suggest.py tests/test_keyvals_to_keycodes.py\
 		tests/test_m17n_translit.py tests/test_emoji_unicode_version.py	\
 		tests/test_emoji_similar.py tests/test_emoji_candidates.py
 SHR2FIX=	engine/itb_util.py engine/itb_emoji.py engine/hunspell_table.py	\
 		tests/test_compose_sequences.py typing-booster.appdata.xml	\
 		setup/user_transliteration.py ${GLIB_SCHEMAS} engine/itb_sound.py
 COMP2DEL=	engine/Makefile setup/Makefile
 
 pre-configure:
 .for f in ${SPELL2FIX}
 	${REINPLACE_CMD} -e 's|/usr/share/myspell|${LOCALBASE}/share/hunspell|'	\
 		${WRKSRC}/${f}
 .endfor
 .for f in ${PY2FIX}
 	${REINPLACE_CMD} -e 's|/usr/bin/python3| ${PYTHON_CMD}|' ${WRKSRC}/${f}
 .endfor
 	${REINPLACE_CMD} -e 's|/usr/libexec|${PREFIX}/libexec|'	\
 		${WRKSRC}/typing-booster.appdata.xml
 .for f in ${SHR2FIX}
 	${REINPLACE_CMD} -e 's|/usr/share/ibus-typing-booster|${DATADIR}|'	\
 		-e 's|/usr/share|${LOCALBASE}/share|' ${WRKSRC}/${f}
 .endfor
 
 post-configure:
 .for f in ${COMP2DEL}
 	${SED} -i.orig -e '/if test -n "\$$\$$dlist"/,/^	else :; fi$$/ d'	\
 		${WRKSRC}/${f}
 .endfor
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX} \
 	&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 	-d ${PREFIX} -f ${DATADIR:S;${PREFIX}/;;}	\
 	&& ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 	-d ${PREFIX} -f ${DATADIR:S;${PREFIX}/;;})
 
 .include <bsd.port.mk>