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.
This commit is contained in:
Alexey Dokuchaev 2023-05-15 10:19:30 +00:00
parent 3cb92a7711
commit 92ccd379cf
3 changed files with 17 additions and 19 deletions

View file

@ -1,5 +1,5 @@
PORTNAME= nvidia-xconfig PORTNAME= nvidia-xconfig
PORTVERSION= 470.86 PORTVERSION= 525.116.04
CATEGORIES= x11 CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org MAINTAINER= x11@FreeBSD.org
@ -9,20 +9,17 @@ WWW= https://www.nvidia.com/object/unix.html
LICENSE= GPLv2 LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpciaccess.so:devel/libpciaccess
USES= gmake USES= gmake
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= NVIDIA GH_ACCOUNT= NVIDIA
MAKE_ENV= NV_VERBOSE=1 \ MAKE_ENV= NV_VERBOSE=1 \
INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ PCIACCESS_CFLAGS=-I${LOCALBASE}/include \
INSTALL_MAN="${INSTALL_MAN}" \ PCIACCESS_LDFLAGS=-L${LOCALBASE}/lib
prefix=${PREFIX}
PLIST_FILES= bin/nvidia-xconfig \ PLIST_FILES= bin/nvidia-xconfig \
man/man1/nvidia-xconfig.1.gz share/man/man1/nvidia-xconfig.1.gz
post-patch: .SILENT
${REINPLACE_CMD} -e '/^MANDIR/s|share/||' \
${WRKSRC}/utils.mk
.include <bsd.port.mk> .include <bsd.port.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1636571456 TIMESTAMP = 1683649709
SHA256 (NVIDIA-nvidia-xconfig-470.86_GH0.tar.gz) = 3cd3cbedde98e3873693bd44abc11ab6c98a0755f40801a8e05ac6ec17a9771e SHA256 (NVIDIA-nvidia-xconfig-525.116.04_GH0.tar.gz) = 2a6eb713033437c1f715390760bbdadab5759d292b3f56de3495b43fa8860e57
SIZE (NVIDIA-nvidia-xconfig-470.86_GH0.tar.gz) = 142559 SIZE (NVIDIA-nvidia-xconfig-525.116.04_GH0.tar.gz) = 145159

View file

@ -1,16 +1,17 @@
--- Makefile.orig 2015-08-31 19:26:16 UTC --- Makefile.orig 2023-05-09 16:28:29 UTC
+++ Makefile +++ 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) NVIDIA_XCONFIG_install: $(NVIDIA_XCONFIG)
$(MKDIR) $(BINDIR) $(MKDIR) $(BINDIR)
- $(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<) - $(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
+ $(INSTALL_PROGRAM) $< $(BINDIR)/$(notdir $<) + $(BSD_INSTALL_PROGRAM) $< $(BINDIR)/$(notdir $<)
.PHONY: MANPAGE_install
MANPAGE_install: $(MANPAGE) MANPAGE_install: $(MANPAGE)
$(MKDIR) $(MANDIR) $(MKDIR) $(MANDIR)
- $(INSTALL) $(INSTALL_DOC_ARGS) $< $(MANDIR)/$(notdir $<) - $(INSTALL) $(INSTALL_DOC_ARGS) $< $(MANDIR)/$(notdir $<)
+ $(INSTALL_MAN) $< $(MANDIR)/$(notdir $<) + $(BSD_INSTALL_MAN) $< $(MANDIR)/$(notdir $<)
$(NVIDIA_XCONFIG): $(OBJS) $(eval $(call DEBUG_INFO_RULES, $(NVIDIA_XCONFIG)))
$(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \ $(NVIDIA_XCONFIG).unstripped: $(OBJS)