From owner-svn-ports-all@freebsd.org Fri Jan 18 17:59:43 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA33914A5D7F; Fri, 18 Jan 2019 17:59:42 +0000 (UTC) (envelope-from tijl@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 81B836B46E; Fri, 18 Jan 2019 17:59:42 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 767605E07; Fri, 18 Jan 2019 17:59:42 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0IHxgbp021010; Fri, 18 Jan 2019 17:59:42 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0IHxfSt021008; Fri, 18 Jan 2019 17:59:41 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201901181759.x0IHxfSt021008@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Fri, 18 Jan 2019 17:59:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r490644 - in branches/2019Q1/x11: nvidia-driver nvidia-driver-304 nvidia-driver-340 X-SVN-Group: ports-branches X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in branches/2019Q1/x11: nvidia-driver nvidia-driver-304 nvidia-driver-340 X-SVN-Commit-Revision: 490644 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 81B836B46E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.953,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jan 2019 17:59:43 -0000 Author: tijl Date: Fri Jan 18 17:59:41 2019 New Revision: 490644 URL: https://svnweb.freebsd.org/changeset/ports/490644 Log: MFH: r490643 Recreate symlinks instead of renaming them, so they point to the right file. PR: 226403 Submitted by: Tatu Kilappa Approved by: ports-secteam (blanket) Modified: branches/2019Q1/x11/nvidia-driver-304/Makefile branches/2019Q1/x11/nvidia-driver-340/Makefile branches/2019Q1/x11/nvidia-driver/Makefile Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/x11/nvidia-driver-304/Makefile ============================================================================== --- branches/2019Q1/x11/nvidia-driver-304/Makefile Fri Jan 18 17:52:59 2019 (r490643) +++ branches/2019Q1/x11/nvidia-driver-304/Makefile Fri Jan 18 17:59:41 2019 (r490644) @@ -3,7 +3,7 @@ DISTVERSION= 304.137 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 2 +PORTREVISION= 3 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -304 Modified: branches/2019Q1/x11/nvidia-driver-340/Makefile ============================================================================== --- branches/2019Q1/x11/nvidia-driver-340/Makefile Fri Jan 18 17:52:59 2019 (r490643) +++ branches/2019Q1/x11/nvidia-driver-340/Makefile Fri Jan 18 17:59:41 2019 (r490644) @@ -3,7 +3,7 @@ DISTVERSION= 340.107 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 2 +PORTREVISION= 3 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -340 Modified: branches/2019Q1/x11/nvidia-driver/Makefile ============================================================================== --- branches/2019Q1/x11/nvidia-driver/Makefile Fri Jan 18 17:52:59 2019 (r490643) +++ branches/2019Q1/x11/nvidia-driver/Makefile Fri Jan 18 17:59:41 2019 (r490644) @@ -12,7 +12,7 @@ PORTNAME= nvidia-driver DISTVERSION?= 390.87 # Always try to set PORTREVISION as it can be overridden by the slave ports -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11 MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} @@ -546,20 +546,24 @@ post-install: .SILENT /libEGL_nvidia\.so\.${PORTVERSION}/d;}' ${TMPPLIST} .endif ${REINPLACE_CMD} -E ${PLIST_RE:S/^/-e /} ${TMPPLIST} -# rename libGL.so, libEGL.so and libGLESv2.so - ${MV} -f ${STAGEDIR}${PREFIX}/lib/libGL.so \ +# Rename some libraries and install a libmap file to resolve conflict with +# Mesa libraries. + ${LN} -sf libGL-NVIDIA.so.1 \ ${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so ${MV} -f ${STAGEDIR}${PREFIX}/lib/libGL.so.1 \ ${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so.1 + ${RM} -f ${STAGEDIR}${PREFIX}/lib/libGL.so .if ${NVVERSION} >= 331.013 - ${MV} -f ${STAGEDIR}${PREFIX}/lib/libEGL.so \ + ${LN} -sf libEGL-NVIDIA.so.1 \ ${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so ${MV} -f ${STAGEDIR}${PREFIX}/lib/libEGL.so.1 \ ${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1 - ${MV} -f ${STAGEDIR}${PREFIX}/lib/libGLESv2.so \ + ${RM} -f ${STAGEDIR}${PREFIX}/lib/libEGL.so + ${LN} -sf libGLESv2-NVIDIA.so.2 \ ${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so ${MV} -f ${STAGEDIR}${PREFIX}/lib/libGLESv2.so.2 \ ${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2 + ${RM} -f ${STAGEDIR}${PREFIX}/lib/libGLESv2.so .endif @${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d/ ${INSTALL_DATA} ${WRKDIR}/nvidia.conf \