Date: Sat, 29 Apr 2023 23:42:57 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 62f02a3116fe - 2023Q2 - graphics/mesa-devel: discard user edits to libmap.conf(5) Message-ID: <202304292342.33TNgv2Y061103@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=62f02a3116fed01b5edc45840e4a1548c36b63b8 commit 62f02a3116fed01b5edc45840e4a1548c36b63b8 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-04-29 22:06:12 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-04-29 23:42:13 +0000 graphics/mesa-devel: discard user edits to libmap.conf(5) - pkg32.sh from emulators/wine* uses RUN_SCRIPTS=false, so mesa-devel.conf.sample isn't copied to mesa-devel.conf - other ports with libmap.conf(5) support don't use @sample - partially overriding mesa-{dri,libs} is only useful for debugging (cherry picked from commit 13d5524a0dec75df4d80f3fca4f266cb790f1b76) --- graphics/mesa-devel/Makefile | 3 ++- graphics/mesa-devel/pkg-plist | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 98d810b0063d..dbd220e24a1e 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,6 +1,7 @@ PORTNAME= mesa DISTVERSION= 23.1-branchpoint-780 DISTVERSIONSUFFIX= -gb07f575a91d +PORTREVISION= 1 CATEGORIES= graphics PKGNAMESUFFIX= -devel @@ -174,6 +175,6 @@ post-patch-COINST-on: post-install-COINST-on: @${INSTALL_DATA} ${WRKDIR}/libmap.conf \ - ${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf.sample + ${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf .include <bsd.port.mk> diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist index 0cc426306aed..3a43b378fa2b 100644 --- a/graphics/mesa-devel/pkg-plist +++ b/graphics/mesa-devel/pkg-plist @@ -1,7 +1,7 @@ %%VKLAYERS%%bin/mesa-overlay-control.py %%NO_COINST%%%%OPENCL%%etc/OpenCL/vendors/mesa.icd %%OPENCL%%etc/OpenCL/vendors/rusticl.icd -%%COINST%%@sample etc/libmap.d/mesa%%SUFFIX%%.conf.sample +%%COINST%%etc/libmap.d/mesa%%SUFFIX%%.conf %%NO_COINST%%include/EGL/eglext_angle.h %%NO_COINST%%include/EGL/eglmesaext.h %%NO_COINST%%include/GL/internal/dri_interface.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304292342.33TNgv2Y061103>