diff --git a/audio/synthpod-lv2/Makefile b/audio/synthpod-lv2/Makefile
index ef1d9cfa5efc..8815499756ff 100644
--- a/audio/synthpod-lv2/Makefile
+++ b/audio/synthpod-lv2/Makefile
@@ -1,82 +1,82 @@
 PORTNAME=	synthpod
 PORTVERSION=	g20230521
 PORTREVISION=	1
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Lightweight Nonlinear LV2 Plugin Container
 WWW=		https://git.open-music-kontrollers.ch/~hp/synthpod
 
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 FETCH_DEPENDS=	git:devel/git
 BUILD_DEPENDS=	lv2>0:audio/lv2
 LIB_DEPENDS=	liblilv-0.so:audio/lilv \
 		libserd-0.so:devel/serd \
 		libsratom-0.so:audio/sratom \
 		libxcb-xrm.so:x11/xcb-util-xrm
 
 USES=		meson compiler:c++11-lib pkgconfig localbase
 USE_CXXSTD=	c++11
 
 GIT_URL=	https://git.open-music-kontrollers.ch/~hp/synthpod
 GIT_TAGNAME=	8217951d21f53546c7ef7d28ed4143ae43f26d02
 
 MESON_ARGS=	-Duse-alsa=false -Duse-qt4=false
 
 OPTIONS_DEFINE=		JACK DUMMY
 OPTIONS_DEFAULT=	JACK X11
 OPTIONS_GROUP=		UI
 OPTIONS_GROUP_UI=	X11 GTK2 GTK3 QT
 OPTIONS_SUB=		yes
 
 DUMMY_DESC=		Build DUMMY standalone host
 DUMMY_MESON_OFF=	-Duse-dummy=false
 DUMMY_LIB_DEPENDS=	libuv.so:devel/libuv
 
 GTK2_DESC=		Build GTK-2 sandbox
 GTK2_MESON_ON=		-Duse-gtk2=true
 GTK2_LIB_DEPENDS=	libxcb-icccm.so:x11/xcb-util-wm
 GTK2_USES=		gnome xorg
 GTK2_USE=		XORG=x11,xcb,xext GNOME=glib20,gtk20,gdkpixbuf2 gettext-runtime
 
 GTK3_DESC=		Build GTK-3 sandbox
 GTK3_MESON_ON=		-Duse-gtk3=true
 GTK3_USES=		gnome xorg
 GTK3_USE=		XORG=x11,xcb,xext GNOME=glib20,gtk30,atk gettext-runtime
 GTK3_LIB_DEPENDS=	libxcb-icccm.so:x11/xcb-util-wm
 
 JACK_DESC=		Build JACK standalone host
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_MESON_OFF=		-Duse-jack=false
 
 QT_DESC=		Build Qt-5 sandbox
 QT_MESON_ON=		-Duse-qt5=true
 QT_USES=		qt:5 xorg
 QT_USE=			qt=core,widgets,buildtools:build xorg=xcb
 QT_LIB_DEPENDS=		libxcb-icccm.so:x11/xcb-util-wm
 
 X11_DESC=		Build X11 sandbox
 X11_MESON_OFF=		-Duse-x11=false
 X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libxcb-icccm.so:x11/xcb-util-wm \
 			libvterm.so:devel/libvterm
 X11_USES=		gl gnome xorg
 X11_USE=		GL=glew,opengl XORG=xcb,x11 GNOME=cairo
 
 do-fetch:
 	@if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}" ]; then \
 	  ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
 	  cd ${DISTDIR}/${DIST_SUBDIR} && \
 	    ${ECHO} "==> Fetching from ${GIT_URL} for tag-name=${GIT_TAGNAME}" && \
 	    git clone -q ${GIT_URL} ${PORTNAME}-${DISTVERSIONFULL} && \
 	    (cd ${PORTNAME}-${DISTVERSIONFULL} && git reset -q --hard ${GIT_TAGNAME} && ${RM} -r .git) && \
 	    ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \
 	    ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | LC_ALL=C ${SORT} -z | \
-	        ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=bsdtar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
+	        ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=ustar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
 	    ${RM} -r ${PORTNAME}-${DISTVERSIONFULL}; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/biology/gatk/Makefile b/biology/gatk/Makefile
index 672e53c1d812..d518057376ef 100644
--- a/biology/gatk/Makefile
+++ b/biology/gatk/Makefile
@@ -1,97 +1,97 @@
 PORTNAME=	gatk
 DISTVERSION=	4.5.0.0
 CATEGORIES=	biology java
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Variant discovery in high-throughput sequencing data
 WWW=		https://gatk.broadinstitute.org/hc/en-us
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 BUILD_DEPENDS=	gradle:devel/gradle
 
 USES=		gettext-runtime
 USE_JAVA=	yes
 
 JAVA_VERSION=	17 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=76025, tid=0x000000000006e359 guarantee(val < (1U << nbits)) failed: Field too big for insn
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	broadinstitute
 
 SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	PORTVERSION=${PORTVERSION} JAVA=${JAVA}
 
 NO_ARCH=	yes
 
 DEPS_CACHE_DIR=	${WRKDIR}
 
 PLIST_FILES=	bin/${PORTNAME} \
 		${JAVAJARDIR}/GenomeAnalysisTK-${PORTVERSION}.jar
 
 BINARY_ALIAS=	java=${JAVA}
 
 # TODO additionally fetch git-lfs files: https://github.com/broadinstitute/gatk/issues/6395
 
 # to rebuild the deps archive:
 #   1. set DEV_UPDATE_MODE=yes
 #   2. make makesum build
 #   3. upload the *-deps archive
 #   4. set DEV_UPDATE_MODE=no
 #   5. make clean makesum
 
 DEV_UPDATE_MODE=	no
 
 OPTIONS_DEFINE=			WITH_LARGE_FILES # probably should be default for tests, but the build doesn't seem to be affected contrary to what README says
 
 WITH_LARGE_FILES_DESC=		Download large LFS files needed for build and tests
 WITH_LARGE_FILES_FETCH_DEPENDS=	git:devel/git \
 				git-lfs:devel/git-lfs
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MWITH_LARGE_FILES}
 do-fetch:
 	@if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}" ]; then \
 		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
 		cd ${DISTDIR}/${DIST_SUBDIR} && \
 		${ECHO} "==> Fetching ${PORTNAME} including large LFS files" && \
 		( \
 			${MKDIR} ${WRKDIR}; \
 			HOME=${WRKDIR}; \
 			git config --global filter.lfs.smudge "git-lfs smudge -- %f" && \
 			git clone -q https://github.com/broadinstitute/gatk.git ${PORTNAME}-${DISTVERSION} && \
 			(cd ${PORTNAME}-${DISTVERSION} && git reset -q --hard ${DISTVERSION} && ${RM} -r .git) && \
 			${RM} -r ${WRKDIR} \
 		) && \
 		${FIND} ${PORTNAME}-${DISTVERSION} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \
 		${FIND} ${PORTNAME}-${DISTVERSION} -print0 | LC_ALL=C ${SORT} -z | \
-		${TAR} czf ${DISTNAME}${EXTRACT_SUFX} --format=bsdtar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
+		${TAR} czf ${DISTNAME}${EXTRACT_SUFX} --format=ustar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
 		${RM} -r ${PORTNAME}-${DISTVERSION}; \
 	fi
 .endif
 
 .if (${DEV_UPDATE_MODE} == "yes")
 post-build:
 	@cd ${DEPS_CACHE_DIR} && ${TAR} czf ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX} gradle-${PORTNAME}
 	@${ECHO} "(!!!) Please upload the gradle deps archive: ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}"
 .else
 MASTER_SITES=	LOCAL/yuri/:deps
 DISTFILES=	${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}:deps
 GRADLE_ARGS=	--offline
 
 post-extract: # need a separate extract step because the cache is in /tmp, and not under work/ like with maven
 	@cd ${DEPS_CACHE_DIR} && ${TAR} xzf ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}
 .endif
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle \
 		--gradle-user-home ${DEPS_CACHE_DIR}/gradle-${PORTNAME} --project-cache-dir ${DEPS_CACHE_DIR}/gradle-${PORTNAME} \
 		${GRADLE_ARGS} --build-cache localJar
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/build/libs/gatk-package-1.0-SNAPSHOT-local.jar ${STAGEDIR}${JAVAJARDIR}/GenomeAnalysisTK-${PORTVERSION}.jar
 
 .include <bsd.port.mk>
diff --git a/math/ttmath/Makefile b/math/ttmath/Makefile
index 89503a45c06a..144d75ed4bdb 100644
--- a/math/ttmath/Makefile
+++ b/math/ttmath/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	ttmath
 DISTVERSION=	0.9.3.20191013
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ headers-only library for big integer and floating point numbers
 WWW=		https://ttmath.org
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 FETCH_DEPENDS=	git:devel/git
 
 USES=		cmake:testing
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 GIT_URL=	https://gitea.ttmath.org/tomasz.sowa/ttmath.git
 GIT_TAG=	aad580f51e7ffc32966507a9897ec575c389e3e6
 
 do-fetch:
 	@if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}" ]; then \
 	  ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
 	  cd ${DISTDIR}/${DIST_SUBDIR} && \
 	    git clone -q ${GIT_URL} ${PORTNAME}-${DISTVERSIONFULL} && \
 	    (cd ${PORTNAME}-${DISTVERSIONFULL} && git reset -q --hard ${GIT_TAG} && ${RM} -r .git) && \
 	    ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \
 	    ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | LC_ALL=C ${SORT} -z | \
-	        ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=bsdtar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
+	        ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=ustar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
 	    ${RM} -r ${PORTNAME}-${DISTVERSIONFULL}; \
 	fi
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include
 
 .include <bsd.port.mk>
diff --git a/science/salome-configuration/Makefile b/science/salome-configuration/Makefile
index ea03f6e27265..6afeb92ff2cd 100644
--- a/science/salome-configuration/Makefile
+++ b/science/salome-configuration/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	salome-configuration
 DISTVERSIONPREFIX=	V
 DISTVERSION=	9_11_0
 CATEGORIES=	science # physics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Salome Project: Multi-physics simulations: Configuration
 WWW=		https://www.salome-platform.org/
 
 FETCH_DEPENDS=	git:devel/git
 
 GIT_URL=	https://git.salome-platform.org/gitpub/tools/configuration.git # all Salome repositories: https://git.salome-platform.org/gitweb/
 
 DATADIR=	${PREFIX}/share/salome
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 do-fetch:
 	@if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}" ]; then \
 	  ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
 	  cd ${DISTDIR}/${DIST_SUBDIR} && \
 	    git clone -q ${GIT_URL} ${PORTNAME}-${DISTVERSIONFULL} && \
 	    (cd ${PORTNAME}-${DISTVERSIONFULL} && git reset -q --hard ${DISTVERSIONFULL} && ${RM} -r .git) && \
 	    ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \
 	    ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | LC_ALL=C ${SORT} -z | \
-	        ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=bsdtar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
+	        ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=ustar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
 	    ${RM} -r ${PORTNAME}-${DISTVERSIONFULL}; \
 	fi
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/configuration
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/configuration
 	${RM} ${STAGEDIR}${DATADIR}/configuration/.gitignore
 
 .include <bsd.port.mk>
diff --git a/science/salome-kernel/Makefile b/science/salome-kernel/Makefile
index 134403d43687..28f3f2eecabb 100644
--- a/science/salome-kernel/Makefile
+++ b/science/salome-kernel/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	salome-kernel
 DISTVERSIONPREFIX=	V
 DISTVERSION=	9_11_0
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Salome Project: Multi-physics simulations: Kernel
 WWW=		https://www.salome-platform.org/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 FETCH_DEPENDS=	git:devel/git
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}omniorb>0:devel/py-omniorb \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 BUILD_DEPENDS=	salome-configuration>0:science/salome-configuration \
 		swig:devel/swig \
 		${PY_DEPENDS}
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libhdf5.so:science/hdf5 \
 		libomniORB4.so:devel/omniORB
 RUN_DEPENDS=	bash:shells/bash \
 		${PY_DEPENDS}
 
 USES=		cmake compiler:c++11-lang gnome python shebangfix
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 SHEBANG_GLOB=	*.py *.sh
 SHEBANG_FILES=	bin/appliskel/salome \
 		bin/appliskel/salome_mesa \
 		bin/appliskel/.salome_run \
 		bin/appliskel/.bashrc
 
 GIT_URL=	https://git.salome-platform.org/gitpub/modules/kernel # all Salome repositories: https://git.salome-platform.org/gitweb/
 
 CMAKE_ARGS=	-DCONFIGURATION_ROOT_DIR=${LOCALBASE}/share/salome/configuration \
 		-DOMNIORBPY_ROOT_DIR=${LOCALBASE} \
 		-DPython_EXECUTABLE=${PYTHON_CMD}
 CMAKE_OFF=	SALOME_BUILD_TESTS SALOME_BUILD_DOC
 CFLAGS+=	-DSIZEOF_INT=4 -DSIZEOF_LONG=4
 LDFLAGS+=	-lexecinfo
 
 DATADIR=	${PREFIX}/share/salome
 
 do-fetch:
 	@if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}" ]; then \
 	  ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
 	  cd ${DISTDIR}/${DIST_SUBDIR} && \
 	    git clone -q ${GIT_URL} ${PORTNAME}-${DISTVERSIONFULL} && \
 	    (cd ${PORTNAME}-${DISTVERSIONFULL} && git reset -q --hard ${DISTVERSIONFULL} && ${RM} -r .git) && \
 	    ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \
 	    ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | LC_ALL=C ${SORT} -z | \
-	        ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=bsdtar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
+	        ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=ustar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
 	    ${RM} -r ${PORTNAME}-${DISTVERSIONFULL}; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/textproc/write-good/Makefile b/textproc/write-good/Makefile
index 9384473e3150..d82ddd1c61c0 100644
--- a/textproc/write-good/Makefile
+++ b/textproc/write-good/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	write-good
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.8
 PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	LOCAL/0mp/:npm
 DISTFILES=	${_NPM_DISTFILES}
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Naive linter for English prose
 WWW=		https://github.com/btford/write-good
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	npm:www/npm
 
 USES=		nodejs:run
 USE_GITHUB=	yes
 GH_ACCOUNT=	btford
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS
 PORTDOCS=	README.md
 
 .if !defined(MAINTAINER_MODE)
 _NPM_DISTFILES=		${_NPM_DISTFILE_cache}:npm \
 			${_NPM_DISTFILE_modules}:npm
 .endif
 _NPM_DISTFILE_cache=	${PORTNAME}-${DISTVERSION}.cache${EXTRACT_SUFX}
 _NPM_DISTFILE_modules=	${PORTNAME}-${DISTVERSION}.modules${EXTRACT_SUFX}
 
 _UNNECESSARY_FILES=	test .dockerignore \
 			.eslintrc .gitignore .npmignore .pre-commit-hooks.yaml \
 			.travis.yml Dockerfile LICENSE README.md
 _LIBEXEC_REL=		libexec/${PORTNAME}
 _LIBEXEC=		${STAGEDIR}${PREFIX}/${_LIBEXEC_REL}
 
 do-install:
 	@${MKDIR} ${_LIBEXEC}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${_LIBEXEC})
 
 	${RLN} ${_LIBEXEC}/bin/${PORTNAME}.js ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${RLN} ${_LIBEXEC}/bin/${PORTNAME}.js ${STAGEDIR}${PREFIX}/bin/writegood
 	${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/writegood
 
 	(cd ${_LIBEXEC} && ${RM} -r ${_UNNECESSARY_FILES})
 
 post-install:
 # Build plist automatically to avoid listing all the node_modules files.
 	(cd ${STAGEDIR}${PREFIX} && \
 		${FIND} ${_LIBEXEC_REL}/node_modules -not -type d >> ${TMPPLIST})
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 # - Requires npm (e.g., from www/npm).
 # - Remember to set MAINTAINER_MODE,
 #   e.g., "make -DMAINTAINER_MODE _npm-regenerate".
 _npm-regenerate:
 	${MAKE} clean patch
 	(cd ${WRKSRC} && ${SETENV} ${_NPM_ENV} npm install --ignore-scripts)
 	${FIND} ${WRKDIR}/.npm ${WRKSRC}/node_modules -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \;
 	(cd ${WRKDIR} && \
 		${FIND} .npm/_cacache -print0 | LC_ALL=C ${SORT} -z | \
-		${TAR} czf ${WRKDIR}/${_NPM_DISTFILE_cache} --format=bsdtar --uid 0 --gid 0 --options gzip:!timestamp --no-recursion --null -T -)
+		${TAR} czf ${WRKDIR}/${_NPM_DISTFILE_cache} --format=ustar --uid 0 --gid 0 --options gzip:!timestamp --no-recursion --null -T -)
 	(cd ${WRKDIR} && \
 		${FIND} ${WRKSRC:T}/node_modules -print0 | LC_ALL=C ${SORT} -z | \
-		${TAR} czf ${WRKDIR}/${_NPM_DISTFILE_modules} --format=bsdtar --uid 0 --gid 0 --options gzip:!timestamp --no-recursion --null -T -)
+		${TAR} czf ${WRKDIR}/${_NPM_DISTFILE_modules} --format=ustar --uid 0 --gid 0 --options gzip:!timestamp --no-recursion --null -T -)
 	scp ${WRKDIR}/${_NPM_DISTFILE_cache} ${WRKDIR}/${_NPM_DISTFILE_modules} 0mp@freefall.freebsd.org:public_distfiles/
 	cp ${WRKDIR}/${_NPM_DISTFILE_cache} ${WRKDIR}/${_NPM_DISTFILE_modules} ${DISTDIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/xlnt/Makefile b/textproc/xlnt/Makefile
index fc7bc790d92b..7146d8afcdea 100644
--- a/textproc/xlnt/Makefile
+++ b/textproc/xlnt/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	xlnt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.0-92
 DISTVERSIONSUFFIX=	-g20f3dac2
 CATEGORIES=	textproc devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ xlsx library for reading/writing/manipulating spreadsheets
 WWW=		https://github.com/tfussell/xlnt
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 FETCH_DEPENDS=	git:devel/git
 
 USES=		cmake compiler:c++14-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tfussell
 
 CMAKE_OFF=	TESTS
 
 LIBSTUDXML_NAME=	libstudxml
 LIBSTUDXML_GIT_URL=	https://git.codesynthesis.com/libstudxml/libstudxml.git
 LIBSTUDXML_REV=		e729667
 
 DISTFILES=	${LIBSTUDXML_NAME}-${LIBSTUDXML_REV}${EXTRACT_SUFX}
 
 pre-fetch:
 	@if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${LIBSTUDXML_NAME}-${LIBSTUDXML_REV}${EXTRACT_SUFX}" ]; then \
 	  ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
 	  cd ${DISTDIR}/${DIST_SUBDIR} && \
 	    git clone -q ${LIBSTUDXML_GIT_URL} ${LIBSTUDXML_NAME}-${LIBSTUDXML_REV} && \
 	    (cd ${LIBSTUDXML_NAME}-${LIBSTUDXML_REV} && git reset -q --hard ${LIBSTUDXML_REV} && ${RM} -r .git) && \
 	    ${FIND} ${LIBSTUDXML_NAME}-${LIBSTUDXML_REV} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \
 	    ${FIND} ${LIBSTUDXML_NAME}-${LIBSTUDXML_REV} -print0 | LC_ALL=C ${SORT} -z | \
-	        ${TAR} czf ${LIBSTUDXML_NAME}-${LIBSTUDXML_REV}${EXTRACT_SUFX} --format=bsdtar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
+	        ${TAR} czf ${LIBSTUDXML_NAME}-${LIBSTUDXML_REV}${EXTRACT_SUFX} --format=ustar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
 	    ${RM} -r ${LIBSTUDXML_NAME}-${LIBSTUDXML_REV}; \
 	fi
 
 post-extract:
 	@${RLN} ${WRKDIR}/${LIBSTUDXML_NAME}-${LIBSTUDXML_REV}/libstudxml ${WRKSRC}/third-party/libstudxml/libstudxml
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DTESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/x11/qimageblitz/Makefile b/x11/qimageblitz/Makefile
index 5bfc83df5e87..c023eb10d4c8 100644
--- a/x11/qimageblitz/Makefile
+++ b/x11/qimageblitz/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	qimageblitz
 PORTVERSION=	0.1.0.${SVN_REVISION} # a made-up version also used in some linux distros, otherwise we need to add PORTEPOCH
 CATEGORIES=	x11
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Graphical effects and filters library for Qt5
 WWW=		https://sourceforge.net/projects/qimageblitz/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 FETCH_DEPENDS=	svn:devel/subversion
 
 USES=		cmake compiler:c++11-lang qt:5
 USE_LDCONFIG=	yes
 USE_QT=		core gui widgets qmake:build buildtools:build
 USE_CXXSTD=	gnu++98
 
 SVN_URL=	svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qimageblitz
 SVN_REVISION=	1548172
 
 do-fetch:
 	@if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}" ]; then \
 	  ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
 	  cd ${DISTDIR}/${DIST_SUBDIR} && \
 	    svn co -r ${SVN_REVISION} ${SVN_URL} ${PORTNAME}-${DISTVERSIONFULL} && \
 	    (cd ${PORTNAME}-${DISTVERSIONFULL} && ${RM} -r .svn) && \
 	    ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \
 	    ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | LC_ALL=C ${SORT} -z | \
-	        ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=bsdtar --uid 0 --gid 0 --options gzip:!timestamp --no-recursion --null -T - && \
+	        ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=ustar --uid 0 --gid 0 --options gzip:!timestamp --no-recursion --null -T - && \
 	    ${RM} -r ${PORTNAME}-${DISTVERSIONFULL}; \
 	fi
 
 .include <bsd.port.mk>