From nobody Mon May 15 10:20:41 2023 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 4QKb3t1C7fz4BRt2; Mon, 15 May 2023 10:20:42 +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 4QKb3t0gQdz3xX8; Mon, 15 May 2023 10:20:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684146042; 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=Jujq0Jm3sgrbYkrgXGbDEidIyYulFN6EsCBfQdB+AWk=; b=KknH+eigdaXjdAH+wywQvXgvhjTGmrIHresDjtCfRlp3MncT3QOvcSnAbMMIHQDavaYWRe wYN9ZjaRifD/5eRFCCHAp53DvrTcQtGcmpO1bnHD0lpZ2ywviCq/MIt1xoVvCDWrJT5jgw JaEGZcyTHcjtyrdyHIuYPs1HT8TW55EF1DZIYjqIgtRCxLZjRP+rzkpo/eG8Lb3/cdwgxR MGqaG92UimR2pgjyxaRE8y0Kzqmnq219Y+Hgq1YNMfSGPz+w0+Bny3THmRFMvoBEiFXeJQ aeZoZWbByMkn+Eoth9ea/iTsOLgkkLuzDzTiAsLBbSJIe8BMPFGSMY8FAUZq6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684146042; 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=Jujq0Jm3sgrbYkrgXGbDEidIyYulFN6EsCBfQdB+AWk=; b=G2SK1KNR3C5Mj58/Zz7pm7TrZxNYCULIchP8/EsTuP2UFkmM/9cHvIta0R84yhKyf76dAn ojIAwda3r9s2bLlb6LObJY19/LUjhdbcax/nc3Mc9CkWLvhLuCVRZI2KeuD87Zl5hSTM11 hrppMmdTk01irptYveiUi50TwlMPRrom9JTFM7thQTRHzBHKpEolnx+uDFVTBD5x96PR93 iNKHiMEmoR+xvOhedX930/QZiqglZHpMjaFlZ5S4pHbJ6aSEwJu9HCJTl+cyGYZ2bfPxOO S7elS8jnXQnn4jZLhwv5pPaov+Pm1IXnNku2+Kd1owRGwybD7HKfXXsfCrfx+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684146042; a=rsa-sha256; cv=none; b=fl73f7vYW1zOn+jG+V8eY8D3AUy0ENJb8U1bOajA1SHfIOUPNJhrmX14oWk7yim5n+4mx8 tUmp9Z2rptLYaHzS7AH+owMVTXA/jGGRWUIt2v+eZguzgdGSRK1CNisOsWfQXTpso68Ng6 uMTEfilTKN0HxU/qIwIL/toNqIaqXMlsz/mkNAO3qFHNHPhzPZFvjbJSpea7tMNrUVIU/u rVe4zO5PSPSzZprsNgou/L7XkLTH7k3iBPuGa3nhP3+wBv4pGGTwWKlKv11kZK50M+6lcs zM/qZ7cFGCAtHV6W0xvEQOGksgC4i0WMM6Ma8LiTPWjUzN4uX7AZDy+Kvy5/wA== 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 4QKb3s6rkDzblr; Mon, 15 May 2023 10:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34FAKf98040184; Mon, 15 May 2023 10:20:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34FAKfst040183; Mon, 15 May 2023 10:20:41 GMT (envelope-from git) Date: Mon, 15 May 2023 10:20:41 GMT Message-Id: <202305151020.34FAKfst040183@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 92ccd379cf7b - main - x11/nvidia-xconfig: update the port to version 525.116.04 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92ccd379cf7b6eab97fa703c981b337ab07cfd4c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=92ccd379cf7b6eab97fa703c981b337ab07cfd4c commit 92ccd379cf7b6eab97fa703c981b337ab07cfd4c Author: Alexey Dokuchaev AuthorDate: 2023-05-15 10:19:30 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-05-15 10:19:30 +0000 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 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)