Skip to content

Commit

Permalink
x11/nvidia-xconfig: update the port to version 525.116.04
Browse files Browse the repository at this point in the history
Reduce MAKE_ENV pollution and do not patch default manpage
location (share/man/manX) which is what we also now prefer.
  • Loading branch information
Alexey Dokuchaev authored and Alexey Dokuchaev committed May 15, 2023
1 parent 3cb92a7 commit 92ccd37
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 19 deletions.
15 changes: 6 additions & 9 deletions x11/nvidia-xconfig/Makefile
@@ -1,5 +1,5 @@
PORTNAME= nvidia-xconfig
PORTVERSION= 470.86
PORTVERSION= 525.116.04
CATEGORIES= x11

MAINTAINER= x11@FreeBSD.org
Expand All @@ -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>
6 changes: 3 additions & 3 deletions 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
15 changes: 8 additions & 7 deletions 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)

0 comments on commit 92ccd37

Please sign in to comment.