diff --git a/release/Makefile.azure b/release/Makefile.azure
index de95a944f9c7..32e91833b766 100644
--- a/release/Makefile.azure
+++ b/release/Makefile.azure
@@ -1,53 +1,53 @@
 #
 # $FreeBSD$
 #
 #
 # Makefile for uploading Microsoft Azure disk images.
 #
 
 AZURE_IMG?=		${.OBJDIR}/azure.vhdf
 AZURE_UPLOAD_TGTS=	azure-check-depends \
 			azure-do-upload
 CLEANFILES+=		${AZURE_UPLOAD_TGTS}
 
 .if defined(AZURE_UPLOAD_CONF) && !empty(AZURE_UPLOAD_CONF)
 . for VAR in _STORAGE _ACCOUNT _KEY
 AZURE${VAR}!=	grep -E ^AZURE${VAR} ${AZURE_UPLOAD_CONF} | awk -F'	' '{print $$2}'
 . endfor
 .endif
 
 .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
 SNAPSHOT_DATE!=		date +-${BUILDDATE}
 .endif
 
 AZURE_TARGET:=		${OSRELEASE}${SNAPSHOT_DATE}.vhd
 
 azure-upload:		${AZURE_UPLOAD_TGTS}
 
 azure-check-depends:
 .for VAR in _STORAGE _ACCOUNT _KEY
 . if !defined(AZURE${VAR}) || empty(AZURE${VAR})
 	@echo "Variable AZURE${VAR} cannot be empty."
 	@false
 . endif
 .endfor
 .if !exists(/usr/local/bin/azure)
 . if !exists(/usr/local/bin/npm)
 .  if !exists(${PORTSDIR}/www/npm/Makefile)
 .   if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
 .   endif
 	env ASSUME_ALWAYS_YES=yes pkg install -y www/npm
 .  else
-	make -C ${PORTSDIR}/www/npm BATCH=1 all install clean
+	env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/www/npm BATCH=1 all install clean
 .  endif
 . endif
 	npm install -g azure-cli
 .endif
 
 azure-do-upload:
 	/usr/local/bin/azure storage blob upload \
 		${AZURE_IMG} ${AZURE_STORAGE} ${AZURE_TARGET} \
 		-t page -a ${AZURE_ACCOUNT} -k "${AZURE_KEY}"
 	touch ${.OBJDIR}/${.TARGET}
 
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index 035137e61d53..e26f4f705cc6 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -1,83 +1,83 @@
 #
 # $FreeBSD$
 #
 #
 # Makefile for creating an EC2 AMI from a disk image.
 #
 
 .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE"
 AMINAMESUFFIX!=	date +-${BUILDDATE}
 .endif
 .if defined(EC2PUBLIC) && !empty(EC2PUBLIC)
 PUBLISH=	--public
 .endif
 .if defined(EC2PUBLICSNAP) && !empty(EC2PUBLICSNAP)
 PUBLICSNAP=	--publicsnap
 .endif
 .if defined(EC2SNSTOPIC) && !empty(EC2SNSTOPIC)
 EC2SNSREL=	${REVISION}-${BRANCH}
 EC2SNSVERS=	${GITBRANCH}@${GITREV}
 .endif
 .if defined(SSMPREFIX) && !empty(SSMPREFIX)
 SSMOPTS=	--ssm-name ${SSMPREFIX}/${TARGET_ARCH:S/aarch64/arm64/}/base/ufs/${REVISION}/${BRANCH}
 .endif
 .if ${TARGET_ARCH} != "amd64"
 EC2ARCH=	--${TARGET_ARCH:S/aarch64/arm64/}
 .endif
 .if !defined(AMIBOOTMETHOD)
 AMIBOOTMETHOD=	UEFI-PREFERRED
 .endif
 .if ${AMIBOOTMETHOD} == "UEFI" && ${TARGET_ARCH} == "amd64"
 BOOTMODEOPT=	--uefi
 .endif
 .if ${AMIBOOTMETHOD} == "UEFI-PREFERRED" && ${TARGET_ARCH} == "amd64"
 BOOTMODEOPT=	--uefi-preferred
 .endif
 
 CLEANFILES+=		ec2ami
 
 .if !exists(/usr/local/bin/bsdec2-image-upload)
 CW_EC2_PORTINSTALL=	cw-ec2-portinstall
 CLEANFILES+=		${CW_EC2_PORTINSTALL}
 .else
 CW_EC2_PORTINSTALL=
 .endif
 
 cw-ec2-portinstall:
 .if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile)
-	env - PATH=$$PATH make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean
+	env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean
 .else
 . if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -y
 . endif
 	env ASSUME_ALWAYS_YES=yes pkg install -y net/bsdec2-image-upload
 .endif
 	@touch ${.TARGET}
 
 ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL}
 .if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE})
 	@echo "--------------------------------------------------------------"
 	@echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation"
 	@echo "--------------------------------------------------------------"
 	@false
 .endif
 .if !defined(AWSREGION)
 	@echo "--------------------------------------------------------------"
 	@echo ">>> AWSREGION must be specified EC2 AMI creation"
 	@echo "--------------------------------------------------------------"
 	@false
 .endif
 .if !defined(AWSBUCKET)
 	@echo "--------------------------------------------------------------"
 	@echo ">>> AWSBUCKET must be specified for EC2 AMI creation"
 	@echo "--------------------------------------------------------------"
 	@false
 .endif
 	/usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} \
 	    ${EC2ARCH} ${SSMOPTS} ${BOOTMODEOPT} --sriov --ena \
 	    ${.OBJDIR}/ec2.raw \
 	    "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} ${AMIBOOTMETHOD}" \
 	    "${TYPE}/${TARGET} ${GITBRANCH}@${GITREV}" \
 	    ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE} \
 	    ${EC2SNSTOPIC} ${EC2SNSREL} ${EC2SNSVERS}
 	@touch ${.TARGET}
diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant
index 4abcaa891ed3..d49eedacb6c9 100644
--- a/release/Makefile.vagrant
+++ b/release/Makefile.vagrant
@@ -1,137 +1,137 @@
 #
 # $FreeBSD$
 #
 # Makefile for producing and uploading Vagrant boxes to Hashicorp Atlas
 #
 # Usage Example:
 #   Create a Vagrant image for VirtualBox:
 #     make vagrant-box WITH_VMIMAGES=y WITH_CLOUDWARE=y \
 #       CLOUDWARE=vagrant-virtualbox VMFORMATS=vmdk
 #
 #   To create a Vagrant image for VMWare and Upload it to Atlas:
 #     VAGRANT_KEY is your Atlas API Token
 #     VAGRANT_USERNAME is your Atlas Username
 #     env VAGRANT_KEY=foo VAGRANT_USERNAME=bar make vagrant-upload \
 #       WITH_VMIMAGES=y WITH_CLOUDWARE=y CLOUDWARE=vagrant-vmware \
 #       VMFORMATS=vmdk
 #     For more info: https://www.vagrantup.com/docs/other/atlas.html
 #
 
 VAGRANT_IMG?=		${.OBJDIR}/vagrant.vmdk
 VAGRANT_UPLOAD_TGTS=	vagrant-check-depends
 CLEANFILES+=		${VAGRANT_UPLOAD_TGTS}
 
 .if defined(VAGRANT_UPLOAD_CONF) && !empty(VAGRANT_UPLOAD_CONF)
 . for VAR in _KEY _USERNAME
 VAGRANT${VAR}!=		grep -E ^VAGRANT${VAR} ${VAGRANT_UPLOAD_CONF} | awk -F'	' '{print $$2}'
 ATLAS${VAR}:=		${VAGRANT${VAR}}
 . endfor
 .endif
 
 .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
 SNAPSHOT_DATE!=		date +-${BUILDDATE}
 .endif
 
 VAGRANT_VERSION!=	date +%Y.%m.%d
 VAGRANT_TARGET:=	${OSRELEASE}${SNAPSHOT_DATE}
 .if !empty(CLOUDWARE)
 . for _PROVIDER in ${CLOUDWARE}
 .  if ${_PROVIDER:tu:MVAGRANT*}
 VAGRANT_PROVIDERS+=	${_PROVIDER:tu:S/VAGRANT-//:tl}
 .  endif
 . endfor
 .endif
 VAGRANT_PROVIDERS?=	vmware virtualbox
 
 
 vagrant-check-depends:
 .for VAR in _KEY _USERNAME _VERSION
 . if !defined(VAGRANT${VAR}) || empty(VAGRANT${VAR})
 	@echo "Variable VAGRANT${VAR} cannot be empty."
 	@false
 . endif
 .endfor
 .if !exists(/usr/local/bin/curl)
 . if !exists(${PORTSDIR}/ftp/curl/Makefile)
 .  if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
 .  endif
 	env ASSUME_ALWAYS_YES=yes pkg install -y curl
 . else
-	make -C ${PORTSDIR}/ftp/curl BATCH=1 all install clean
+	env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/ftp/curl BATCH=1 all install clean
 . endif
 .endif
 
 .for PROVIDER in ${VAGRANT_PROVIDERS}
 CLEANFILES+=	vagrant-do-package-${PROVIDER} ${VAGRANT_TARGET}.${PROVIDER}.box
 CLEANDIRS+=	${PROVIDER}
 VAGRANT_UPLOAD_TGTS+=	vagrant-do-upload-${PROVIDER}
 
 ${PROVIDER}:
 	@mkdir -p ${PROVIDER}
 
 ${VAGRANT_TARGET}.${PROVIDER}.box: ${PROVIDER} cw-vagrant-${PROVIDER} vagrant-create-${PROVIDER}-metadata
 	@echo "==> PACKAGING: ${VAGRANT_TARGET}.${PROVIDER}.box in `pwd`"
 	@cp vagrant-${PROVIDER}.vmdk ${PROVIDER}/vagrant.vmdk
 . if ${PROVIDER} == "virtualbox"
 	@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}"}' > metadata.json)
 	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json box.ovf vagrant.vmdk)
 . elif ${PROVIDER} == "vmware"
 	@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}_desktop"}' > metadata.json)
 	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json vagrant.vmx vagrant.vmdk)
 . endif
 
 CLEANFILES+=	vagrant-do-upload-${PROVIDER}
 vagrant-do-upload-${PROVIDER}: vagrant-box
 . if ${PROVIDER} == "virtualbox"
 	${.CURDIR}/scripts/atlas-upload.sh -b ${TYPE}-${REVISION}-${BRANCH} -f ${VAGRANT_TARGET}.${PROVIDER}.box -p ${PROVIDER} -k ${VAGRANT_KEY} -u ${VAGRANT_USERNAME} -v ${VAGRANT_VERSION}
 . elif ${PROVIDER} == "vmware"
 	${.CURDIR}/scripts/atlas-upload.sh -b ${TYPE}-${REVISION}-${BRANCH} -f ${VAGRANT_TARGET}.${PROVIDER}.box -p ${PROVIDER}_desktop -k ${VAGRANT_KEY} -u ${VAGRANT_USERNAME} -v ${VAGRANT_VERSION}
 . endif
 	touch ${.OBJDIR}/${.TARGET}
 
 vagrant-box: ${VAGRANT_TARGET}.${PROVIDER}.box
 
 .endfor
 
 vagrant-upload:	${VAGRANT_UPLOAD_TGTS}
 
 vagrant-create-virtualbox-metadata: virtualbox/box.ovf
 
 virtualbox/box.ovf: ${.CURDIR}/scripts/box.ovf
 	cp ${.ALLSRC} virtualbox/
 
 vmware/vagrant.vmx:
 	@(cd vmware && echo '.encoding = "UTF-8"' > vagrant.vmx)
 	@(cd vmware && echo 'bios.bootorder = "hdd,CDROM"' >> vagrant.vmx)
 	@(cd vmware && echo 'checkpoint.vmstate = ""' >> vagrant.vmx)
 	@(cd vmware && echo 'cleanshutdown = "TRUE"' >> vagrant.vmx)
 	@(cd vmware && echo 'config.version = "8"' >> vagrant.vmx)
 	@(cd vmware && echo 'displayname = "${VAGRANT_TARGET}"' >> vagrant.vmx)
 	@(cd vmware && echo 'ethernet0.addresstype = "generated"' >> vagrant.vmx)
 	@(cd vmware && echo 'ethernet0.bsdname = "en0"' >> vagrant.vmx)
 	@(cd vmware && echo 'ethernet0.connectiontype = "nat"' >> vagrant.vmx)
 	@(cd vmware && echo 'ethernet0.displayname = "Ethernet"' >> vagrant.vmx)
 	@(cd vmware && echo 'ethernet0.linkstatepropagation.enable = "FALSE"' >> vagrant.vmx)
 	@(cd vmware && echo 'ethernet0.pcislotnumber = "33"' >> vagrant.vmx)
 	@(cd vmware && echo 'ethernet0.present = "TRUE"' >> vagrant.vmx)
 	@(cd vmware && echo 'ethernet0.virtualdev = "e1000"' >> vagrant.vmx)
 	@(cd vmware && echo 'ethernet0.wakeonpcktrcv = "FALSE"' >> vagrant.vmx)
 	@(cd vmware && echo 'floppy0.present = "FALSE"' >> vagrant.vmx)
 	@(cd vmware && echo 'guestos = "freebsd-64"' >> vagrant.vmx)
 	@(cd vmware && echo 'gui.fullscreenatpoweron = "FALSE"' >> vagrant.vmx)
 	@(cd vmware && echo 'gui.viewmodeatpoweron = "windowed"' >> vagrant.vmx)
 	@(cd vmware && echo 'memsize = "512"' >> vagrant.vmx)
 	@(cd vmware && echo 'sound.startconnected = "FALSE"' >> vagrant.vmx)
 	@(cd vmware && echo 'softpoweroff = "TRUE"' >> vagrant.vmx)
 	@(cd vmware && echo 'scsi0.pcislotnumber = "16"' >> vagrant.vmx)
 	@(cd vmware && echo 'scsi0.present = "TRUE"' >> vagrant.vmx)
 	@(cd vmware && echo 'scsi0.virtualdev = "lsilogic"' >> vagrant.vmx)
 	@(cd vmware && echo 'scsi0:0.filename = "vagrant.vmdk"' >> vagrant.vmx)
 	@(cd vmware && echo 'scsi0:0.present = "TRUE"' >> vagrant.vmx)
 	@(cd vmware && echo 'tools.synctime = "TRUE"' >> vagrant.vmx)
 	@(cd vmware && echo 'usb.present = "FALSE"' >> vagrant.vmx)
 	@(cd vmware && echo 'virtualhw.productcompatibility = "hosted"' >> vagrant.vmx)
 	@(cd vmware && echo 'virtualhw.version = "9"' >> vagrant.vmx)
 
 vagrant-create-vmware-metadata: vmware/vagrant.vmx