Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Oct 2019 08:00:21 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r515584 - in head/x11: . linux-nvidia-libs linux-nvidia-libs-304 linux-nvidia-libs-340 linux-nvidia-libs/files nvidia-driver nvidia-driver-304 nvidia-driver-340
Message-ID:  <201910250800.x9P80Luj055508@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Fri Oct 25 08:00:21 2019
New Revision: 515584
URL: https://svnweb.freebsd.org/changeset/ports/515584

Log:
  Move Linux versions of NVidia graphics libraries (OpenGL/GLX/EGL/GLES/GLVND)
  to its own ports instead of abusing the driver ports and making maintenance
  thereof a nightmare.  This is also what most, if not all, GNU/Linux distros
  do, allows to properly annotate ports with correct CATETORIES, USES, macros
  like NO_BUILD etc., and greatly simplify Makefiles and distinfo files.

Added:
  head/x11/linux-nvidia-libs/
     - copied from r515260, head/x11/nvidia-driver/
  head/x11/linux-nvidia-libs-304/
  head/x11/linux-nvidia-libs-304/Makefile   (contents, props changed)
  head/x11/linux-nvidia-libs-340/
  head/x11/linux-nvidia-libs-340/Makefile   (contents, props changed)
Deleted:
  head/x11/linux-nvidia-libs/Makefile.common
  head/x11/linux-nvidia-libs/files/
Modified:
  head/x11/Makefile
  head/x11/linux-nvidia-libs/Makefile
  head/x11/linux-nvidia-libs/distinfo
  head/x11/linux-nvidia-libs/pkg-descr
  head/x11/linux-nvidia-libs/pkg-plist
  head/x11/nvidia-driver-304/Makefile
  head/x11/nvidia-driver-340/Makefile
  head/x11/nvidia-driver/Makefile
  head/x11/nvidia-driver/pkg-plist

Modified: head/x11/Makefile
==============================================================================
--- head/x11/Makefile	Fri Oct 25 07:23:22 2019	(r515583)
+++ head/x11/Makefile	Fri Oct 25 08:00:21 2019	(r515584)
@@ -190,6 +190,9 @@
     SUBDIR += linux-c7-libxkbcommon
     SUBDIR += linux-c7-pixman
     SUBDIR += linux-c7-xorg-libs
+    SUBDIR += linux-nvidia-libs
+    SUBDIR += linux-nvidia-libs-304
+    SUBDIR += linux-nvidia-libs-340
     SUBDIR += listres
     SUBDIR += lsw
     SUBDIR += luit

Added: head/x11/linux-nvidia-libs-304/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/linux-nvidia-libs-304/Makefile	Fri Oct 25 08:00:21 2019	(r515584)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+DISTVERSION=	304.137
+# Explicitly set PORTREVISION as it can be overridden by the master port
+PORTREVISION=	0
+
+MASTERDIR=	${.CURDIR}/../linux-nvidia-libs
+PKGNAMESUFFIX=	-304
+
+.include "${MASTERDIR}/Makefile"

Added: head/x11/linux-nvidia-libs-340/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/linux-nvidia-libs-340/Makefile	Fri Oct 25 08:00:21 2019	(r515584)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+DISTVERSION=	340.107
+# Explicitly set PORTREVISION as it can be overridden by the master port
+PORTREVISION=	0
+
+MASTERDIR=	${.CURDIR}/../linux-nvidia-libs
+PKGNAMESUFFIX=	-340
+
+.include "${MASTERDIR}/Makefile"

Modified: head/x11/linux-nvidia-libs/Makefile
==============================================================================
--- head/x11/nvidia-driver/Makefile	Wed Oct 23 14:25:34 2019	(r515260)
+++ head/x11/linux-nvidia-libs/Makefile	Fri Oct 25 08:00:21 2019	(r515584)
@@ -1,94 +1,28 @@
-# Created by: Stijn Hoop <stijn@win.tue.nl>
 # $FreeBSD$
-#
-# For those wondering why this port is not under `x11-drivers' category,
-# have a look at https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=121930.
-#
-# Starting with version 1.0-7667, NVidia has dropped support for numerous
-# "legacy" GPUs.  Consult NVidia README (the Appendix) to find out whether
-# you need to use legacy driver version and install one of corresponding
-# slave ports instead (`x11/nvidia-driver-340' or `x11/nvidia-driver-304').
 
-PORTNAME=	nvidia-driver
+PORTNAME=	nvidia-libs
 DISTVERSION?=	390.87
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	3
-CATEGORIES=	x11
-MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
-DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+PORTREVISION?=	0
+CATEGORIES=	x11 linux
+MASTER_SITES=	NVIDIA/XFree86/Linux-${ARCH_SUFX}/${DISTVERSION}/
+DISTNAME=	NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION}
+EXTRACT_SUFX=	.run
+PKGNAMEPREFIX=	linux-
 
-MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	NVidia graphics card binary drivers for hardware OpenGL rendering
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	NVidia graphics libraries and programs (Linux version)
 
-LICENSE_FILE=	${WRKSRC}/doc/license.txt
+LICENSE_FILE=	${WRKSRC}/LICENSE
 .include "${.CURDIR}/../nvidia-driver/Makefile.common"
 
-USES=		kmod uidfix
-USE_XORG=	x11 xorg-server xext
-USE_GL=		gl
+USES=		linux
+USE_LINUX=	xorglibs
 USE_LDCONFIG=	yes
+NO_BUILD=	yes
 
-# NVIDIA_ROOT is not set in src/Makefile, which results in bogus -I/src
-# passed to compiler and broken build on HEAD since r221320 when option
-# -Wmissing-include-dirs was added for kernel sources.  Until properly
-# fixed upstream (across all versions, including legacy ones), use this
-# hack below to universally set NVIDIA_ROOT.  Also provide X11BASE value
-# since it is still used by legacy drivers.
-MAKE_ENV=	NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE}
 PLIST_RE=	# empty
-SUB_FILES=	pkg-deinstall pkg-install pkg-message nvidia.conf
-SUB_PATCHES=	extra-patch-src-Makefile \
-		extra-patch-src-nv-freebsd.h \
-		extra-patch-src-nv-misc.h \
-		extra-patch-src-nvidia_ctl.c \
-		extra-patch-src-nvidia_dev.c \
-		extra-patch-src-nvidia_linux.c \
-		extra-patch-src-nvidia_pci.c
-DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
-MODULESDIR=	lib/xorg/modules
-PORTDOCS=	*
 
-.if ${NVVERSION} >= 331.013
-SUB_LIST+=	NVGL=""
-.else
-SUB_LIST+=	NVGL="\# "
-.endif
-
-.if ${NVVERSION} < 355.006
-NVSRC=		.
-.else
-NVSRC=		nvidia
-.endif
-
-.if ${NVVERSION} >= 358.009
-# Initialize memory allocations to avoid spurious "lock re-initialization"
-# errors.  A little more detail can be found in bug 201340 starting around
-# comment #50.
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c
-.endif
-
-OPTIONS_DEFINE=	ACPI_PM LINUX WBINVD DOCS
-OPTIONS_DEFINE_i386=	PAE
-OPTIONS_DEFAULT=	LINUX
-OPTIONS_SUB=		yes
-
-ACPI_PM_DESC=		ACPI Power Management support
-LINUX_DESC=		Linux compatibility support
-PAE_DESC=		Physical Address Extensions support
-WBINVD_DESC=		Flush CPU caches directly with WBINVD
-
-.if ${NVVERSION} < 310.014
-OPTIONS_DEFINE+=	FREEBSD_AGP
-FREEBSD_AGP_DESC=	Use FreeBSD AGP GART driver
-.endif
-
-LINUX_MASTER_SITES=NVIDIA/XFree86/Linux-${ARCH_SUFX}/${DISTVERSION}/:linux
-LINUX_DISTFILES=NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION}.run:linux
-LINUX_USES=	linux
-LINUX_USE=	LINUX=xorglibs
-
 LINUX_LIBDIR=	/usr/lib${ARCH:S/i386//:S/amd//}
 LINUX_WRKSRC=	${WRKDIR}/NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION}
 
@@ -273,12 +207,10 @@ PLIST_RE+=	'\,${LINUXBASE}/etc/vulkan,d'
 
 PLIST_SUB+=	LINUXBASE=${LINUXBASE} \
 		LINUX_LIBDIR=${LINUX_LIBDIR} \
-		SHLIB_VERSION=${PORTVERSION} \
-		MODULESDIR=${MODULESDIR}
+		SHLIB_VERSION=${PORTVERSION}
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MLINUX}
 .if ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT} != c6
 USE_LINUX+=	libglvnd
 PLIST_RE+=	'\,${LINUXBASE}.*libEGL\.so,d' \
@@ -386,134 +318,26 @@ LINUX32_LINKS+=	libnvcuvid.so.${PORTVERSION} libnvcuvi
 PLIST_RE+=	'\,${LINUXBASE}/usr/lib/libnvcuvid\.so,d'
 .endif
 .endif
-.endif	# ${PORT_OPTIONS:MLINUX}
 
-.if ${PORT_OPTIONS:MLINUX} && ${ARCH} == amd64
+.if ${ARCH} == amd64
 PLIST_SUB+=	LINUX32=""
 .else
 PLIST_SUB+=	LINUX32="@comment "
 .endif
 
-# XXX Only needed to obtain PORTVERSION.
-.include <bsd.port.pre.mk>
-
-post-extract-LINUX-on:
+do-extract:
 	@(cd ${WRKDIR} && ${SH} \
 		${DISTDIR}/NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION}.run \
 		--extract-only > /dev/null)
 
-pre-patch:
-.for p in ${SUB_PATCHES}
-	@${SED} 's/%%NVSRC%%/${NVSRC}/g' ${PATCHDIR}/${p}.in > ${WRKDIR}/${p}
-.endfor
-.for p in ${SUB_PATCHES}
-EXTRA_PATCHES+=	${WRKDIR}/${p}
-.endfor
-
-post-patch: .SILENT
-# We should support -CURRENT: kill the check
-	${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/${NVSRC}/nv-freebsd.h
-# Adjust Linux headers #include's after FreeBSD src r246085
-	${REINPLACE_CMD} -E '/#include "machine\/\.\.\/linux(32)?\/linux.h"/ \
-		{ x ; s/.*/#include "machine\/..\/..\/compat\/linux\/linux_ioctl.h"/ ; H ; x ; }' \
-			${WRKSRC}/src/${NVSRC}/nvidia_linux.c
-# Fix bogus memset() call
-	${REINPLACE_CMD} -e '/memset/s/sizeof(ci/sizeof(*ci/' \
-		${WRKSRC}/src/${NVSRC}/nvidia_subr.c
-# Chase `sys/capability.h' rename to `sys/capsicum.h' in FreeBSD src r263232
-	${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \
-		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
-.if ${NVVERSION} >= 358.009
-	${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \
-		${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c
-.endif
-# KPI of kmem_alloc_contig(),kmem_free() changed in FreeBSD src r338143,r338318
-.if ${OSVERSION} >= 1200079
-	${REINPLACE_CMD} \
-	    -e 's/kmem_alloc_contig(kmem_arena, /kmem_alloc_contig(/' \
-	    -e 's/kmem_free(kmem_arena, /kmem_free(/' \
-		${WRKSRC}/src/${NVSRC}/nvidia_subr.c
-.endif
-# Pull the right header after FreeBSD src r347984
-.if ${OSVERSION} >= 1300029 && ${NVVERSION} >= 358.009
-	${REINPLACE_CMD} -e '/^#include/s:lock\.h:mutex.h:' \
-		${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c
-.endif
-# Disable installation of Linux libraries
-	${REINPLACE_CMD} -e 's/exists(\/.*/& \&\& 0/' \
-		${WRKSRC}/lib/Makefile
-# Do not install VDPAU libraries which are provided by `multimedia/libvdpau'
-# port for a while now
-	${REINPLACE_CMD} -e '/libvdpau[[:blank:]_][^n]/d ; \
-		s/name libvdpau/&_nvidia/' ${WRKSRC}/lib/Makefile
-# Do not build any binaries (native nvidia-settings and nvidia-xconfig are
-# provided by corresponding ports) and manual pages
-	${REINPLACE_CMD} -E 's/(extension).*/\1/' ${WRKSRC}/x11/Makefile
-	${REINPLACE_CMD} -e '/bin/d ; /man/d' ${WRKSRC}/x11/Makefile
-# Also do not install libnvidia-gtk* libraries which are for nvidia-settings
-.if ${NVVERSION} >= 346.016
-	${REINPLACE_CMD} -e '/libnvidia-gtk/d' ${WRKSRC}/lib/Makefile
-.endif
-# Adjust installation path of a conflicting file (shared between
-# nvidia-driver and xorg-server) to ease package manager work
-	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia:' \
-		${WRKSRC}/x11/extension/Makefile
-# Do not execute afterinstall target (prevent automatic module registration
-# and "smart" installation of conflicting files heuristics)
-	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's/beforeinstall/&_dontexecute/' \
-		${WRKSRC}/lib/Makefile ${WRKSRC}/src/${NVSRC}/Makefile
-# /usr/share/nvidia path is hardcoded in libGL and nvidia-settings, but we
-# won't adhere to this stupidity and install nvidia-application-profiles-*
-# files as part of documentation
-.if ${NVVERSION} >= 334.016
-	${REINPLACE_CMD} -e 's,/usr/share/nvidia,${STAGEDIR}${DOCSDIR},' \
-		${WRKSRC}/lib/libGL/Makefile ${WRKSRC}/doc/Makefile
-.endif
-# Finally, process OPTIONS
-.if ${PORT_OPTIONS:MFREEBSD_AGP}
-	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
-		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
-.endif
-.if ${PORT_OPTIONS:MACPI_PM}
-	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_ACPI_PM)/define \1/' \
-		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
-.endif
-.if ! ${PORT_OPTIONS:MLINUX}
-	${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \
-		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
-.  if ${NVVERSION} >= 358.009
-	${REINPLACE_CMD} -E 's/define (NVKMS_SUPPORT_LINUX_COMPAT)/undef \1/' \
-		${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c
-.  endif
-.endif
-.if ${PORT_OPTIONS:MPAE}
-	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_PAE)/define \1/' \
-		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
-.endif
-.if ${PORT_OPTIONS:MWBINVD}
-	${REINPLACE_CMD} -E 's/undef (NV_USE_WBINVD)/define \1/' \
-		${WRKSRC}/src/${NVSRC}/nv-freebsd.h
-.endif
-# Conditionally install documentation (but you generally want it)
-.if ! ${PORT_OPTIONS:MDOCS}
-	${REINPLACE_CMD} -E 's/(x11).*/\1/ ; /doc/d' ${WRKSRC}/Makefile
-.endif
-
-post-patch-LINUX-on:
+post-patch:
 .if ${NVVERSION} >= 384.047
 	@${SED} 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' \
 		${LINUX_WRKSRC}/nvidia_icd.json.template > \
 		${LINUX_WRKSRC}/nvidia_icd.json
 .endif
 
-pre-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${MODULESDIR}/drivers \
-		${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions
-
-post-install: .SILENT
-	${INSTALL_SCRIPT} ${WRKSRC}/obj/nvidia-bug-report.sh \
-		${STAGEDIR}${PREFIX}/bin
+do-install:
 # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
 .if ${NVVERSION} >= 304.128 && ${NVVERSION} < 310.019 || ${NVVERSION} >= 361.016
 	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/libvdpau(_trace)?\.so/d;}' \
@@ -521,9 +345,6 @@ post-install: .SILENT
 .endif
 .if ${NVVERSION} >= 310.019
 	${REINPLACE_CMD} -e '\,${LINUXBASE},!{/libXvMCNVIDIA/d;}' ${TMPPLIST}
-.else	# some applications need this symlink (see PR ports/72877)
-	${LN} -sf libXvMCNVIDIA.so.1 \
-		${STAGEDIR}${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
 .endif
 .if ${NVVERSION} < 331.013 || ${ARCH} == amd64 && ${NVVERSION} < 334.016
 	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/lib(nvidia-)?(EGL|eglcore|GLESv|glsi)/d;}' \
@@ -540,9 +361,6 @@ post-install: .SILENT
 	${REINPLACE_CMD} '\,${LINUXBASE},!s/libEGL\.so\.${PORTVERSION}/libEGL.so/' \
 		${TMPPLIST}
 .endif
-.if ${NVVERSION} < 358.009
-	${REINPLACE_CMD} '/nvidia-modeset.ko/d' ${TMPPLIST}
-.endif
 .if ${NVVERSION} >= 361.028
 	${REINPLACE_CMD} -E '\,${LINUXBASE},!{/(EGL_nvidia\.so|GLESv[12](_CM)?(\.so\.[0-9]+\.[0-9]+))$$/d;}' \
 		${TMPPLIST}
@@ -551,30 +369,6 @@ post-install: .SILENT
 		/libEGL_nvidia\.so\.${PORTVERSION}/d;}' ${TMPPLIST}
 .endif
 	${REINPLACE_CMD} -E ${PLIST_RE:S/^/-e /} ${TMPPLIST}
-# 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
-	${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
-	${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 \
-		${STAGEDIR}${PREFIX}/etc/libmap.d/
-
-post-install-LINUX-on:
 .for f d in ${LINUX_DATA}
 	${MKDIR} ${STAGEDIR}${LINUXBASE}${d}
 	${INSTALL_DATA} ${LINUX_WRKSRC}/${f} ${STAGEDIR}${LINUXBASE}${d}

Modified: head/x11/linux-nvidia-libs/distinfo
==============================================================================
--- head/x11/nvidia-driver/distinfo	Wed Oct 23 14:25:34 2019	(r515260)
+++ head/x11/linux-nvidia-libs/distinfo	Fri Oct 25 08:00:21 2019	(r515584)
@@ -1,25 +1,13 @@
 TIMESTAMP = 1482026038
-SHA256 (NVIDIA-FreeBSD-x86_64-390.87.tar.gz) = 221c80982378a333f541646d5d2030c72311c491f5a0f98b93fdd95cd5be11fc
-SIZE (NVIDIA-FreeBSD-x86_64-390.87.tar.gz) = 63648591
 SHA256 (NVIDIA-Linux-x86_64-390.87.run) = 38290a0b19e86037112f22397e02be9cdd6bcd677dd926b2977bbd49119e611e
 SIZE (NVIDIA-Linux-x86_64-390.87.run) = 82690871
-SHA256 (NVIDIA-FreeBSD-x86-390.87.tar.gz) = a2e61b0c541aa9bdcde7de43cd88a7ce5ff3de9fdafe60fa7d6e10942186d7d4
-SIZE (NVIDIA-FreeBSD-x86-390.87.tar.gz) = 64326801
 SHA256 (NVIDIA-Linux-x86-390.87.run) = 5c29c5f9d80a07ea71219c6323fe5fc9b7577847b970f23161685d4b890b9966
 SIZE (NVIDIA-Linux-x86-390.87.run) = 47959124
-SHA256 (NVIDIA-FreeBSD-x86_64-340.107.tar.gz) = 047efae28cc81e4d56c64d2a0c15d9b7ff07f09bba22696464de8276334a4df7
-SIZE (NVIDIA-FreeBSD-x86_64-340.107.tar.gz) = 61179967
 SHA256 (NVIDIA-Linux-x86_64-340.107.run) = e3e359964ed568008584c4fb2dbcb76b76a848591d1456a783e94dd0c7f6695f
 SIZE (NVIDIA-Linux-x86_64-340.107.run) = 70233686
-SHA256 (NVIDIA-FreeBSD-x86-340.107.tar.gz) = 1978ae48512d8a693979b153463c76954d2aec91a6b2a568b3aa1198e5b3d199
-SIZE (NVIDIA-FreeBSD-x86-340.107.tar.gz) = 60305952
 SHA256 (NVIDIA-Linux-x86-340.107.run) = 8d8bd2b04019eaa55d848534e2dbdc460be918e7731ecd8da87199ef9c1a0856
 SIZE (NVIDIA-Linux-x86-340.107.run) = 39016798
-SHA256 (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 231693189e1bdf5c1dd02315cde5ef9ed6c0854564314438f2f40f9788a34120
-SIZE (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 36474676
 SHA256 (NVIDIA-Linux-x86_64-304.137.run) = eb1f56db3a2bea13e3ccde7b5ae14abe8cd6c6dbe69af4c71c68a623cc96e3e2
 SIZE (NVIDIA-Linux-x86_64-304.137.run) = 70087133
-SHA256 (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 5f874133853eacc5b9a10311cec22d3c4898db7f75b92bb6c12d5be5126516fb
-SIZE (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 35399011
 SHA256 (NVIDIA-Linux-x86-304.137.run) = ca98379fc2090bdfe8b74113d6ac7bcc7eadbd86a489c3c4ec4cd5ba9f6064f8
 SIZE (NVIDIA-Linux-x86-304.137.run) = 41504115

Modified: head/x11/linux-nvidia-libs/pkg-descr
==============================================================================
--- head/x11/nvidia-driver/pkg-descr	Wed Oct 23 14:25:34 2019	(r515260)
+++ head/x11/linux-nvidia-libs/pkg-descr	Fri Oct 25 08:00:21 2019	(r515584)
@@ -1,4 +1,4 @@
-These are the official NVidia binary drivers for hardware OpenGL rendering
-in X11, using the GLX extensions.
+These are the Linux versions of common NVidia OpenGL/GLX/EGL/GLES/GLVND
+libraries and Vulkan ICD.
 
 WWW: https://www.nvidia.com/object/unix.html

Modified: head/x11/linux-nvidia-libs/pkg-plist
==============================================================================
--- head/x11/nvidia-driver/pkg-plist	Wed Oct 23 14:25:34 2019	(r515260)
+++ head/x11/linux-nvidia-libs/pkg-plist	Fri Oct 25 08:00:21 2019	(r515584)
@@ -1,49 +1,13 @@
-bin/nvidia-bug-report.sh
-bin/nvidia-debugdump
-bin/nvidia-smi
-etc/libmap.d/nvidia.conf
-lib/libGL-NVIDIA.so
-lib/libGL-NVIDIA.so.1
-lib/libEGL-NVIDIA.so
-lib/libEGL-NVIDIA.so.1
-lib/libGLESv1_CM.so
-lib/libGLESv1_CM.so.1
-lib/libGLESv2-NVIDIA.so
-lib/libGLESv2-NVIDIA.so.2
-lib/libXvMCNVIDIA.a
-lib/libXvMCNVIDIA.so
-lib/libXvMCNVIDIA.so.1
-lib/libXvMCNVIDIA_dynamic.so.1
-lib/libnvidia-cfg.so
-lib/libnvidia-cfg.so.1
-lib/libnvidia-eglcore.so
-lib/libnvidia-eglcore.so.1
-lib/libnvidia-glcore.so
-lib/libnvidia-glcore.so.1
-lib/libnvidia-glsi.so
-lib/libnvidia-glsi.so.1
-lib/libnvidia-ml.so
-lib/libnvidia-ml.so.1
-lib/libnvidia-tls.so
-lib/libnvidia-tls.so.1
-lib/libvdpau_nvidia.so
-lib/vdpau/libvdpau_nvidia.so.1
-man/man1/nvidia-smi.1.gz
-%%MODULESDIR%%/drivers/nvidia_drv.so
-%%MODULESDIR%%/extensions/.nvidia/libglx.so
-%%MODULESDIR%%/extensions/.nvidia/libglx.so.1
-/%%KMODDIR%%/nvidia.ko
-/%%KMODDIR%%/nvidia-modeset.ko
-%%LINUX%%%%LINUXBASE%%/etc/OpenCL/vendors/nvidia.icd
-%%LINUX%%%%LINUXBASE%%/etc/vulkan/icd.d/nvidia_icd.json
-%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-bug-report.sh
-%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-cuda-mps-control
-%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-cuda-mps-server
-%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-debugdump
-%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-persistenced
-%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-settings
-%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-smi
-%%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-xconfig
+%%LINUXBASE%%/etc/OpenCL/vendors/nvidia.icd
+%%LINUXBASE%%/etc/vulkan/icd.d/nvidia_icd.json
+%%LINUXBASE%%/usr/bin/nvidia-bug-report.sh
+%%LINUXBASE%%/usr/bin/nvidia-cuda-mps-control
+%%LINUXBASE%%/usr/bin/nvidia-cuda-mps-server
+%%LINUXBASE%%/usr/bin/nvidia-debugdump
+%%LINUXBASE%%/usr/bin/nvidia-persistenced
+%%LINUXBASE%%/usr/bin/nvidia-settings
+%%LINUXBASE%%/usr/bin/nvidia-smi
+%%LINUXBASE%%/usr/bin/nvidia-xconfig
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL.so.X
 %%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libEGL.so.1.0.0 ] || ln -sf libEGL.so.1.0.0 %%LINUXBASE%%/usr/lib/libEGL.so.1
@@ -105,110 +69,110 @@ man/man1/nvidia-smi.1.gz
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libvdpau_nvidia.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/tls/libnvidia-tls.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/vdpau/libvdpau_nvidia.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.X
-%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1.0.0 ] || ln -sf libEGL.so.1.0.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1
-%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1.1.0 ] || ln -sf libEGL.so.1.1.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL_nvidia.so.0
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL_nvidia.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.X
-%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1.2.0 ] || ln -sf libGL.so.1.2.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1
-%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1.7.0 ] || ln -sf libGL.so.1.7.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.X
-%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.1.2.0 ] || ln -sf libGLESv1_CM.so.1.2.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM_nvidia.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM_nvidia.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.2
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.X
-%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.2.1.0 ] || ln -sf libGLESv2.so.2.1.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.2
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2_nvidia.so.2
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2_nvidia.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX.so.0
-%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX.so.0.0.0 ] || ln -sf libGLX.so.0.0.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX.so.0
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX_indirect.so.0
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX_nvidia.so.0
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX_nvidia.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLdispatch.so.0
-%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLdispatch.so.0.0.0 ] || ln -sf libGLdispatch.so.0.0.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLdispatch.so.0
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libOpenGL.so.0
-%%LINUX%%@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libOpenGL.so.0.0.0 ] || ln -sf libOpenGL.so.0.0.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libOpenGL.so.0
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libXvMCNVIDIA.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libXvMCNVIDIA_dynamic.so
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libXvMCNVIDIA_dynamic.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libcuda.so
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libcuda.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libcuda.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-compiler.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-wayland.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-wayland.so.X
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-eglcore.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fatbinaryloader.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glcore.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glsi.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk2.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk3.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opencl.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opencl.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so.1
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-tls.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libvdpau_nvidia.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/tls/libnvidia-tls.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/vdpau/libvdpau_nvidia.so.1
-%%LINUX%%%%LINUXBASE%%/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json
-%%LINUX%%%%LINUXBASE%%/usr/share/glvnd/egl_vendor.d/10_nvidia.json
-%%LINUX%%%%LINUXBASE%%/usr/share/man/man1/nvidia-cuda-mps-control.1.gz
-%%LINUX%%%%LINUXBASE%%/usr/share/man/man1/nvidia-persistenced.1.gz
-%%LINUX%%%%LINUXBASE%%/usr/share/man/man1/nvidia-settings.1.gz
-%%LINUX%%%%LINUXBASE%%/usr/share/man/man1/nvidia-smi.1.gz
-%%LINUX%%%%LINUXBASE%%/usr/share/man/man1/nvidia-xconfig.1.gz
-%%LINUX%%%%LINUXBASE%%/usr/share/nvidia/monitoring.conf
-%%LINUX%%%%LINUXBASE%%/usr/share/nvidia/nvidia-application-profiles-%%SHLIB_VERSION%%-key-documentation
-%%LINUX%%%%LINUXBASE%%/usr/share/nvidia/nvidia-application-profiles-%%SHLIB_VERSION%%-rc
-%%LINUX%%%%LINUXBASE%%/usr/share/nvidia/pci.ids
-%%LINUX%%@postexec %%LINUXBASE%%/sbin/ldconfig
-%%LINUX%%@postunexec %%LINUXBASE%%/sbin/ldconfig
-%%LINUX%%@dir %%LINUXBASE%%/etc/OpenCL/vendors
-%%LINUX%%@dir %%LINUXBASE%%/etc/OpenCL
-%%LINUX%%@dir %%LINUXBASE%%/etc/vulkan/icd.d
-%%LINUX%%@dir %%LINUXBASE%%/etc/vulkan
-%%LINUX%%@dir %%LINUXBASE%%/etc
-%%LINUX%%@dir %%LINUXBASE%%/usr/bin
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.X
+@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1.0.0 ] || ln -sf libEGL.so.1.0.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1
+@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1.1.0 ] || ln -sf libEGL.so.1.1.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL_nvidia.so.0
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL_nvidia.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.X
+@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1.2.0 ] || ln -sf libGL.so.1.2.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1
+@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1.7.0 ] || ln -sf libGL.so.1.7.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.X
+@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.1.2.0 ] || ln -sf libGLESv1_CM.so.1.2.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM_nvidia.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv1_CM_nvidia.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.2
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.X
+@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.2.1.0 ] || ln -sf libGLESv2.so.2.1.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2.so.2
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2_nvidia.so.2
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLESv2_nvidia.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX.so.0
+@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX.so.0.0.0 ] || ln -sf libGLX.so.0.0.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX.so.0
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX_indirect.so.0
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX_nvidia.so.0
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLX_nvidia.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLdispatch.so.0
+@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLdispatch.so.0.0.0 ] || ln -sf libGLdispatch.so.0.0.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGLdispatch.so.0
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libOpenGL.so.0
+@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libOpenGL.so.0.0.0 ] || ln -sf libOpenGL.so.0.0.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libOpenGL.so.0
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libXvMCNVIDIA.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libXvMCNVIDIA_dynamic.so
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libXvMCNVIDIA_dynamic.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libcuda.so
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libcuda.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libcuda.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-compiler.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-wayland.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-egl-wayland.so.X
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-eglcore.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fatbinaryloader.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glcore.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glsi.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk2.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk3.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opencl.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opencl.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so.1
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-tls.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/libvdpau_nvidia.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/tls/libnvidia-tls.so.%%SHLIB_VERSION%%
+%%LINUXBASE%%%%LINUX_LIBDIR%%/vdpau/libvdpau_nvidia.so.1
+%%LINUXBASE%%/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json
+%%LINUXBASE%%/usr/share/glvnd/egl_vendor.d/10_nvidia.json
+%%LINUXBASE%%/usr/share/man/man1/nvidia-cuda-mps-control.1.gz
+%%LINUXBASE%%/usr/share/man/man1/nvidia-persistenced.1.gz
+%%LINUXBASE%%/usr/share/man/man1/nvidia-settings.1.gz
+%%LINUXBASE%%/usr/share/man/man1/nvidia-smi.1.gz
+%%LINUXBASE%%/usr/share/man/man1/nvidia-xconfig.1.gz
+%%LINUXBASE%%/usr/share/nvidia/monitoring.conf
+%%LINUXBASE%%/usr/share/nvidia/nvidia-application-profiles-%%SHLIB_VERSION%%-key-documentation
+%%LINUXBASE%%/usr/share/nvidia/nvidia-application-profiles-%%SHLIB_VERSION%%-rc
+%%LINUXBASE%%/usr/share/nvidia/pci.ids
+@postexec %%LINUXBASE%%/sbin/ldconfig
+@postunexec %%LINUXBASE%%/sbin/ldconfig
+@dir %%LINUXBASE%%/etc/OpenCL/vendors
+@dir %%LINUXBASE%%/etc/OpenCL
+@dir %%LINUXBASE%%/etc/vulkan/icd.d
+@dir %%LINUXBASE%%/etc/vulkan
+@dir %%LINUXBASE%%/etc
+@dir %%LINUXBASE%%/usr/bin
 %%LINUX32%%@dir %%LINUXBASE%%/usr/lib/tls
 %%LINUX32%%@dir %%LINUXBASE%%/usr/lib/vdpau
 %%LINUX32%%@dir %%LINUXBASE%%/usr/lib
-%%LINUX%%@dir %%LINUXBASE%%%%LINUX_LIBDIR%%/tls
-%%LINUX%%@dir %%LINUXBASE%%%%LINUX_LIBDIR%%/vdpau
-%%LINUX%%@dir %%LINUXBASE%%%%LINUX_LIBDIR%%
-%%LINUX%%@dir %%LINUXBASE%%/usr/share/egl/egl_external_platform.d
-%%LINUX%%@dir %%LINUXBASE%%/usr/share/egl
-%%LINUX%%@dir %%LINUXBASE%%/usr/share/glvnd/egl_vendor.d
-%%LINUX%%@dir %%LINUXBASE%%/usr/share/glvnd
-%%LINUX%%@dir %%LINUXBASE%%/usr/share/man/man1
-%%LINUX%%@dir %%LINUXBASE%%/usr/share/man
-%%LINUX%%@dir %%LINUXBASE%%/usr/share/nvidia
-%%LINUX%%@dir %%LINUXBASE%%/usr/share
-%%LINUX%%@dir %%LINUXBASE%%/usr
-%%LINUX%%@dir %%LINUXBASE%%
-%%LINUX%%@dir /compat
+@dir %%LINUXBASE%%%%LINUX_LIBDIR%%/tls
+@dir %%LINUXBASE%%%%LINUX_LIBDIR%%/vdpau
+@dir %%LINUXBASE%%%%LINUX_LIBDIR%%
+@dir %%LINUXBASE%%/usr/share/egl/egl_external_platform.d
+@dir %%LINUXBASE%%/usr/share/egl
+@dir %%LINUXBASE%%/usr/share/glvnd/egl_vendor.d
+@dir %%LINUXBASE%%/usr/share/glvnd
+@dir %%LINUXBASE%%/usr/share/man/man1
+@dir %%LINUXBASE%%/usr/share/man
+@dir %%LINUXBASE%%/usr/share/nvidia
+@dir %%LINUXBASE%%/usr/share
+@dir %%LINUXBASE%%/usr
+@dir %%LINUXBASE%%
+@dir /compat

Modified: head/x11/nvidia-driver-304/Makefile
==============================================================================
--- head/x11/nvidia-driver-304/Makefile	Fri Oct 25 07:23:22 2019	(r515583)
+++ head/x11/nvidia-driver-304/Makefile	Fri Oct 25 08:00:21 2019	(r515584)
@@ -3,7 +3,7 @@
 
 DISTVERSION=	304.137
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	4
+PORTREVISION=	5
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-304

Modified: head/x11/nvidia-driver-340/Makefile
==============================================================================
--- head/x11/nvidia-driver-340/Makefile	Fri Oct 25 07:23:22 2019	(r515583)
+++ head/x11/nvidia-driver-340/Makefile	Fri Oct 25 08:00:21 2019	(r515584)
@@ -3,7 +3,7 @@
 
 DISTVERSION=	340.107
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	4
+PORTREVISION=	5
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-340

Modified: head/x11/nvidia-driver/Makefile
==============================================================================
--- head/x11/nvidia-driver/Makefile	Fri Oct 25 07:23:22 2019	(r515583)
+++ head/x11/nvidia-driver/Makefile	Fri Oct 25 08:00:21 2019	(r515584)
@@ -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?=	3
+PORTREVISION?=	4
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
@@ -37,7 +37,6 @@ USE_LDCONFIG=	yes
 # hack below to universally set NVIDIA_ROOT.  Also provide X11BASE value
 # since it is still used by legacy drivers.
 MAKE_ENV=	NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE}
-PLIST_RE=	# empty
 SUB_FILES=	pkg-deinstall pkg-install pkg-message nvidia.conf
 SUB_PATCHES=	extra-patch-src-Makefile \
 		extra-patch-src-nv-freebsd.h \
@@ -71,8 +70,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_nvidia-mod
 
 OPTIONS_DEFINE=	ACPI_PM LINUX WBINVD DOCS
 OPTIONS_DEFINE_i386=	PAE
-OPTIONS_DEFAULT=	LINUX
-OPTIONS_SUB=		yes
+#OPTIONS_DEFAULT=	LINUX
 
 ACPI_PM_DESC=		ACPI Power Management support
 LINUX_DESC=		Linux compatibility support
@@ -84,324 +82,10 @@ OPTIONS_DEFINE+=	FREEBSD_AGP
 FREEBSD_AGP_DESC=	Use FreeBSD AGP GART driver
 .endif
 
-LINUX_MASTER_SITES=NVIDIA/XFree86/Linux-${ARCH_SUFX}/${DISTVERSION}/:linux
-LINUX_DISTFILES=NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION}.run:linux
-LINUX_USES=	linux
-LINUX_USE=	LINUX=xorglibs
+PLIST_SUB+=	MODULESDIR=${MODULESDIR}
 
-LINUX_LIBDIR=	/usr/lib${ARCH:S/i386//:S/amd//}
-LINUX_WRKSRC=	${WRKDIR}/NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION}
-
-LINUX_LIBS=	libcuda.so.${PORTVERSION} \
-		libnvcuvid.so.${PORTVERSION} \
-		libnvidia-cfg.so.${PORTVERSION} \
-		libnvidia-compiler.so.${PORTVERSION} \
-		libnvidia-glcore.so.${PORTVERSION} \
-		libnvidia-ml.so.${PORTVERSION} \
-		libnvidia-opencl.so.${PORTVERSION} \
-		libnvidia-tls.so.${PORTVERSION} \
-		libvdpau_nvidia.so.${PORTVERSION} \
-		tls/libnvidia-tls.so.${PORTVERSION}
-LINUX_LINKS=	libcuda.so.${PORTVERSION} libcuda.so.1 \
-		libcuda.so.${PORTVERSION} libcuda.so \
-		libnvcuvid.so.${PORTVERSION} libnvcuvid.so.1 \
-		libnvcuvid.so.${PORTVERSION} libnvcuvid.so \
-		libnvidia-cfg.so.${PORTVERSION} libnvidia-cfg.so.1 \
-		libnvidia-cfg.so.${PORTVERSION} libnvidia-cfg.so \
-		libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so.1 \
-		libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so \
-		libnvidia-opencl.so.${PORTVERSION} libnvidia-opencl.so.1 \
-		libvdpau_nvidia.so.${PORTVERSION} vdpau/libvdpau_nvidia.so.1
-LINUX32_LIBS=	libcuda.so.${PORTVERSION} \
-		libnvidia-compiler.so.${PORTVERSION} \
-		libnvidia-glcore.so.${PORTVERSION} \
-		libnvidia-ml.so.${PORTVERSION} \
-		libnvidia-opencl.so.${PORTVERSION} \
-		libnvidia-tls.so.${PORTVERSION} \
-		libvdpau_nvidia.so.${PORTVERSION} \
-		tls/libnvidia-tls.so.${PORTVERSION}
-LINUX32_LINKS=	libcuda.so.${PORTVERSION} libcuda.so.1 \
-		libcuda.so.${PORTVERSION} libcuda.so \
-		libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so.1 \
-		libnvidia-ml.so.${PORTVERSION} libnvidia-ml.so \
-		libnvidia-opencl.so.${PORTVERSION} libnvidia-opencl.so.1 \
-		libvdpau_nvidia.so.${PORTVERSION} vdpau/libvdpau_nvidia.so.1
-LINUX_PROGS=	nvidia-debugdump nvidia-settings nvidia-smi nvidia-xconfig
-LINUX_MANS=	nvidia-settings nvidia-smi nvidia-xconfig
-LINUX_DATA=	nvidia.icd /etc/OpenCL/vendors
-.if ${NVVERSION} >= 375.010
-LINUX_DATA+=	10_nvidia.json /usr/share/glvnd/egl_vendor.d
-.else
-PLIST_RE+=	'\,${LINUXBASE}/usr/share/glvnd,d'
-.endif
-.if ${NVVERSION} >= 378.009
-LINUX_DATA+=	10_nvidia_wayland.json /usr/share/egl/egl_external_platform.d
-.else
-PLIST_RE+=	'\,${LINUXBASE}/usr/share/egl,d'
-.endif
-.if ${NVVERSION} >= 361.016
-LINUX_LIBS+=	libEGL_nvidia.so.${PORTVERSION}
-LINUX_LINKS+=	libEGL_nvidia.so.${PORTVERSION} libEGL_nvidia.so.0
-LINUX32_LIBS+=	libEGL_nvidia.so.${PORTVERSION}
-LINUX32_LINKS+=	libEGL_nvidia.so.${PORTVERSION} libEGL_nvidia.so.0
-.elif ${NVVERSION} >= 355.006
-LINUX_LIBS+=	libEGL_nvidia.so.0
-PLIST_RE+=	'\,${LINUXBASE}.*libEGL_nvidia\.so\.${PORTVERSION},d'
-.else
-PLIST_RE+=	'\,${LINUXBASE}.*libEGL_nvidia\.so,d'
-.endif
-.if ${NVVERSION} >= 361.016
-LINUX_LIBS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} \
-		libGLESv2_nvidia.so.${PORTVERSION} \
-		libGLX_nvidia.so.${PORTVERSION} \
-		libnvidia-fatbinaryloader.so.${PORTVERSION} \
-		libnvidia-ptxjitcompiler.so.${PORTVERSION}
-LINUX_LINKS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \
-		libGLESv2_nvidia.so.${PORTVERSION} libGLESv2_nvidia.so.2 \
-		libGLX_nvidia.so.${PORTVERSION} libGLX_nvidia.so.0 \
-		libGLX_nvidia.so.${PORTVERSION} libGLX_indirect.so.0 \
-		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so.1 \
-		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so
-LINUX32_LIBS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} \
-		libGLESv2_nvidia.so.${PORTVERSION} \
-		libGLX_nvidia.so.${PORTVERSION} \
-		libnvidia-fatbinaryloader.so.${PORTVERSION} \
-		libnvidia-ptxjitcompiler.so.${PORTVERSION}
-LINUX32_LINKS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \
-		libGLESv2_nvidia.so.${PORTVERSION} libGLESv2_nvidia.so.2 \
-		libGLX_nvidia.so.${PORTVERSION} libGLX_nvidia.so.0 \
-		libGLX_nvidia.so.${PORTVERSION} libGLX_indirect.so.0 \
-		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so.1 \
-		libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so
-.else
-PLIST_RE+=	'\,${LINUXBASE}.*libGLESv(1_CM|2)_nvidia\.so,d' \
-		'\,${LINUXBASE}.*libGLX_(nvidia|indirect)\.so,d' \
-		'\,${LINUXBASE}.*libnvidia-fatbinaryloader\.so,d' \
-		'\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d'
-.endif
-.if ${NVVERSION} >= 387.012
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.2
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.2 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.2/'
-.elif ${NVVERSION} >= 378.013
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.1
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.1 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.1/'
-.elif ${NVVERSION} >= 378.009
-LINUX_LIBS+=	libnvidia-egl-wayland.so.1.0.0
-LINUX_LINKS+=	libnvidia-egl-wayland.so.1.0.0 libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.0.0/'
-.elif ${NVVERSION} >= 364.012
-LINUX_LIBS+=	libnvidia-egl-wayland.so.${PORTVERSION}
-LINUX_LINKS+=	libnvidia-egl-wayland.so.${PORTVERSION} libnvidia-egl-wayland.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.${PORTVERSION}/'
-.else
-PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-egl-wayland\.so,d'
-.endif
-.if ${NVVERSION} >= 331.013
-LINUX_LIBS+=	libnvidia-eglcore.so.${PORTVERSION} \
-		libnvidia-fbc.so.${PORTVERSION} \
-		libnvidia-glsi.so.${PORTVERSION} \
-		libnvidia-ifr.so.${PORTVERSION}
-LINUX_LINKS+=	libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so.1 \
-		libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so \
-		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
-		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
-LINUX32_LIBS+=	libnvidia-eglcore.so.${PORTVERSION} \
-		libnvidia-fbc.so.${PORTVERSION} \
-		libnvidia-glsi.so.${PORTVERSION} \
-		libnvidia-ifr.so.${PORTVERSION}
-LINUX32_LINKS+=	libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so.1 \
-		libnvidia-fbc.so.${PORTVERSION} libnvidia-fbc.so \
-		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so.1 \
-		libnvidia-ifr.so.${PORTVERSION} libnvidia-ifr.so
-.else
-PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-(eglcore|fbc|glsi|ifr),d'
-.endif
-.if ${NVVERSION} >= 310.014
-LINUX_LIBS+=	libnvidia-encode.so.${PORTVERSION}
-LINUX_LINKS+=	libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so.1 \
-		libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so
-LINUX32_LIBS+=	libnvidia-encode.so.${PORTVERSION}
-LINUX32_LINKS+=	libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so.1 \
-		libnvidia-encode.so.${PORTVERSION} libnvidia-encode.so
-PLIST_RE+=	'\,${LINUXBASE}.*libXvMCNVIDIA,d'
-.else
-LINUX_LIBS+=	libXvMCNVIDIA.so.${PORTVERSION}
-LINUX_LINKS+=	libXvMCNVIDIA.so.${PORTVERSION} libXvMCNVIDIA_dynamic.so.1 \
-		libXvMCNVIDIA.so.${PORTVERSION} libXvMCNVIDIA_dynamic.so
-PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-encode,d'
-.endif
-.if ${NVVERSION} >= 346.016
-LINUX_LIBS+=	libnvidia-gtk2.so.${PORTVERSION} \
-		libnvidia-gtk3.so.${PORTVERSION}
-.else
-PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-gtk(2|3)\.so,d'
-.endif
-.if ${NVVERSION} >= 331.049 && ${NVVERSION} < 352.009
-LINUX_DATA+=	monitoring.conf /usr/share/nvidia \
-		${WRKSRC}/pci.ids /usr/share/nvidia
-.else
-PLIST_RE+=	'\,${LINUXBASE}.*monitoring\.conf,d' \
-		'\,${LINUXBASE}.*pci\.ids,d'
-.endif
-.if ${NVVERSION} >= 334.016
-LINUX_DATA+=	nvidia-application-profiles-${PORTVERSION}-key-documentation /usr/share/nvidia
-.else
-PLIST_RE+=	'\,${LINUXBASE}.*application-profiles-${PORTVERSION}-key-documentation,d'
-.endif
-.if ${NVVERSION} >= 319.012
-LINUX_DATA+=	nvidia-application-profiles-${PORTVERSION}-rc /usr/share/nvidia
-.else
-PLIST_RE+=	'\,${LINUXBASE}.*share/nvidia,d'
-.endif
-.if ${NVVERSION} >= 319.017
-LINUX_PROGS+=	nvidia-cuda-mps-control nvidia-cuda-mps-server \
-		nvidia-persistenced
-LINUX_MANS+=	nvidia-cuda-mps-control nvidia-persistenced
-.else
-LINUX_PROGS+=	nvidia-cuda-proxy-control nvidia-cuda-proxy-server
-LINUX_MANS+=	nvidia-cuda-proxy-control
-PLIST_RE+=	'\,${LINUXBASE},s/cuda-mps/cuda-proxy/' \
-		'\,${LINUXBASE}.*nvidia-persistenced,d'
-.endif
-.if ${NVVERSION} >= 364.012
-LINUX_DATA+=	nvidia_icd.json /etc/vulkan/icd.d
-.else
-PLIST_RE+=	'\,${LINUXBASE}/etc/vulkan,d'
-.endif
-
-PLIST_SUB+=	LINUXBASE=${LINUXBASE} \
-		LINUX_LIBDIR=${LINUX_LIBDIR} \
-		SHLIB_VERSION=${PORTVERSION} \
-		MODULESDIR=${MODULESDIR}
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLINUX}
-.if ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT} != c6
-USE_LINUX+=	libglvnd
-PLIST_RE+=	'\,${LINUXBASE}.*libEGL\.so,d' \
-		'\,${LINUXBASE}.*libGL\.so,d' \
-		'\,${LINUXBASE}.*libGLESv(1_CM|2)\.so,d' \
-		'\,${LINUXBASE}.*libGLX\.so,d' \
-		'\,${LINUXBASE}.*libGLdispatch\.so,d' \
-		'\,${LINUXBASE}.*libOpenGL\.so,d'
-.else
-.if ${NVVERSION} >= 390.042
-LINUX_LIBS+=	libEGL.so.1.1.0
-LINUX_LINKS+=	libEGL.so.1.1.0 libEGL.so.1
-LINUX32_LIBS+=	libEGL.so.1.1.0
-LINUX32_LINKS+=	libEGL.so.1.1.0 libEGL.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libEGL\.so)\.X/\1.1.1.0/'
-.elif ${NVVERSION} >= 355.006
-LINUX_LIBS+=	libEGL.so.1
-LINUX32_LIBS+=	libEGL.so.1
-PLIST_RE+=	'\,${LINUXBASE}.*libEGL\.so\.X,d'
-.elif ${NVVERSION} >= 331.013
-LINUX_LIBS+=	libEGL.so.${PORTVERSION}
-LINUX_LINKS+=	libEGL.so.${PORTVERSION} libEGL.so.1
-LINUX32_LIBS+=	libEGL.so.${PORTVERSION}
-LINUX32_LINKS+=	libEGL.so.${PORTVERSION} libEGL.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libEGL\.so)\.X/\1.${PORTVERSION}/'
-.else
-PLIST_RE+=	'\,${LINUXBASE}.*libEGL\.so,d'
-.endif
-.if ${NVVERSION} >= 390.042
-LINUX_LIBS+=	libGL.so.1.7.0
-LINUX_LINKS+=	libGL.so.1.7.0 libGL.so.1
-LINUX32_LIBS+=	libGL.so.1.7.0
-LINUX32_LINKS+=	libGL.so.1.7.0 libGL.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libGL\.so)\.X/\1.1.7.0/'
-.elif ${NVVERSION} >= 361.028
-LINUX_LIBS+=	libGL.so.1.0.0
-LINUX_LINKS+=	libGL.so.1.0.0 libGL.so.1
-LINUX32_LIBS+=	libGL.so.1.0.0
-LINUX32_LINKS+=	libGL.so.1.0.0 libGL.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libGL\.so)\.X/\1.1.0.0/'
-.elif ${NVVERSION} >= 361.016
-LINUX_LIBS+=	libGL.so.1
-LINUX32_LIBS+=	libGL.so.1
-PLIST_RE+=	'\,${LINUXBASE}.*libGL\.so\.X,d'
-.else
-LINUX_LIBS+=	libGL.so.${PORTVERSION}
-LINUX_LINKS+=	libGL.so.${PORTVERSION} libGL.so.1
-LINUX32_LIBS+=	libGL.so.${PORTVERSION}
-LINUX32_LINKS+=	libGL.so.${PORTVERSION} libGL.so.1
-PLIST_RE+=	'\,${LINUXBASE},s/(libGL\.so)\.X/\1.${PORTVERSION}/'
-.endif
-.if ${NVVERSION} >= 390.042
-LINUX_LIBS+=	libGLESv1_CM.so.1.2.0 \
-		libGLESv2.so.2.1.0
-LINUX_LINKS+=	libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1 \
-		libGLESv2.so.2.1.0 libGLESv2.so.2
-LINUX32_LIBS+=	libGLESv1_CM.so.1.2.0 \
-		libGLESv2.so.2.1.0
-LINUX32_LINKS+=	libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1 \
-		libGLESv2.so.2.1.0 libGLESv2.so.2
-PLIST_RE+=	'\,${LINUXBASE},s/(libGLESv1_CM\.so)\.X/\1.1.2.0/' \
-		'\,${LINUXBASE},s/(libGLESv2\.so)\.X/\1.2.1.0/'
-.elif ${NVVERSION} >= 361.016
-LINUX_LIBS+=	libGLESv1_CM.so.1 \
-		libGLESv2.so.2
-LINUX32_LIBS+=	libGLESv1_CM.so.1 \
-		libGLESv2.so.2
-PLIST_RE+=	'\,${LINUXBASE}.*GLESv(1_CM|2)\.so\.X,d'
-.elif ${NVVERSION} >= 331.013
-LINUX_LIBS+=	libGLESv1_CM.so.${PORTVERSION} \
-		libGLESv2.so.${PORTVERSION}
-LINUX_LINKS+=	libGLESv1_CM.so.${PORTVERSION} libGLESv1_CM.so.1 \
-		libGLESv2.so.${PORTVERSION} libGLESv2.so.2
-LINUX32_LIBS+=	libGLESv1_CM.so.${PORTVERSION} \
-		libGLESv2.so.${PORTVERSION}
-LINUX32_LINKS+=	libGLESv1_CM.so.${PORTVERSION} libGLESv1_CM.so.1 \
-		libGLESv2.so.${PORTVERSION} libGLESv2.so.2
-PLIST_RE+=	'\,${LINUXBASE},s/(libGLESv(1_CM|2)\.so)\.X/\1.${PORTVERSION}/'
-.else
-PLIST_RE+=	'\,${LINUXBASE}.*libGLESv(1_CM|2)\.so,d'
-.endif
-.if ${NVVERSION} >= 361.016

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910250800.x9P80Luj055508>