From nobody Sat Apr 29 23:42:04 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q85bx10pDz48QHF; Sat, 29 Apr 2023 23:42:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q85bx0bNvz40TB; Sat, 29 Apr 2023 23:42:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682811725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1m8a8pIt4gM0X3O85IOnncYlMrKSdVzoNphf3xEh+lQ=; b=ILwBFeaUD/wui8UbtaCB5ydeKGO1ZSvD4lCF5kHw/A6BjlUEWmVSsLqIhQAcV8CYKjCyuq kX3CKEe+5Kz8cVMtUjZOxakfjwaWbLu65pI40SPsCtHapSq2lPjQb1j6XJj2NDw/s3tbX2 5ly6CThF/xjmvuxradsqPfd8QfAnWFtvPkZ8BaLVdCI65nLpBug96PM6GznehCwXNvGqVR w8f25EDcOt9FqW1D+jbHhyEUh0VR3a6Zw15uNYbZHDupIcWPgCAsPpAwsXGsXYoxGM2G+e cC54TZVYyvOAoBFje3sqfRh3FMEFbpUMPY8mwqjyaj8sVkHY7fGzVwPPU/YIbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682811725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1m8a8pIt4gM0X3O85IOnncYlMrKSdVzoNphf3xEh+lQ=; b=ESyFdFPFJpwRwCiFVUnveURL4/Vx1fUHpBdg0ye6hpy5LeUdnnxZVNIKxMVllhxJFdfPwl 4GqzPPcveS+/MFQcTJhNvBTPkAN3c3Uu6g5Bgz6PtqOWWgH3sWxWwtbN2fIyp6QcBNz5bq CIEpE71Z4qXgBAIm4lNALhpU/pWc5Aniaa/PXzqet0Ia0NK+A+3MADFSGP1D7BLjMrb3Ms cKe9dQvMXYgUy80ZakXiowMWMMszdwzJP6+7i9iGBrcN4EVrWrOFuxEgo/G1H8sWqo/PhT 2lQa+m/kjM5tLkYcQk0Y2Vs91hzydzjnaDAr11XJ66srLvym6K5ik+P3qGqN2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682811725; a=rsa-sha256; cv=none; b=EemEzOwes4qVXIP8++GjY0jLrpCVW+FpdXJzcY9nx1gx+1XRZUF8bxn1MOIRdDyaP1RALm 1t5EZyb5xCPCudzaddiZt2e1zakZlf7Gpdy82XRlz6jauXxhLMSDy0x2m/38fJcx7+3b+7 azpI55MkeCEkRHLNTD8pt5jcC/2O0oCEOvrB7AvTsLM668BMLJhkH9DjCxQy6IUSkBHV6v dzXX1Lc2zpFkiNV5DtpZFDUhup+Df0civr4FvPAc/GfvTjtfvF1YqH/aIcKd5BdwU/kHlu xOQFGve1dZeR1dSx47zpFzRuExHyeV2fe8eIggEhIs4YuIpOVrdiyrPvnf2Zhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q85bw6nCFz11pv; Sat, 29 Apr 2023 23:42:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33TNg4iT060751; Sat, 29 Apr 2023 23:42:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33TNg4lP060750; Sat, 29 Apr 2023 23:42:04 GMT (envelope-from git) Date: Sat, 29 Apr 2023 23:42:04 GMT Message-Id: <202304292342.33TNg4lP060750@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 13d5524a0dec - main - graphics/mesa-devel: discard user edits to libmap.conf(5) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13d5524a0dec75df4d80f3fca4f266cb790f1b76 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=13d5524a0dec75df4d80f3fca4f266cb790f1b76 commit 13d5524a0dec75df4d80f3fca4f266cb790f1b76 Author: Jan Beich AuthorDate: 2023-04-29 22:06:12 +0000 Commit: Jan Beich CommitDate: 2023-04-29 23:41:58 +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 --- 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 5e3044f0f986..402345e8cc20 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 @@ -175,6 +176,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 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