Date: Fri, 18 Jan 2019 17:59:41 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> 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 Message-ID: <201901181759.x0IHxfSt021008@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <tatu.kilappa@iki.fi> 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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901181759.x0IHxfSt021008>