diff --git a/biology/ncbi-vdb/Makefile b/biology/ncbi-vdb/Makefile
index c38dea3ffdb4..fc60b954bcd8 100644
--- a/biology/ncbi-vdb/Makefile
+++ b/biology/ncbi-vdb/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	ncbi-vdb
 DISTVERSION=	2.11.0
 PORTREVISION=	6
 CATEGORIES=	biology
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NCBI's virtualized back-end for accessing Sequence Read Archive
 WWW=		https://github.com/ncbi/ncbi-vdb/wiki
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 DEPRECATED=	Very outdated, unmaintained and unsupported upstream
 EXPIRATION_DATE=2024-12-31
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	libs/search/nucstrstr.c requires SSE2 instructions
 
 BUILD_DEPENDS=	bash:shells/bash \
 		libepoll-shim>0:devel/libepoll-shim
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
-		libhdf5.so:science/hdf5 \
+LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libmbedtls.so:security/mbedtls
 
-USES=		compiler:c11 gmake localbase:ldflags perl5 shebangfix
+USES=		compiler:c11 gmake gnome localbase:ldflags perl5 shebangfix
+USE_GNOME=	libxml2
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ncbi
 GH_TUPLE+=	ncbi:ngs:${DISTVERSION}:ngs # ported as biology/ngs-sdk
 
 SHEBANG_GLOB=	*.sh *.pl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xml2-prefix=${LOCALBASE} \
 		--with-hdf5-prefix=${LOCALBASE} \
 		--with-mbedtls-prefix=${LOCALBASE} \
 		CC="${CC}" CXX="${CXX}" TOOLS="${CHOSEN_COMPILER_TYPE}"
 MAKE_ENV+=	CPATH="${LOCALBASE}/include/libepoll-shim"
 MAKE_ARGS+=	CCNAME=${CC} CXXNAME=${CXX} PKGCFLAGS="${CFLAGS}"
 
 CFLAGS+=	-I${WRKSRC}/lib
 
 MAKE_JOBS_UNSAFE=	yes
 
 post-extract:
 	@${LN} -sf ${WRKSRC_ngs} ${WRKDIR}/ngs
 	@${LN} -sf ${WRKSRC} ${WRKDIR}/${PORTNAME}
 
 pre-patch:
 	@${CP} ${FILESDIR}/Makefile.bsd ${WRKSRC}/build/
 	@for f in ${WRKSRC}/build/ld.linux.*.sh; do ${CP} -p $${f} $${f%linux*}bsd$${f#*linux}; done
 	@${CP} -p ${WRKSRC}/build/ld.linux.gcc.sh ${WRKSRC}/build/ld.bsd.clang.sh
 	@${MKDIR} ${WRKSRC}/interfaces/os/bsd
 	@${CP} -p ${WRKSRC}/interfaces/os/mac/endian.h ${WRKSRC}/interfaces/os/bsd/
 
 post-patch:
 	@${GREP} -q '@@PREFIX@@' ${WRKSRC}/libs/kfg/config.c || (echo "@@PREFIX@@ in file/patch-libs_kfg_config.c is overwritten probably due to using 'make makepatch'"; exit 1)
 	@${REINPLACE_CMD} -e 's#@@PREFIX@@#"${PREFIX}"#' ${WRKSRC}/libs/kfg/config.c
 
 post-configure:
 	@${ECHO} ${CHOSEN_COMPILER_TYPE} > ${WRKSRC}/build/COMP
 
 # The 'install' target installs broken-looking static libs with symlinks.
 # This is intentional, see comments https://github.com/ncbi/ncbi-vdb/issues/36#issuecomment-817990790 This may change in future versions.
 
 .include <bsd.port.mk>
diff --git a/cad/pcb-rnd/Makefile b/cad/pcb-rnd/Makefile
index d4c6df4588ee..745b86b2e0db 100644
--- a/cad/pcb-rnd/Makefile
+++ b/cad/pcb-rnd/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	pcb-rnd
 DISTVERSION=	3.1.1
 CATEGORIES=	cad
 MASTER_SITES=	http://repo.hu/projects/pcb-rnd/releases/
 
 MAINTAINER=	hasdalcodes@gmail.com
 COMMENT=	Flexible, modular Printed Circuit Board editor
 WWW=		http://www.repo.hu/projects/pcb-rnd/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfungw.so:devel/fungw \
 		libfreetype.so:print/freetype2 \
 		libgd.so:graphics/gd \
 		libgenht.so:devel/genht \
-		librnd-hid.so:cad/librnd \
-		libxml2.so:textproc/libxml2
+		librnd-hid.so:cad/librnd
 
-USES=		gmake pkgconfig tar:bz2
+USES=		gmake gnome pkgconfig tar:bz2
+USE_GNOME=	libxml2
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--cflags/libs/sul/freetype2="-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include/freetype2/freetype" \
 		--ldflags/libs/sul/freetype2=-L${LOCALBASE}/lib \
 		${WITH_DEBUG:D--debug} \
 		--CC=${CC} \
 		--CFLAGS='${CFLAGS}' \
 		--LDFLAGS='${LDFLAGS}'
 BINARY_ALIAS=	make=${MAKE_CMD}
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 .for f in pcb-rnd txt2bxl bxl2txt gsch2pcb-rnd
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$f
 .endfor
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pcb-rnd/plugins/*.so
 
 post-patch:
 	@${ECHO_CMD} 'USER_CFLAGS += -DSCCONFIG_ACCEPT_IMPLICIT' \
 		>> ${WRKSRC}/scconfig/Makefile
 
 .include <bsd.port.mk>
diff --git a/deskutils/bookworm/Makefile b/deskutils/bookworm/Makefile
index 0e680d9107c3..5b306e39fa8f 100644
--- a/deskutils/bookworm/Makefile
+++ b/deskutils/bookworm/Makefile
@@ -1,62 +1,61 @@
 PORTNAME=	bookworm
 DISTVERSION=	1.1.2
 PORTREVISION=	21
 CATEGORIES=	deskutils
 
 MAINTAINER=	miguel@gocobachi.dev
 COMMENT=	Simple, focused ebook reader
 WWW=		https://babluboy.github.io/bookworm/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	curl>0:ftp/curl \
 		html2text>0:textproc/html2text
 LIB_DEPENDS=	libappstream-glib.so:devel/appstream-glib \
 		libgee-0.8.so:devel/libgee \
 		libgranite.so:x11-toolkits/granite \
 		libpoppler-glib.so:graphics/poppler-glib \
 		libsoup-2.4.so:devel/libsoup \
-		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
-		libxml2.so:textproc/libxml2
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 RUN_DEPENDS=	bash:shells/bash \
 		pdftohtml:graphics/poppler-utils \
 		unar:archivers/unarchiver \
 		unzip:archivers/unzip
 
 USES=		desktop-file-utils gettext gnome meson pkgconfig \
 		python shebangfix sqlite vala:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	babluboy
 USE_GNOME=	gdkpixbuf2 glib20 gtk30 libxml2 pango
 
 GLIB_SCHEMAS=	com.github.babluboy.bookworm.gschema.xml
 SHEBANG_FILES=	data/scripts/com.github.babluboy.bookworm.search.sh \
 		data/scripts/mobi_lib/mobi_dict.py \
 		data/scripts/mobi_lib/mobi_html.py \
 		data/scripts/mobi_lib/mobi_index.py \
 		data/scripts/mobi_lib/mobi_k8proc.py \
 		data/scripts/mobi_lib/mobi_ncx.py \
 		data/scripts/mobi_lib/mobi_opf.py \
 		data/scripts/mobi_lib/mobi_split.py \
 		data/scripts/mobi_lib/mobi_uncompress.py \
 		data/scripts/mobi_lib/mobi_unpack.py \
 		data/scripts/mobi_lib/mobi_utils.py
 
 MESON_BUILD_DIR=	build
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-configure:
 	@${MKDIR} ${WRKSRC}/${MESON_BUILD_DIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 do-test:
 	cd ${WRKSRC}/${MESON_BUILD_DIR} && ${LOCALBASE}/bin/ninja test
 
 .include <bsd.port.mk>
diff --git a/devel/libabigail/Makefile b/devel/libabigail/Makefile
index e38ef83d3a40..a3870ccc5518 100644
--- a/devel/libabigail/Makefile
+++ b/devel/libabigail/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	libabigail
 DISTVERSION=	2.0
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SOURCEWARE/${PORTNAME}/
 
 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	ABI Generic Analysis and Instrumentation Library
 WWW=		https://sourceware.org/libabigail/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
-		libdw.so:devel/elfutils
+LIB_DEPENDS=	libdw.so:devel/elfutils
 
-USES=		compiler:c++11-lang gmake libtool localbase pkgconfig python
+USES=		compiler:c++11-lang gmake gnome libtool localbase pkgconfig \
+		python
+USE_GNOME=	libxml2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-cxx11=yes
 
 .include <bsd.port.mk>
diff --git a/devel/libdatovka/Makefile b/devel/libdatovka/Makefile
index 84d7a2186131..9dc778eb1ce3 100644
--- a/devel/libdatovka/Makefile
+++ b/devel/libdatovka/Makefile
@@ -1,40 +1,39 @@
 PORTNAME=	libdatovka
 DISTVERSION=	0.7.0
 CATEGORIES=	devel
 MASTER_SITES=	https://secure.nic.cz/files/datove_schranky/libdatovka/
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	ISDS client library
 WWW=		https://gitlab.nic.cz/datovka/libdatovka
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl \
 		expat>0:textproc/expat2 \
 		gpgme>0:security/gpgme \
 		libgcrypt>0:security/libgcrypt \
 		libiconv>0:converters/libiconv \
 		pkgconf:devel/pkgconf \
 		xsltproc:textproc/libxslt
-LIB_DEPENDS+=	libassuan.so:security/libassuan \
+LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
-		libgpgme.so:security/gpgme \
-		libxml2.so:textproc/libxml2
+		libgpgme.so:security/gpgme
 
 USES=		autoreconf gettext gmake gnome libtool localbase ssl tar:xz
 USE_GNOME=	libxml2 libxslt
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=		yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS+=	--disable-fatalwarnings \
 			--enable-openssl-backend \
 			--with-docbook-xsl-stylesheets=${LOCALBASE}/share/xsl/docbook
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/devel/liblangtag/Makefile b/devel/liblangtag/Makefile
index 165bf8bf379f..ae49a3eec586 100644
--- a/devel/liblangtag/Makefile
+++ b/devel/liblangtag/Makefile
@@ -1,23 +1,22 @@
 PORTNAME=	liblangtag
 PORTVERSION=	0.6.7
 CATEGORIES=	devel textproc
 MASTER_SITES=	https://bitbucket.org/tagoh/liblangtag/downloads/ \
 		LOCAL/jkim
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Interface library to access tags for identifying languages
 WWW=		https://bitbucket.org/tagoh/liblangtag/wiki/Home
 
 LICENSE=	LGPL3 MPL20
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2
-
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		iconv libtool pathfix pkgconfig tar:bzip2
+USES=		iconv gnome libtool pathfix pkgconfig tar:bzip2
+USE_GNOME=	libxml2
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--disable-introspection
 
 .include <bsd.port.mk>
diff --git a/devel/libsmpp34/Makefile b/devel/libsmpp34/Makefile
index a164c0159384..168d836171b6 100644
--- a/devel/libsmpp34/Makefile
+++ b/devel/libsmpp34/Makefile
@@ -1,31 +1,30 @@
 PORTNAME=	libsmpp34
 PORTVERSION=	1.10
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://chaosophia.net/downloads/osmocom/${PORTNAME}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Provide an implementation of SMPP-3.4 protocol for PDUs handling
 WWW=		https://c-open-smpp-34.sourceforge.net/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2
-
-USES=		autoreconf libtool pathfix
+USES=		autoreconf gnome libtool pathfix
+USE_GNOME=	libxml2
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 post-patch:
 	@${REINPLACE_CMD} 's|malloc.h|stdlib.h|' \
 		${WRKSRC}/src/smpp34_dumpBuf.c \
 		${WRKSRC}/src/smpp34_dumpPdu.c \
 		${WRKSRC}/src/smpp34_pack.c \
 		${WRKSRC}/src/smpp34_params.c \
 		${WRKSRC}/src/smpp34_structs.c \
 		${WRKSRC}/src/smpp34_unpack.c
 	@${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
 
 .include <bsd.port.mk>
diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index 96500977e6fe..0d0bb27ff2a9 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -1,218 +1,217 @@
 PORTNAME=	libvirt
 DISTVERSION=	10.9.0
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Toolkit to interact with virtualization capabilities
 WWW=		https://libvirt.org/
 
 LICENSE=	LGPL3
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
-		libgnutls.so:security/gnutls \
-		libxml2.so:textproc/libxml2
+		libgnutls.so:security/gnutls
 BUILD_DEPENDS=	dnsmasq:dns/dnsmasq \
 		${LOCALBASE}/bin/grep:textproc/gnugrep \
 		gsed:textproc/gsed \
 		rst2html:textproc/py-docutils@${PY_FLAVOR} \
 		xsltproc:textproc/libxslt
 RUN_DEPENDS=	dnsmasq:dns/dnsmasq
 
 OPTIONS_DEFINE=	DOCS NLS NSS QEMU READLINE SASL LIBSSH LIBSSH2 ZFS
 OPTIONS_DEFAULT=	READLINE LIBSSH LIBSSH2 ZFS
 OPTIONS_DEFINE_amd64=	XEN
 .if exists(/usr/sbin/bhyveload)
 OPTIONS_DEFINE+=	BHYVE
 OPTIONS_DEFAULT+=	BHYVE
 .else
 PLIST_SUB+=		BHYVE="@comment "
 SUB_LIST+=		BHYVE="@comment "
 MESON_ARGS+=	-Ddriver_bhyve=disabled
 .endif
 QEMU_DESC=	QEMU driver
 BHYVE_DESC=	bhyve driver
 XEN_DESC=	Xen support via libxl
 NSS_DESC=	Name Service Switch plugin
 LIBSSH_DESC=	libssh remote transport
 LIBSSH2_DESC=	libssh2 remote transport
 ZFS_DESC=	ZFS storage driver
 
 OPTIONS_SUB=	yes
 
 BHYVE_MESON_ENABLED=	driver_bhyve
 
 QEMU_MESON_ENABLED=	driver_qemu
 QEMU_RUN_DEPENDS=	dmidecode:sysutils/dmidecode \
 			qemu-io:emulators/qemu
 
 NLS_USES=	gettext
 NLS_MESON_ENABLED=	nls
 NLS_CFLAGS=	-I${LOCALBASE}/include
 
 NSS_MESON_ENABLED=	nss
 
 READLINE_MESON_ENABLED=	readline
 READLINE_USES=		readline
 
 SASL_MESON_ENABLED=	sasl
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 XEN_MESON_ENABLED=	driver_libxl
 XEN_CFLAGS=	-I${LOCALBASE}/include
 XEN_LIB_DEPENDS=	libxenlight.so:sysutils/xen-tools
 
 LIBSSH_MESON_ENABLED=	libssh
 LIBSSH_LIB_DEPENDS=	libssh.so:security/libssh
 
 LIBSSH2_MESON_ENABLED=	libssh2
 LIBSSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
 
 ZFS_MESON_ENABLED=	storage_zfs
 
 MESON_ARGS+=	\
 		-Dapparmor=disabled \
 		-Dapparmor_profiles=disabled \
 		-Dattr=disabled \
 		-Daudit=disabled \
 		-Dblkid=disabled \
 		-Dcapng=disabled \
 		-Ddriver_hyperv=disabled \
 		-Ddriver_interface=disabled \
 		-Ddriver_libxl=disabled \
 		-Ddriver_lxc=disabled \
 		-Ddriver_openvz=disabled \
 		-Ddriver_remote=enabled \
 		-Ddriver_vz=disabled \
 		-Dfirewalld=disabled \
 		-Dfirewalld_zone=disabled \
 		-Dfuse=disabled \
 		-Dglusterfs=disabled \
 		-Dlibiscsi=disabled \
 		-Dlibnl=disabled \
 		-Dlibpcap=disabled \
 		-Dnumactl=disabled \
 		-Dnumad=disabled \
 		-Dopenwsman=disabled \
 		-Dpciaccess=disabled \
 		-Dpolkit=disabled \
 		-Dsanlock=disabled \
 		-Dsecdriver_apparmor=disabled \
 		-Dsecdriver_selinux=disabled \
 		-Dselinux=disabled \
 		-Dssh_proxy=disabled \
 		-Dstorage_disk=disabled \
 		-Dstorage_fs=disabled \
 		-Dstorage_gluster=disabled \
 		-Dstorage_iscsi=disabled \
 		-Dstorage_iscsi_direct=disabled \
 		-Dstorage_lvm=disabled \
 		-Dstorage_mpath=disabled \
 		-Dstorage_rbd=disabled \
 		-Dstorage_vstorage=disabled \
 		-Dudev=disabled \
 		-Dnetcf=disabled \
 		-Dsysctl_config=disabled \
 		-Dnbdkit=disabled \
 		-Dnbdkit_config_default=disabled \
 		-Dlogin_shell=disabled \
 		-Dwireshark_dissector=disabled \
 		-Dinit_script=none \
 		-Dbash_completion=disabled \
 		-Duserfaultfd_sysctl=disabled
 
 # random_data fix can be removed when 8.x is eol
 CONFIGURE_ENV=	ac_cv_type_struct_random_data=""
 
 # limit production release x.x.x
 PORTSCOUT=	limit:\d+\.\d+\.\d+$$
 
 LDFLAGS+=	-L${LOCALBASE}/lib -fstack-protector
 
 USES=		gnome charsetfix compiler:c++0x cpe gettext-runtime gmake \
 	        meson pathfix perl5 python:build pkgconfig shebangfix tar:xz
-USE_GNOME=	glib20
+USE_GNOME=	glib20 libxml2
 USE_RC_SUBR=	libvirtd virtlogd
 CPE_VENDOR=	redhat
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 SHLIB_VER=	0.10009.0
 PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}
 PORTDOCS=	*
 #SHEBANG_FILES=	src/keycodemapdb/tools/keymap-gen
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQEMU} || ${PORT_OPTIONS:MNSS}
 LIB_DEPENDS+=		libjson-c.so:devel/json-c
 MESON_ARGS+=	-Djson_c=enabled
 .else
 MESON_ARGS+=	-Djson_c=disabled
 .endif
 
 .if !${PLIST_SUB:MXEN}
 PLIST_SUB+=	XEN="@comment "
 .endif
 
 CONF_FILES=	\
 		bhyve.conf \
 		libvirt-admin.conf \
 		libvirt.conf \
 		libvirtd.conf \
 		libxl.conf \
 		network.conf \
 		qemu.conf \
 		virtbhyved.conf \
 		virtlockd.conf \
 		virtlogd.conf \
 		virtnetworkd.conf \
 		virtproxyd.conf \
 		virtqemud.conf \
 		virtsecretd.conf \
 		virtstoraged.conf \
 		virtvboxd.conf \
 		virtxend.conf
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/qemu/networks/autostart
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in AUTHORS.rst NEWS.rst README.rst
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .for dir in run/libvirt/network \
 	run/libvirt/qemu \
 	run/libvirt/lockd \
 	log/libvirt/uml \
 	log/libvirt/qemu \
 	log/libvirt/lxc \
 	lib/libvirt/boot \
 	lib/libvirt/lockd/files \
 	lib/libvirt/images \
 	lib/libvirt/dnsmasq \
 	lib/libvirt/filesystems \
 	lib/libvirt/network \
 	lib/libvirt/qemu/channel/target \
 	cache/libvirt/qemu
 	@${MKDIR} "${STAGEDIR}/var/${dir}"
 .endfor
 
 .for file in ${CONF_FILES}
 	@if test -f ${STAGEDIR}${ETCDIR}/${file}; then \
 		${MV} ${STAGEDIR}${ETCDIR}/${file} \
 		${STAGEDIR}${ETCDIR}/${file}.sample; fi
 .endfor
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 RUN_DEPENDS+=	dmidecode:sysutils/dmidecode
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/pcsc-cyberjack/Makefile b/devel/pcsc-cyberjack/Makefile
index d6e574a664bf..32d8f684c458 100644
--- a/devel/pcsc-cyberjack/Makefile
+++ b/devel/pcsc-cyberjack/Makefile
@@ -1,29 +1,29 @@
 PORTNAME=	pcsc-cyberjack
 DISTVERSION=	3.99.5final.SP16
 CATEGORIES=	devel security
 MASTER_SITES=	https://support.reiner-sct.de/downloads/LINUX/V3.99.5_SP16/
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	Reiner SCT cyberJack card reader PCSC driver
 WWW=		https://www.reiner-sct.com/
 
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYRIGHT.GPL
 LICENSE_FILE_LGPL20=	${WRKSRC}/COPYRIGHT.LGPL
 
-LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite \
-		libxml2.so:textproc/libxml2
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
-USES=		autoreconf dos2unix libtool localbase pkgconfig tar:bzip2
+USES=		autoreconf dos2unix gnome libtool localbase pkgconfig tar:bzip2
+USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-release --with-usbdropdir=${PREFIX}/lib/pcsc/drivers
 DOS2UNIX_FILES=	cjeca32/Debug.cpp \
 		cjeca32/RSCTCriticalSection.cpp \
 		cjeca32/RSCTCriticalSection.h
 INSTALL_TARGET=	install-strip
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/sope/Makefile b/devel/sope/Makefile
index ed64ca7b7ba4..03d6d5a42b1a 100644
--- a/devel/sope/Makefile
+++ b/devel/sope/Makefile
@@ -1,72 +1,72 @@
 PORTNAME=		sope
 PORTVERSION=		5.11.2
 CATEGORIES=		devel gnustep
 MASTER_SITES=		https://packages.sogo.nu/sources/
 DISTNAME=		SOPE-${PORTVERSION}
 
 MAINTAINER=		acm@FreeBSD.org
 COMMENT=		Extensive set of GNUstep web application frameworks
 WWW=			https://sogo.nu/
 
 LICENSE=		LGPL20
 
-LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
-			libmemcached.so:databases/libmemcached
+LIB_DEPENDS=		libmemcached.so:databases/libmemcached
 
-USES=			gmake iconv gnustep
+USES=			gmake gnome iconv gnustep
+USE_GNOME=		libxml2
 USE_GNUSTEP=		base build
 USE_LDCONFIG=		${GNUSTEP_LOCAL_LIBRARIES}
 
 CONFIGURE_ARGS=		--with-gnustep --disable-debug --disable-strip
 CONFIGURE_ENV+=		CC="${CC}"
 
 LLD_UNSAFE=		yes # PR 230608
 
 CONFLICTS=		sope2
 
 SUB_LIST+=		GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \
 			GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES}
 
 WRKSRC=			${WRKDIR}/SOPE
 
 OPTIONS_DEFINE=		LDAP MYSQL PGSQL MEMCACHED
 OPTIONS_DEFAULT=	LDAP PGSQL MEMCACHED
 OPTIONS_SUB=		yes
 
 LDAP_DESC=		Build with LDAP support
 MEMCACHED_DESC=		Install memcached
 MYSQL_DESC=		Build with MySQL support
 PGSQL_DESC=		Build with PostgreSQL support
 
 LDAP_USES=		ldap
 MEMCACHED_RUN_DEPENDS=	${LOCALBASE}/bin/memcached:databases/memcached
 MYSQL_USES=		mysql
 PGSQL_USES=		pgsql
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 CPPFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|g' ${WRKSRC}/sope-core/NGStreams/configure
 	@${REINPLACE_CMD} -e 's|LDAP_OPT_ON|1|g' ${WRKSRC}/sope-ldap/NGLdap/NGLdapConnection.m
 .for f in config.guess config.sub
 	@${CP} ${TEMPLATES}/$f ${WRKSRC}/sope-core/NGStreams/
 .endfor
 
 post-patch-LDAP-off:
 	@${REINPLACE_CMD} -e '/checkLinking "ldap"/d' ${WRKSRC}/configure
 
 post-patch-MYSQL-off:
 	@${REINPLACE_CMD} -e '/checkLinking "mysqlclient"/d' ${WRKSRC}/configure
 
 post-patch-PGSQL-off:
 	@${REINPLACE_CMD} -e '/checkLinking "pq"/d' ${WRKSRC}/configure
 
 do-configure:
 	cd ${WRKSRC} ; . ${GNUSTEP_MAKEFILES}/GNUstep.sh ; ./configure ${CONFIGURE_ARGS}
 
 .include <bsd.port.mk>
diff --git a/devel/sope2/Makefile b/devel/sope2/Makefile
index 1b7abfcdc6a9..9c7ae9c539da 100644
--- a/devel/sope2/Makefile
+++ b/devel/sope2/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=		sope2
 PORTVERSION=		2.4.3
 PORTREVISION=		1
 CATEGORIES=		devel gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOPE-${PORTVERSION}
 
 MAINTAINER=		acm@FreeBSD.org
 COMMENT=		Extensive set of GNUstep web application frameworks
 WWW=		https://sogo.nu/
 
 LICENSE=		LGPL20
 
-LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
-			libmemcached.so:databases/libmemcached
+LIB_DEPENDS=		libmemcached.so:databases/libmemcached
 
 WRKSRC=			${WRKDIR}/SOPE
 
 OPTIONS_DEFINE=		LDAP MYSQL PGSQL MEMCACHED
 OPTIONS_DEFAULT=	LDAP PGSQL MEMCACHED
 OPTIONS_SUB=		yes
 
 MYSQL_DESC=		Build with MySQL support
 PGSQL_DESC=		Build with PostgreSQL support
 MEMCACHED_DESC=		Install memcached
 
-USES=			gmake iconv gnustep ssl
+USES=			gmake gnome iconv gnustep ssl
+USE_GNOME=		libxml2
 USE_GNUSTEP=		base build
 USE_LDCONFIG=		${GNUSTEP_LOCAL_LIBRARIES}
 LLD_UNSAFE=		yes # PR 230608
 
 SUB_LIST+=		GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \
 			GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES}
 
 CONFIGURE_ARGS=		--with-gnustep --disable-debug --enable-strip
 
 LDAP_USES=		ldap
 PGSQL_USES=		pgsql
 MYSQL_USES=		mysql
 MEMCACHED_RUN_DEPENDS=	${LOCALBASE}/bin/memcached:databases/memcached
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 ADDITIONAL_CPPFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|g' ${WRKSRC}/sope-core/NGStreams/configure
 .for f in config.guess config.sub
 	@${CP} ${TEMPLATES}/$f ${WRKSRC}/sope-core/NGStreams/
 .endfor
 
 post-patch-LDAP-off:
 	@${REINPLACE_CMD} -e '/checkLinking "ldap"/d' ${WRKSRC}/configure
 
 post-patch-PGSQL-off:
 	@${REINPLACE_CMD} -e '/checkLinking "pq"/d' ${WRKSRC}/configure
 
 post-patch-MYSQL-off:
 	@${REINPLACE_CMD} -e '/checkLinking "mysqlclient"/d' ${WRKSRC}/configure
 
 do-configure:
 	cd ${WRKSRC} ; . ${GNUSTEP_MAKEFILES}/GNUstep.sh ; ./configure ${CONFIGURE_ARGS}
 
 .include <bsd.port.mk>
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 2276f4733a43..50fff6e129fa 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -1,229 +1,229 @@
 # pkg-help formatted with fmt 59 63
 
 PORTNAME=	bind
 DISTVERSION=	9.21.3
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
 PORTREVISION=	0
 .else
 # XXX: correct version
 # dns/bind9xx here
 PORTREVISION=	0
 .endif
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${DISTVERSION}
 .if defined(BIND_TOOLS_SLAVE)
 PKGNAMESUFFIX=	-tools
 .else
 # XXX: correct SUFFIX.
 PKGNAMESUFFIX=	9-devel
 .endif
 
 MAINTAINER=	mat@FreeBSD.org
 WWW=		https://www.isc.org/bind/
 .if defined(BIND_TOOLS_SLAVE)
 COMMENT=	Command line tools from BIND: delv, dig, host, nslookup...
 .else
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 .endif
 
 # Uncomment when bind9xx comes of age. +3 years if ESV, +1year otherwise, see
 # https://kb.isc.org/docs/aa-00896
 # DEPRECATED=	End of life, please migrate to a newer version of BIND9
 # EXPIRATION_DATE=	XXX-12-31
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libuv.so:devel/libuv \
 		libnghttp2.so:www/libnghttp2 \
-		liburcu.so:sysutils/liburcu \
-		libxml2.so:textproc/libxml2
+		liburcu.so:sysutils/liburcu
 
 .if !defined(BIND_TOOLS_SLAVE)
 RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 .endif
 
-USES=		autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:xz
+USES=		autoreconf compiler:c11 cpe gnome libedit libtool pkgconfig ssl tar:xz
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${DISTVERSION:C/-.*//}
 .if ${DISTVERSION:M*-*}
 CPE_UPDATE=	${DISTVERSION:C/.*-//:tl}
 .endif
+USE_GNOME=	libxml2
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--sysconfdir=${ETCDIR} \
 		--with-libxml2 \
 		--with-openssl=${OPENSSLBASE} \
 		--enable-dnsrps \
 		--with-readline=libedit
 ETCDIR=		${PREFIX}/etc/namedb
 
 # FIXME: figure out why build fails if enabled
 CONFIGURE_ARGS+=	--disable-tracing
 
 .if defined(BIND_TOOLS_SLAVE)
 EXTRA_PATCHES=		${PATCHDIR}/extrapatch-bind-tools
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/bind-tools
 .else
 USE_RC_SUBR=		named
 # XXX: remove the big warning about it being a development version from pkg-message
 SUB_FILES=		named.conf pkg-message
 EXTRA_PATCHES=		${PATCHDIR}/extrapatch-no-bind-tools
 
 PORTDOCS=	*
 
 # XXX: Add -devel
 CONFLICTS=	bind9[0-9][0-9]
 .endif	# BIND_TOOLS_SLAVE
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFAULT=	GSSAPI_NONE IDN JSON LMDB \
 			TCP_FASTOPEN DNSTAP
 OPTIONS_DEFINE=		DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \
 			OVERRIDECACHE QUERYTRACE \
 			START_LATE TCP_FASTOPEN
 
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 
 .if defined(BIND_TOOLS_SLAVE)
 OPTIONS_EXCLUDE=	DOCS GEOIP LMDB \
 			OVERRIDECACHE QUERYTRACE START_LATE \
 			TCP_FASTOPEN
 .endif	# BIND_TOOLS_SLAVE
 
 OPTIONS_SUB=	yes
 
 DNSTAP_DESC=		Provides fast passive logging of DNS messages
 FIXED_RRSET_DESC=	Enable fixed rrset ordering
 GSSAPI_BASE_DESC=	Using Heimdal in base (nsupdate is broken)
 GSSAPI_HEIMDAL_DESC=	Using security/heimdal (nsupdate is broken)
 GSSAPI_MIT_DESC=	Using security/krb5
 GSSAPI_NONE_DESC=	Disable
 LARGE_FILE_DESC=	64-bit file support
 LMDB_DESC=		Use LMDB for zone management
 OVERRIDECACHE_DESC=	Use the override-cache patch
 QUERYTRACE_DESC=	Enable the very verbose query tracelogging
 START_LATE_DESC=	Start BIND late in the boot process (see help)
 TCP_FASTOPEN_DESC=	RFC 7413 support
 
 DOCS_ALL_TARGET=	all html
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
 			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
 DOCS_USES=	gmake python:env
 
 DNSTAP_CONFIGURE_ENABLE=	dnstap
 DNSTAP_LIB_DEPENDS=		libfstrm.so:devel/fstrm \
 				libprotobuf-c.so:devel/protobuf-c
 
 FIXED_RRSET_CONFIGURE_ENABLE=	fixed-rrset
 
 GEOIP_CONFIGURE_ENABLE=	geoip
 GEOIP_CONFIGURE_WITH=	maxminddb
 GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
 GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
 				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_BASE_USES=		gssapi
 
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
 				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal
 
 GSSAPI_MIT_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
 				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_MIT_USES=		gssapi:mit
 
 GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
 
 IDN_CONFIGURE_OFF=	--without-libidn2
 IDN_CONFIGURE_ON=	${ICONV_CONFIGURE_BASE} \
 			--with-libidn2=${LOCALBASE}
 IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
 IDN_USES=		iconv
 
 JSON_CONFIGURE_WITH=	json-c
 JSON_LIB_DEPENDS=	libjson-c.so:devel/json-c
 JSON_LDFLAGS=		-L${LOCALBASE}/lib -ljson-c
 
 LARGE_FILE_CONFIGURE_ENABLE=	largefile
 
 LMDB_CONFIGURE_WITH=	lmdb=${LOCALBASE}
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 
 OVERRIDECACHE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-min-override-ttl
 
 QUERYTRACE_CONFIGURE_ENABLE=	querytrace
 
 START_LATE_SUB_LIST=		NAMED_BEFORE="LOGIN" \
 				NAMED_REQUIRE="SERVERS cleanvar"
 START_LATE_SUB_LIST_OFF=	NAMED_BEFORE="SERVERS" \
 				NAMED_REQUIRE="NETWORKING ldconfig syslogd"
 
 TCP_FASTOPEN_CONFIGURE_ENABLE=	tcp-fastopen
 
 .include <bsd.port.options.mk>
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-developer
 USES+=			perl5
 USE_PERL5=		build
 BUILD_DEPENDS+=		cmocka>0:sysutils/cmocka
 .endif
 
 .if !${PORT_OPTIONS:MDOCS}
 CONFIGURE_ENV+=		ac_cv_path_SPHINX_BUILD=
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} == base
 SUB_LIST+=	ENGINES=/usr/lib/engines
 .else
 SUB_LIST+=	ENGINES=${LOCALBASE}/lib/engines
 .endif
 
 post-patch:
 .for FILE in check/named-checkconf.rst named/named.rst nsupdate/nsupdate.rst \
 	rndc/rndc.rst
 	@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \
 		-e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \
 		-e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \
 		${WRKSRC}/bin/${FILE}
 .endfor
 
 .if !defined(BIND_TOOLS_SLAVE)
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 .  for i in dynamic primary secondary working
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/$i
 .  endfor
 	${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample
 	${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/primary
 	${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/primary
 	${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/primary
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/arm/_build/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/arm
 .else
 
 do-install:
 	for dir in bin lib doc/man; do \
 		(cd ${INSTALL_WRKSRC}/$$dir && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) ; \
 	done
 	@${RM} -r ${STAGEDIR}${PREFIX}/include
 
 .endif	# BIND_TOOLS_SLAVE
 
 .include <bsd.port.post.mk>
diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile
index 9d951f79f2d1..950a1abc4bfa 100644
--- a/dns/bind918/Makefile
+++ b/dns/bind918/Makefile
@@ -1,187 +1,188 @@
 # pkg-help formatted with fmt 59 63
 
 PORTNAME=	bind
 DISTVERSION=	9.18.32
 PORTREVISION=	0
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${DISTVERSION}
 PKGNAMESUFFIX=	918
 
 MAINTAINER=	mat@FreeBSD.org
 WWW=		https://www.isc.org/bind/
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 
 # Uncomment when bind920 comes of age. +3 years if ESV, +1year otherwise, see
 # https://kb.isc.org/docs/aa-00896
 # DEPRECATED=	End of life, please migrate to a newer version of BIND9
 # EXPIRATION_DATE=	2025-12-31
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libuv.so:devel/libuv \
-		libnghttp2.so:www/libnghttp2 \
-		libxml2.so:textproc/libxml2
+		libnghttp2.so:www/libnghttp2
 
 RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 
-USES=		autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:xz
+USES=		autoreconf compiler:c11 cpe gnome libedit libtool pkgconfig ssl \
+		tar:xz
+USE_GNOME=	libxml2
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${DISTVERSION:C/-.*//}
 .if ${DISTVERSION:M*-*}
 CPE_UPDATE=	${DISTVERSION:C/.*-//:tl}
 .endif
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--disable-linux-caps \
 		--localstatedir=/var \
 		--sysconfdir=${ETCDIR} \
 		--with-dlopen=yes \
 		--with-libxml2 \
 		--with-openssl=${OPENSSLBASE} \
 		--enable-dnsrps \
 		--with-readline=libedit
 CONFIGURE_ENV=	READLINE_CFLAGS="-L${LOCALBASE}/lib"
 ETCDIR=		${PREFIX}/etc/namedb
 
 USE_RC_SUBR=		named
 SUB_FILES=		named.conf pkg-message
 
 PORTDOCS=	*
 
 CONFLICTS=	bind920 bind9-devel
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFAULT=	GSSAPI_NONE IDN JSON LMDB \
 			TCP_FASTOPEN DNSTAP
 OPTIONS_DEFINE=		DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \
 			OVERRIDECACHE QUERYTRACE \
 			START_LATE TCP_FASTOPEN
 
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 
 OPTIONS_SUB=	yes
 
 DNSTAP_DESC=		Provides fast passive logging of DNS messages
 FIXED_RRSET_DESC=	Enable fixed rrset ordering
 GSSAPI_BASE_DESC=	Using Heimdal in base (nsupdate is broken)
 GSSAPI_HEIMDAL_DESC=	Using security/heimdal (nsupdate is broken)
 GSSAPI_MIT_DESC=	Using security/krb5
 GSSAPI_NONE_DESC=	Disable
 LARGE_FILE_DESC=	64-bit file support
 LMDB_DESC=		Use LMDB for zone management
 OVERRIDECACHE_DESC=	Use the override-cache patch
 QUERYTRACE_DESC=	Enable the very verbose query tracelogging
 START_LATE_DESC=	Start BIND late in the boot process (see help)
 TCP_FASTOPEN_DESC=	RFC 7413 support
 
 DOCS_ALL_TARGET=	all html
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
 			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
 DOCS_USES=	gmake python:env
 
 DNSTAP_CONFIGURE_ENABLE=	dnstap
 DNSTAP_LIB_DEPENDS=		libfstrm.so:devel/fstrm \
 				libprotobuf-c.so:devel/protobuf-c
 
 FIXED_RRSET_CONFIGURE_ENABLE=	fixed-rrset
 
 GEOIP_CONFIGURE_ENABLE=	geoip
 GEOIP_CONFIGURE_WITH=	maxminddb
 GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
 GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
 				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_BASE_USES=		gssapi
 
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
 				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal
 
 GSSAPI_MIT_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
 				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_MIT_USES=		gssapi:mit
 
 GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
 
 IDN_CONFIGURE_OFF=	--without-libidn2
 IDN_CONFIGURE_ON=	${ICONV_CONFIGURE_BASE} \
 			--with-libidn2=${LOCALBASE}
 IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
 IDN_USES=		iconv
 
 JSON_CONFIGURE_WITH=	json-c
 JSON_LIB_DEPENDS=	libjson-c.so:devel/json-c
 JSON_LDFLAGS=		-L${LOCALBASE}/lib -ljson-c
 
 LARGE_FILE_CONFIGURE_ENABLE=	largefile
 
 LMDB_CONFIGURE_WITH=	lmdb=${LOCALBASE}
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 
 OVERRIDECACHE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-min-override-ttl
 
 QUERYTRACE_CONFIGURE_ENABLE=	querytrace
 
 START_LATE_SUB_LIST=		NAMED_BEFORE="LOGIN" \
 				NAMED_REQUIRE="SERVERS cleanvar"
 START_LATE_SUB_LIST_OFF=	NAMED_BEFORE="SERVERS" \
 				NAMED_REQUIRE="NETWORKING ldconfig syslogd"
 
 TCP_FASTOPEN_CONFIGURE_ENABLE=	tcp-fastopen
 
 .include <bsd.port.options.mk>
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-developer \
 			--enable-symtable
 USES+=			perl5
 USE_PERL5=		build
 BUILD_DEPENDS+=		cmocka>0:sysutils/cmocka
 .endif
 
 .if !${PORT_OPTIONS:MDOCS}
 CONFIGURE_ENV+=		ac_cv_path_SPHINX_BUILD=
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} == base
 SUB_LIST+=	ENGINES=/usr/lib/engines
 .else
 SUB_LIST+=	ENGINES=${LOCALBASE}/lib/engines
 .endif
 
 post-patch:
 .for FILE in check/named-checkconf.rst named/named.rst nsupdate/nsupdate.rst \
 	rndc/rndc.rst
 	@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \
 		-e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \
 		-e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \
 		${WRKSRC}/bin/${FILE}
 .endfor
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 .  for i in dynamic primary secondary working
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/$i
 .  endfor
 	${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample
 	${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/primary
 	${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/primary
 	${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/primary
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/arm/_build/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/arm
 
 .include <bsd.port.post.mk>
diff --git a/dns/bind920/Makefile b/dns/bind920/Makefile
index 85c6700015a8..ac02ff159561 100644
--- a/dns/bind920/Makefile
+++ b/dns/bind920/Makefile
@@ -1,226 +1,228 @@
 # pkg-help formatted with fmt 59 63
 
 PORTNAME=	bind
 DISTVERSION=	9.20.4
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
 PORTREVISION=	0
 .else
 # XXX: correct version
 # dns/bind920 here
 PORTREVISION=	0
 .endif
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${DISTVERSION}
 .if defined(BIND_TOOLS_SLAVE)
 PKGNAMESUFFIX=	-tools
 .else
 PKGNAMESUFFIX=	920
 .endif
 
 MAINTAINER=	mat@FreeBSD.org
 WWW=		https://www.isc.org/bind/
 .if defined(BIND_TOOLS_SLAVE)
 COMMENT=	Command line tools from BIND: delv, dig, host, nslookup...
 .else
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 .endif
 
 # Uncomment when bind922 comes of age. +3 years if ESV, +1year otherwise, see
 # https://kb.isc.org/docs/aa-00896
 # DEPRECATED=	End of life, please migrate to a newer version of BIND9
 # EXPIRATION_DATE=	XXX-12-31
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libuv.so:devel/libuv \
 		libnghttp2.so:www/libnghttp2 \
 		liburcu.so:sysutils/liburcu \
 		libxml2.so:textproc/libxml2
 
 .if !defined(BIND_TOOLS_SLAVE)
 RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 .endif
 
-USES=		autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:xz
+USES=		autoreconf compiler:c11 cpe gnome libedit libtool pkgconfig ssl \
+		tar:xz
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${DISTVERSION:C/-.*//}
 .if ${DISTVERSION:M*-*}
 CPE_UPDATE=	${DISTVERSION:C/.*-//:tl}
 .endif
+USE_GNOME=	libxml2
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--sysconfdir=${ETCDIR} \
 		--with-libxml2 \
 		--with-openssl=${OPENSSLBASE} \
 		--enable-dnsrps \
 		--with-readline=libedit
 ETCDIR=		${PREFIX}/etc/namedb
 
 # FIXME: figure out why build fails if enabled
 CONFIGURE_ARGS+=	--disable-tracing
 
 .if defined(BIND_TOOLS_SLAVE)
 EXTRA_PATCHES=		${PATCHDIR}/extrapatch-bind-tools
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/bind-tools
 .else
 USE_RC_SUBR=		named
 SUB_FILES=		named.conf pkg-message
 EXTRA_PATCHES=		${PATCHDIR}/extrapatch-no-bind-tools
 
 PORTDOCS=	*
 
 CONFLICTS=	bind918 bind9-devel
 .endif	# BIND_TOOLS_SLAVE
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFAULT=	GSSAPI_NONE IDN JSON LMDB \
 			TCP_FASTOPEN DNSTAP
 OPTIONS_DEFINE=		DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \
 			OVERRIDECACHE QUERYTRACE \
 			START_LATE TCP_FASTOPEN
 
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 
 .if defined(BIND_TOOLS_SLAVE)
 OPTIONS_EXCLUDE=	DOCS GEOIP LMDB \
 			OVERRIDECACHE QUERYTRACE START_LATE \
 			TCP_FASTOPEN
 .endif	# BIND_TOOLS_SLAVE
 
 OPTIONS_SUB=	yes
 
 DNSTAP_DESC=		Provides fast passive logging of DNS messages
 FIXED_RRSET_DESC=	Enable fixed rrset ordering
 GSSAPI_BASE_DESC=	Using Heimdal in base (nsupdate is broken)
 GSSAPI_HEIMDAL_DESC=	Using security/heimdal (nsupdate is broken)
 GSSAPI_MIT_DESC=	Using security/krb5
 GSSAPI_NONE_DESC=	Disable
 LARGE_FILE_DESC=	64-bit file support
 LMDB_DESC=		Use LMDB for zone management
 OVERRIDECACHE_DESC=	Use the override-cache patch
 QUERYTRACE_DESC=	Enable the very verbose query tracelogging
 START_LATE_DESC=	Start BIND late in the boot process (see help)
 TCP_FASTOPEN_DESC=	RFC 7413 support
 
 DOCS_ALL_TARGET=	all html
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
 			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
 DOCS_USES=	gmake python:env
 
 DNSTAP_CONFIGURE_ENABLE=	dnstap
 DNSTAP_LIB_DEPENDS=		libfstrm.so:devel/fstrm \
 				libprotobuf-c.so:devel/protobuf-c
 
 FIXED_RRSET_CONFIGURE_ENABLE=	fixed-rrset
 
 GEOIP_CONFIGURE_ENABLE=	geoip
 GEOIP_CONFIGURE_WITH=	maxminddb
 GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
 GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
 				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_BASE_USES=		gssapi
 
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
 				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal
 
 GSSAPI_MIT_CONFIGURE_ON=	--with-gssapi="${KRB5CONFIG}" \
 				${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_MIT_USES=		gssapi:mit
 
 GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
 
 IDN_CONFIGURE_OFF=	--without-libidn2
 IDN_CONFIGURE_ON=	${ICONV_CONFIGURE_BASE} \
 			--with-libidn2=${LOCALBASE}
 IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
 IDN_USES=		iconv
 
 JSON_CONFIGURE_WITH=	json-c
 JSON_LIB_DEPENDS=	libjson-c.so:devel/json-c
 JSON_LDFLAGS=		-L${LOCALBASE}/lib -ljson-c
 
 LARGE_FILE_CONFIGURE_ENABLE=	largefile
 
 LMDB_CONFIGURE_WITH=	lmdb=${LOCALBASE}
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 
 OVERRIDECACHE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-min-override-ttl
 
 QUERYTRACE_CONFIGURE_ENABLE=	querytrace
 
 START_LATE_SUB_LIST=		NAMED_BEFORE="LOGIN" \
 				NAMED_REQUIRE="SERVERS cleanvar"
 START_LATE_SUB_LIST_OFF=	NAMED_BEFORE="SERVERS" \
 				NAMED_REQUIRE="NETWORKING ldconfig syslogd"
 
 TCP_FASTOPEN_CONFIGURE_ENABLE=	tcp-fastopen
 
 .include <bsd.port.options.mk>
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-developer
 USES+=			perl5
 USE_PERL5=		build
 BUILD_DEPENDS+=		cmocka>0:sysutils/cmocka
 .endif
 
 .if !${PORT_OPTIONS:MDOCS}
 CONFIGURE_ENV+=		ac_cv_path_SPHINX_BUILD=
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} == base
 SUB_LIST+=	ENGINES=/usr/lib/engines
 .else
 SUB_LIST+=	ENGINES=${LOCALBASE}/lib/engines
 .endif
 
 post-patch:
 .for FILE in check/named-checkconf.rst named/named.rst nsupdate/nsupdate.rst \
 	rndc/rndc.rst
 	@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \
 		-e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \
 		-e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \
 		${WRKSRC}/bin/${FILE}
 .endfor
 
 .if !defined(BIND_TOOLS_SLAVE)
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 .  for i in dynamic primary secondary working
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/$i
 .  endfor
 	${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample
 	${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/primary
 	${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/primary
 	${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/primary
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/arm/_build/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/arm
 .else
 
 do-install:
 	for dir in bin lib doc/man; do \
 		(cd ${INSTALL_WRKSRC}/$$dir && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) ; \
 	done
 	@${RM} -r ${STAGEDIR}${PREFIX}/include
 
 .endif	# BIND_TOOLS_SLAVE
 
 .include <bsd.port.post.mk>
diff --git a/dns/opendnssec2/Makefile b/dns/opendnssec2/Makefile
index 2c6859c0820e..fe23a2bc75df 100644
--- a/dns/opendnssec2/Makefile
+++ b/dns/opendnssec2/Makefile
@@ -1,91 +1,92 @@
 PORTNAME=	opendnssec
 DISTVERSION=	2.1.14
 CATEGORIES=	dns
 MASTER_SITES=	https://dist.opendnssec.org/source/
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool suite for maintaining DNSSEC
 WWW=		https://www.opendnssec.org
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	ldns>=1.6.16:dns/ldns
-LIB_DEPENDS=	libldns.so:dns/ldns \
-		libxml2.so:textproc/libxml2
+LIB_DEPENDS=	libldns.so:dns/ldns
+
+USES=		autoreconf cpe gnome libtool ssl
+USE_GNOME=	libxml2
 
-USES=		autoreconf cpe libtool ssl
 USE_RC_SUBR=	opendnssec
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir="${PREFIX}/var" \
 		--with-ssl=${OPENSSLBASE}
 
 INSTALL_TARGET=	install-strip
 
 CONFLICTS=	opendnssec-1.[0-4]*
 
 SUB_FILES=	pkg-message
 
 USERS=		opendnssec
 GROUPS=		opendnssec
 
 PORTDOCS=	MIGRATION NEWS README.md
 MIGRATE=	README.md find_problematic_zones.sql convert_mysql \
 		mysql_convert.sql convert_sqlite sqlite_convert.sql
 CONVERT=	convert_mysql_to_sqlite convert_sqlite_to_mysql
 SCHEMAS=	schema.mysql schema.sqlite
 
 OPTIONS_DEFINE=		DOCS SOFTHSM
 OPTIONS_DEFAULT=	SQLITE
 OPTIONS_SINGLE=		DB
 OPTIONS_SINGLE_DB=	MYSQL SQLITE
 OPTIONS_SUB=		yes
 
 MYSQL_DESC=	Use MYSQL backend
 SOFTHSM_DESC=	SoftHSM cryptographic store for PKCS \#11 interface
 SQLITE_DESC=	Use SQLite backend
 
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-enforcer-database=mysql
 MYSQL_VARS=		IGNORE_WITH_MYSQL="80 81"
 SOFTHSM_RUN_DEPENDS=	softhsm2>=2.5.0:security/softhsm2
 SOFTHSM_CONFIGURE_ON=	--with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm2.so
 SQLITE_BUILD_DEPENDS=	sqlite3>=3.3.9:databases/sqlite3
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-enforcer-database=sqlite3
 
 pre-build:
 	${REINPLACE_CMD} -e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \
 		${WRKSRC}/configure
 
 pre-install-MYSQL-on:
 	${REINPLACE_CMD} -e '/REQUIRE:/ s|$$| mysql|' \
 		${WRKDIR}/opendnssec
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} \
 		${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert
 	${INSTALL_DATA} ${MIGRATE:S|^|${WRKSRC}/enforcer/utils/1.4-2.0_db_convert/|} \
 		${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert
 	${INSTALL_DATA} ${CONVERT:S|^|${WRKSRC}/enforcer/utils/|} \
 		${STAGEDIR}${DOCSDIR}
 	${REINPLACE_CMD} -e 's|enforcer/utils/|${DOCSDIR}/|' \
 		${STAGEDIR}${DOCSDIR}/MIGRATION
 	${INSTALL_DATA} ${SCHEMAS:S|^|${WRKSRC}/enforcer/src/db/|} \
 		${STAGEDIR}${DOCSDIR}
 	${REINPLACE_CMD} -e 's|../src/db/schema|${DOCSDIR}/schema|' \
 		-e 's|mysql_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		-e 's|sqlite_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		-e 's|find_problematic_zones.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		${STAGEDIR}${DOCSDIR}/convert_*
 	${REINPLACE_CMD} -e 's|../../src/db/schema|${DOCSDIR}/schema|' \
 		-e 's|mysql_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		-e 's|sqlite_convert.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		-e 's|find_problematic_zones.sql|${DOCSDIR}/1.4-2.0_db_convert/&|' \
 		${STAGEDIR}${DOCSDIR}/1.4-2.0_db_convert/convert_*
 
 .include <bsd.port.mk>
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index f0dfd3757d4d..e20453a86ef9 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -1,34 +1,33 @@
 PORTNAME=	xmlcopyeditor
 DISTVERSION=	1.3.1.0
 PORTREVISION=	4
 CATEGORIES=	editors
 MASTER_SITES=	SF/xml-copy-editor/${PORTNAME}-linux/${DISTVERSION}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Fast validating XML editor
 WWW=		http://xml-copy-editor.sourceforge.net/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 LIB_DEPENDS=	libaspell.so:textproc/aspell \
 		libenchant-2.so:textproc/enchant2 \
 		libexpat.so:textproc/expat2 \
 		libharfbuzz.so:print/harfbuzz \
 		libpcre2-8.so:devel/pcre2 \
 		libxerces-c.so:textproc/xerces-c3 \
-		libxml2.so:textproc/libxml2 \
 		libxslt.so:textproc/libxslt
 
 USES=		autoreconf compiler:c++11-lang desktop-file-utils dos2unix \
 		gettext-tools gmake gnome iconv libtool localbase pkgconfig
-USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 intltool pango
+USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 intltool libxml2 pango
 USE_WX=		3.0 # fails to build with 3.2
 WX_COMPS=	wx
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 .include <bsd.port.mk>
diff --git a/filesystems/s3fs/Makefile b/filesystems/s3fs/Makefile
index 20cdfb4ae528..b72ce0134ef8 100644
--- a/filesystems/s3fs/Makefile
+++ b/filesystems/s3fs/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	s3fs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.92
 PORTREVISION=	1
 CATEGORIES=	filesystems
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	FUSE-based file system backed by Amazon S3
 WWW=		https://github.com/s3fs-fuse/s3fs-fuse
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:ftp/curl \
-		libxml2.so:textproc/libxml2
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
-USES=		autoreconf fuse pkgconfig ssl
+USES=		autoreconf fuse gnome pkgconfig ssl
+USE_GNOME=	libxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	s3fs-fuse
 GH_PROJECT=	s3fs-fuse
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 CONFIGURE_ENV+=	ac_cv_prog_GITCMD=no
 
 PLIST_FILES=	bin/s3fs share/man/man1/s3fs.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/libcrypto >= 0.9//' ${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e '/DEPS_LIBS/s/$$/ -lcrypto/' \
 		${WRKSRC}/src/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile
index 610b4ead4a06..fbeed2b99d68 100644
--- a/finance/odoo/Makefile
+++ b/finance/odoo/Makefile
@@ -1,113 +1,113 @@
 PORTNAME=	odoo
 PORTVERSION=	17.0.20240325
 PORTREVISION=	2
 CATEGORIES=	finance www
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Suite of web based open source business apps
 WWW=		https://www.odoo.com
 
 LICENSE=	LGPL3
 
 USE_GITHUB=	yes
 GH_TAGNAME=	c18b9f44be3d666ca1e082807a2fdfc7ef2049d2
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
-		libxslt.so:textproc/libxslt \
+LIB_DEPENDS=	libxslt.so:textproc/libxslt \
 		libevent.so:devel/libevent \
 		libsasl2.so:security/cyrus-sasl2
 RUN_DEPENDS=	wkhtmltopdf>0:converters/wkhtmltopdf \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>=0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}num2words>=0:devel/py-num2words@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyusb>=0:devel/py-pyusb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vatnumber>=0:finance/py-vatnumber@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-ldap>=0:net/py-python-ldap@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zeep>=0:net/py-zeep@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html2text>=0:textproc/py-html2text@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qrcode>=0:textproc/py-qrcode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=0:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlwt>=0:textproc/py-xlwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pypdf2>0:print/py-pypdf2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-file>0:www/py-requests-file@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}werkzeug2>0:www/py-werkzeug2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=1.2.0:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlwt>=1.3.0:textproc/py-xlwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ofxparse>=0.20:finance/py-ofxparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ebaysdk>=2.1.3:finance/py-ebaysdk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rjsmin>0:archivers/py-rjsmin@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}GeoIP2>0:net/py-GeoIP2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR}
 
-USES=		cpe ldap python pgsql shebangfix
+USES=		cpe gnome ldap python pgsql shebangfix
+USE_GNOME=	libxml2
 USE_PYTHON=	cryptography distutils
 
 SHEBANG_LANG=	python
 SHEBANG_FILES=	${WRKSRC}/${PORTNAME}/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init.d/odoo \
 		${WRKSRC}/${PORTNAME}/addons/web/static/lib/select2/release.sh \
 		${WRKSRC}/${PORTNAME}/addons/web/tooling/*.sh \
 		${WRKSRC}/${PORTNAME}/addons/web/tooling/hooks/pre-commit \
 		${WRKSRC}/${PORTNAME}/addons/mail/static/scripts/odoo-mailgate.py \
 		${WRKSRC}/${PORTNAME}-bin
 
 USERS=		odoo
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
 
 CONFLICTS=	odoo14 odoo15 odoo16
 
 ETCDIR=		${PREFIX}/etc/odoo
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31000
 IGNORE=		odoo requires Python 3.10+
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -i "" -e 's|(index !== |(index == |g' \
 		${WRKSRC}/odoo/addons/web/static/src/core/network/download.js
 
 post-extract:
 	@cd ${WRKSRC}/addons/ && ${MV} * ${WRKSRC}/odoo/addons/
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 
 post-install:
 	@${INSTALL_SCRIPT} ${FILESDIR}/odoo.conf ${STAGEDIR}${ETCDIR}/odoo.conf.sample
 
 .include <bsd.port.post.mk>
diff --git a/finance/odoo14/Makefile b/finance/odoo14/Makefile
index 9019766a4770..76ff0168969c 100644
--- a/finance/odoo14/Makefile
+++ b/finance/odoo14/Makefile
@@ -1,111 +1,111 @@
 PORTNAME=	odoo
 PORTVERSION=	14.0
 PORTREVISION=	4
 CATEGORIES=	finance www
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	14
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Suite of web based open source business apps
 WWW=		https://www.odoo.com
 
 LICENSE=	LGPL3
 
 USE_GITHUB=	yes
 GH_TAGNAME=	c976a0920dd8d7910c7635cc1e2bbff47edcafa9
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
-		libxslt.so:textproc/libxslt \
+LIB_DEPENDS=	libxslt.so:textproc/libxslt \
 		libevent.so:devel/libevent \
 		libsasl2.so:security/cyrus-sasl2
 RUN_DEPENDS=	wkhtmltopdf>0:converters/wkhtmltopdf \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>=0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}num2words>=0:devel/py-num2words@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyusb>=0:devel/py-pyusb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vatnumber>=0:finance/py-vatnumber@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-ldap>=0:net/py-python-ldap@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zeep>=0:net/py-zeep@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html2text>=0:textproc/py-html2text@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qrcode>=0:textproc/py-qrcode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=0:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlwt>=0:textproc/py-xlwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pypdf2>0:print/py-pypdf2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}secure-cookie>0:www/py-secure-cookie@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=1.2.0:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlwt>=1.3.0:textproc/py-xlwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ofxparse>=0.20:finance/py-ofxparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ebaysdk>=2.1.3:finance/py-ebaysdk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR}
 
-USES=		cpe ldap python pgsql shebangfix
+USES=		cpe gnome ldap python pgsql shebangfix
+USE_GNOME=	libxml2
 USE_PYTHON=	distutils
 
 SHEBANG_LANG=	python
 SHEBANG_FILES=	${WRKSRC}/${PORTNAME}-bin
 
 USERS=		odoo
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
 
 CONFLICTS=	odoo
 
 ETCDIR=		${PREFIX}/etc/odoo
 
 post-patch:
 	@${REINPLACE_CMD} -i "" -e '25d' ${WRKSRC}/odoo/service/wsgi_server.py
 	@${REINPLACE_CMD} -i "" -e 's|werkzeug.url_quote_plus|werkzeug.urls.url_quote_plus|g' \
 		${WRKSRC}/odoo/addons/base/models/ir_ui_view.py
 	@${REINPLACE_CMD} -i "" -e 's|werkzeug.url_unquote_plus|werkzeug.urls.url_quote_plus|g' \
 		-e 's|.NumberConverter|.converters.NumberConverter|g' \
 		${WRKSRC}/odoo/addons/base/models/ir_http.py \
 		${WRKSRC}/odoo/addons/http_routing/models/ir_http.py
 	@${REINPLACE_CMD} -i "" -e 's|from werkzeug import url_encode|from werkzeug.urls import url_encode|g' \
 		${WRKSRC}/odoo/addons/mail/models/mail_thread.py \
 		${WRKSRC}/odoo/addons/mail/controllers/main.py \
 		${WRKSRC}/odoo/addons/hr/models/hr_employee.py
 	@${REINPLACE_CMD} -i "" -e 's|(index !== |(index == |g' \
 		${WRKSRC}/odoo/addons/web/static/src/js/libs/content-disposition.js
 	@${REINPLACE_CMD} -i "" -e 's|BaseResponse|Response|g' \
 		${WRKSRC}/odoo/http.py
 
 post-extract:
 	@cd ${WRKSRC}/addons/ && ${MV} * ${WRKSRC}/odoo/addons/
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 
 post-install:
 	@${INSTALL_SCRIPT} ${FILESDIR}/odoo.conf ${STAGEDIR}${ETCDIR}/odoo.conf.sample
 
 .include <bsd.port.mk>
diff --git a/finance/odoo15/Makefile b/finance/odoo15/Makefile
index 64735edc1af6..d89ee6e2d36c 100644
--- a/finance/odoo15/Makefile
+++ b/finance/odoo15/Makefile
@@ -1,109 +1,109 @@
 PORTNAME=	odoo
 PORTVERSION=	15.0
 PORTREVISION=	4
 CATEGORIES=	finance www
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	15
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Suite of web based open source business apps
 WWW=		https://www.odoo.com
 
 LICENSE=	LGPL3
 
 USE_GITHUB=	yes
 GH_TAGNAME=	02b4e98ebb2c45d9a4af10fe1bc732f048708f85
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
-		libxslt.so:textproc/libxslt \
+LIB_DEPENDS=	libxslt.so:textproc/libxslt \
 		libevent.so:devel/libevent \
 		libsasl2.so:security/cyrus-sasl2
 RUN_DEPENDS=	wkhtmltopdf>0:converters/wkhtmltopdf \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>=0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}num2words>=0:devel/py-num2words@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyusb>=0:devel/py-pyusb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vatnumber>=0:finance/py-vatnumber@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-ldap>=0:net/py-python-ldap@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zeep>=0:net/py-zeep@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html2text>=0:textproc/py-html2text@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qrcode>=0:textproc/py-qrcode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=0:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlwt>=0:textproc/py-xlwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pypdf2>0:print/py-pypdf2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}secure-cookie>0:www/py-secure-cookie@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=1.2.0:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlwt>=1.3.0:textproc/py-xlwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ofxparse>=0.20:finance/py-ofxparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ebaysdk>=2.1.3:finance/py-ebaysdk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR}
 
-USES=		cpe ldap python pgsql shebangfix
+USES=		cpe gnome ldap python pgsql shebangfix
+USE_GNOME=	libxml2
 USE_PYTHON=	distutils
 
 SHEBANG_LANG=	python
 SHEBANG_FILES=	${WRKSRC}/${PORTNAME}-bin
 
 USERS=		odoo
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
 
 CONFLICTS=	odoo14 odoo
 
 ETCDIR=		${PREFIX}/etc/odoo
 
 post-patch:
 	@${REINPLACE_CMD} -i "" -e '25d' ${WRKSRC}/odoo/service/wsgi_server.py
 	@${REINPLACE_CMD} -i "" -e 's|werkzeug.url_quote_plus|werkzeug.urls.url_quote_plus|g' \
 		${WRKSRC}/odoo/addons/base/models/ir_ui_view.py
 	@${REINPLACE_CMD} -i "" -e 's|werkzeug.url_unquote_plus|werkzeug.urls.url_quote_plus|g' \
 		-e 's|.NumberConverter|.converters.NumberConverter|g' \
 		${WRKSRC}/odoo/addons/base/models/ir_http.py \
 		${WRKSRC}/odoo/addons/http_routing/models/ir_http.py
 	@${REINPLACE_CMD} -i "" -e 's|from werkzeug import url_encode|from werkzeug.urls import url_encode|g' \
 		${WRKSRC}/odoo/addons/mail/models/mail_thread.py \
 		${WRKSRC}/odoo/addons/hr/models/hr_employee.py
 	@${REINPLACE_CMD} -i "" -e 's|(index !== |(index == |g' \
 		${WRKSRC}/odoo/addons/web/static/src/legacy/js/libs/content-disposition.js \
 		${WRKSRC}/odoo/addons/web/static/src/core/network/download.js
 
 post-extract:
 	@cd ${WRKSRC}/addons/ && ${MV} * ${WRKSRC}/odoo/addons/
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 
 post-install:
 	@${INSTALL_SCRIPT} ${FILESDIR}/odoo.conf ${STAGEDIR}${ETCDIR}/odoo.conf.sample
 
 .include <bsd.port.mk>
diff --git a/finance/odoo16/Makefile b/finance/odoo16/Makefile
index 4d0fa70e5edc..dc887422cf04 100644
--- a/finance/odoo16/Makefile
+++ b/finance/odoo16/Makefile
@@ -1,107 +1,107 @@
 PORTNAME=	odoo
 PORTVERSION=	16.0.20240222
 PORTREVISION=	2
 CATEGORIES=	finance www
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	16
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Suite of web based open source business apps
 WWW=		https://www.odoo.com
 
 LICENSE=	LGPL3
 
 USE_GITHUB=	yes
 GH_TAGNAME=	ecb1f0268adde613bbcb0aa122c0c53847a600a9
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
-		libxslt.so:textproc/libxslt \
+LIB_DEPENDS=	libxslt.so:textproc/libxslt \
 		libevent.so:devel/libevent \
 		libsasl2.so:security/cyrus-sasl2
 RUN_DEPENDS=	wkhtmltopdf>0:converters/wkhtmltopdf \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>=0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dateutil>=0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}num2words>=0:devel/py-num2words@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyusb>=0:devel/py-pyusb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vatnumber>=0:finance/py-vatnumber@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-ldap>=0:net/py-python-ldap@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zeep>=0:net/py-zeep@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html2text>=0:textproc/py-html2text@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=0:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}qrcode>=0:textproc/py-qrcode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=0:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlwt>=0:textproc/py-xlwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pypdf2>0:print/py-pypdf2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-file>0:www/py-requests-file@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}werkzeug2>0:www/py-werkzeug2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=1.2.0:textproc/py-xlrd@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xlwt>=1.3.0:textproc/py-xlwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ofxparse>=0.20:finance/py-ofxparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ebaysdk>=2.1.3:finance/py-ebaysdk@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rjsmin>0:archivers/py-rjsmin@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cryptography-legacy>0:security/py-cryptography-legacy@${PY_FLAVOR}
 
-USES=		cpe ldap python pgsql shebangfix
+USES=		cpe gnome ldap python pgsql shebangfix
+USE_GNOME=	libxml2
 USE_PYTHON=	distutils
 
 SHEBANG_LANG=	python
 SHEBANG_FILES=	${WRKSRC}/${PORTNAME}/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init.d/odoo \
 		${WRKSRC}/${PORTNAME}/addons/web/static/lib/select2/release.sh \
 		${WRKSRC}/${PORTNAME}/addons/web/tooling/*.sh \
 		${WRKSRC}/${PORTNAME}/addons/web/tooling/hooks/pre-commit \
 		${WRKSRC}/${PORTNAME}/addons/mail/static/scripts/odoo-mailgate.py \
 		${WRKSRC}/${PORTNAME}-bin
 
 USERS=		odoo
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
 
 CONFLICTS=	odoo odoo14 odoo15
 
 ETCDIR=		${PREFIX}/etc/odoo
 
 post-patch:
 	@${REINPLACE_CMD} -i "" -e 's|(index !== |(index == |g' \
 		${WRKSRC}/odoo/addons/web/static/src/legacy/js/libs/content-disposition.js \
 		${WRKSRC}/odoo/addons/web/static/src/core/network/download.js
 	@${RM} ${WRKSRC}/odoo/release.py.orig 
 
 post-extract:
 	@cd ${WRKSRC}/addons/ && ${MV} * ${WRKSRC}/odoo/addons/
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 
 post-install:
 	@${INSTALL_SCRIPT} ${FILESDIR}/odoo.conf ${STAGEDIR}${ETCDIR}/odoo.conf.sample
 
 .include <bsd.port.mk>
diff --git a/graphics/flam3/Makefile b/graphics/flam3/Makefile
index 352e189f1dba..7b5e7f49be9a 100644
--- a/graphics/flam3/Makefile
+++ b/graphics/flam3/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	flam3
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.1-5
 PORTREVISION=	4
 DISTVERSIONSUFFIX=	-g7fb50c8
 CATEGORIES=	graphics
 
 MAINTAINER=	john.c.prather@gmail.com
 COMMENT=	Algorithmically generated fractal flames images and animations
 WWW=		http://flam3.com/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:graphics/png \
-		libxml2.so:textproc/libxml2
+LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		gmake jpeg libtool localbase pathfix
+USES=		gmake gnome jpeg libtool localbase pathfix
+USE_GNOME=	libxml2
 USE_GITHUB=	yes
 GH_ACCOUNT=	scottdraves
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-shared --disable-static
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^libflam3_la_SOURCES = .*|& sincos.c| ; s| isaac.lo$$|& sincos.lo|' \
 		${WRKSRC}/Makefile.in # sincos is missing on some systems: bug#218300
 	@${REINPLACE_CMD} -e 's| -g -O3||' ${WRKSRC}/Makefile.in # https://github.com/scottdraves/flam3/issues/25
 
 pre-build:
 	@${CP} ${FILESDIR}/sincos.c ${WRKSRC}
 
 .include <bsd.port.mk>
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index 5ea94b63664d..87251963b81a 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -1,56 +1,55 @@
 PORTNAME=	shotwell
 PORTVERSION=	0.32.10
 PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Open source photo manager for GNOME
 WWW=		https://wiki.gnome.org/Apps/Shotwell
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libportal.so:deskutils/libportal \
 		libportal-gtk3.so:deskutils/libportal-gtk3 \
 		libgio-2.0.so:devel/glib20 \
 		libjson-glib-1.0.so:devel/json-glib \
 		libgee-0.8.so:devel/libgee \
 		libsoup-3.0.so:devel/libsoup3 \
 		libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2 \
 		libgexiv2.so:graphics/gexiv2 \
 		libexif.so:graphics/libexif \
 		libgphoto2.so:graphics/libgphoto2 \
 		libraw.so:graphics/libraw \
 		libwebp.so:graphics/webp \
 		libgcr-ui-3.so:security/gcr3 \
-		libsecret-1.so:security/libsecret \
-		libxml2.so:textproc/libxml2
+		libsecret-1.so:security/libsecret
 
 USES=		compiler:c++11-lib cpe desktop-file-utils gettext gnome gstreamer meson \
 		ninja pkgconfig python:build sqlite tar:xz vala:build xorg
 CPE_VENDOR=	gnome
-USE_GNOME=	cairo gtk30
+USE_GNOME=	cairo gtk30 libxml2
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 
 MESON_ARGS=	-Dudev=false \
 		-Dpublishers=flickr,gallery3,googlephotos,piwigo,tumblr,youtube
 PORTSCOUT=	limitw:1,even
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	FACED
 OPTIONS_SUB=	yes
 
 FACED_DESC=	Face Detection
 
 FACED_CONFIGURE_ON=	-Dface_detection=true
 FACED_CONFIGURE_OFF=	-Dface_detection=false -Dface_detection_helper=true
 FACED_LIB_DEPENDS=	libopencv_core.so:graphics/opencv
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 GLIB_SCHEMAS=	org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/graphics/tinyows/Makefile b/graphics/tinyows/Makefile
index a4f223c3100c..25eac83f3955 100644
--- a/graphics/tinyows/Makefile
+++ b/graphics/tinyows/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	tinyows
 PORTVERSION=	1.2.0
 PORTREVISION=	5
 CATEGORIES=	graphics www geography
 MASTER_SITES=	https://download.osgeo.org/mapserver/
 
 MAINTAINER=	joris.dedieu@gmail.com
 COMMENT=	High Performance WFS-T server
 WWW=		https://mapserver.org/tinyows/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/share/postgresql/extension/postgis.control:databases/postgis31
-LIB_DEPENDS=	libxml2.so:textproc/libxml2
 RUN_DEPENDS=	${LOCALBASE}/share/postgresql/extension/postgis.control:databases/postgis31
 
-USES=		autoreconf pgsql
+USES=		autoreconf gnome pgsql
+USE_GNOME=	libxml2
 
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	FASTCGI
 OPTIONS_DEFAULT=FASTCGI
 
 FASTCGI_LIB_DEPENDS=	libfcgi.so:www/fcgi
 FASTCGI_CONFIGURE_WITH=	fastcgi=${LOCALBASE}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/cgi-bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/tinyows ${STAGEDIR}${WWWDIR}/cgi-bin/tinyows
 
 .include <bsd.port.mk>
diff --git a/lang/crystal/Makefile b/lang/crystal/Makefile
index 174e4f0475b9..55001b2642e0 100644
--- a/lang/crystal/Makefile
+++ b/lang/crystal/Makefile
@@ -1,138 +1,138 @@
 PORTNAME=	crystal
 DISTVERSION=	1.10.1
 PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	https://github.com/dmgk/crystal-bootstrap/releases/download/${BOOTSTRAP_VERSION}/:bootstrap \
 		LOCAL/dmgk/crystal:bootstrap
 DISTFILES=	${BOOTSTRAP_NAME}.tar.xz:bootstrap
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Language with Ruby-like syntax and static type checking
 WWW=		https://crystal-lang.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=		aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap compiler
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/llvm-config${BOOTSTRAP_LLVM_VERSION}:devel/llvm${BOOTSTRAP_LLVM_VERSION} \
 		git:devel/git
 LIB_DEPENDS=	libLLVM-${LLVM_VERSION}.so:devel/llvm${LLVM_VERSION} \
 		libevent.so:devel/libevent \
 		libffi.so:devel/libffi \
 		libgc-threaded.so:devel/boehm-gc-threaded \
 		libgmp.so:math/gmp \
 		libpcre.so:devel/pcre \
 		libpcre2-8.so:devel/pcre2 \
-		libxml2.so:textproc/libxml2 \
 		libyaml.so:textproc/libyaml
 RUN_DEPENDS=	pkg-config:devel/pkgconf
 
-USES=		compiler gmake pkgconfig ssl
+USES=		compiler gmake gnome pkgconfig ssl
+USE_GNOME=	libxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	crystal-lang
 
 COMMIT_ID=		84f389ac5424
 LLVM_VERSION?=		16
 BOOTSTRAP_LLVM_VERSION=	14
 BOOTSTRAP_VERSION=	1.5.1
 BOOTSTRAP_NAME=		crystal-${BOOTSTRAP_VERSION}-${ARCH}-llvm${BOOTSTRAP_LLVM_VERSION}
 
 MAKE_ARGS=	LLVM_CONFIG="${LOCALBASE}/bin/llvm-config${LLVM_VERSION}" \
 		CRYSTAL_CONFIG_PATH="lib:${PREFIX}/lib/${PORTNAME}" \
 		CRYSTAL_CONFIG_BUILD_COMMIT="${COMMIT_ID}" \
 		CRYSTAL_CACHE_DIR="${WRKDIR}/cache" \
 		FLAGS="--progress --stats --threads ${MAKE_JOBS_NUMBER} ${OPT_FLAGS}"
 
 TEST_ARGS=	${MAKE_ARGS:S/release=1//}
 TEST_TARGET=	spec
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES INTERPRETER STATIC
 OPTIONS_DEFAULT=	INTERPRETER
 
 INTERPRETER_DESC=	Enable interpreter (experimental)
 
 DEBUG_VARS=		opt_flags+="--debug" strip=
 DEBUG_VARS_OFF=		opt_flags+="--release --no-debug"
 INTERPRETER_MAKE_ARGS=	interpreter=1
 STATIC_MAKE_ARGS=	static=1
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} != FreeBSD
 IGNORE=		not supported on anything but FreeBSD
 .endif
 
 # crystal needs pkgconfig to determine SSL variants but these are not
 # present in FreeBSD base. We splice in the correct info based on
 # FreeBSD version and hope it doesn't change during minor releases.
 # See post-patch for the substitutions of these patches.
 .if ${SSL_DEFAULT} == "base" && ${OSREL:R} < 13
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_openssl_lib__crypto.cr \
 		${PATCHDIR}/extra-patch-src_openssl_lib__ssl.cr
 .endif
 
 post-extract:
 	@${RLN} ${WRKDIR}/.build ${WRKSRC}
 	@${RLN} x86_64-freebsd ${WRKSRC}/src/lib_c/aarch64-freebsd
 	@${RLN} x86_64-freebsd ${WRKSRC}/src/lib_c/aarch64-portbld-freebsd
 	@${RLN} x86_64-freebsd ${WRKSRC}/src/lib_c/aarch64-unknown-freebsd
 
 post-patch:
 .if ${SSL_DEFAULT} == "base" && ${OSREL:R} <= 13
 	@${REINPLACE_CMD} -i '' \
 		-e 's|CRYSTAL_SSL_VERSION|1.1.1|g' \
 		-e 's|CRYSTAL_SSL_LDFLAGS|${OPENSSLLIB}|g' \
 		${WRKSRC}/src/openssl/lib_ssl.cr \
 		${WRKSRC}/src/openssl/lib_crypto.cr
 .endif
 .if ${SSL_DEFAULT} == "base" && ${OSREL:R} >= 14
 	@${REINPLACE_CMD} -i '' \
 		-e 's|CRYSTAL_SSL_VERSION|3.0.10|g' \
 		-e 's|CRYSTAL_SSL_LDFLAGS|${OPENSSLLIB}|g' \
 		${WRKSRC}/src/openssl/lib_ssl.cr \
 		${WRKSRC}/src/openssl/lib_crypto.cr
 .endif
 
 pre-test:
 	@${CHMOD} +x ${WRKSRC}/src/llvm/ext/find-llvm-config
 
 post-build-DOCS-on:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} docs)
 
 do-install:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/.build/crystal ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${INSTALL_WRKSRC}/man/crystal.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 	(cd ${INSTALL_WRKSRC}/src && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/${PORTNAME})
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/bash_completion.d
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/share/zsh/site-functions
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/etc/completion.bash \
 		${STAGEDIR}${LOCALBASE}/etc/bash_completion.d/_crystal.bash
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/etc/completion.zsh \
 		${STAGEDIR}${LOCALBASE}/share/zsh/site-functions/_crystal
 
 do-install-DOCS-on:
 	(cd ${INSTALL_WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 do-install-EXAMPLES-on:
 	(cd ${INSTALL_WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .if !defined(_CRYSTAL_MAKESUM_GUARD)
 makesum:
 	${MAKE} -D_CRYSTAL_MAKESUM_GUARD makesum ARCH=${ONLY_FOR_ARCHS:O:[1]} DISTINFO_FILE=${DISTINFO_FILE}.tmp
 .for arch in ${ONLY_FOR_ARCHS:O:[2..-1]}
 	${MAKE} -D_CRYSTAL_MAKESUM_GUARD makesum ARCH=${arch} DISTINFO_FILE=${DISTINFO_FILE}.${arch}
 	${SED} 1d ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE}.tmp
 	${RM} ${DISTINFO_FILE}.${arch}
 .endfor
 	${AWK} '!seen[$$0]++' ${DISTINFO_FILE}.tmp > ${DISTINFO_FILE}
 	${RM} ${DISTINFO_FILE}.tmp
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/gnu-cobol/Makefile b/lang/gnu-cobol/Makefile
index 6adde92b82d6..6277b81e0fa8 100644
--- a/lang/gnu-cobol/Makefile
+++ b/lang/gnu-cobol/Makefile
@@ -1,44 +1,44 @@
 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
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
-		libcjson.so:devel/libcjson \
-		libxml2.so:textproc/libxml2
+		libcjson.so:devel/libcjson
 
-USES=		bdb gmake libtool ncurses tar:xz
+USES=		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/math/pdal/Makefile b/math/pdal/Makefile
index fc2e429f573e..c14df6be3b46 100644
--- a/math/pdal/Makefile
+++ b/math/pdal/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	pdal
 DISTVERSION=	2.7.2
 PORTREVISION=	5
 CATEGORIES=	math databases graphics
 MASTER_SITES=	https://github.com/PDAL/PDAL/releases/download/${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Library for translating and manipulating point cloud data
 WWW=		https://www.pdal.io
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos \
 		libproj.so:graphics/proj \
 		libboost_thread.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libgeotiff.so:graphics/libgeotiff \
-		libxml2.so:textproc/libxml2 \
 		liblaszip.so:archivers/laszip \
 		libzstd.so:archivers/zstd \
 		${LIB_DEPENDS_${ARCH}}
 LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_armv7=	libunwind.so:devel/libunwind
 LIB_DEPENDS_i386=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64le=libunwind.so:devel/libunwind
 
-USES=		cmake compiler:c++11-lib pathfix pkgconfig ssl tar:bz2
+USES=		cmake compiler:c++11-lib gnome pathfix pkgconfig ssl tar:bz2
+USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME:tu}-${DISTVERSION}-src
 
 CMAKE_ON=	WITH_LASZIP #LASZIP is recommended
 CMAKE_OFF=	WITH_TESTS
 
 OPTIONS_DEFINE=	BASH \
 		ICEBRIDGE PGPOINTCLOUD LAZPERF MBIO \
 
 OPTIONS_DEFAULT=	BASH \
 			ICEBRIDGE PGPOINTCLOUD LAZPERF MBIO
 
 #Plugins with lib not in port:
 #RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin, NITF (nitro)
 OPTIONS_SUB=	yes
 
 BASH_DESC=		BASH completion
 ICEBRIDGE_DESC=		Enable Icebridge plugin
 LAZPERF_DESC=		Enable LAZPerf plugin
 MBIO_DESC=		Enable MBIO plugin
 PGPOINTCLOUD_DESC=	Enable Coherent PostgreSQL Point Cloud plugin
 
 BASH_CMAKE_BOOL=	WITH_COMPLETION
 BASH_RUN_DEPENDS=	bash:shells/bash
 
 ICEBRIDGE_CMAKE_BOOL=	BUILD_PLUGIN_ICEBRIDGE
 ICEBRIDGE_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 			libsz.so:science/libaec
 
 LAZPERF_CMAKE_BOOL=	WITH_LAZPERF
 LAZPERF_LIB_DEPENDS=	liblazperf.so:archivers/lazperf
 
 MBIO_CMAKE_BOOL=	BUILD_PLUGIN_MBIO
 
 PGPOINTCLOUD_CMAKE_BOOL=	BUILD_PLUGIN_PGPOINTCLOUD
 PGPOINTCLOUD_USES=	pgsql
 
 CXXFLAGS_powerpc64=	-mvsx
 
 pre-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
 
 .include <bsd.port.mk>
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index e0b85e20534b..dd46fedd7898 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,188 +1,188 @@
 PORTNAME=	scilab
 PORTVERSION=	6.1.1
 PORTREVISION=	18
 CATEGORIES=	math cad java
 MASTER_SITES=	https://www.scilab.org/download/${PORTVERSION}/
 DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Scientific software package for numerical computations
 WWW=		https://www.scilab.org
 
 LICENSE=	GPLv2 BSD3CLAUSE
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/COPYING-BSD
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
-		libpcre.so:devel/pcre \
+LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libcurl.so:ftp/curl \
 		libhdf5.so:science/hdf5 \
 		libarpack.so:math/arpack-ng \
 		libfftw3.so:math/fftw3 \
 		libmatio.so:math/matio \
 		libamd.so:math/suitesparse-amd \
 		libumfpack.so:math/suitesparse-umfpack
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		compiler:c++17-lang cpe desktop-file-utils eigen:3,build \
 		fortran gettext gmake gnome iconv:wchar_t libtool \
 		localbase ncurses pathfix pkgconfig shared-mime-info
+USE_GNOME=	libxml2
 USE_LOCALE=	en_US.UTF-8
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--with-gfortran \
 		--without-emf \
 		--with-eigen-include=${LOCALBASE}/include/eigen3 \
 		${ICONV_CONFIGURE_ARG}
 LDFLAGS+=	${ICONV_LIB}
 
 CONFIGURE_ENV=	BLAS_LIBS="${BLASLIB}" LAPACK_LIBS="${LAPACKLIB}"
 INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	SHLIB_VER=${PORTVERSION}
 
 OPTIONS_DEFINE=	GUI OCAML TK
 OPTIONS_RADIO=	BLAS
 OPTIONS_RADIO_BLAS=	ATLAS NETLIB OPENBLAS
 OPTIONS_DEFAULT=	GUI NETLIB OCAML TK
 OPTIONS_EXCLUDE_powerpc64=	GUI
 OPTIONS_EXCLUDE_powerpc64le=	GUI
 OPTIONS_SUB=	yes
 
 ATLAS_USES=	blaslapack:atlas
 NETLIB_USES=	blaslapack:netlib
 OPENBLAS_USES=	blaslapack:openblas
 
 GUI_DESC=	Java-based Graphical User Interface
 OCAML_DESC=	Scicos - dynamical system simulator (requires GUI)
 
 # Java dependencies:
 _GUI_DEPENDS+=	${JAVALIBDIR}/flexdock.jar:devel/flexdock \
 		${JAVALIBDIR}/jogl2.jar:graphics/jogamp-jogl \
 		foprep:math/jeuclid \
 		${JAVALIBDIR}/jhall.jar:java/javahelp \
 		${JAVALIBDIR}/jrosetta-api.jar:java/jrosetta \
 		${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
 		${JAVALIBDIR}/jgraphx.jar:java/jgraphx \
 		${JAVALIBDIR}/jlatexmath.jar:math/jlatexmath \
 		${JAVALIBDIR}/ecj-4.4.2.jar:java/eclipse-ecj \
 		${JAVALIBDIR}/lucene-core-5.5.5.jar:textproc/lucene5
 # Documentation, graphic export:
 _GUI_DEPENDS+=	${LOCALBASE}/share/java/fop/build/fop.jar:textproc/fop \
 		${JAVALIBDIR}/jlatexmath-fop.jar:math/jlatexmath \
 		${LOCALBASE}/share/java/batik/lib/batik-all.jar:graphics/batik \
 		${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \
 		${JAVALIBDIR}/commons-io.jar:devel/apache-commons-io \
 		${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons
 # Code quality:
 _GUI_DEPENDS+=	${JAVALIBDIR}/commons-beanutils.jar:java/apache-commons-beanutils \
 		${JAVALIBDIR}/antlr.jar:devel/antlr \
 		${JAVALIBDIR}/junit4.jar:java/junit \
 		${LOCALBASE}/bin/splint:devel/splint
 # Documentation building:
 _GUI_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/javahelp/javahelp.xsl:textproc/docbook-xsl \
 		${JAVALIBDIR}/saxon-he-10.6.jar:textproc/saxon-he \
 		${JAVALIBDIR}/xml-apis-ext.jar:textproc/xml-commons \
 		xsltproc:textproc/libxslt
 # Other gui deps:
 _GUI_DEPENDS+=	${JAVALIBDIR}/looks.jar:devel/jgoodies-looks \
 		${JAVALIBDIR}/skinlf.jar:x11-toolkits/skinlf
 
 # Can't use USE_ANT because it overrides do-build target
 GUI_BUILD_DEPENDS=	${_GUI_DEPENDS} \
 			ant:devel/apache-ant
 GUI_RUN_DEPENDS=	${_GUI_DEPENDS}
 
 GUI_ALL_TARGET=	all doc
 GUI_USES=	gl
 GUI_USE=	GL=gl JAVA=yes
 GUI_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-bin-JAVA_HOME
 GUI_CONFIGURE_ON=	--with-jdk=${JAVA_HOME} \
 			--with-docbook=${LOCALBASE}/share/xsl/docbook \
 			--enable-build-help
 GUI_CONFIGURE_OFF=	--without-gui \
 			--without-javasci \
 			--without-xcos \
 			--disable-build-help
 
 OCAML_IMPLIES=		GUI
 OCAML_CONFIGURE_WITH=	modelica
 OCAML_BUILD_DEPENDS=	ocaml:lang/ocaml \
 	${LOCALBASE}/lib/ocaml/site-lib/num/META:math/ocaml-num
 OCAML_RUN_DEPENDS=	ocaml:lang/ocaml
 
 TK_CONFIGURE_OFF=	--without-tk
 TK_CONFIGURE_ON=	--with-tk-library=${LOCALBASE}/lib \
 			--with-tk-include=${TK_INCLUDEDIR} \
 			--with-tcl-library=${LOCALBASE}/lib \
 			--with-tcl-include=${TCL_INCLUDEDIR}
 TK_USES=	tk xorg
 TK_USE=		XORG=x11
 TK_RUN_DEPENDS=	${LOCALBASE}/lib/bwidget/init.tcl:x11-toolkits/bwidget
 
 .if !exists(/usr/include/omp.h)
 CONFIGURE_ARGS+=	--without-openmp
 .endif
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == clang
 CFLAGS+=	-Wno-error=int-conversion
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 .if ${GCC_DEFAULT} >= 10
 # workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (rank-1 and scalar)
 FFLAGS+=	-fallow-argument-mismatch
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},' ${WRKSRC}/etc/librarypath.xml
 	@${REINPLACE_CMD} -e 's, gfortran, ${FC},' ${WRKSRC}/modules/dynamic_link/src/scripts/configure
 .if ${COMPILER_TYPE} == clang
 	@${REINPLACE_CMD} -e 's|std::filesystem|std::__fs::filesystem|g' \
 		${WRKSRC}/modules/fileio/src/cpp/fullpath.cpp \
 		${WRKSRC}/modules/fileio/sci_gateway/cpp/sci_get_absolute_file_path.cpp
 	@${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|' \
 		${WRKSRC}/modules/ast/includes/types/sparseOp.hxx
 	@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
 		${WRKSRC}/modules/ast/src/cpp/types/sparse.cpp
 .endif
 
 post-patch-GUI-on:
 # scilab segfaults on FreeBSD with C locale
 	@${REINPLACE_CMD} 's,LC_ALL=C,,' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} '/ac_java_jvm_jni_lib_flags/s,\(ljvm\),\1 -pthread,' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/lib/java|${JAVALIBDIR}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/lib64/jni|${LOCALBASE}/lib/|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} 's,\(DEFAULT_JAR_DIR="\),\1 \
 		${LOCALBASE}/share/java/classes \
 		${LOCALBASE}/share/java/fop/build \
 		${LOCALBASE}/share/java/batik/lib \
 		${LOCALBASE}/share/java/jeuclid/repo ,' ${WRKSRC}/configure
 # Prefer non-versioned files to avoid excessive rebuilds. This also fixes detection of fop.
 	@${REINPLACE_CMD} 's|batik-all\*\.jar|batik-all.jar|g; \
 			s|commons-io\*\.jar|commons-io.jar|g; \
 			s|commons-logging\*\.jar|commons-logging.jar|g; \
 			s|fop\*\.jar|fop.jar|g; \
 			s|jlatexmath\*\.jar|jlatexmath.jar|g; \
 			s|xmlgraphics-commons\*\.jar|xmlgraphics-commons.jar|g' \
 			${WRKSRC}/configure
 # Part of the jogamp-jogl-2.3 patch:
 	@${REINPLACE_CMD} -e 's|javax.media.opengl.glu.GLUnurbs|com.jogamp.opengl.glu.GLUnurbs|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|jogamp.common.os.MachineDescriptionRuntime|jogamp.common.os.MachineDataInfoRuntime|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/bin/scilab
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/.atoms
 
 post-install:
 	@${FIND} ${STAGEDIR}${DATADIR}/modules -type d -empty -delete
 
 .include <bsd.port.post.mk>
diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile
index a7fe76d94f97..727344735357 100644
--- a/misc/hotkeys/Makefile
+++ b/misc/hotkeys/Makefile
@@ -1,59 +1,58 @@
 PORTNAME=	hotkeys
 PORTVERSION=	0.5.7.1
 PORTREVISION=	21
 CATEGORIES=	misc
 MASTER_SITES=	https://BSDforge.com/projects/source/misc/hotkeys/${PORTVERSION}/
 DISTNAME=	hotkeys_${PORTVERSION}
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Allows usage of special keys on internet/multimedia keyboards
 WWW=		http://ypwong.org/hotkeys/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz \
 		libfreetype.so:print/freetype2 \
-		libxml2.so:textproc/libxml2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
-USES=		bdb gettext-runtime gmake xorg
-USE_GNOME=	glib20 pango
+USES=		bdb gettext-runtime gmake gnome xorg
+USE_GNOME=	glib20 libxml2 pango
 USE_XORG=	x11 xext xft xinerama xkbfile xmu
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-db3-inc=${BDB_INCLUDE_DIR} \
 		--with-db3-lib=${BDB_LIB_DIR} \
 		--with-db-name=${BDB_LIB_NAME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	OSD
 OPTIONS_DEFAULT=	OSD
 
 OSD_LIB_DEPENDS=	libxosd.so:misc/xosd
 OSD_CONFIGURE_WITH=	xosd
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 post-extract:
 	@${CP} ${PATCHDIR}/error.h ${WRKSRC}/src
 	@${CP} ${PATCHDIR}/eliteduo.def ${WRKSRC}/def
 	@${CP} ${PATCHDIR}/logitech-ultrax.def ${WRKSRC}/def
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^install-exec-am/s/install-sysconfDATA//' \
 		${WRKSRC}/src/Makefile.in
 
 post-configure:
 	${REINPLACE_CMD} -e 's,-lXinerama,-lXinerama `pkgconf --libs pangoxft`,g' ${WRKSRC}/src/Makefile
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/hotkeys.conf ${STAGEDIR}${PREFIX}/etc/hotkeys.conf.sample
 
 .include <bsd.port.mk>
diff --git a/misc/liblxi/Makefile b/misc/liblxi/Makefile
index 854e24c01817..e85a66d9617b 100644
--- a/misc/liblxi/Makefile
+++ b/misc/liblxi/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	liblxi
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.18
 PORTREVISION=	1
 CATEGORIES=	misc
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Library for communicating with LXI compatible instruments
 WWW=		https://lxi-tools.github.io
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libavahi-client.so:net/avahi-app \
-		libxml2.so:textproc/libxml2
+LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 
-USES=		meson pkgconfig
+USES=		gnome meson pkgconfig
+USE_GNOME=	libxml2
 USE_GITHUB=	yes
 GH_ACCOUNT=	lxi-tools
 USE_LDCONFIG=	yes
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/libsupertone/Makefile b/misc/libsupertone/Makefile
index 510f79bb49be..fbf194adfb7b 100644
--- a/misc/libsupertone/Makefile
+++ b/misc/libsupertone/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	libsupertone
 PORTVERSION=	0.0.2
 PORTREVISION=	10
 CATEGORIES=	misc
 MASTER_SITES=	http://www.soft-switch.org/downloads/unicall/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for supervisory tone generation and detection
 WWW=		https://www.soft-switch.org/
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile \
 		libspandsp.so:comms/spandsp \
-		libtiff.so:graphics/tiff \
-		libxml2.so:textproc/libxml2
+		libtiff.so:graphics/tiff
 
-USES=		tar:tgz libtool
+USES=		gnome tar:tgz libtool
+USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 # Add missing dependency in attempt to fix parallel (-jX) builds
 post-patch:
 	@${REINPLACE_CMD} -e '/DEPENDENCIES =/s,$$, $$(lib_LTLIBRARIES),' \
 		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 44e2ff08bba3..30d42bb84bda 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -1,133 +1,133 @@
 PORTNAME=	handbrake
 DISTVERSION=	1.7.2
 PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	https://github.com/HandBrake/HandBrake/releases/download/${DISTVERSION}/
 MASTER_SITES+=	https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/:contrib
 DISTNAME=	HandBrake-${DISTVERSION}
 DISTFILES=	${DISTNAME}-source.tar.bz2 ${CONTRIB_FILES:S/$/:contrib/}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	naito.yuichiro@gmail.com
 COMMENT=	Versatile DVD ripper and video transcoder
 WWW=		https://handbrake.fr/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 powerpc powerpc64 powerpc64le
 
 BUILD_DEPENDS=	bash:shells/bash \
 		nasm:devel/nasm \
 		cmake:devel/cmake-core \
 		meson:devel/meson \
 		git:devel/git@lite
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libgudev-1.0.so:devel/libgudev \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libturbojpeg.so:graphics/libjpeg-turbo \
-		libxml2.so:textproc/libxml2 \
 		libass.so:multimedia/libass \
 		libspeex.so:audio/speex \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis \
 		libvorbisenc.so:audio/libvorbis \
 		libtheoradec.so:multimedia/libtheora \
 		libtheoraenc.so:multimedia/libtheora \
 		libx264.so:multimedia/libx264 \
 		libvpx.so:multimedia/libvpx \
 		libmp3lame.so:audio/lame \
 		libopus.so:audio/opus \
 		libjansson.so:devel/jansson
 
-USES=		autoreconf:build compiler:c11 gmake iconv libtool:build \
+USES=		autoreconf:build compiler:c11 gmake gnome iconv libtool:build \
 		localbase:ldflags ninja:build pkgconfig python:build
+USE_GNOME=	libxml2
 
 CONTRIB_FILES=	SVT-AV1-v1.7.0.tar.gz \
 		fdk-aac-2.0.2.tar.gz \
 		ffmpeg-6.1.tar.bz2 \
 		libbluray-1.3.4.tar.bz2 \
 		libdvdnav-6.1.1.tar.bz2 \
 		libdvdread-6.1.3.tar.bz2 \
 		dav1d-1.3.0.tar.bz2 \
 		dovi_tool-libdovi-3.1.2.tar.gz \
 		x265-snapshot-20230403-12776.tar.gz \
 		zimg-3.0.5.tar.gz
 
 .if !defined(PACKAGE_BUILDING)
 # DVDCSS version hardcoded in contrib/libdvdread/libdvdread-5.0.0-6-gcb1ae87/src/dvd_input.c (dlopen'ed)
 LIB_DEPENDS+=	libdvdcss.so:multimedia/libdvdcss
 .endif
 
 GNU_CONFIGURE=	yes
 MAKE_ENV=	V=1 ACLOCAL=${LOCALBASE}/bin/aclocal
 
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 CONFIGURE_ARGS=	--force --enable-x265
 CONFIGURE_TARGET=	build
 
 BUILD_WRKSRC=	${WRKSRC}/build
 INSTALL_WRKSRC=	${WRKSRC}/build
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	#
 INSTALL_TARGET=	install-strip
 
 NOPRECIOUSMAKEVARS=	yes			# for ffmpeg and x264
 
 # Enforce linking to bundled libraries instead of system libraries
 LDFLAGS+=	-L${BUILD_WRKSRC}/contrib/lib
 
 OPTIONS_DEFINE=		FDK_AAC VPL X11
 OPTIONS_DEFAULT=	VPL X11
 OPTIONS_EXCLUDE_powerpc=	VPL
 OPTIONS_EXCLUDE_powerpc64=	VPL
 OPTIONS_EXCLUDE_powerpc64le=	VPL
 
 OPTIONS_SUB=	yes
 
 FDK_AAC_DESC=	Enable non-free Fraunhofer FDK AAC codec
 VPL_DESC=	Intel oneVPL (aka Quick Sync Video)
 X11_DESC=	Build GTK 3 based GUI program
 
 FDK_AAC_CONFIGURE_ENABLE=	fdk-aac
 FDK_AAC_VARS=			LICENSE+=FDK_AAC LICENSE_COMB=multi
 LICENSE_NAME_FDK_AAC=		Software License for The Fraunhofer FDK AAC Codec Library for Android
 LICENSE_FILE_FDK_AAC=		${WRKDIR}/${DISTFILES:Mfdk*:R:R}/NOTICE
 LICENSE_PERMS_FDK_AAC=		dist-mirror pkg-mirror auto-accept
 
 VPL_LIB_DEPENDS=	libvpl.so:multimedia/onevpl \
 			libmfx.so:multimedia/intel-media-sdk \
 			libva-drm.so:multimedia/libva
 VPL_CONFIGURE_ON=	--enable-qsv
 
 X11_CONFIGURE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
 X11_MAKE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
 X11_CONFIGURE_OFF=	--disable-gtk
 X11_LIB_DEPENDS=	libvpx.so:multimedia/libvpx \
 			libnotify.so:devel/libnotify
 X11_USES=	gettext desktop-file-utils gnome gstreamer
 X11_USE=	gstreamer=gdkpixbuf,libav \
 		gnome=gtk30,intltool,cairo,gdkpixbuf2
 
 # HandBrake tries to fetch its dependencies during build phase, which is not
 # considered good in FreeBSD.  Instead, we will provide the downloaded files.
 post-extract: .SILENT
 	${MKDIR} ${WRKSRC}/download
 
 pre-configure:
 	cd ${DISTDIR}/${DIST_SUBDIR} && \
 	    ${INSTALL_DATA} ${CONTRIB_FILES} \
 	    ${WRKSRC}/download
 
 # for powerpc64
 # picked from multimedia/ffmpeg/files/patch-libswscale_ppc_yuv2rgb__altivec.c
 	${CP} ${FILESDIR}/P02-freebsd-ppc-libswscale.patch ${WRKSRC}/contrib/ffmpeg
 
 post-install-X11-on:
 	${LN} -sf ghb ${STAGEDIR}${PREFIX}/bin/HandBrake
 
 .include <bsd.port.mk>
diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index 7cfa1d2ea26d..4b362cf4b84c 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -1,250 +1,250 @@
 PORTNAME=	mythtv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	34.0
 PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	ahicks@p-o.co.uk
 COMMENT=	Homebrew PVR project
 WWW=		https://www.mythtv.org/
 
 LICENSE=	GPLv2+
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc powerpc64 powerpc64le
 .if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
 BROKEN_i386=	ld: error: can't create dynamic relocation R_386_32 against local symbol in readonly segment
 .endif
 
 LIB_DEPENDS=	liblzo2.so:archivers/lzo2 \
 		libmp3lame.so:audio/lame \
 		libsamplerate.so:audio/libsamplerate \
 		libtag.so:audio/taglib \
 		libexiv2.so:graphics/exiv2 \
 		libva.so:multimedia/libva \
 		libbluray.so:multimedia/libbluray \
 		libass.so:multimedia/libass \
 		libfftw3_threads.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libfreetype.so:print/freetype2 \
-		libxml2.so:textproc/libxml2 \
 		libdav1d.so:multimedia/dav1d \
 		libaom.so:multimedia/aom \
 		libdrm.so:graphics/libdrm \
 		libpulse.so:audio/pulseaudio \
 		libjack.so:audio/jack \
 		libSoundTouch.so:audio/soundtouch \
 		libasound.so:audio/alsa-lib \
 		libsndio.so:audio/sndio \
 		libgnutls.so:security/gnutls \
 		libzip.so:archivers/libzip \
 		libexpat.so:textproc/expat2
 BUILD_DEPENDS=	yasm:devel/yasm \
 		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 
-USES=		compiler:c++17-lang gmake gl iconv libtool pkgconfig pathfix \
+USES=		compiler:c++17-lang gmake gl gnome iconv libtool pkgconfig pathfix \
 		perl5 python qmake:no_env qt:5 shebangfix ssl xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MythTV
 USE_GL=		gl
+USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_QT=		buildtools:build core dbus gui imageformats:run \
 		linguist:build multimedia network opengl qmake:build script \
 		sql sql-mysql:run widgets xml
 USE_PERL5=	run build
 USE_XORG=	x11 xv xrandr xxf86vm xinerama xext xcb
 SHEBANG_FILES=	programs/scripts/database/*.pl \
 		programs/scripts/metadata/Music/mbutils.py
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" \
 		--libxml2-path="${LOCALBASE}/include/libxml2" \
 		--disable-audio-alsa \
 		--disable-qtwebkit
 CONFIGURE_ENV=	QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \
 		QTDIR="${PREFIX}" PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
 MAKE_ENV=	QTDIR="${PREFIX}" \
 		QMAKESPEC="${QMAKESPEC}"
 NOPRECIOUSMAKEVARS=	# don't override ARCH in ffmpeg makefiles
 DESTDIRNAME=	INSTALL_ROOT
 CFLAGS_powerpc=	-Wno-error=int-conversion
 CPPFLAGS+=	${QTCPPFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib
 LDFLAGS_aarch64=-Wl,-z,notext
 
 REINPLACE_ARGS=	-i ""
 WRKSRC_SUBDIR=	${PORTNAME}
 
 DESKTOP_ENTRIES="MythTV Frontend" "MythTV is a homebrew PVR project" "" \
 		"mythfrontend" "AudioVideo;Video;" false
 
 CONFLICTS_INSTALL=	mythtv-frontend
 
 RUN_DEPENDS+=	tv_check:textproc/p5-xmltv \
 		wget:ftp/wget
 USE_RC_SUBR=	mythbackend
 SHEBANG_FILES=	programs/scripts/database/*.pl \
 		programs/scripts/internetcontent/*.py \
 		programs/scripts/internetcontent/*.pl \
 		programs/scripts/internetcontent/nv_python_libs/*.py \
 		programs/scripts/hardwareprofile/*.py \
 		programs/scripts/metadata/Movie/tmdb3.py \
 		programs/scripts/metadata/Music/mbutils.py
 
 CONFIGURE_ARGS+=--dvb-path="${WRKSRC}/media_tree/include/uapi" \
 		--enable-v4l2
 
 USERS=		mythtv
 GROUPS=		mythtv
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		BINDINGS HDHOMERUN JACK LIRC MYSQL PULSEAUDIO VDPAU
 OPTIONS_DEFAULT=	BINDINGS HDHOMERUN VDPAU
 OPTIONS_SUB=		yes
 
 BINDINGS_DESC=		Perl and Python bindings
 BINDINGS_BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 			${PYTHON_PKGNAMEPREFIX}mysqlclient>=0:databases/py-mysqlclient@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR} \
 			p5-DBI>=0:databases/p5-DBI \
 			${DBD_MYSQL} \
 			p5-Net-UPnP>=0:multimedia/p5-Net-UPnP \
 			p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \
 			p5-XML-Simple>=0:textproc/p5-XML-Simple \
 			p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \
 			p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined
 BINDINGS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.2.2:databases/py-mysqlclient@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}requests-cache>0:www/py-requests-cache@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}simplejson>=3:devel/py-simplejson@${PY_FLAVOR} \
 			p5-DBI>=0:databases/p5-DBI \
 			${DBD_MYSQL} \
 			p5-Net-UPnP>=0:multimedia/p5-Net-UPnP \
 			p5-IO-Socket-INET6>=2.51:net/p5-IO-Socket-INET6 \
 			p5-XML-Simple>=0:textproc/p5-XML-Simple \
 			p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \
 			p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined
 BINDINGS_CONFIGURE_ON=	--python="${PYTHON_CMD}" --with-bindings=perl,python
 BINDINGS_CONFIGURE_OFF=	--without-bindings=perl,python
 BINDINGS_USES=		mysql
 
 HDHOMERUN_DESC=		Native support for HDHomeRun network tuners
 HDHOMERUN_LIB_DEPENDS=	libhdhomerun.so:multimedia/libhdhomerun
 HDHOMERUN_CONFIGURE_OFF=	--disable-hdhomerun
 
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	--disable-audio-jack
 
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_OFF=	--disable-lirc
 
 MYSQL_DESC=		Install MySQL server in addition to client
 MYSQL_USES=		mysql:client,server
 MYSQL_USES_OFF=		mysql
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--disable-audio-pulseoutput
 
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_OFF=	--disable-vdpau
 
 LINUXDVB=	${WRKSRC}/media_tree/include/uapi/linux/dvb
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/libs/libmythtv/libmythtv.pro \
 		${WRKSRC}/bindings/perl/MythTV/Recording.pm \
 		${WRKSRC}/programs/mythtranscode/external/replex/Makefile.standalone \
 		${WRKSRC}/programs/scripts/database/mythconverg_backup.pl \
 		${WRKSRC}/programs/scripts/database/mythconverg_restore.pl \
 		${WRKSRC}/programs/mythcommflag/mythcommflag-analyze
 	# Header file from:
 	# https://git.linuxtv.org/media_tree.git/tree/include/uapi/linux/dvb
 	@${MKDIR} ${LINUXDVB}
 	@${CP} ${FILESDIR}/audio.h ${LINUXDVB}
 	@${CP} ${FILESDIR}/ca.h ${LINUXDVB}
 	@${CP} ${FILESDIR}/dmx.h ${LINUXDVB}
 	@${CP} ${FILESDIR}/frontend.h ${LINUXDVB}
 	@${CP} ${FILESDIR}/net.h ${LINUXDVB}
 	@${CP} ${FILESDIR}/osd.h ${LINUXDVB}
 	@${CP} ${FILESDIR}/version.h ${LINUXDVB}
 	@${CP} ${FILESDIR}/video.h ${LINUXDVB}
 	# Linux to BSD from multimedia/libv4l/Makefile
 	@${FIND} ${LINUXDVB} -type f -name "*.h" | \
 		${XARGS} -n 1 ${REINPLACE_CMD} \
 		-e 's|#include <linux/types.h>|#include <sys/types.h>|'\
 		-e 's|__inline__|inline|g' \
 		-e 's|__u8|uint8_t|g' \
 		-e 's|__s8|int8_t|g' \
 		-e 's|__le16|uint16_t|g' \
 		-e 's|__be16|uint16_t|g' \
 		-e 's|__u16|uint16_t|g' \
 		-e 's|__s16|int16_t|g' \
 		-e 's|__le32|uint32_t|g' \
 		-e 's|__be32|uint32_t|g' \
 		-e 's|__u32|uint32_t|g' \
 		-e 's|__s32|int32_t|g' \
 		-e 's|__le64|uint64_t|g' \
 		-e 's|__be64|uint64_t|g' \
 		-e 's|__u64|uint64_t|g' \
 		-e 's|__s64|int64_t|g' \
 		-e 's|uint16_t_to_cpu|letoh16|g' \
 		-e 's|uint32_t_to_cpu|letoh32|g' \
 		-e 's|uint64_t_to_cpu|letoh64|g' \
 		-e 's|error_t|int|g' \
 		-e 's|"gettext.h"|<stdio.h>|g' \
 		-e 's|MSG_MORE|0|g' \
 		-e 's|EBADR|EFAULT|g' \
 		-e 's|ENONET|EHOSTDOWN|g' \
 		-e 's|_IOC_READ|IOC_OUT|g' \
 		-e 's|_IOC_WRITE|IOC_IN|g' \
 		-e 's|_IOC_NONE|IOC_VOID|g' \
 		-e 's|<endian.h>|<sys/endian.h>|g' \
 		-e 's|<linux/compiler.h>|<sys/cdefs.h>|g' \
 		-e 's|<linux/errno.h>|<errno.h>|g' \
 		-e 's|<linux/ioctl.h>|<sys/ioctl.h>|g' \
 		-e '/^.*\<linux\/kernel.h\>.*/d' \
 		-e 's|<linux/string.h>|<string.h>|g' \
 		-e 's|<linux/sysmacros.h>|<sys/types.h>|g' \
 		-e 's|<malloc.h>|<stdlib.h>|g' \
 		-e 's|<sys/epoll.h>|<libepoll-shim/sys/epoll.h>|g' \
 		-e 's|<sys/sysmacros.h>|<sys/types.h>|g' \
 		-e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \
 		-e 's|__user||g' \
 		${LINUXDVB}/frontend.h
 
 pre-install:
 	@${REINPLACE_CMD} -e '/^CPPFLAGS=/ s#$$# -I${LOCALBASE}/include#' \
 		${WRKSRC}/libs/libmythbase/mythconfig.mak
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mythtv/database
 	${INSTALL_DATA} ${WRKSRC}/database/mc.sql ${STAGEDIR}${PREFIX}/share/mythtv/database
 	@${FIND} ${STAGEDIR}${PREFIX}/bin -type f -exec ${SH} -c "${FILE} -i '{}' | \
 		${GREP} -q 'x-executable; charset=binary'" \; -print | ${XARGS} ${STRIP_CMD}
 	@${FIND} ${STAGEDIR}${PREFIX}/lib -type f -name lib\*.so.\* | ${XARGS} ${STRIP_CMD}
 
 # Apply additional substitutions to pkg-plist generated by the 'makeplist' target
 create-plist: stage
 	@(cd ${.CURDIR} && ${MAKE} makeplist > pkg-plist && \
 		${REINPLACE_CMD} -E \
 		-e '1d' -e '/etc\/rc.d\/mythbackend/d' -e '/[.]packlist$$/d' \
 		-e '/[.]bak$$/d' \
 		-e '/[.]gitignore$$/d' \
 		-e 's#^bin/mythpython#%%BINDINGS%%bin/mythpython#' \
 		-e 's#^bin/mythwikiscripts#%%BINDINGS%%bin/mythwikiscripts#' \
 		-e 's#^%%PYTHON_SITELIBDIR%%#%%BINDINGS%%%%PYTHON_SITELIBDIR%%#' \
 		-e 's#^%%DATADIR%%hardwareprofile#%%BINDINGS%%hardwareprofile#' \
 		-e 's#^%%DATADIR%%internetcontent#%%BINDINGS%%internetcontent#' \
 		-e 's#^%%SITE_PERL%%#%%BINDINGS%%%%SITE_PERL%%#' \
 		pkg-plist)
 
 .include <bsd.port.mk>
diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile
index b040342f707b..7f5ca4a0b3a0 100644
--- a/multimedia/vcdimager/Makefile
+++ b/multimedia/vcdimager/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	vcdimager
 PORTVERSION=	2.0.1
 PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	GNU
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	GNU VCDImager/VCDRip -- The GNU VideoCD Image Maker/Ripping Tool
 WWW=		https://www.gnu.org/software/vcdimager/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpopt.so:devel/popt \
-		libxml2.so:textproc/libxml2 \
 		libcdio.so:sysutils/libcdio
 
-USES=		gmake libtool localbase makeinfo pathfix pkgconfig
+USES=		gmake gnome libtool localbase makeinfo pathfix pkgconfig
+USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 INFO=		vcdimager vcdxrip vcd-info
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/libfds/Makefile b/net-mgmt/libfds/Makefile
index 792e16fdb8b5..ba2e06a5fcaa 100644
--- a/net-mgmt/libfds/Makefile
+++ b/net-mgmt/libfds/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=		libfds
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.0
 CATEGORIES=		net-mgmt
 
 MAINTAINER=	zarychtam@plan-b.pwste.edu.pl
 COMMENT=	Flow Data Storage library for IPFIX messages
 WWW=		https://github.com/CESNET/libfds
 
 LICENSE=		GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	 libxml2.so:textproc/libxml2 \
-			 liblz4.so:archivers/liblz4 \
-			 libzstd.so:archivers/zstd
+LIB_DEPENDS=	 liblz4.so:archivers/liblz4 \
+		 libzstd.so:archivers/zstd
 
-USES=		cmake localbase:ldflags pkgconfig
+USES=		cmake gnome localbase:ldflags pkgconfig
+USE_GNOME=	libxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CESNET
 
 CXXFLAGS+=	-D_GNU_SOURCE
 
 .include <bsd.port.mk>
diff --git a/net/fort/Makefile b/net/fort/Makefile
index 8acdd8d98300..3527116e5da4 100644
--- a/net/fort/Makefile
+++ b/net/fort/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	fort
 DISTVERSION=	1.6.4
 CATEGORIES=	net
 
 MAINTAINER=	toni@devboks.com
 COMMENT=	FORT Validator is an open source RPKI validator
 WWW=		https://fortproject.net/en/validator
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcurl.so:ftp/curl libjansson.so:devel/jansson \
-		libxml2.so:textproc/libxml2
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libjansson.so:devel/jansson
 RUN_DEPENDS=	${LOCALBASE}/bin/rsync:net/rsync
 
-USES=		autoreconf compiler:c11 pkgconfig ssl
+USES=		autoreconf compiler:c11 gnome pkgconfig ssl
+USE_GNOME=	libxml2
 USE_GITHUB=	yes
 USE_RC_SUBR=	fort
 
 GH_ACCOUNT=	NICMx
 GH_PROJECT=	FORT-validator
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 SUB_FILES=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/tmp/fort|${ETCDIR}|" \
 		${WRKSRC}/examples/config.json
 	@${REINPLACE_CMD} -e "s|/usr/local/ssl|/etc/ssl|" \
 		${WRKSRC}/examples/config.json
 	@${REINPLACE_CMD} -e "s|rsync\",|${LOCALBASE}/bin/rsync\",|" \
 		${WRKSRC}/examples/config.json
 	@${REINPLACE_CMD} -e "/\"daemon\": false,/d" \
 		${WRKSRC}/examples/config.json
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/repository ${STAGEDIR}${ETCDIR}/tal
 	${INSTALL_DATA} ${WRKSRC}/examples/config.json \
 		${STAGEDIR}${ETCDIR}/fort-config.json.sample
 
 .include <bsd.port.mk>
diff --git a/net/libgrss/Makefile b/net/libgrss/Makefile
index d9f0fe9261af..9094199fc89d 100644
--- a/net/libgrss/Makefile
+++ b/net/libgrss/Makefile
@@ -1,26 +1,25 @@
 PORTNAME=	libgrss
 PORTVERSION=	0.7.0
 PORTREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library for easy management of RSS/Atom/Pie feeds
 WWW=		https://www.gnome.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
-		libxml2.so:textproc/libxml2
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 
 USES=		cpe gettext gmake gnome libtool localbase pathfix pkgconfig tar:xz
 CPE_VENDOR=	gnome
-USE_GNOME=	glib20 intlhack introspection:build
+USE_GNOME=	glib20 intlhack introspection:build libxml2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile
index 84016f5469f7..eb8e1f893d1b 100644
--- a/news/nzbget/Makefile
+++ b/news/nzbget/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	nzbget
 DISTVERSIONPREFIX=	v
 DISTVERSION=	24.4
 PORTREVISION=	0
 CATEGORIES=	news
 
 MAINTAINER=	a13xlevy@pm.me
 COMMENT=	Binary newsreader supporting NZB files
 WWW=		https://nzbget.net/
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_json.so:devel/boost-libs \
-		libxml2.so:textproc/libxml2
+LIB_DEPENDS=	libboost_json.so:devel/boost-libs
 RUN_DEPENDS=	7-zip>0:archivers/7-zip \
 		unrar>0:archivers/unrar
 
 # Since v24.4 nzbget maintainers switched from libpar2 to a fork of par2cmdline-turbo which is in its own repository.
 # See https://github.com/nzbgetcom/nzbget/blob/v24.4/cmake/par2-turbo.cmake for the version to pull
 PAR2CMDLINE_TURBO_VERSION=1.1.1-nzbget
 
-USES=		cmake:testing ssl
+USES=		cmake:testing gnome ssl
+USE_GNOME=	libxml2
 USE_GITHUB=	yes
 GH_ACCOUNT=	nzbgetcom
 GH_PROJECT=	nzbget par2cmdline-turbo:par2
 GH_TAGNAME= ${DISTVERSIONPREFIX}${PAR2CMDLINE_TURBO_VERSION}:par2
 USE_RC_SUBR=	nzbget
 
 BINMODE=	0755
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		DOCS NCURSES PAR2 PYTHON
 OPTIONS_SUB=		yes
 OPTIONS_DEFAULT=	NCURSES PAR2
 
 PAR2_DESC=		PAR 2.0 compatible file verification and repair
 
 NCURSES_USES=	ncurses
 
 NCURSES_CMAKE_BOOL_OFF=	DISABLE_CURSES
 PAR2_CMAKE_BOOL_OFF=	DISABLE_PARCHECK
 CMAKE_TESTING_ON=	ENABLE_TESTS
 
 PYTHON_USES=	python:run,3.8+
 
 .include <bsd.port.options.mk>
 
 .if (${ARCH} == "i386")
 CMAKE_ARGS+=	-DDISABLE_SIGCHLD_HANDLER=ON
 .endif
 
 # We need to manually extract par2cmdline-turbo source repository as the cmake option FETCHCONTENT_FULLY_DISCONNECTED is ON by default for ports
 post-extract-PAR2-on:
 	${MKDIR} ${BUILD_WRKSRC}/_deps
 	${MV} ${WRKDIR}/par2cmdline-turbo-${PAR2CMDLINE_TURBO_VERSION} ${BUILD_WRKSRC}/_deps/par2-turbo-src
 
 # Clean up par2 static libraries and delete empty directories
 post-stage-PAR2-on:
 	${RM} ${STAGEDIR}${BUILD_WRKSRC}/lib/*.a
 	${FIND} ${STAGEDIR} -depth -type d -not -path "${STAGEDIR}${PREFIX}*" -empty -delete
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/nzbget.conf \
 		${STAGEDIR}${PREFIX}/etc/nzbget.conf.sample
 
 .include <bsd.port.mk>
diff --git a/science/abinit/Makefile b/science/abinit/Makefile
index 1d387262d9ee..c3c3e81d36e8 100644
--- a/science/abinit/Makefile
+++ b/science/abinit/Makefile
@@ -1,134 +1,133 @@
 PORTNAME=	abinit
 DISTVERSION=	10.0.9
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Full-featured atomic-scale first-principles simulation software
 WWW=		https://www.abinit.org
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	gm4:devel/m4	\
 		${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}graphviz>0:graphics/py-graphviz@${PY_FLAVOR}
 LIB_DEPENDS=	libelpa.so:math/elpa		\
 		libsz.so:science/libaec		\
 		libxc.so:science/libxc		\
 		libfftw3.so:math/fftw3		\
 		libhdf5.so:science/hdf5		\
-		libxml2.so:textproc/libxml2	\
 		libnetcdf.so:science/netcdf	\
 		libxmlf90.so:textproc/xmlf90	\
 		libwannier.so:science/wannier90	\
 		libnetcdff.so:science/netcdf-fortran
 RUN_DEPENDS=	atompaw:science/atompaw
 TEST_DEPENDS=	bash:shells/bash \
 		${PYNUMPY} \
 		libyaml>0:textproc/libyaml
 
 USES=		autoreconf:build blaslapack:netlib fortran gmake gnome localbase:ldflags	\
 		python shebangfix
 USE_GITHUB=	yes
 USE_GNOME=	libxml2
 SHEBANG_FILES=	config/scripts/* doc/tutorial/paral_bandpw_assets/abinit.sub.*
 SHEBANG_GLOB=	*.py *.sh
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	H5CC="${LOCALBASE}/bin/h5cc" \
 		HDF5_CFLAGS="-I${LOCALBASE}/include" \
 		HDF5_LDFLAGS="-L${LOCALBASE}/lib -lhdf5" \
 		LINALG_FCFLAGS="-I${LOCALBASE}/include/elpa-2019.05.002/modules"	\
 		LINALG_LIBS="${BLASLIB}  ${LAPACKLIB} -lelpa"	\
 		NETCDF_FORTRAN_FCFLAGS=-I${LOCALBASE}/include	\
 		XMLF90_FCFLAGS=-I${LOCALBASE}/include/xmlf90	\
 		WANNIER90_LIBS="${BLASLIB}  ${LAPACKLIB} -lwannier"
 CONFIGURE_ARGS=	--with-fft --with-libxc --with-libxml2 --with-netcdf	\
 		--with-netcdf-fortran --with-wannier90 --with-xmlf90
 FCFLAGS+=	-ffree-line-length-none
 TEST_TARGET=	tests_abirules tests_buildsys # Many tests print RuntimeError, https://github.com/abinit/abinit/issues/64
 TEST_WRKSRC=	${WRKSRC}/abichecks
 PORTDOCS=	*
 
 BINARY_ALIAS=	git=false
 
 OPTIONS_DEFINE=			DOCS OPENMP
 OPTIONS_DEFAULT=		MPICH
 OPTIONS_RADIO=			MPIX
 OPTIONS_RADIO_MPIX=		NOMPI MPICH OPENMPI
 
 OPENMP_CONFIGURE_ENABLE=	openmp
 OPENMP_LDFLAGS=			-lomp
 
 MIX_DESC=			MPI options
 
 NOMPI_DESC=			Do not use MPI
 NOMPI_CONFIGURE_ON=		CC_LDFLAGS="${LDFLAGS}" CXX_LDFLAGS="${LDFLAGS}"	\
 				FC_LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}"
 
 OPENMPI_USES=			mpi:openmpi
 OPENMPI_CONFIGURE_ON=		mpi=yes
 OPENMPI_VARS=			FCFLAGS+="`pkg-config --cflags ompi-fort`" \
 				CFLAGS+="${MPI_CFLAGS}" \
 				LDFLAGS+="${MPI_LDFLAGS}"
 OPENMPI_CONFIGURE_ENV=		${MPIX_CONFIGURE_ENV} \
 				MPI_FCFLAGS="`pkg-config --cflags ompi-fort`"
 
 MPICH_USES=			mpi:mpich
 MPICH_CONFIGURE_ON=		mpi=yes
 MPICH_VARS=			FFLAGS+=-I${LOCALBASE}/include FCFLAGS+=-I${LOCALBASE}/include	\
 				CONFIGURE_ENV+=MPI_LIBS="`pkg-config --libs mpich` -lmpifort"	\
 				CONFIGURE_ENV+MPI_LDFLAGS="`pkg-config --libs mpich` -lmpifort"
 MPICH_CONFIGURE_ENV=		${MPIX_CONFIGURE_ENV}
 
 MPIX_CONFIGURE_ENV=		CC_LDFLAGS="${MPI_LIBS} ${LDFLAGS}" \
 				CXX_LDFLAGS="${MPI_LIBS} ${LDFLAGS}" \
 				FC_LDFLAGS="${MPI_LIBS} ${LDFLAGS}" \
 				CFLAGS="${MPI_CFLAGS} ${CFLAGS} ${CFLAGS_F2018}" \
 				MPI_CPPFLAGS="${MPI_CFLAGS}" \
 				MPI_LIBS="${MPI_LIBS}" \
 				MPI_LDFLAGS="${MPI_LIBS}"
 # When OpenMPI is enabled, put its related variables 1st to avoid conflicts with MPICH
 
 .if defined(WITH_LEVMAR)
 # --with-levmar seems deprecated
 LIB_DEPENDS+=	liblevmar.so:math/levmar
 CONFIGURE_ENV+=	LEVMAR_LIBS="-llevmar ${BLASLIB} ${LAPACKLIB}"
 CONFIGURE_ARGS+=	--with-levmar
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${GCC_DEFAULT} >= 10
 FCFLAGS+=	-fallow-argument-mismatch # see https://github.com/abinit/abinit/issues/41
 .endif
 
 pre-configure: # version lines below are workaround for https://github.com/abinit/abinit/issues/75
 	@cd ${WRKSRC} && \
 		${ECHO} ${PORTVERSION} > .version && \
 		${ECHO} ${PORTVERSION} > .tarball-version && \
 		./autogen.sh
 
 post-install-DOCS-on:
 	${REINPLACE_CMD} -e 's|/usr/bin/env  python|${PYTHON_CMD}|'	\
 		${WRKSRC}/doc/tutorial/paral_moldyn_assets/diag_moldyn.py
 	${RM} ${WRKSRC}/doc/tutorial/paral_moldyn_assets/diag_moldyn.py.bak
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -R ${WRKSRC}/doc/tutorial ${STAGEDIR}${DOCSDIR}
 
 pre-test:
 	${TOUCH} ${TEST_WRKSRC}/make.log
 
 test-long: # run all examples from tutorial/Input
 	@cd ${WRKSRC}/tests/tutorial/Input && \
 		for abi in `${LS} *.abi`; do \
 			${ECHO} "===> Running example $$abi" && \
 			${SETENV} PATH=${STAGEDIR}${PREFIX}/bin:${PATH} ABI_PSPDIR=${WRKSRC}/tests/Psps_for_tests abinit $$abi; \
 		done
 
 # fftw3 not enabled because libfftw3_mpi is required but not packaged
 
 .include <bsd.port.post.mk>
diff --git a/science/afni/Makefile b/science/afni/Makefile
index 33be8851ee5b..2a056997e47a 100644
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@@ -1,164 +1,163 @@
 PORTNAME=		afni
 DISTVERSIONPREFIX=	AFNI_
 DISTVERSION=		24.3.10
 CATEGORIES=		science biology graphics perl5 python
 
 MAINTAINER=	fernape@FreeBSD.org
 COMMENT=	Advanced Functional Neuro Imaging
 WWW=		https://afni.nimh.nih.gov/afni/
 
 LICENSE=	GPLv2
 
 BROKEN_aarch64=	fails to build: statement requires expression of scalar type \
 		('va_list' (aka '__builtin_va_list') invalid)
 
 CRAN_DEPENDS=	R-cran-lme4>0:math/R-cran-lme4 \
 		R-cran-snow>0:science/R-cran-snow \
 		R-cran-psych>0:math/R-cran-psych
 BUILD_DEPENDS=	gm4:devel/m4 \
 		R:math/R \
 		${CRAN_DEPENDS}
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libXm.so:x11-toolkits/open-motif \
 		libf2c.so:lang/f2c \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgsl.so:math/gsl \
 		libicudata.so:devel/icu \
 		libnetcdff.so:science/netcdf-fortran \
 		libnetpbm.so:graphics/netpbm \
 		libpcre2-8.so:devel/pcre2 \
-		libpng16.so:graphics/png \
-		libxml2.so:textproc/libxml2
+		libpng16.so:graphics/png
 
 # Remote execution of suma.  Also needed for glxinfo.
 RUN_DEPENDS=	endian:sysutils/endian \
 		mpeg_encode:multimedia/mpeg_encode \
 		qhull:math/qhull \
 		R:math/R \
 		${CRAN_DEPENDS}
 
 USES=		gettext gl gmake gnome iconv jpeg:run motif readline
 USES+=		perl5 python shebangfix tar:xz xorg
 USE_GITHUB=	yes
 USE_GL=		gl glu
-USE_GNOME=	glib20
+USE_GNOME=	glib20 libxml2
 USE_XORG= 	ice sm x11 xau xcb xdmcp xext xft xi xmu xrender xt
 
 SHEBANG_FILES=	scripts_install/* \
 		python_scripts/afnipy/*.py \
 		python_scripts/scripts/*.py \
 		jzosky/*.py \
 		jzosky/lib_RetroTS/*.py \
 		discoraj/ClusterExplorer/*.py \
 		pkundu/*.py \
 		pkundu/meica.libs/*.py \
 		pkundu/meica.libs/*/*.py \
 		pkundu/meica.libs/*/*/*.py
 
 MAKE_ENV=	CC="${CC}" R_SHARE_DIR=${LOCALBASE}/lib/R/share
 MAKE_JOBS_UNSAFE=yes
 ALL_TARGET=	vastness suma
 
 CFLAGS+=	-fcommon -Wno-incompatible-function-pointer-types
 
 ###########################################################################
 # Install parameters
 
 SUB_FILES=	pkg-message afni.cshrc afni.profile
 
 INSTALL_WRKSRC=	${WRKSRC}/BSD
 WRKSRC_SUBDIR=	src
 
 OPTIONS_DEFINE=	DOCS
 
 INSTALL_TMP=	${INSTALL_WRKSRC}-temp
 PRESTAGE=	${WRKSRC}/prestage
 
 .include <bsd.port.options.mk>
 
 CONFLICTS=	im \
 		nifticlib \
 		open-usp-tukubai
 
 X11R6_FILES=	coxplot/Makefile \
 		coxplot/Makefile.f2c
 
 PKG_COMPRESSION_LEVEL= 	6
 
 post-extract:
 .for f in ${X11R6_FILES}
 	@${REINPLACE_CMD} \
 		-e 's|/usr/X11R6|$${LOCALBASE}|g' ${WRKSRC}/${f}
 .endfor
 	@${REINPLACE_CMD} \
 		-E 's|AFNI_[0-9_]+|${PORTVERSION}|g' ${WRKSRC}/AFNI_label.h
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 	@${RM} ${WRKSRC}/3DEdge/src/Makefile.orig
 
 pre-configure:
 	@${REINPLACE_CMD} -e "s|-lglib|-lglib-2.0|g" \
 		${WRKSRC}/SUMA/SUMA_Makefile
 	@${REINPLACE_CMD} \
 		-e 's|os\.path\.dirname(os\.path\.abspath(os\.path\.expanduser(sys\.argv\[0\])))|"${DATADIR}"|g' \
 		${WRKSRC}/pkundu/meica.py
 
 do-install:
 	# AFNI install just dumps everything into one flat directory
 	# ${WRKSRC}/BSD == ${INSTALL_WRKSRC}.
 	# Preserve ${INSTALL_WRKSRC} and make a sacrificial temp copy
 	# to be pruned and rearranged for easy staging
 	@${RM} -r ${INSTALL_TMP}
 	@${CP} -R ${INSTALL_WRKSRC} ${INSTALL_TMP}
 
 	# Clean up and organize files into ${PRESTAGE}, destroying
 	# ${INSTALL_TMP} in the process
 	@${RM} -rf ${PRESTAGE}
 	@${MKDIR} ${PRESTAGE}/bin \
 		${PRESTAGE}/scripts \
 		${PRESTAGE}/lib \
 		${PRESTAGE}/include \
 		${PRESTAGE}/trash \
 		${PRESTAGE}/doc \
 		${PRESTAGE}/share \
 		${PRESTAGE}/pylib
 	@${RM}	${INSTALL_TMP}/libf2c.a
 	@${MV}	${INSTALL_TMP}/meica.libs \
 		${INSTALL_TMP}/shiny \
 		${INSTALL_TMP}/lib_RetroTS \
 		${INSTALL_TMP}/funstuff \
 		${INSTALL_TMP}/AFNI.*rc \
 		${INSTALL_TMP}/afnigui* \
 		${PRESTAGE}/share
 	@${MV}	${INSTALL_TMP}/*.a \
 		${INSTALL_TMP}/*.so \
 		${PRESTAGE}/lib
 	@${MV}	${INSTALL_TMP}/*.h ${PRESTAGE}/include
 	@${MV}	${INSTALL_TMP}/afnipy ${PRESTAGE}/pylib
 	@${CP}	${WRKDIR}/afni-AFNI_${PORTVERSION}/doc/README/* ${PRESTAGE}/doc
 	@for binary in `${FILE} ${INSTALL_TMP}/* | fgrep 'ELF' | ${AWK} -F ':' ' { print $$1 }'` ; do \
 		${MV} $${binary} ${PRESTAGE}/bin ; \
 	done
 	@${MV}	${INSTALL_TMP}/* ${PRESTAGE}/scripts
 
 	# Install to STAGEDIR using proper ports tools
 	@${MKDIR} \
 		${STAGEDIR}${DATADIR} \
 		${STAGEDIR}${PREFIX}/lib/afni \
 		${STAGEDIR}${PREFIX}/include/afni \
 		${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${PREFIX}/etc/mri
 	${INSTALL_PROGRAM} ${PRESTAGE}/bin/* ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${PRESTAGE}/scripts/* ${STAGEDIR}${PREFIX}/bin
 	(cd ${PRESTAGE}/pylib && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR})
 	${INSTALL_DATA} ${PRESTAGE}/lib/* ${STAGEDIR}${PREFIX}/lib/afni
 	${INSTALL_DATA} ${PRESTAGE}/include/* ${STAGEDIR}${PREFIX}/include/afni
 	(cd ${PRESTAGE}/share && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	${INSTALL_SCRIPT} ${WRKDIR}/afni.cshrc ${WRKDIR}/afni.profile \
 		${STAGEDIR}${PREFIX}/etc/mri
 
 do-install-DOCS-on:
 	${INSTALL_DATA} ${PRESTAGE}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/kc/Makefile b/security/kc/Makefile
index a9c101e171c2..6d034b44451e 100644
--- a/security/kc/Makefile
+++ b/security/kc/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	kc
 DISTVERSION=	2.5.3
 PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	leva@ecentrum.hu
 COMMENT=	Console based password storing application
 WWW=		https://github.com/levaidaniel/kc
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2
 TEST_DEPENDS=	bash:shells/bash
 
-USES=		ncurses pkgconfig ssl uidfix
+USES=		gnome ncurses pkgconfig ssl uidfix
+USE_GNOME=	libxml2
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	levaidaniel
 
 MAKE_ARGS=	BINDIR="${PREFIX}/bin" \
 		MANDIR="${PREFIX}/share/man/man"
 MAKE_ENV=	BUNDLED_BCRYPT=y
 TEST_ENV=	SH=${PREFIX}/bin/bash
 TEST_TARGET=	test
 
 CONFLICTS=	kc24
 
 PLIST_FILES=	bin/kc share/doc/kc/Changelog.md share/man/man1/kc.1.gz
 
 OPTIONS_DEFINE=		SCRYPT YUBIKEY
 OPTIONS_DEFAULT=	LIBEDIT SCRYPT
 OPTIONS_SINGLE=		CLI
 OPTIONS_SINGLE_CLI=	LIBEDIT READLINE
 
 SCRYPT_DESC=	Scrypt KDF support (needs libscrypt)
 YUBIKEY_DESC=	YubiKey support (needs libyubikey and ykpers)
 
 LIBEDIT_USES=		libedit
 LIBEDIT_MAKE_ENV=	EDITLINE=y
 READLINE_USES=		readline
 READLINE_MAKE_ENV=	READLINE=y
 SCRYPT_LIB_DEPENDS=	libscrypt.so:security/libscrypt
 SCRYPT_MAKE_ENV=	HAVE_LIBSCRYPT=1
 YUBIKEY_LIB_DEPENDS=	libykpers-1.so:security/ykpers \
 			libyubikey.so:security/libyubikey
 YUBIKEY_MAKE_ENV+=	CFLAGS=-I${PREFIX}/include \
 			HAVE_YUBIKEY=y
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lncursesw|${NCURSESLIBS}|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|^#!/bin/sh|#!${PREFIX}/bin/bash|' ${WRKSRC}/regress/run_tests.sh
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Changelog.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile
index b02d8502b1d3..dde1ab75f49e 100644
--- a/security/openconnect/Makefile
+++ b/security/openconnect/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	openconnect
 PORTVERSION=	9.12
 PORTREVISION=	1
 CATEGORIES=	security net-vpn
 MASTER_SITES=	ftp://ftp.infradead.org/pub/openconnect/ \
 		ZI
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Client for Cisco's AnyConnect SSL VPN
 WWW=		https://www.infradead.org/openconnect/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LGPL
 
-LIB_DEPENDS=	libxml2.so:textproc/libxml2
 RUN_DEPENDS=	vpnc-script:sysutils/vpnc-scripts
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--disable-nls --with-vpnc-script=${LOCALBASE}/sbin/vpnc-script \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
 		--without-openssl-version-check --without-libpcsclite \
 		--without-libpskc
-USES=		cpe gmake iconv libtool localbase pkgconfig python:build ssl \
+USES=		cpe gmake gnome iconv libtool localbase pkgconfig python:build ssl \
 		shebangfix
 CPE_VENDOR=	infradead
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 SHEBANG_LANG+=	SH
 SH_OLD_CMD+=	/system/bin/sh
 SHEBANG_FILES=	trojans/csd-post.sh trojans/csd-wrapper.sh \
 		trojans/tncc-emulate.py \
 		trojans/hipreport-android.sh trojans/tncc-wrapper.py
+USE_GNOME=	libxml2
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS PROXY GNUTLS GSSAPI LZ4 P11 STOKEN
 OPTIONS_DEFAULT=GSSAPI
 
 LZ4_DESC=		LZ4-based compression
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 LZ4_CONFIGURE_WITH=	lz4
 
 PROXY_DESC=		Automatic proxy configuration via libproxy
 PROXY_LIB_DEPENDS=	libproxy.so:net/libproxy
 PROXY_CONFIGURE_WITH=	libproxy
 
 GNUTLS_DESC=		Use GnuTLS instead of OpenSSL (experimental)
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
 
 GSSAPI_CONFIGURE_WITH=	gssapi
 
 P11_DESC=		PKCS \#11 support via libp11
 P11_LIB_DEPENDS=	libp11.so:security/libp11
 
 STOKEN_DESC=		With RSA soft token support via libstoken
 STOKEN_LIB_DEPENDS=	libstoken.so:security/stoken \
 				libtomcrypt.so:security/libtomcrypt
 STOKEN_CONFIGURE_WITH=	stoken
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile
index 6284145eb025..5c4a15aafb60 100644
--- a/sysutils/xen-tools/Makefile
+++ b/sysutils/xen-tools/Makefile
@@ -1,109 +1,108 @@
 PORTNAME=	xen
 PKGNAMESUFFIX=	-tools
 DISTVERSION=	4.19.0.20241112
 CATEGORIES=	sysutils emulators
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	xen-project
 GL_TAGNAME=	251a9496485a86f302980a3f8d3c656831b5a62f
 GL_TUPLE=	qemu-project:qemu:v8.0.4:qemu \
 		qemu-project:dtc:b6910bec:dtc \
 		qemu-project:meson:3a9b285a:meson \
 		qemu-project:keycodemapdb:f5772a62:keycodemapdb \
 		qemu-project:berkeley-testfloat-3:40619cbb:testfloat \
 		qemu-project:berkeley-softfloat-3:b64af41c:softfloat
 
 MAINTAINER=	royger@FreeBSD.org
 COMMENT=	Xen Hypervisor management tools
 WWW=		https://www.xenproject.org/
 
 LICENSE=	GPLv2 LGPL3
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libyajl.so:devel/yajl \
 		liblzo2.so:archivers/lzo2 \
 		libpixman-1.so:x11/pixman \
-		libargp.so:devel/argp-standalone \
-		libxml2.so:textproc/libxml2
+		libargp.so:devel/argp-standalone
 BUILD_DEPENDS=	seabios>0:misc/seabios \
 		${LOCALBASE}/share/edk2-xen/XEN_X64_EFI.fd:sysutils/edk2@xen_x64 \
 		bash>0:shells/bash
 RUN_DEPENDS=	seabios>0:misc/seabios \
 		${LOCALBASE}/share/edk2-xen/XEN_X64_EFI.fd:sysutils/edk2@xen_x64
 
 OPTIONS_DEFINE=		DOCS SPICE
 OPTIONS_DEFAULT=	DOCS
 OPTIONS_SUB=		yes
 
 SPICE_DESC=		Enable SPICE protocol for QEMU
 SPICE_CONFIGURE_WITH=	extra-qemuu-configure-args="--enable-spice"
 SPICE_BUILD_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol
 SPICE_LIB_DEPENDS=	libspice-server.so:devel/libspice-server
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than amd64
 
 USES=		cpe gettext gmake gnome libtool localbase:ldflags perl5 \
 		pkgconfig python shebangfix iconv bison ninja:build
-USE_GNOME=	glib20
+USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
 USE_PYTHON=	py3kplist
 HAS_CONFIGURE=	yes
 # Set ARCH=x86_64 in order to overwrite the environment ARCH=amd64
 MAKE_ARGS=	clang=y ARCH=x86_64
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 CONFIGURE_ARGS+=	--with-system-seabios=${LOCALBASE}/share/seabios/bios.bin \
 			--with-system-ovmf=${LOCALBASE}/share/edk2-xen/XEN_X64_EFI.fd \
 			--mandir=${PREFIX}/share/man \
 			--disable-golang
 
 SHEBANG_FILES=	tools/misc/xencov_split \
 		tools/python/scripts/convert-legacy-stream \
 		tools/python/scripts/verify-stream-v2 \
 		tools/xenmon/xenmon.py
 
 ALL_TARGET=		tools
 DOCS_ALL_TARGET=	docs
 INSTALL_TARGET=		install-tools
 DOCS_INSTALL_TARGET=	install-docs
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} != FreeBSD
 IGNORE=		only supported on FreeBSD
 .endif
 
 post-extract:
 	${MV} ${WRKSRC_qemu} ${WRKSRC}/tools/qemu-xen
 	${RM} -rf ${WRKSRC}/tools/qemu-xen/dtc
 	${MV} ${WRKSRC_dtc} ${WRKSRC}/tools/qemu-xen/dtc
 	${RM} -rf ${WRKSRC}/tools/qemu-xen/meson
 	${MV} ${WRKSRC_meson} ${WRKSRC}/tools/qemu-xen/meson
 	${RM} -rf ${WRKSRC}/tools/qemu-xen/ui/keycodemapdb
 	${MV} ${WRKSRC_keycodemapdb} ${WRKSRC}/tools/qemu-xen/ui/keycodemapdb
 	${RM} -rf ${WRKSRC}/tools/qemu-xen/tests/fp/berkeley-testfloat-3
 	${MV} ${WRKSRC_testfloat} ${WRKSRC}/tools/qemu-xen/tests/fp/berkeley-testfloat-3
 	${RM} -rf ${WRKSRC}/tools/qemu-xen/tests/fp/berkeley-softfloat-3
 	${MV} ${WRKSRC_softfloat} ${WRKSRC}/tools/qemu-xen/tests/fp/berkeley-softfloat-3
 
 post-patch:
 	@for p in `ls ${FILESDIR}/*qemuu*.patch 2>/dev/null`; do \
 		${ECHO_CMD} "====> Applying $${p##*/}" ; \
 		${PATCH} -s -p1 -i $${p} -d ${WRKSRC}/tools/qemu-xen ; \
 	done
 
 # The ports native 'build' target cannot be used because it sets CFLAGS, and
 # that breaks the Xen kernel build system that's used by the tools in order to
 # build the pv-shim.
 do-build:
 	${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${WRKSRC} ${MAKE_ARGS} ${ALL_TARGET}
 
 do-install:
 	${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${WRKSRC} ${MAKE_ARGS} ${INSTALL_TARGET}
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/run/xen
 
 .include <bsd.port.mk>
diff --git a/textproc/lttoolbox/Makefile b/textproc/lttoolbox/Makefile
index ae406d79d937..c97b720746fd 100644
--- a/textproc/lttoolbox/Makefile
+++ b/textproc/lttoolbox/Makefile
@@ -1,29 +1,30 @@
 PORTNAME=	lttoolbox
 DISTVERSION=	3.7.6
 PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/apertium/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Tool for lexical, morphological analysis and generation of words
 WWW=		https://wiki.apertium.org/wiki/Lttoolbox
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	utf8cpp>=4.0.3:devel/utf8cpp
-LIB_DEPENDS=	libicuio.so:devel/icu \
-		libxml2.so:textproc/libxml2
+LIB_DEPENDS=	libicuio.so:devel/icu
 
-USES=		autoreconf compiler:c++14-lang libtool pathfix pkgconfig tar:bz2
+USES=		autoreconf compiler:c++14-lang gnome libtool pathfix pkgconfig \
+		tar:bz2
+USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 INSTALL_TARGET=	install-strip
 
 CFLAGS+=	-I${LOCALBASE}/include/utf8cpp
 LDFLAGS+=	-lpthread
 
 .include <bsd.port.mk>
diff --git a/www/pecl-solr/Makefile b/www/pecl-solr/Makefile
index 83c351ff0997..90899c8c8e97 100644
--- a/www/pecl-solr/Makefile
+++ b/www/pecl-solr/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	solr
 PORTVERSION=	2.7.0
 CATEGORIES=	www
 
 MAINTAINER=	gaod@hychen.org
 COMMENT=	PHP extension for Apache Solr
 WWW=		https://pecl.php.net/package/solr
 
 LICENSE=	PHP301
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcurl.so:ftp/curl \
-		libxml2.so:textproc/libxml2
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
-USES=		php:build,pecl pkgconfig
+USES=		gnome php:build,pecl pkgconfig
+USE_GNOME=	libxml2
 IGNORE_WITH_PHP=	84
 
 CONFIGURE_ARGS=	LIBXML_CFLAGS=-I${LOCALBASE}/include/libxml2 \
 		LIBXML_LIBS=-L${LOCALBASE}/include/libxml2
 
 .include <bsd.port.mk>
diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index acbc80151d68..6bc3995b0724 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -1,86 +1,86 @@
 PORTNAME=	trafficserver
 DISTVERSION=	9.2.5
 CATEGORIES=	www
 MASTER_SITES=	APACHE/${PORTNAME}
 
 MAINTAINER=	gaod@hychen.org
 COMMENT=	Fast, scalable and extensible HTTP proxy server
 WWW=		https://trafficserver.apache.org/
 
 LICENSE=	APACHE20
 
 ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libhwloc.so:devel/hwloc2 \
 		libpcre.so:devel/pcre \
-		libxml2.so:textproc/libxml2 \
 		libbrotlienc.so:archivers/brotli
 
-USES=		compiler:c++17-lang cpe gmake libtool localbase luajit \
-		ncurses pathfix perl5 pkgconfig sqlite ssl tar:bzip2
+USES=		compiler:c++17-lang cpe gmake gnome libtool localbase \
+		luajit ncurses pathfix perl5 pkgconfig sqlite ssl tar:bzip2
 CPE_VENDOR=	apache
 CPE_PRODUCT=	traffic_server
+USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PERL5=	build run
 USE_RC_SUBR=	${PORTNAME}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pcre=${LOCALBASE} \
 		--with-openssl=${OPENSSLBASE} \
 		--localstatedir=/var \
 		--with-user=${USERS} \
 		--with-group=${GROUPS} \
 		--disable-maintainer-mode \
 		--disable-dependency-tracking \
 		--enable-mime-sanity-check \
 		--enable-experimental-plugins \
 		--enable-event-tracker
 INSTALL_TARGET=	install-strip
 USERS=		${WWWOWN}
 GROUPS=		${WWWGRP}
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" \
 		PORTVERSION="${DISTVERSION}" \
 		ARCH="${ARCH:C/powerpc64.*/powerpc/}"
 
 OPTIONS_DEFINE=	DOCS GEOIP IMAGEMAGICK MEMCACHED MIMALLOC WCCP X11
 OPTIONS_SUB=	yes
 
 IMAGEMAGICK_DESC=		Enable ats-magick & webp convert plugin
 MEMCACHED_DESC=			Enable memcache & memcached_remap plugin
 MIMALLOC_DESC=			Use mimalloc
 WCCP_DESC=			Enable WCCPv2 protocol
 
 GEOIP_LIB_DEPENDS=		libmaxminddb.so:net/libmaxminddb
 MEMCACHED_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
 MIMALLOC_LIB_DEPENDS=		libmimalloc.so:devel/mimalloc
 MIMALLOC_CONFIGURE_WITH=	mimalloc
 WCCP_CONFIGURE_ENABLE=		wccp
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMAGEMAGICK}
 .if ${PORT_OPTIONS:MX11}
 USES+=		magick
 .else
 USES+=		magick:nox11
 .endif
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e '/cachedir:/s,$${localstatedir}+,$${localstatedir}/cache+,' \
 		-e '/runtimedir:/s,$${localstatedir}+,$${localstatedir}/run+,' \
 		${WRKSRC}/config.layout
 	@${REINPLACE_CMD} -e 's/#ifdef HAVE_EVENTFD/#if defined(HAVE_EVENTFD) \&\& TS_USE_EPOLL == 1/' \
 		${WRKSRC}/src/tscore/EventNotify.cc \
 		${WRKSRC}/include/tscore/EventNotify.h
 
 post-install:
 	${RMDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots
 	(cd ${STAGEDIR}${ETCDIR} && for f in *.config *.yaml; do ${MV} $$f $$f.sample; done)
 	${SED} -i '' -e 's|^${STAGEDIR}||g' \
 		${STAGEDIR}${PREFIX}/lib/perl5/${ARCH:C/powerpc64.*/powerpc/}-freebsd-thread-multi/auto/Apache/TS/.packlist
 
 .include <bsd.port.mk>