From nobody Sun Jan 02 15:48:29 2022 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 58A7D19153FF; Sun, 2 Jan 2022 15:48:30 +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 4JRjvy0R5pz3LWT; Sun, 2 Jan 2022 15:48:30 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E447414B8C; Sun, 2 Jan 2022 15:48:29 +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 202FmTdf091011; Sun, 2 Jan 2022 15:48:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 202FmTk8091010; Sun, 2 Jan 2022 15:48:29 GMT (envelope-from git) Date: Sun, 2 Jan 2022 15:48:29 GMT Message-Id: <202201021548.202FmTk8091010@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: 0375fc8f10e7 - main - x11/nvidia-driver: lax the check when applying fix for src df38ada293 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: 0375fc8f10e7ebcee63258c57abcd80e3c84333f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641138510; 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=tVyijl8KcGEMLUn8QwcGqX8+ZkEuIOIzlf53nz7+b/4=; b=efr1Wqan6o2kI/3mCA4iUelc0AhixbFQg83uKJhvY6gVO0l98RhjwpcUqMXwOPdZhQ+CFa yAmjfi7wWWgmPEC3z0ShSWUmHUMJu5NJGNhN2NDalWkwmKaXz8cbrLiuIGgiueoPSy9exH TNpSsar0ZhBY/ndP6oo+2d7Jzi0UMM+nSaGKsJTGYvFm9eGydUgypkoDzxptjc03U2NHZk b5r48Y9/BVGMoWX8yQeJO/kl0I5C0nyNSz4Cmc5A1kqCpqpFZYhAkN6Hshj4R8ZHBmWsWH CyobL8pJ9uL/FAPwUwhOr1xBvp31e+yzFVpVcE71t5F88fnvVzfbCe9mewQoZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641138510; a=rsa-sha256; cv=none; b=HxqBiFjaLMjvYQqdq6S2ru2EN6nVkARC0vPBOmJMDoh+IK1Axl9V2CYGaZyFSB8JNadKC9 PloP3TusH1blil2KtLRPsaA8ovlILC/Y4+x2hNzhzi1TurLr09W/tL5yQu6sgwrF4Qy7D3 dHJgzF8a8RYGvDUNnfucGaryc9z2wPg29iiinE79gIcwJIhfRnAth8pYGEzZ6lvjkxKjCL WcX0Tf9nIMgM2lUMvG/JCgsskxZw+0qcMvZoldT16TCH87+0Mcit9XqGZ4zCUIunRLIsOb VTHmdh7s3Cmn0AACmddAR3k1oH4MHQjCm0xshflDr9F4YuBmldNLz+rhoHDmcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=0375fc8f10e7ebcee63258c57abcd80e3c84333f commit 0375fc8f10e7ebcee63258c57abcd80e3c84333f Author: Alexey Dokuchaev AuthorDate: 2022-01-02 15:47:24 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-01-02 15:47:24 +0000 x11/nvidia-driver: lax the check when applying fix for src df38ada293 It turns out that NVVERSION check is not very accurate and may easily break the build in various circumstances. Also, do not use the line number as an anchor, just spell out the #include line in its entirety when removing it. PR: 260318 --- x11/nvidia-driver/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index e7de4d18e89a..383e2882d9b0 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -169,9 +169,10 @@ post-patch: .SILENT ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c .endif # After src df38ada2931f, `sys/module.h' must be included after `sys/param.h' -.if ${OSVERSION} >= 1400042 && ${NVVERSION} >= 358.009 - @${REINPLACE_CMD} -e '/^#include :; G; }; 14d' \ +.if ${NVVERSION} >= 358.009 + @${REINPLACE_CMD} -e '/^#include /d; \ + /^#include / { x; \ + s:^:#include :; G; }' \ ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c .endif # Disable installation of Linux libraries (provided by the corresponding