diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2019-01-18 17:52:59 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2019-01-18 17:52:59 +0000 |
| commit | 5ed30a038cac2cef544c67362c6fee52bda4d65b (patch) | |
| tree | 3cadfa518aa36aaac67856f9d7396495114cc174 | |
| parent | devel/libvirt-dbus: update to 1.3.0 (diff) | |
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: maintainer timeout (10 months)
Notes
Notes:
svn path=/head/; revision=490643
| -rw-r--r-- | x11/nvidia-driver-304/Makefile | 2 | ||||
| -rw-r--r-- | x11/nvidia-driver-340/Makefile | 2 | ||||
| -rw-r--r-- | x11/nvidia-driver/Makefile | 14 |
3 files changed, 11 insertions, 7 deletions
diff --git a/x11/nvidia-driver-304/Makefile b/x11/nvidia-driver-304/Makefile index e58271c8757d..5c8fd466a252 100644 --- a/x11/nvidia-driver-304/Makefile +++ b/x11/nvidia-driver-304/Makefile @@ -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 diff --git a/x11/nvidia-driver-340/Makefile b/x11/nvidia-driver-340/Makefile index 771e930c6405..9952eaad0797 100644 --- a/x11/nvidia-driver-340/Makefile +++ b/x11/nvidia-driver-340/Makefile @@ -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 diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index c405976f27ed..ec269f712aaf 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -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 \ |