From nobody Sat Aug 12 22:59:02 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 4RNbgp2tSQz4TwRl; Sat, 12 Aug 2023 22:59:02 +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 4RNbgp1yp3z4bT0; Sat, 12 Aug 2023 22:59:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691881142; 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=rqMKNlpPh7eq4RGJL6Aj99yAXPiOUqYdvqksYKhg7r4=; b=wtC2InohTB9QA31CpNlqYNmdrFuUSlvglESLB+l5eibsndEp7uefnvE5NUX1MG5L/tqpF0 Ik8dZKBOSdeQhDbMnWTcxdq6jp3BAeIo+i/FBd/AlhPCQjqfpajMM3f5d76FAUxOt/G9Ws Ndb7LL/WR99LgQ3bzlGPDONuYggOq2IExJ0ZsEVzuzbKo7KaWWuH60ZIQHwzj0trprSPHF VfCYANQQzwiSv6+hThK+Hs5B0gYkeMhNCjIiWsHKNdlgMHatiPerkWmTtUA0l/FribARgL l+upVBFmnwQ1JzxQSEMuZCQuDPoVRAu2bWQoJJ11jL6lIjl+MTfIzn5Zp0D1yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691881142; 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=rqMKNlpPh7eq4RGJL6Aj99yAXPiOUqYdvqksYKhg7r4=; b=bX3eooEQO3pEbrPtOiCh8PEKEIa/QdgyjVdPVqNJlpH6wLfP+feCnFoQBnjPio3hfrSBYs 7t7wTrF5WDQ+G95CZbq2rU5IBUkT/PJizimc//eRftaPjeHV8/232zBXkffQVejq4XxXT3 +U4AUG9WMcqxCW+UBlCiJyHRQv8TBWW3pPJm9HFzW2xdLOZhzovRMQU1T4ZevhgpVT9SFq ZVSf0yIe3Pn4m6KLtfZE3ShjDIb7Vcx77MsFeKVkPK3N8CNefeIcweUFLB/LmTCmrHoK+/ q0CM6pz2xximAuTGSd3scSdSk8jqUPm3vCYgPoVEer8ZmTcBQUsbCbxme/6UqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691881142; a=rsa-sha256; cv=none; b=LrpqonACDUicsl0JspTCNr3wpxEI23b5C4uY+Tkq/it55Yfe6AzxbZx+eHbUSC5hwv0GUL O/t/oDcKv7m7pnz53fwABfuA4BZM7fQJAiDxo2foSBiPS5QWAlhccdRm9EW8jCLbPqiUbc WV/aH+L53KEEmiI0pEogiPD2l7oUYivI9DWD1Eijm28SliuthXTTSPdDJCGIEEj0PFQZ1X +ZJ8dElTqF6TOx28aF0UpzOs8c+fwaSAq/xVv52dchitwe42eYxHRYKXAwWK7g+CnOYZZK Mi5vzpQOOEruVNR6CnHBflrNzjxmz9Mf1aszJG9N23FNspO6YHVg5r2646I2yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RNbgp119Gzdw9; Sat, 12 Aug 2023 22:59:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37CMx2Yv071445; Sat, 12 Aug 2023 22:59:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37CMx2eK071442; Sat, 12 Aug 2023 22:59:02 GMT (envelope-from git) Date: Sat, 12 Aug 2023 22:59:02 GMT Message-Id: <202308122259.37CMx2eK071442@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 0d5b62609e7d - main - x11-servers/xorg-server: unbreak nvidia-driver < 410 after 88b0ae2bb9c6 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d5b62609e7d66aa4f64519ba822c83498874cd0 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d5b62609e7d66aa4f64519ba822c83498874cd0 commit 0d5b62609e7d66aa4f64519ba822c83498874cd0 Author: Jan Beich AuthorDate: 2023-08-12 22:35:29 +0000 Commit: Jan Beich CommitDate: 2023-08-12 22:58:06 +0000 x11-servers/xorg-server: unbreak nvidia-driver < 410 after 88b0ae2bb9c6 Restore libglx.so -> .nvidia/libglx.so hardlink as symlink when xorg-server is reinstalled after nvidia-driver. PR: 271629 Reported by: gallatin --- x11-servers/xorg-server/Makefile | 2 +- x11-servers/xorg-server/files/pkg-post-install.in | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 9187b5e12c12..3489488c8bc4 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= xorg PORTVERSION= 21.1.8 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver diff --git a/x11-servers/xorg-server/files/pkg-post-install.in b/x11-servers/xorg-server/files/pkg-post-install.in index 118c4eb9e706..17bfe3cda643 100644 --- a/x11-servers/xorg-server/files/pkg-post-install.in +++ b/x11-servers/xorg-server/files/pkg-post-install.in @@ -2,5 +2,10 @@ PREFIX=${PKG_PREFIX-/usr/local} +if [ -e ${PKG_ROOTDIR}${PREFIX}/lib/xorg/modules/extensions/.nvidia/libglx.so ]; then +install -l rs ${PKG_ROOTDIR}${PREFIX}/lib/xorg/modules/extensions/.nvidia/libglx.so \ + ${PKG_ROOTDIR}${PREFIX}/lib/xorg/modules/extensions/libglx.so +else install -l rs ${PKG_ROOTDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/libglx.so \ ${PKG_ROOTDIR}${PREFIX}/lib/xorg/modules/extensions/libglx.so +fi