From nobody Sat Mar 16 12:56:06 2024 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 4Txh1z0HJpz5Dmhv; Sat, 16 Mar 2024 12:56:07 +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 4Txh1y6g5Rz58k8; Sat, 16 Mar 2024 12:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710593766; 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=cbLQeOGFBvq+OksKHbk2MLwDyLbN1ou/zOoWN8VWv7I=; b=Bxv4K+0/5+dDOfi59l8aYpNoRFIDi2mlkqUcrhBH7OrehD7vL1JKIHOvdhAD8bAKMo6/1L nCO4OGcgGVDZWFUJ+70xnuzhyNRFZ3WrAMYowjs80A6btCcf4zEXAM7/AdXhDa0+0SMIZw DMcYth/7QpzclZhDblzaVNV/hNpPPuWMKYfSaETeXQLKQ2cM9k4AOCNUXp0ejnvqbzenSK g8d/54PkpsT5svBwuX90CLsZ3tf081UpuBImC6CAqA6q/o2BEfhGWJrrFmsaK8ambrOm9u U3FBXn0Uecr81eDB3DqojRl/NRLcylCeFJ5OH3oKXJ6vvRrwFwr7C9NdwntS8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710593766; a=rsa-sha256; cv=none; b=mJ+K4LHqGTsAZvsDM4jhyEdkzOy0kGWJoPvncUkmyJw3Dd1Iy8yXuph8/MAxYkMG5cHdZm J8gt4ES6tXMIkC5yZK3gBCZAKBEbAS0Kr3zZLvrEBra6hY1PNAyRwzgv/A3aga1KwlimPf 19FI73wk7Z91pWPySV/xoyioRwfjalPnJiqW/88NNwYCIU1eRy6AmoBgtNd0T5rd5/dUHT TBzonugXxFFEXbM3mXds0tysxoQ2Ypfe88KfxsFS3yXthXEvKgbV5jOYcA8IiyoIMDChQ9 kOkn677IZp7Gflh5g0qmta/l2zPftWr7pEAIWRYjd5HN/q7RLObhO74xFUeQ/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710593766; 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=cbLQeOGFBvq+OksKHbk2MLwDyLbN1ou/zOoWN8VWv7I=; b=qDqzNp3h7dh9E9grXnGD8ShkWZX3W08EgSiXsvwr+t6sLpP9nNveP7rrIzz7l3EQllx0ij TXaBVMzzQzOBGwTXF+IR6got7E3GjaSzcKuMhSkuCQMkm/KwKJikwzeqvRvOdVoRQTO8X1 gU6hKpR6sFlxKJ+99qYHHvg8rZxci31fOK86qlDI4t1MPzLFeC07cMHEazgd+yOO0IkXeb 2/WJIN/TX1qfU0ABM0TsQURNqu4sUEEBYFxgD+7dGO0r95MyW3AmqHnlvRItwdqBHA/Po3 Tip/Q0cWEklHmO0HiZb/7CR8NCfSGHccw9nVQtaQclr7qOJqU71IdrxwgESJdw== 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 4Txh1y6GF6zwMp; Sat, 16 Mar 2024 12:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42GCu6KR025973; Sat, 16 Mar 2024 12:56:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42GCu6Dj025970; Sat, 16 Mar 2024 12:56:06 GMT (envelope-from git) Date: Sat, 16 Mar 2024 12:56:06 GMT Message-Id: <202403161256.42GCu6Dj025970@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 848ce0529ef3 - main - x11/nvidia-driver: fix build 304 and 340 after "Move manpages to share/man" 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 848ce0529ef3eed81535b763942f0b5175c943fc Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=848ce0529ef3eed81535b763942f0b5175c943fc commit 848ce0529ef3eed81535b763942f0b5175c943fc Author: Vladimir Druzenko AuthorDate: 2024-03-16 12:40:06 +0000 Commit: Vladimir Druzenko CommitDate: 2024-03-16 12:55:39 +0000 x11/nvidia-driver: fix build 304 and 340 after "Move manpages to share/man" sed: /usr/ports/x11/nvidia-driver-340/work/NVIDIA-FreeBSD-x86_64-340.108/nvml/man/Makefile: No such file or directory *** Error code 1 Approved by: arrowd (mentor) Fixes: bf8a0031d97ff4c1fc019d7061085bdc38484365 "*: Move manpages to share/man" --- x11/nvidia-driver/Makefile | 2 ++ x11/nvidia-driver/pkg-plist | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index db35190592e3..3fd6e3722bb8 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -163,7 +163,9 @@ EXTRA_PATCHES+= ${WRKDIR}/${p} .endfor post-patch: .SILENT +.if ${NVVERSION} >= 390 ${REINPLACE_CMD} -e 's|/man/man1|/share/man/man1|' ${WRKSRC}/nvml/man/Makefile +.endif # We should support -CURRENT: kill the check (first #if __FreeBSD_version) linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \ ${WRKSRC}/src/${NVSRC}/nv-freebsd.h) ; ${REINPLACE_CMD} \ diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist index bc1ceb3e3eb7..973dc8193b11 100644 --- a/x11/nvidia-driver/pkg-plist +++ b/x11/nvidia-driver/pkg-plist @@ -94,10 +94,10 @@ lib32/libnvidia-gpucomp.so.1 lib32/libnvidia-tls.so lib32/libnvidia-tls.so.1 lib32/vdpau/libvdpau_nvidia.so.1 -share/man/man1/nvidia-smi.1.gz @comment share/egl/egl_external_platform.d/10_nvidia_wayland.json share/egl/egl_external_platform.d/15_nvidia_gbm.json share/glvnd/egl_vendor.d/10_nvidia.json +share/man/man1/nvidia-smi.1.gz share/vulkan/icd.d/nvidia_icd.json share/vulkan/implicit_layer.d/nvidia_layers.json %%MODULESDIR%%/drivers/nvidia_drv.so