From 92ccd379cf7b6eab97fa703c981b337ab07cfd4c Mon Sep 17 00:00:00 2001
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Mon, 15 May 2023 10:19:30 +0000
Subject: [PATCH] x11/nvidia-xconfig: update the port to version 525.116.04

Reduce MAKE_ENV pollution and do not patch default manpage
location (share/man/manX) which is what we also now prefer.
---
 x11/nvidia-xconfig/Makefile             | 15 ++++++---------
 x11/nvidia-xconfig/distinfo             |  6 +++---
 x11/nvidia-xconfig/files/patch-Makefile | 15 ++++++++-------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/x11/nvidia-xconfig/Makefile b/x11/nvidia-xconfig/Makefile
index 0a11df05597a..1e27e268c26d 100644
--- a/x11/nvidia-xconfig/Makefile
+++ b/x11/nvidia-xconfig/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nvidia-xconfig
-PORTVERSION=	470.86
+PORTVERSION=	525.116.04
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -9,20 +9,17 @@ WWW=		https://www.nvidia.com/object/unix.html
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess
+
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	NVIDIA
 
 MAKE_ENV=	NV_VERBOSE=1 \
-		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		INSTALL_MAN="${INSTALL_MAN}" \
-		prefix=${PREFIX}
+		PCIACCESS_CFLAGS=-I${LOCALBASE}/include \
+		PCIACCESS_LDFLAGS=-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/nvidia-xconfig \
-		man/man1/nvidia-xconfig.1.gz
-
-post-patch:	.SILENT
-	${REINPLACE_CMD} -e '/^MANDIR/s|share/||' \
-		${WRKSRC}/utils.mk
+		share/man/man1/nvidia-xconfig.1.gz
 
 .include <bsd.port.mk>
diff --git a/x11/nvidia-xconfig/distinfo b/x11/nvidia-xconfig/distinfo
index 3cf6a987a45d..2e1d2ed14773 100644
--- a/x11/nvidia-xconfig/distinfo
+++ b/x11/nvidia-xconfig/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636571456
-SHA256 (NVIDIA-nvidia-xconfig-470.86_GH0.tar.gz) = 3cd3cbedde98e3873693bd44abc11ab6c98a0755f40801a8e05ac6ec17a9771e
-SIZE (NVIDIA-nvidia-xconfig-470.86_GH0.tar.gz) = 142559
+TIMESTAMP = 1683649709
+SHA256 (NVIDIA-nvidia-xconfig-525.116.04_GH0.tar.gz) = 2a6eb713033437c1f715390760bbdadab5759d292b3f56de3495b43fa8860e57
+SIZE (NVIDIA-nvidia-xconfig-525.116.04_GH0.tar.gz) = 145159
diff --git a/x11/nvidia-xconfig/files/patch-Makefile b/x11/nvidia-xconfig/files/patch-Makefile
index c89de1ee5f4c..5be5d41b76bb 100644
--- a/x11/nvidia-xconfig/files/patch-Makefile
+++ b/x11/nvidia-xconfig/files/patch-Makefile
@@ -1,16 +1,17 @@
---- Makefile.orig	2015-08-31 19:26:16 UTC
+--- Makefile.orig	2023-05-09 16:28:29 UTC
 +++ Makefile
-@@ -112,11 +112,11 @@ install: NVIDIA_XCONFIG_install MANPAGE_
- 
+@@ -112,12 +112,12 @@ install: NVIDIA_XCONFIG_install MANPAGE_install
+ .PHONY: NVIDIA_XCONFIG_install
  NVIDIA_XCONFIG_install: $(NVIDIA_XCONFIG)
  	$(MKDIR) $(BINDIR)
 -	$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
-+	$(INSTALL_PROGRAM) $< $(BINDIR)/$(notdir $<)
++	$(BSD_INSTALL_PROGRAM) $< $(BINDIR)/$(notdir $<)
  
+ .PHONY: MANPAGE_install
  MANPAGE_install: $(MANPAGE)
  	$(MKDIR) $(MANDIR)
 -	$(INSTALL) $(INSTALL_DOC_ARGS) $< $(MANDIR)/$(notdir $<)
-+	$(INSTALL_MAN) $< $(MANDIR)/$(notdir $<)
++	$(BSD_INSTALL_MAN) $< $(MANDIR)/$(notdir $<)
  
- $(NVIDIA_XCONFIG): $(OBJS)
- 	$(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
+ $(eval $(call DEBUG_INFO_RULES, $(NVIDIA_XCONFIG)))
+ $(NVIDIA_XCONFIG).unstripped: $(OBJS)