*/*: Use Gnome helper for defining libxml2 dependency

Replace LIB_DEPENDS with USES= gnome, USE_GNOME= libxml2 Approved by: portmgr (blanket)
HardenedBSD · Dec 23, 2024 · 3b3700f · 3b3700f
1 parent 2782fc9
commit 3b3700f
Show file tree

Hide file tree

Showing 46 changed files with 120 additions and 124 deletions.
diff --git a/biology/ncbi-vdb/Makefile b/biology/ncbi-vdb/Makefile
@@ -19,11 +19,11 @@ 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
 

diff --git a/cad/pcb-rnd/Makefile b/cad/pcb-rnd/Makefile
@@ -14,10 +14,10 @@ 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" \

diff --git a/deskutils/bookworm/Makefile b/deskutils/bookworm/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS=	libappstream-glib.so:devel/appstream-glib \
 		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 \

diff --git a/devel/libabigail/Makefile b/devel/libabigail/Makefile
@@ -11,10 +11,11 @@ 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

diff --git a/devel/libdatovka/Makefile b/devel/libdatovka/Makefile
@@ -17,13 +17,12 @@ BUILD_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl \
 		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

diff --git a/devel/liblangtag/Makefile b/devel/liblangtag/Makefile
@@ -11,11 +11,10 @@ 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

diff --git a/devel/libsmpp34/Makefile b/devel/libsmpp34/Makefile
@@ -11,9 +11,8 @@ 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

diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
@@ -11,8 +11,7 @@ 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 \
@@ -132,7 +131,7 @@ 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

diff --git a/devel/pcsc-cyberjack/Makefile b/devel/pcsc-cyberjack/Makefile
@@ -12,10 +12,10 @@ 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

diff --git a/devel/sope/Makefile b/devel/sope/Makefile
@@ -10,10 +10,10 @@ 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}
 

diff --git a/devel/sope2/Makefile b/devel/sope2/Makefile
@@ -11,8 +11,7 @@ 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
 
@@ -24,7 +23,8 @@ 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

diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
@@ -37,20 +37,20 @@ 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

diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile
@@ -20,12 +20,13 @@ 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/-.*//}

diff --git a/dns/bind920/Makefile b/dns/bind920/Makefile
@@ -43,13 +43,15 @@ LIB_DEPENDS=	libuv.so:devel/libuv \
 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

diff --git a/dns/opendnssec2/Makefile b/dns/opendnssec2/Makefile
@@ -12,10 +12,11 @@ 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

diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
@@ -17,12 +17,11 @@ LIB_DEPENDS=	libaspell.so:textproc/aspell \
 		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

diff --git a/filesystems/s3fs/Makefile b/filesystems/s3fs/Makefile
@@ -12,10 +12,10 @@ 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

diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile
@@ -13,8 +13,7 @@ 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 \
@@ -70,7 +69,8 @@ RUN_DEPENDS=	wkhtmltopdf>0:converters/wkhtmltopdf \
 		${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

diff --git a/finance/odoo14/Makefile b/finance/odoo14/Makefile
@@ -14,8 +14,7 @@ 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 \
@@ -66,7 +65,8 @@ RUN_DEPENDS=	wkhtmltopdf>0:converters/wkhtmltopdf \
 		${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

diff --git a/finance/odoo15/Makefile b/finance/odoo15/Makefile
@@ -14,8 +14,7 @@ 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 \
@@ -66,7 +65,8 @@ RUN_DEPENDS=	wkhtmltopdf>0:converters/wkhtmltopdf \
 		${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

diff --git a/finance/odoo16/Makefile b/finance/odoo16/Makefile
@@ -14,8 +14,7 @@ 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 \
@@ -68,7 +67,8 @@ RUN_DEPENDS=	wkhtmltopdf>0:converters/wkhtmltopdf \
 		${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

diff --git a/graphics/flam3/Makefile b/graphics/flam3/Makefile
@@ -12,10 +12,10 @@ 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

diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
@@ -25,13 +25,12 @@ LIB_DEPENDS=	libportal.so:deskutils/libportal \
 		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
 

diff --git a/graphics/tinyows/Makefile b/graphics/tinyows/Makefile
@@ -12,10 +12,10 @@ 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