Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Mar 2024 12:56:06 GMT
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 848ce0529ef3 - main - x11/nvidia-driver: fix build 304 and 340 after "Move manpages to share/man"
Message-ID:  <202403161256.42GCu6Dj025970@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=848ce0529ef3eed81535b763942f0b5175c943fc

commit 848ce0529ef3eed81535b763942f0b5175c943fc
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-03-16 12:40:06 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403161256.42GCu6Dj025970>