git: 67dae6618236 - main - *: Fix dependency on Mesa after pkg-plist reshuffling

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Mon, 15 Jun 2026 15:56:37 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=67dae6618236a5d1e20abaede0ea52ee860e585f

commit 67dae6618236a5d1e20abaede0ea52ee860e585f
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2026-05-31 08:49:13 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2026-06-15 15:55:34 +0000

    *: Fix dependency on Mesa after pkg-plist reshuffling
---
 comms/cubicsdr/Makefile          | 2 +-
 devel/electron37/Makefile        | 2 +-
 devel/electron38/Makefile        | 2 +-
 devel/electron39/Makefile        | 2 +-
 devel/electron40/Makefile        | 2 +-
 devel/electron41/Makefile        | 2 +-
 devel/electron42/Makefile        | 2 +-
 www/chromium/Makefile            | 2 +-
 www/iridium/Makefile             | 2 +-
 www/ungoogled-chromium/Makefile  | 2 +-
 x11-servers/xorg-server/Makefile | 5 +++--
 x11/xlibre/Makefile              | 2 +-
 x11/xorg/Makefile                | 2 +-
 13 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/comms/cubicsdr/Makefile b/comms/cubicsdr/Makefile
index 05487f666ed2..e1aee8381b9b 100644
--- a/comms/cubicsdr/Makefile
+++ b/comms/cubicsdr/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libhamlib.so:comms/hamlib \
 		libliquid.so:comms/liquid-dsp \
 		libpulse.so:audio/pulseaudio \
 		libSoapySDR.so:misc/soapysdr
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-libs \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.16:math/py-numpy@${PY_FLAVOR}
 
 USES=		cmake:noninja compiler:c++11-lib gl python
diff --git a/devel/electron37/Makefile b/devel/electron37/Makefile
index 4a52ac85b5ae..70d54fb98a54 100644
--- a/devel/electron37/Makefile
+++ b/devel/electron37/Makefile
@@ -34,7 +34,7 @@ PATCH_DEPENDS=	git:devel/git \
 BUILD_DEPENDS=	gperf:devel/gperf \
 		bindgen:devel/rust-bindgen-cli \
 		yasm:devel/yasm \
-		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
+		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-libs \
 		rustc:lang/rust \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION} \
diff --git a/devel/electron38/Makefile b/devel/electron38/Makefile
index ef39e2ef8a55..15674e370aa5 100644
--- a/devel/electron38/Makefile
+++ b/devel/electron38/Makefile
@@ -36,7 +36,7 @@ PATCH_DEPENDS=	git:devel/git \
 BUILD_DEPENDS=	gperf:devel/gperf \
 		bindgen:devel/rust-bindgen-cli \
 		yasm:devel/yasm \
-		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
+		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-libs \
 		rustc:lang/rust \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION} \
diff --git a/devel/electron39/Makefile b/devel/electron39/Makefile
index 689064b06d2b..2f389c7ce081 100644
--- a/devel/electron39/Makefile
+++ b/devel/electron39/Makefile
@@ -36,7 +36,7 @@ PATCH_DEPENDS=	git:devel/git \
 BUILD_DEPENDS=	gperf:devel/gperf \
 		bindgen:devel/rust-bindgen-cli \
 		yasm:devel/yasm \
-		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
+		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-libs \
 		rustc:lang/rust \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION} \
diff --git a/devel/electron40/Makefile b/devel/electron40/Makefile
index 21b035595198..40559c3b1fe8 100644
--- a/devel/electron40/Makefile
+++ b/devel/electron40/Makefile
@@ -33,7 +33,7 @@ BUILD_DEPENDS=	esbuild:devel/esbuild \
 		gperf:devel/gperf \
 		bindgen:devel/rust-bindgen-cli \
 		yasm:devel/yasm \
-		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
+		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-libs \
 		rustc:lang/rust \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION} \
diff --git a/devel/electron41/Makefile b/devel/electron41/Makefile
index 936beae4919c..e148e39f53b7 100644
--- a/devel/electron41/Makefile
+++ b/devel/electron41/Makefile
@@ -33,7 +33,7 @@ BUILD_DEPENDS=	esbuild:devel/esbuild \
 		gperf:devel/gperf \
 		bindgen:devel/rust-bindgen-cli \
 		yasm:devel/yasm \
-		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
+		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-libs \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION} \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
diff --git a/devel/electron42/Makefile b/devel/electron42/Makefile
index 74856ce1fce2..d23ef7e095e8 100644
--- a/devel/electron42/Makefile
+++ b/devel/electron42/Makefile
@@ -33,7 +33,7 @@ BUILD_DEPENDS=	esbuild:devel/esbuild \
 		gperf:devel/gperf \
 		bindgen:devel/rust-bindgen-cli \
 		yasm:devel/yasm \
-		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
+		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-libs \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION} \
 		npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 1b2efb3ff6b0..1b60eb0c6e0d 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -36,7 +36,7 @@ BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \
 		${LOCALBASE}/include/va/va.h:multimedia/libva \
-		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
+		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-libs \
 		${LOCALBASE}/libdata/pkgconfig/Qt5Core.pc:devel/qt5-core \
 		${LOCALBASE}/libdata/pkgconfig/Qt5Widgets.pc:x11-toolkits/qt5-widgets
 
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index df6524e703b6..58cf3ae76aa6 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -38,7 +38,7 @@ BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \
 		${LOCALBASE}/include/va/va.h:multimedia/libva \
-		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
+		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-libs \
 		${LOCALBASE}/libdata/pkgconfig/Qt5Core.pc:devel/qt5-core \
 		${LOCALBASE}/libdata/pkgconfig/Qt5Widgets.pc:x11-toolkits/qt5-widgets
 
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index 737e854de0d7..c605306b693a 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -38,7 +38,7 @@ BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \
 		${LOCALBASE}/include/va/va.h:multimedia/libva \
-		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
+		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-libs \
 		${LOCALBASE}/libdata/pkgconfig/Qt5Core.pc:devel/qt5-core \
 		${LOCALBASE}/libdata/pkgconfig/Qt5Widgets.pc:x11-toolkits/qt5-widgets
 
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index a77098fecdb6..dcb4b4c46399 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xorg
 PORTVERSION=	21.1.23
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
@@ -38,10 +39,10 @@ PLIST_FILES=	bin/${BINARY_NAME} \
 
 DESCR=	${.CURDIR}/pkg-descr-${FLAVOR}
 
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-libs
 RUN_DEPENDS+=	xkeyboard-config>=2.5:x11/xkeyboard-config \
 		xkbcomp:x11/xkbcomp \
-		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
+		${LOCALBASE}/lib/dri/libdril_dri.so:graphics/mesa-dri
 
 MESON_ARGS+=	-Dxwin=false \
 		-Dxquartz=false \
diff --git a/x11/xlibre/Makefile b/x11/xlibre/Makefile
index e99c8b23157f..1562a0f88ac4 100644
--- a/x11/xlibre/Makefile
+++ b/x11/xlibre/Makefile
@@ -9,7 +9,7 @@ WWW=		https://github.com/X11Libre/ \
 
 USES=		metaport
 
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-libs
 
 # data
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:x11/xbitmaps \
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index 36cae3ec6333..0effe0bc6f72 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -9,7 +9,7 @@ WWW=		https://www.x.org/
 
 USES=		metaport
 
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-libs
 
 # data
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:x11/xbitmaps \