diff --git a/devel/libpci/Makefile b/devel/libpci/Makefile
index 358d235ce21d..8cc09e70074a 100644
--- a/devel/libpci/Makefile
+++ b/devel/libpci/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	libpci
 PORTVERSION=	3.11.1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/utils/pciutils \
 		LOCAL/sunpoet
 DISTNAME=	pciutils-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PCI configuration space I/O made easy
 WWW=		https://mj.ucw.cz/sw/pciutils/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:misc/pciids
 
 USES=		gmake tar:xz
 
 ALL_TARGET=	lib/libpci.a
 CFLAGS+=	-fPIC
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	${LIBPCI_FILES} \
 		lib/libpci.so
 PORTDATA=	config.mk
 
 LIBPCI_FILES=	include/pci/config.h \
 		include/pci/header.h \
 		include/pci/pci.h \
 		include/pci/types.h \
 		lib/libpci.a \
 		lib/libpci.so.3 \
 		libdata/pkgconfig/libpci.pc
 
 post-patch:
 	@${LN} -s . ${WRKSRC}/lib/pci
 
 do-configure:
-	@cd ${WRKSRC}/ && ${SETENVI} ${MAKE_ENV} ${MAKE_CMD} lib/config.h
+	@cd ${WRKSRC}/ && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} lib/config.h
 
 post-build:
 	@cd ${WRKSRC}/lib/ && ${CC} ${CFLAGS} ${STRIP} -Wl,-soname=libpci.so.3 -shared *.o -lz -o libpci.so.3
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/pci/ ${STAGEDIR}${DATADIR}/
 .for file in ${LIBPCI_FILES}
 	${INSTALL_DATA} ${WRKSRC}/lib/${file:T} ${STAGEDIR}${PREFIX}/${file}
 .endfor
 	${LN} -fs libpci.so.3 ${STAGEDIR}${PREFIX}/lib/libpci.so
 	${INSTALL_DATA} ${WRKSRC}/lib/config.mk ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/devel/redo/Makefile b/devel/redo/Makefile
index 2877292d46d6..f3ea4f5efb25 100644
--- a/devel/redo/Makefile
+++ b/devel/redo/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	redo
 PORTVERSION=	1.5
 CATEGORIES=	devel
 MASTER_SITES=	https://jdebp.eu/Repository/freebsd/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Incremental build system
 WWW=		https://jdebp.eu/Softwares/redo/
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/source/COPYING
 
 USES=		compiler:c++11-lang
 
 NO_WRKSUBDIR=	yes
 
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 
 MANPAGES_USES=	perl5
 MANPAGES_USE=	PERL5=build
 MANPAGES_BINARY_ALIAS_OFF=	pod2man=true
 
 do-configure:
 	@cd ${WRKSRC} && ./package/prepare
 	@${ECHO_CMD} '${CXX}' > ${WRKSRC}/build/cxx
 	@${ECHO_CMD} '${CPPFLAGS}' > ${WRKSRC}/build/cppflags
 	@${ECHO_CMD} '${CXXFLAGS}' > ${WRKSRC}/build/cxxflags
 	@${ECHO_CMD} '${LDFLAGS}' > ${WRKSRC}/build/ldflags
 
 do-build:
-	@cd ${WRKSRC} && ${SETENVI} ${MAKE_ENV} ./package/make
+	@cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ./package/make
 
 do-install:
 	cd ${WRKSRC} && ./package/makeinstall
 	cd ${WRKSRC} && ./package/export '${STAGEDIR}${PREFIX}/'
 
 .include <bsd.port.mk>
diff --git a/devel/tinycbor/Makefile b/devel/tinycbor/Makefile
index 2ebd07ac91d3..6319f1472ee5 100644
--- a/devel/tinycbor/Makefile
+++ b/devel/tinycbor/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	tinycbor
 PORTVERSION=	0.6.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Concise Binary Object Representation (CBOR) library
 WWW=		https://github.com/intel/tinycbor
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcjson.so:devel/libcjson
 
 USES=		gmake localbase pathfix
 
 INSTALL_TARGET=	install-strip
 MAKE_ARGS=	SOVERSION=${PORTVERSION:R:R}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 GH_ACCOUNT=	intel
 USE_GITHUB=	yes
 
 do-configure:
-	@cd ${WRKSRC}/ && ${SETENVI} ${MAKE_ENV} ${MAKE_CMD} configure
+	@cd ${WRKSRC}/ && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} configure
 
 post-install:
 	${LN} -fs libtinycbor.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libtinycbor.so
 	${LN} -fs libtinycbor.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libtinycbor.so.${PORTVERSION:R:R}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtinycbor.so
 
 .include <bsd.port.mk>
diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index ba3f6d3865b1..3e0140edccfc 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=	cdo
 PORTVERSION=	2.3.0
 CATEGORIES=	science
 MASTER_SITES=	https://code.mpimet.mpg.de/attachments/download/29019/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Climate Data Operators
 WWW=		https://code.mpimet.mpg.de/projects/cdo
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 OPTIONS_DEFINE=	CGRIBEX ECCODES HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID
 OPTIONS_DEFAULT=CGRIBEX ECCODES HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID
 OPTIONS_SUB=	yes
 CGRIBEX_DESC=	Use CGRIBEX library for GRIB1 files
 ECCODES_DESC=	Use ecCodes for GRIB files
 HDF5_IMPLIES=	SZIP
 NETCDF_IMPLIES=	HDF5
 UUID_DESC=	UUID support
 
 PORTSCOUT=	site:https://code.mpimet.mpg.de/projects/cdo/files
 
 USES=		compiler:c++17-lang gmake libtool localbase pathfix python:build
 
 CFLAGS+=	-DPTHREAD_MUTEXATTR
 CONFIGURE_ARGS=	--disable-data \
 		--disable-extra \
 		--disable-fortran \
 		--disable-ieg \
 		--disable-openmp \
 		--disable-service \
 		--enable-cdi-lib \
 		--program-transform-name="" \
 		--with-zlib=/usr
 CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	check
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 CGRIBEX_CONFIGURE_WITH=	cgribex
 CGRIBEX_LIB_DEPENDS=	libcgribex.so:science/cgribex
 ECCODES_CONFIGURE_WITH=	eccodes
 ECCODES_LIB_DEPENDS=	libeccodes.so:science/eccodes
 HDF5_CONFIGURE_WITH=	hdf5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 JASPER_CONFIGURE_WITH=	jasper
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 NETCDF_CONFIGURE_WITH=	netcdf
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 PROJ_CONFIGURE_WITH=	proj
 PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 SZIP_CONFIGURE_WITH=	szlib
 SZIP_LIB_DEPENDS=	libsz.so:science/libaec
 UDUNITS_CONFIGURE_WITH=	udunits2
 UDUNITS_LIB_DEPENDS=	libudunits2.so:science/udunits
 UUID_CONFIGURE_OFF=	ac_cv_func_uuid_create=no ac_cv_have_decl_uuid_create=no ac_cv_have_decl_uuid_generate=no ac_cv_lib_uuid_uuid_generate=no
 UUID_LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| contrib||' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|$$(libdir)/\($$$$pkgconfigfile\)|${PREFIX}/libdata/\1|' ${WRKSRC}/libcdi/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|unsigned32 |uint32_t |' ${WRKSRC}/libcdi/src/cdilib.c ${WRKSRC}/libcdi/src/util.c
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/libcdi/src/cdi.inc ${STAGEDIR}${PREFIX}/include/cdi.inc
 
 test-NETCDF-on:
-	@cd ${WRKSRC}/ && ${SETENVI} CDO_PATH=src/cdo src/cdotest
+	@cd ${WRKSRC}/ && ${SETENVI} ${WRK_ENV} CDO_PATH=src/cdo src/cdotest
 
 .include <bsd.port.mk>
diff --git a/textproc/translate-toolkit/Makefile b/textproc/translate-toolkit/Makefile
index f185e96effec..1398b9b34dca 100644
--- a/textproc/translate-toolkit/Makefile
+++ b/textproc/translate-toolkit/Makefile
@@ -1,86 +1,86 @@
 PORTNAME=	translate-toolkit
 PORTVERSION=	3.12.2
 PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	PYPI \
 		https://github.com/translate/translate/releases/download/${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Tools and API for translation and localization engineering
 WWW=		https://toolkit.translatehouse.org/ \
 		https://github.com/translate/translate
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.2:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
 		${RUN_DEPENDS}
 RUN_DEPENDS=	bash:shells/bash \
 		msghack:devel/gettext-msghack \
 		${PYTHON_PKGNAMEPREFIX}lxml>=4.6.3:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		gettext python shebangfix
 USE_PYTHON=	autoplist noflavors pep517
 
 NO_ARCH=	yes
 
 SHEBANG_FILES=	tools/* \
 		translate/convert/odfxml \
 		translate/convert/roundtrip-OOo \
 		translate/convert/roundtrip-gaia \
 		translate/convert/roundtrip-mozilla
 
 MANPAGES=	android2po csv2po csv2tbx dtd2po flatxml2po html2po idml2po json2po moz2po mozlang2po odf2xliff oo2po oo2xliff po2csv po2dtd po2flatxml po2html po2idml po2json po2moz po2mozlang po2oo po2prop po2resx po2sub po2symb po2tiki po2tmx po2ts po2txt po2web2py po2wordfast po2xliff pot2po prop2po resx2po sub2po symb2po tbx2po tiki2po ts2po txt2po web2py2po xliff2odf xliff2oo
 
 OPTIONS_DEFINE=	ENCODING FLUENT ICAL INI LEVENSHTEIN MARKDOWN PHP RC SPELLCHECK SUBTITLES TMSERVER TRADOS YAML
 OPTIONS_DEFAULT=ENCODING FLUENT ICAL INI LEVENSHTEIN MARKDOWN PHP RC SPELLCHECK SUBTITLES TMSERVER TRADOS YAML
 OPTIONS_SUB=	yes
 ENCODING_DESC=	Encoding detection
 FLUENT_DESC=	Fluent translation format support
 ICAL_DESC=	iCal format support
 INI_DESC=	INI format support
 LEVENSHTEIN_DESC=	Faster matching using Levenshtein
 MARKDOWN_DESC=	Markdown format support
 PHP_DESC=	PHP format support
 RC_DESC=	Windows Resource (.rc) format support
 SPELLCHECK_DESC=Enchant spellchecking system
 SUBTITLES_DESC=	Subtitles format support
 TMSERVER_DESC=	Tmserver backend support
 TRADOS_DESC=	Trados format support
 YAML_DESC=	YAML format support
 
 ENCODING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}charset-normalizer>=3.3.2:textproc/py-charset-normalizer@${PY_FLAVOR}
 FLUENT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fluent.syntax>=0.19.0:textproc/py-fluent.syntax@${PY_FLAVOR}
 ICAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vobject>=0.9.6.1:deskutils/py-vobject@${PY_FLAVOR}
 ICAL_VARS=		MANPAGES+="ical2po po2ical"
 INI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}iniparse>=0.5:devel/py-iniparse@${PY_FLAVOR}
 INI_VARS=		MANPAGES+="ini2po po2ini"
 LEVENSHTEIN_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}Levenshtein>=0.12:devel/py-Levenshtein@${PY_FLAVOR}
 MARKDOWN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mistletoe>=1.3.0:textproc/py-mistletoe@${PY_FLAVOR}
 MARKDOWN_VARS=		MANPAGES+="md2po po2md"
 PHP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}phply>=1.2.6:devel/py-phply@${PY_FLAVOR}
 PHP_VARS=		MANPAGES+="php2po po2php"
 RC_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pyparsing>=3.0.7:devel/py-pyparsing@${PY_FLAVOR}
 RC_VARS=		MANPAGES+="po2rc rc2po"
 SPELLCHECK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enchant>=3.2.2:textproc/py-enchant@${PY_FLAVOR}
 SUBTITLES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aeidon>=1.13:textproc/py-aeidon@${PY_FLAVOR}
 TMSERVER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheroot>=10.0.0:www/py-cheroot@${PY_FLAVOR}
 TRADOS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3:www/py-beautifulsoup@${PY_FLAVOR}
 YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.18.5:devel/py-ruamel.yaml@${PY_FLAVOR}
 YAML_VARS=		MANPAGES+="po2yaml yaml2po"
 
 .include <bsd.port.options.mk>
 
 post-build:
 	@${MKDIR} ${WRKSRC}/manpages
 .for manpage in ${MANPAGES}
-	cd ${WRKSRC}/build/lib/translate/convert && ${SETENVI} PYTHONPATH=${WRKSRC}/build/lib ${PYTHON_CMD} ${manpage}.py --man > ${WRKSRC}/manpages/${manpage}.1
+	cd ${WRKSRC}/build/lib/translate/convert && ${SETENVI} ${WRK_ENV} PYTHONPATH=${WRKSRC}/build/lib ${PYTHON_CMD} ${manpage}.py --man > ${WRKSRC}/manpages/${manpage}.1
 .endfor
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/manpages/* ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>