Update CentOS 7 ports to 7.6.1810.

This adds some new ports:
converters/linux-c7-fribidi required by x11-toolkits/linux-c7-pango.
graphics/linux-c7-libglvnd required by graphics/linux-c7-dri.
graphics/linux-c7-wayland required by graphics/linux-c7-dri.
print/linux-c7-freetype unbundled from emulators/linux_base-c7 because it
depends on graphics/linux-c7-png now.

Mesa OpenGL libraries in graphics/linux-c7-dri now support libglvnd (GL
Vendor-Neutral Dispatch library) which allows some applications to use
Mesa while others use Nvidia OpenGL.  The x11/nvidia-driver* ports have
been changed so versions above 390.42 now use CentOS libglvnd and no longer
install a bundled copy.

PR:		229431
Submitted by:	pkubaj (partly)

8 files changed, 208 insertions, 164 deletions

diff --git a/x11/linux-c7-xorg-libs/Makefile b/x11/linux-c7-xorg-libs/Makefile
index 6b92d473c03b..86f19cba6ac0 100644
--- a/x11/linux-c7-xorg-libs/Makefile
+++ b/x11/linux-c7-xorg-libs/Makefile
@@ -3,22 +3,23 @@
 
 PORTNAME=	xorg-libs
 PORTVERSION=	7.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 linux
 LIB_DISTNAMES=	libICE-1.0.9-9.el7 \
 		libSM-1.2.2-2.el7 \
-		libX11-1.6.5-1.el7 \
+		libX11-1.6.5-2.el7 \
 		libXScrnSaver-1.2.2-6.1.el7 \
 		libXau-1.0.8-2.1.el7 \
 		libXaw-1.0.13-4.el7 \
 		libXcomposite-0.4.4-4.1.el7 \
-		libXcursor-1.1.14-8.el7 \
+		libXcursor-1.1.15-1.el7 \
 		libXdamage-1.1.4-4.1.el7 \
 		libXdmcp-1.1.2-6.el7 \
 		libXevie-1.0.3-7.1.el7 \
 		libXext-1.3.3-3.el7 \
 		libXfixes-5.0.3-1.el7 \
-		libXfont-1.5.2-1.el7 \
+		libXfont-1.5.4-1.el7 \
+		libXfont2-2.0.3-1.el7 \
 		libXft-2.3.2-2.el7 \
 		libXi-1.7.9-1.el7 \
 		libXinerama-1.1.3-2.1.el7 \
@@ -27,7 +28,7 @@ LIB_DISTNAMES=	libICE-1.0.9-9.el7 \
 		libXpm-3.5.12-1.el7 \
 		libXrandr-1.5.1-2.el7 \
 		libXrender-0.9.10-1.el7 \
-		libXres-1.0.7-2.1.el7 \
+		libXres-1.2.0-1.el7 \
 		libXt-1.1.5-3.el7 \
 		libXtst-1.2.3-1.el7 \
 		libXv-1.0.11-1.el7 \
@@ -36,24 +37,24 @@ LIB_DISTNAMES=	libICE-1.0.9-9.el7 \
 		libXxf86misc-1.0.3-7.1.el7 \
 		libXxf86vm-1.1.4-1.el7 \
 		libfontenc-1.1.3-3.el7 \
-		libxcb-1.12-1.el7 \
+		libxcb-1.13-1.el7 \
 		libxkbfile-1.0.9-3.el7 \
 		libxshmfence-1.2-1.el7
-SHARE_DISTNAMES=libX11-common-1.6.5-1.el7
+SHARE_DISTNAMES=libX11-common-1.6.5-2.el7
 SRC_DISTFILES=	libICE-1.0.9-9.el7${SRC_SUFX}:SOURCE \
 		libSM-1.2.2-2.el7${SRC_SUFX}:SOURCE \
-		libX11-1.6.5-1.el7${SRC_SUFX}:SOURCE \
+		libX11-1.6.5-2.el7${SRC_SUFX}:SOURCE \
 		libXScrnSaver-1.2.2-6.1.el7${SRC_SUFX}:SOURCE \
 		libXau-1.0.8-2.1.el7${SRC_SUFX}:SOURCE \
 		libXaw-1.0.13-4.el7${SRC_SUFX}:SOURCE \
 		libXcomposite-0.4.4-4.1.el7${SRC_SUFX}:SOURCE \
-		libXcursor-1.1.14-8.el7${SRC_SUFX}:SOURCE \
+		libXcursor-1.1.15-1.el7${SRC_SUFX}:SOURCE \
 		libXdamage-1.1.4-4.1.el7${SRC_SUFX}:SOURCE \
 		libXdmcp-1.1.2-6.el7${SRC_SUFX}:SOURCE \
 		libXevie-1.0.3-7.1.el7${SRC_SUFX}:SOURCE \
 		libXext-1.3.3-3.el7${SRC_SUFX}:SOURCE \
 		libXfixes-5.0.3-1.el7${SRC_SUFX}:SOURCE \
-		libXfont-1.5.2-1.el7${SRC_SUFX}:SOURCE \
+		libXfont-1.5.4-1.el7${SRC_SUFX}:SOURCE \
 		libXft-2.3.2-2.el7${SRC_SUFX}:SOURCE \
 		libXi-1.7.9-1.el7${SRC_SUFX}:SOURCE \
 		libXinerama-1.1.3-2.1.el7${SRC_SUFX}:SOURCE \
@@ -62,7 +63,7 @@ SRC_DISTFILES=	libICE-1.0.9-9.el7${SRC_SUFX}:SOURCE \
 		libXpm-3.5.12-1.el7${SRC_SUFX}:SOURCE \
 		libXrandr-1.5.1-2.el7${SRC_SUFX}:SOURCE \
 		libXrender-0.9.10-1.el7${SRC_SUFX}:SOURCE \
-		libXres-1.0.7-2.1.el7${SRC_SUFX}:SOURCE \
+		libXres-1.2.0-1.el7${SRC_SUFX}:SOURCE \
 		libXt-1.1.5-3.el7${SRC_SUFX}:SOURCE \
 		libXtst-1.2.3-1.el7${SRC_SUFX}:SOURCE \
 		libXv-1.0.11-1.el7${SRC_SUFX}:SOURCE \
@@ -71,7 +72,7 @@ SRC_DISTFILES=	libICE-1.0.9-9.el7${SRC_SUFX}:SOURCE \
 		libXxf86misc-1.0.3-7.1.el7${SRC_SUFX}:SOURCE \
 		libXxf86vm-1.1.4-1.el7${SRC_SUFX}:SOURCE \
 		libfontenc-1.1.3-3.el7${SRC_SUFX}:SOURCE \
-		libxcb-1.12-1.el7${SRC_SUFX}:SOURCE \
+		libxcb-1.13-1.el7${SRC_SUFX}:SOURCE \
 		libxkbfile-1.0.9-3.el7${SRC_SUFX}:SOURCE \
 		libxshmfence-1.2-1.el7${SRC_SUFX}:SOURCE
 
diff --git a/x11/linux-c7-xorg-libs/distinfo b/x11/linux-c7-xorg-libs/distinfo
index ab0566b2ae2e..c2098ce7b505 100644
--- a/x11/linux-c7-xorg-libs/distinfo
+++ b/x11/linux-c7-xorg-libs/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1507319548
+TIMESTAMP = 1556540367
 SHA256 (centos/libICE-1.0.9-9.el7.i686.rpm) = efa438d37d533171e13081aba2e02c092eb44b647c4d9cef5ba4f68b8df797de
 SIZE (centos/libICE-1.0.9-9.el7.i686.rpm) = 66760
 SHA256 (centos/libICE-1.0.9-9.el7.x86_64.rpm) = d910a86326cc0434f6d3536311012f83ee3d2dbf98a350c2ca8a5329750b17ac
@@ -7,12 +7,12 @@ SHA256 (centos/libSM-1.2.2-2.el7.i686.rpm) = bbd4714d8719220c18f162575aad05a6486
 SIZE (centos/libSM-1.2.2-2.el7.i686.rpm) = 39436
 SHA256 (centos/libSM-1.2.2-2.el7.x86_64.rpm) = 3a1f996031e2a1ce991547720319eb92463d9ac667d697bb7b496bdd0722bc62
 SIZE (centos/libSM-1.2.2-2.el7.x86_64.rpm) = 40160
-SHA256 (centos/libX11-1.6.5-1.el7.i686.rpm) = a6f7fe2e3c707885b3b3c6b1a066165a42a23403a40c9e19ce8a7d311960fa90
-SIZE (centos/libX11-1.6.5-1.el7.i686.rpm) = 624876
-SHA256 (centos/libX11-1.6.5-1.el7.x86_64.rpm) = 94ddabb3ce839b7c7e3ffc69e4d6b6b1ea32f1902810eb5578b3c59c83b49376
-SIZE (centos/libX11-1.6.5-1.el7.x86_64.rpm) = 620756
-SHA256 (centos/libX11-common-1.6.5-1.el7.noarch.rpm) = 33aeab9c16b6e54cb39a427ebe145e1724e52f82f4b4d9387877e2c627605ffc
-SIZE (centos/libX11-common-1.6.5-1.el7.noarch.rpm) = 167832
+SHA256 (centos/libX11-1.6.5-2.el7.i686.rpm) = ab46f4bd7acdaf52f9c1da8e2915dfc6f9c971eb08997863f68bbd0f62732e93
+SIZE (centos/libX11-1.6.5-2.el7.i686.rpm) = 625116
+SHA256 (centos/libX11-1.6.5-2.el7.x86_64.rpm) = 546d086f7aaf2bf9435cea180553b1a97ae55ae91cfc17fb85b4bd0bf820e712
+SIZE (centos/libX11-1.6.5-2.el7.x86_64.rpm) = 620832
+SHA256 (centos/libX11-common-1.6.5-2.el7.noarch.rpm) = 936135fadd028f0a69f056a0841013e70a77b10125e04da35b875bccafb3a279
+SIZE (centos/libX11-common-1.6.5-2.el7.noarch.rpm) = 167952
 SHA256 (centos/libXScrnSaver-1.2.2-6.1.el7.i686.rpm) = 773a6a2c04a68027524553fd39f24d2b4d45edbca4ad67f6862a31fc8ce71335
 SIZE (centos/libXScrnSaver-1.2.2-6.1.el7.i686.rpm) = 24168
 SHA256 (centos/libXScrnSaver-1.2.2-6.1.el7.x86_64.rpm) = ea8e5b4a6c0c7b4d8d4c59c8839f90a81e21a7d2b80db7621777d55164c13d93
@@ -29,10 +29,10 @@ SHA256 (centos/libXcomposite-0.4.4-4.1.el7.i686.rpm) = 5b9816bcfe046d26521eac662
 SIZE (centos/libXcomposite-0.4.4-4.1.el7.i686.rpm) = 22804
 SHA256 (centos/libXcomposite-0.4.4-4.1.el7.x86_64.rpm) = 81357f494edca6c828f541cf9d229d97ac5e496fbb23a28a86535b5b9cd49a41
 SIZE (centos/libXcomposite-0.4.4-4.1.el7.x86_64.rpm) = 22792
-SHA256 (centos/libXcursor-1.1.14-8.el7.i686.rpm) = de8ec5b0e49dcb04ccff82dd6ab63dfa89af28e5a9904ba0be99ba07176579c1
-SIZE (centos/libXcursor-1.1.14-8.el7.i686.rpm) = 31340
-SHA256 (centos/libXcursor-1.1.14-8.el7.x86_64.rpm) = 26505edaed91c55e989ceb6ecc52da62e9a70a9b2c26baf1ad624b8d6a75770b
-SIZE (centos/libXcursor-1.1.14-8.el7.x86_64.rpm) = 31116
+SHA256 (centos/libXcursor-1.1.15-1.el7.i686.rpm) = 9f9e13a3c1715a5589633ae75bef4ee7e835c79b3360f57baa094216f4dd3188
+SIZE (centos/libXcursor-1.1.15-1.el7.i686.rpm) = 31440
+SHA256 (centos/libXcursor-1.1.15-1.el7.x86_64.rpm) = 1766cffccf88800e8af5b9b7ca5d5ade2cc2dd42ebb69625ea4509889135adc1
+SIZE (centos/libXcursor-1.1.15-1.el7.x86_64.rpm) = 31104
 SHA256 (centos/libXdamage-1.1.4-4.1.el7.i686.rpm) = 498697f8e0d087052b82b4332152568792a5ce109678285f1f1926a73c507a94
 SIZE (centos/libXdamage-1.1.4-4.1.el7.i686.rpm) = 20832
 SHA256 (centos/libXdamage-1.1.4-4.1.el7.x86_64.rpm) = 790df35e712320c967e7934e417687e17457b7cf989e54045115dd8f4c560949
@@ -53,10 +53,14 @@ SHA256 (centos/libXfixes-5.0.3-1.el7.i686.rpm) = 9bc65a1a342d3ca61fde8c5c448e180
 SIZE (centos/libXfixes-5.0.3-1.el7.i686.rpm) = 18380
 SHA256 (centos/libXfixes-5.0.3-1.el7.x86_64.rpm) = 23a99007971fcbe272a4a82aa79bc49a46e573eecf696daedd84dd7959b2344d
 SIZE (centos/libXfixes-5.0.3-1.el7.x86_64.rpm) = 18684
-SHA256 (centos/libXfont-1.5.2-1.el7.i686.rpm) = e240de9b41e7266a3b6807b700fd5fc82c967774a74c3e7a1f729c83f3bfd72b
-SIZE (centos/libXfont-1.5.2-1.el7.i686.rpm) = 156480
-SHA256 (centos/libXfont-1.5.2-1.el7.x86_64.rpm) = 73e331c16a417b5f9012a4b57f66a3c2a5ee6d4b0e763b14f3e8520661b120b3
-SIZE (centos/libXfont-1.5.2-1.el7.x86_64.rpm) = 155992
+SHA256 (centos/libXfont-1.5.4-1.el7.i686.rpm) = 3dac719a8406b61d023fb2525b679034aefc1e57b8877df6ecac317a92e581c5
+SIZE (centos/libXfont-1.5.4-1.el7.i686.rpm) = 157336
+SHA256 (centos/libXfont-1.5.4-1.el7.x86_64.rpm) = 6c2c0fbe07c781848214a812e704e2f5e97c2c68338b1ad1cdb80ac3c11c059d
+SIZE (centos/libXfont-1.5.4-1.el7.x86_64.rpm) = 156860
+SHA256 (centos/libXfont2-2.0.3-1.el7.i686.rpm) = 797bad11ecf10ffa8dbad577c718a0d1e3520373c5379c4aa5cf49d74ff112a5
+SIZE (centos/libXfont2-2.0.3-1.el7.i686.rpm) = 147336
+SHA256 (centos/libXfont2-2.0.3-1.el7.x86_64.rpm) = 1ba309c5794b3c845ce795d4fd49952c457a482ac2e7a91d58b964287aea715e
+SIZE (centos/libXfont2-2.0.3-1.el7.x86_64.rpm) = 146504
 SHA256 (centos/libXft-2.3.2-2.el7.i686.rpm) = e80bbb502a050b2e204557a0a604743a6a82d82b4da32bded9f800b55e249654
 SIZE (centos/libXft-2.3.2-2.el7.i686.rpm) = 59184
 SHA256 (centos/libXft-2.3.2-2.el7.x86_64.rpm) = aca6be8d337c969a5d84b3af1180f06462cef3bb592b08eeb2eba9f384e796a1
@@ -89,10 +93,10 @@ SHA256 (centos/libXrender-0.9.10-1.el7.i686.rpm) = 9a79496895c4c1799855eb90b8000
 SIZE (centos/libXrender-0.9.10-1.el7.i686.rpm) = 25832
 SHA256 (centos/libXrender-0.9.10-1.el7.x86_64.rpm) = 3de0d3812ff49c6e10175cc56c30fa1801d158e6fb34cb1cdb245ef466bae173
 SIZE (centos/libXrender-0.9.10-1.el7.x86_64.rpm) = 26312
-SHA256 (centos/libXres-1.0.7-2.1.el7.i686.rpm) = 5bde92d5d2671811da7727794f1cc41ad164b6042c3764b5d2f4e4d759ab2dd8
-SIZE (centos/libXres-1.0.7-2.1.el7.i686.rpm) = 13548
-SHA256 (centos/libXres-1.0.7-2.1.el7.x86_64.rpm) = 0d9431ea6ee52436f5bb2336b70673b42044a5ce48962ac3302958dbcbed06d4
-SIZE (centos/libXres-1.0.7-2.1.el7.x86_64.rpm) = 13556
+SHA256 (centos/libXres-1.2.0-1.el7.i686.rpm) = 9521ac6eddc0bf8d191c5e611440e6ab4110ced0eb1b02046a953e60937837ce
+SIZE (centos/libXres-1.2.0-1.el7.i686.rpm) = 14884
+SHA256 (centos/libXres-1.2.0-1.el7.x86_64.rpm) = 5c7b043ef46c83a18267617abf64d738e47071fc0abef95d805934e1807636d4
+SIZE (centos/libXres-1.2.0-1.el7.x86_64.rpm) = 14932
 SHA256 (centos/libXt-1.1.5-3.el7.i686.rpm) = bdff18516ae9506ab42b6a25925649a5e7fc130e67f440791f330da35f641ce7
 SIZE (centos/libXt-1.1.5-3.el7.i686.rpm) = 170852
 SHA256 (centos/libXt-1.1.5-3.el7.x86_64.rpm) = 29a52c675bf20c3ff62cf6627b3dc4957fd8ab8636ee3e98db8db22473ce4083
@@ -125,10 +129,10 @@ SHA256 (centos/libfontenc-1.1.3-3.el7.i686.rpm) = aaf3da1a8ab1f4f478762c80bf3a54
 SIZE (centos/libfontenc-1.1.3-3.el7.i686.rpm) = 31436
 SHA256 (centos/libfontenc-1.1.3-3.el7.x86_64.rpm) = 289e39e5e831d8736efe08ff35f7fef29e91d0438848dc2d8041eedd67204b75
 SIZE (centos/libfontenc-1.1.3-3.el7.x86_64.rpm) = 31564
-SHA256 (centos/libxcb-1.12-1.el7.i686.rpm) = 12e802ffac0e7db9b760fb169e98fdd178e619bf5c4351cc176451553e7e59b4
-SIZE (centos/libxcb-1.12-1.el7.i686.rpm) = 232168
-SHA256 (centos/libxcb-1.12-1.el7.x86_64.rpm) = 0cc065414baec6c41a8d7425eeca5360f8a3026f2d4eade85c582bd639fa51af
-SIZE (centos/libxcb-1.12-1.el7.x86_64.rpm) = 215872
+SHA256 (centos/libxcb-1.13-1.el7.i686.rpm) = fa87f8df331b01b2020607966ee56ffe9380496b1918d7bf628e73e91aa5d267
+SIZE (centos/libxcb-1.13-1.el7.i686.rpm) = 235096
+SHA256 (centos/libxcb-1.13-1.el7.x86_64.rpm) = 125d6cdbea06799872b77b6322bf5cb107d7c0c70218827bf6b649f08ca527c5
+SIZE (centos/libxcb-1.13-1.el7.x86_64.rpm) = 218900
 SHA256 (centos/libxkbfile-1.0.9-3.el7.i686.rpm) = 5640b416543577de77f52e0f8c35d12ea10856852eedb8b927ef19412da68e9e
 SIZE (centos/libxkbfile-1.0.9-3.el7.i686.rpm) = 83592
 SHA256 (centos/libxkbfile-1.0.9-3.el7.x86_64.rpm) = 6cc5caad0c1b44834929650e413fd9fe49d6764b641fd6a3786dd0b7eea27fa9
@@ -141,8 +145,8 @@ SHA256 (centos/libICE-1.0.9-9.el7.src.rpm) = c4e8a40a9ae6153254472165807258b92a4
 SIZE (centos/libICE-1.0.9-9.el7.src.rpm) = 401575
 SHA256 (centos/libSM-1.2.2-2.el7.src.rpm) = d5a68e8f52da9176bf7dfb064196da59296169e3cc8a9d3bc83502a1e185b061
 SIZE (centos/libSM-1.2.2-2.el7.src.rpm) = 360255
-SHA256 (centos/libX11-1.6.5-1.el7.src.rpm) = 3f7818d5609ec5853efc2fe10a7dea09ed51733733a7dc7503161c9916cd17c6
-SIZE (centos/libX11-1.6.5-1.el7.src.rpm) = 2377772
+SHA256 (centos/libX11-1.6.5-2.el7.src.rpm) = ae16f6d31b085f15ea63c88e8979d4288af86f8a2b0ba35a2f7d003068162c89
+SIZE (centos/libX11-1.6.5-2.el7.src.rpm) = 2377908
 SHA256 (centos/libXScrnSaver-1.2.2-6.1.el7.src.rpm) = c4f420c7c17818a3660c9ebf70fa15f1c81ca620272eb4e06784c9cdeddf7021
 SIZE (centos/libXScrnSaver-1.2.2-6.1.el7.src.rpm) = 302309
 SHA256 (centos/libXau-1.0.8-2.1.el7.src.rpm) = 5a69c64dbcab0c437449eb5cbac15b167dbb456a6b14d2fcd6a4d8b20d14064c
@@ -151,8 +155,8 @@ SHA256 (centos/libXaw-1.0.13-4.el7.src.rpm) = a59069e015fa2151f7257b3bc231649d2b
 SIZE (centos/libXaw-1.0.13-4.el7.src.rpm) = 688594
 SHA256 (centos/libXcomposite-0.4.4-4.1.el7.src.rpm) = 9ef3229c8a81871dfb2159cf0c519eb39d0ba614549ae3235f7b756b22312c92
 SIZE (centos/libXcomposite-0.4.4-4.1.el7.src.rpm) = 294529
-SHA256 (centos/libXcursor-1.1.14-8.el7.src.rpm) = 88ad353e15b5fb3f5549e6d40bab8d243788896b99e9281df2365497c54f27a2
-SIZE (centos/libXcursor-1.1.14-8.el7.src.rpm) = 325304
+SHA256 (centos/libXcursor-1.1.15-1.el7.src.rpm) = fc112ad4f41860a7845574d101c4c5e28d36e921f6b33b97e858e1c30e4efcd8
+SIZE (centos/libXcursor-1.1.15-1.el7.src.rpm) = 345437
 SHA256 (centos/libXdamage-1.1.4-4.1.el7.src.rpm) = 6d70019f18de3cb13522bc47b4dad7a4e908a16fe5af2c4916dd272bb844f3bb
 SIZE (centos/libXdamage-1.1.4-4.1.el7.src.rpm) = 289089
 SHA256 (centos/libXdmcp-1.1.2-6.el7.src.rpm) = 4d0fcfb8bc2cc4574ee7450f8aa5ea60e8a3e9eca115c16e995ad5b4682b3b12
@@ -163,8 +167,8 @@ SHA256 (centos/libXext-1.3.3-3.el7.src.rpm) = 0663ed66040824de75185b70dd05a50363
 SIZE (centos/libXext-1.3.3-3.el7.src.rpm) = 402815
 SHA256 (centos/libXfixes-5.0.3-1.el7.src.rpm) = a3aa87db349e267cd9ad06f188c81cb161fef9d0b56cb77d7dce3440248fd78c
 SIZE (centos/libXfixes-5.0.3-1.el7.src.rpm) = 305322
-SHA256 (centos/libXfont-1.5.2-1.el7.src.rpm) = af4476ba8737ed17083d357596763e57d816a1985547317f1695255f6be96741
-SIZE (centos/libXfont-1.5.2-1.el7.src.rpm) = 545865
+SHA256 (centos/libXfont-1.5.4-1.el7.src.rpm) = 3ff51bb5e015f24b339d102a877528169e32eff37a80e94dccffc580780fbcad
+SIZE (centos/libXfont-1.5.4-1.el7.src.rpm) = 544474
 SHA256 (centos/libXft-2.3.2-2.el7.src.rpm) = 89d8d6243f1963c2d27ec03c3959c37cd92938ee63ea10442bf51a9e32dc14d4
 SIZE (centos/libXft-2.3.2-2.el7.src.rpm) = 347282
 SHA256 (centos/libXi-1.7.9-1.el7.src.rpm) = 2438a2d625d52e28a4293a6a0f0ea5d30467f89c0ffa82af349d095bac6a6592
@@ -181,8 +185,8 @@ SHA256 (centos/libXrandr-1.5.1-2.el7.src.rpm) = 6e0d24782fdcc5a5e878f1e563085c16
 SIZE (centos/libXrandr-1.5.1-2.el7.src.rpm) = 328956
 SHA256 (centos/libXrender-0.9.10-1.el7.src.rpm) = 11f9d2e60522786de97d9c9596f3f19eac9c706e4cac44f4dee1bd7455466ff0
 SIZE (centos/libXrender-0.9.10-1.el7.src.rpm) = 319609
-SHA256 (centos/libXres-1.0.7-2.1.el7.src.rpm) = 88b1238a2f0353395a4db1550234e0b5d0de2e693fb4ff5967fb7e5b9a80f165
-SIZE (centos/libXres-1.0.7-2.1.el7.src.rpm) = 293750
+SHA256 (centos/libXres-1.2.0-1.el7.src.rpm) = 12b04e78bbbdc0891982d8dcd1b3443d23ed73d1b5f891d08c849c2f0de4c451
+SIZE (centos/libXres-1.2.0-1.el7.src.rpm) = 297548
 SHA256 (centos/libXt-1.1.5-3.el7.src.rpm) = 2ed20bbe0683467fa8f66bc028a282c93569525d95ff38295b9d22af560b102a
 SIZE (centos/libXt-1.1.5-3.el7.src.rpm) = 785881
 SHA256 (centos/libXtst-1.2.3-1.el7.src.rpm) = abf362edf6bf0cc4c6b57918f8cae11882d3c9e3e88d3692bb17d71860908e22
@@ -199,8 +203,8 @@ SHA256 (centos/libXxf86vm-1.1.4-1.el7.src.rpm) = eb4d75e66f2b61b7c35be419c145ca5
 SIZE (centos/libXxf86vm-1.1.4-1.el7.src.rpm) = 305884
 SHA256 (centos/libfontenc-1.1.3-3.el7.src.rpm) = 0cb1a5b297ede9ade5d6bcee5ef4b548aa235ba5f355e76c0707c351d56806dc
 SIZE (centos/libfontenc-1.1.3-3.el7.src.rpm) = 313913
-SHA256 (centos/libxcb-1.12-1.el7.src.rpm) = 0dab8ad900b3de7f65da2b47a95cd7e1ae8588b8a72b3f5229051b6c45dfe400
-SIZE (centos/libxcb-1.12-1.el7.src.rpm) = 622838
+SHA256 (centos/libxcb-1.13-1.el7.src.rpm) = 832f0b8eb643189e2769538dca574a4a18e8a894c0af1fdff1becdb8c8555e36
+SIZE (centos/libxcb-1.13-1.el7.src.rpm) = 519549
 SHA256 (centos/libxkbfile-1.0.9-3.el7.src.rpm) = 9dba7d93bbf0641b5f779ae1d51f45a034f63ec9225ab7c595be2ee26557c1bc
 SIZE (centos/libxkbfile-1.0.9-3.el7.src.rpm) = 359024
 SHA256 (centos/libxshmfence-1.2-1.el7.src.rpm) = a6a07b5c43199016e43ff009504b3b2849038e92bd8c55859e83c5ad51bcca18
diff --git a/x11/linux-c7-xorg-libs/pkg-plist.amd64 b/x11/linux-c7-xorg-libs/pkg-plist.amd64
index 64a0d34f0097..2ed1dea3cdc1 100644
--- a/x11/linux-c7-xorg-libs/pkg-plist.amd64
+++ b/x11/linux-c7-xorg-libs/pkg-plist.amd64
@@ -29,6 +29,8 @@ usr/lib/libXfixes.so.3
 usr/lib/libXfixes.so.3.1.0
 usr/lib/libXfont.so.1
 usr/lib/libXfont.so.1.4.1
+usr/lib/libXfont2.so.2
+usr/lib/libXfont2.so.2.0.0
 usr/lib/libXft.so.2
 usr/lib/libXft.so.2.3.2
 usr/lib/libXi.so.6
@@ -154,6 +156,8 @@ usr/lib64/libXfixes.so.3
 usr/lib64/libXfixes.so.3.1.0
 usr/lib64/libXfont.so.1
 usr/lib64/libXfont.so.1.4.1
+usr/lib64/libXfont2.so.2
+usr/lib64/libXfont2.so.2.0.0
 usr/lib64/libXft.so.2
 usr/lib64/libXft.so.2.3.2
 usr/lib64/libXi.so.6
@@ -462,9 +466,9 @@ usr/share/X11/locale/zh_TW/XLC_LOCALE
 %%PORTDOCS%%usr/share/doc/libXcomposite-0.4.4/COPYING
 %%PORTDOCS%%usr/share/doc/libXcomposite-0.4.4/ChangeLog
 %%PORTDOCS%%usr/share/doc/libXcomposite-0.4.4/README
-%%PORTDOCS%%usr/share/doc/libXcursor-1.1.14/AUTHORS
-%%PORTDOCS%%usr/share/doc/libXcursor-1.1.14/COPYING
-%%PORTDOCS%%usr/share/doc/libXcursor-1.1.14/README
+%%PORTDOCS%%usr/share/doc/libXcursor-1.1.15/AUTHORS
+%%PORTDOCS%%usr/share/doc/libXcursor-1.1.15/COPYING
+%%PORTDOCS%%usr/share/doc/libXcursor-1.1.15/README
 %%PORTDOCS%%usr/share/doc/libXdamage-1.1.4/AUTHORS
 %%PORTDOCS%%usr/share/doc/libXdamage-1.1.4/COPYING
 %%PORTDOCS%%usr/share/doc/libXdamage-1.1.4/ChangeLog
@@ -481,10 +485,13 @@ usr/share/X11/locale/zh_TW/XLC_LOCALE
 %%PORTDOCS%%usr/share/doc/libXfixes-5.0.3/AUTHORS
 %%PORTDOCS%%usr/share/doc/libXfixes-5.0.3/COPYING
 %%PORTDOCS%%usr/share/doc/libXfixes-5.0.3/README
-%%PORTDOCS%%usr/share/doc/libXfont-1.5.2/AUTHORS
-%%PORTDOCS%%usr/share/doc/libXfont-1.5.2/COPYING
-%%PORTDOCS%%usr/share/doc/libXfont-1.5.2/ChangeLog
-%%PORTDOCS%%usr/share/doc/libXfont-1.5.2/README
+%%PORTDOCS%%usr/share/doc/libXfont-1.5.4/AUTHORS
+%%PORTDOCS%%usr/share/doc/libXfont-1.5.4/COPYING
+%%PORTDOCS%%usr/share/doc/libXfont-1.5.4/ChangeLog
+%%PORTDOCS%%usr/share/doc/libXfont-1.5.4/README
+%%PORTDOCS%%usr/share/doc/libXfont2-2.0.3/AUTHORS
+%%PORTDOCS%%usr/share/doc/libXfont2-2.0.3/ChangeLog
+%%PORTDOCS%%usr/share/doc/libXfont2-2.0.3/README
 %%PORTDOCS%%usr/share/doc/libXft-2.3.2/AUTHORS
 %%PORTDOCS%%usr/share/doc/libXft-2.3.2/COPYING
 %%PORTDOCS%%usr/share/doc/libXft-2.3.2/ChangeLog
@@ -504,8 +511,8 @@ usr/share/X11/locale/zh_TW/XLC_LOCALE
 %%PORTDOCS%%usr/share/doc/libXrandr-1.5.1/COPYING
 %%PORTDOCS%%usr/share/doc/libXrender-0.9.10/AUTHORS
 %%PORTDOCS%%usr/share/doc/libXrender-0.9.10/COPYING
-%%PORTDOCS%%usr/share/doc/libXres-1.0.7/AUTHORS
-%%PORTDOCS%%usr/share/doc/libXres-1.0.7/COPYING
+%%PORTDOCS%%usr/share/doc/libXres-1.2.0/AUTHORS
+%%PORTDOCS%%usr/share/doc/libXres-1.2.0/COPYING
 %%PORTDOCS%%usr/share/doc/libXt/COPYING
 %%PORTDOCS%%usr/share/doc/libXtst-1.2.3/COPYING
 %%PORTDOCS%%usr/share/doc/libXv-1.0.11/AUTHORS
@@ -524,4 +531,5 @@ usr/share/X11/locale/zh_TW/XLC_LOCALE
 %%PORTDOCS%%usr/share/doc/libfontenc-1.1.3/README
 %%PORTDOCS%%usr/share/doc/libxkbfile-1.0.9/COPYING
 %%PORTDOCS%%usr/share/doc/libxkbfile-1.0.9/ChangeLog
+usr/share/licenses/libXfont2-2.0.3/COPYING
 @dir usr/share/X11/app-defaults
diff --git a/x11/linux-c7-xorg-libs/pkg-plist.i386 b/x11/linux-c7-xorg-libs/pkg-plist.i386
index b322b4bfd89e..4567322b357b 100644
--- a/x11/linux-c7-xorg-libs/pkg-plist.i386
+++ b/x11/linux-c7-xorg-libs/pkg-plist.i386
@@ -29,6 +29,8 @@ usr/lib/libXfixes.so.3
 usr/lib/libXfixes.so.3.1.0
 usr/lib/libXfont.so.1
 usr/lib/libXfont.so.1.4.1
+usr/lib/libXfont2.so.2
+usr/lib/libXfont2.so.2.0.0
 usr/lib/libXft.so.2
 usr/lib/libXft.so.2.3.2
 usr/lib/libXi.so.6
@@ -337,9 +339,9 @@ usr/share/X11/locale/zh_TW/XLC_LOCALE
 %%PORTDOCS%%usr/share/doc/libXcomposite-0.4.4/COPYING
 %%PORTDOCS%%usr/share/doc/libXcomposite-0.4.4/ChangeLog
 %%PORTDOCS%%usr/share/doc/libXcomposite-0.4.4/README
-%%PORTDOCS%%usr/share/doc/libXcursor-1.1.14/AUTHORS
-%%PORTDOCS%%usr/share/doc/libXcursor-1.1.14/COPYING
-%%PORTDOCS%%usr/share/doc/libXcursor-1.1.14/README
+%%PORTDOCS%%usr/share/doc/libXcursor-1.1.15/AUTHORS
+%%PORTDOCS%%usr/share/doc/libXcursor-1.1.15/COPYING
+%%PORTDOCS%%usr/share/doc/libXcursor-1.1.15/README
 %%PORTDOCS%%usr/share/doc/libXdamage-1.1.4/AUTHORS
 %%PORTDOCS%%usr/share/doc/libXdamage-1.1.4/COPYING
 %%PORTDOCS%%usr/share/doc/libXdamage-1.1.4/ChangeLog
@@ -356,10 +358,13 @@ usr/share/X11/locale/zh_TW/XLC_LOCALE
 %%PORTDOCS%%usr/share/doc/libXfixes-5.0.3/AUTHORS
 %%PORTDOCS%%usr/share/doc/libXfixes-5.0.3/COPYING
 %%PORTDOCS%%usr/share/doc/libXfixes-5.0.3/README
-%%PORTDOCS%%usr/share/doc/libXfont-1.5.2/AUTHORS
-%%PORTDOCS%%usr/share/doc/libXfont-1.5.2/COPYING
-%%PORTDOCS%%usr/share/doc/libXfont-1.5.2/ChangeLog
-%%PORTDOCS%%usr/share/doc/libXfont-1.5.2/README
+%%PORTDOCS%%usr/share/doc/libXfont-1.5.4/AUTHORS
+%%PORTDOCS%%usr/share/doc/libXfont-1.5.4/COPYING
+%%PORTDOCS%%usr/share/doc/libXfont-1.5.4/ChangeLog
+%%PORTDOCS%%usr/share/doc/libXfont-1.5.4/README
+%%PORTDOCS%%usr/share/doc/libXfont2-2.0.3/AUTHORS
+%%PORTDOCS%%usr/share/doc/libXfont2-2.0.3/ChangeLog
+%%PORTDOCS%%usr/share/doc/libXfont2-2.0.3/README
 %%PORTDOCS%%usr/share/doc/libXft-2.3.2/AUTHORS
 %%PORTDOCS%%usr/share/doc/libXft-2.3.2/COPYING
 %%PORTDOCS%%usr/share/doc/libXft-2.3.2/ChangeLog
@@ -379,8 +384,8 @@ usr/share/X11/locale/zh_TW/XLC_LOCALE
 %%PORTDOCS%%usr/share/doc/libXrandr-1.5.1/COPYING
 %%PORTDOCS%%usr/share/doc/libXrender-0.9.10/AUTHORS
 %%PORTDOCS%%usr/share/doc/libXrender-0.9.10/COPYING
-%%PORTDOCS%%usr/share/doc/libXres-1.0.7/AUTHORS
-%%PORTDOCS%%usr/share/doc/libXres-1.0.7/COPYING
+%%PORTDOCS%%usr/share/doc/libXres-1.2.0/AUTHORS
+%%PORTDOCS%%usr/share/doc/libXres-1.2.0/COPYING
 %%PORTDOCS%%usr/share/doc/libXt/COPYING
 %%PORTDOCS%%usr/share/doc/libXtst-1.2.3/COPYING
 %%PORTDOCS%%usr/share/doc/libXv-1.0.11/AUTHORS
@@ -399,4 +404,5 @@ usr/share/X11/locale/zh_TW/XLC_LOCALE
 %%PORTDOCS%%usr/share/doc/libfontenc-1.1.3/README
 %%PORTDOCS%%usr/share/doc/libxkbfile-1.0.9/COPYING
 %%PORTDOCS%%usr/share/doc/libxkbfile-1.0.9/ChangeLog
+usr/share/licenses/libXfont2-2.0.3/COPYING
 @dir usr/share/X11/app-defaults
diff --git a/x11/nvidia-driver-304/Makefile b/x11/nvidia-driver-304/Makefile
index 5c8fd466a252..a512968e8b23 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=	3
+PORTREVISION=	4
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-304
diff --git a/x11/nvidia-driver-340/Makefile b/x11/nvidia-driver-340/Makefile
index 9952eaad0797..b6bf8c3fe075 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=	3
+PORTREVISION=	4
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-340
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 5a1adc6a0323..eabec88d15f2 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?=	2
+PORTREVISION?=	3
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
@@ -157,25 +157,6 @@ LINUX_DATA+=	10_nvidia_wayland.json /usr/share/egl/egl_external_platform.d
 .else
 PLIST_RE+=	'\,${LINUXBASE}/usr/share/egl,d'
 .endif
-.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} >= 361.016
 LINUX_LIBS+=	libEGL_nvidia.so.${PORTVERSION}
 LINUX_LINKS+=	libEGL_nvidia.so.${PORTVERSION} libEGL_nvidia.so.0
@@ -187,103 +168,35 @@ PLIST_RE+=	'\,${LINUXBASE}.*libEGL_nvidia\.so\.${PORTVERSION},d'
 .else
 PLIST_RE+=	'\,${LINUXBASE}.*libEGL_nvidia\.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
 LINUX_LIBS+=	libGLESv1_CM_nvidia.so.${PORTVERSION} \
 		libGLESv2_nvidia.so.${PORTVERSION} \
-		libGLX.so.0 \
 		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.so.0 libGLX.so \
 		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.so.0 \
 		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.so.0 libGLX.so \
 		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}.*libGLX_(nvidia|indirect)\.so,d' \
 		'\,${LINUXBASE}.*libnvidia-fatbinaryloader\.so,d' \
 		'\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d'
 .endif
-.if ${NVVERSION} >= 355.006
-LINUX_LIBS+=	libGLdispatch.so.0 \
-		libOpenGL.so.0
-LINUX_LINKS+=	libOpenGL.so.0 libOpenGL.so
-LINUX32_LIBS+=	libGLdispatch.so.0 \
-		libOpenGL.so.0
-LINUX32_LINKS+=	libOpenGL.so.0 libOpenGL.so
-.else
-PLIST_RE+=	'\,${LINUXBASE}.*libGLdispatch\.so,d' \
-		'\,${LINUXBASE}.*libOpenGL\.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
@@ -381,6 +294,108 @@ PLIST_SUB+=	LINUXBASE=${LINUXBASE} \
 		SHLIB_VERSION=${PORTVERSION} \
 		MODULESDIR=${MODULESDIR}
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MLINUX}
+.if ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT:S/_64//} == c7
+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
+LINUX_LIBS+=	libGLX.so.0
+LINUX32_LIBS+=	libGLX.so.0
+.else
+PLIST_RE+=	'\,${LINUXBASE}.*libGLX\.so,d'
+.endif
+.if ${NVVERSION} >= 355.006
+LINUX_LIBS+=	libGLdispatch.so.0 \
+		libOpenGL.so.0
+LINUX32_LIBS+=	libGLdispatch.so.0 \
+		libOpenGL.so.0
+.else
+PLIST_RE+=	'\,${LINUXBASE}.*libGLdispatch\.so,d' \
+		'\,${LINUXBASE}.*libOpenGL\.so,d'
+.endif
+.endif	# ${NVVERSION} >= 390.042 && ${LINUX_DEFAULT:S/_64//} == c7
+.endif	# ${PORT_OPTIONS:MLINUX}
+
 .include <bsd.port.pre.mk>
 
 .if ${NVVERSION} >= 310.014
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index bedbfb414320..f2864597dc16 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -45,29 +45,34 @@ man/man1/nvidia-smi.1.gz
 %%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-smi
 %%LINUX%%%%LINUXBASE%%/usr/bin/nvidia-xconfig
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL.so.1
-%%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libEGL.so.1.0.0 ] || ln -sf libEGL.so.1.0.0 %%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
+%%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libEGL.so.1.1.0 ] || ln -sf libEGL.so.1.1.0 %%LINUXBASE%%/usr/lib/libEGL.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.0
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGL.so.1
-%%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGL.so.1.2.0 ] || ln -sf libGL.so.1.2.0 %%LINUXBASE%%/usr/lib/libGL.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGL.so.X
-%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLdispatch.so.0
+%%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGL.so.1.2.0 ] || ln -sf libGL.so.1.2.0 %%LINUXBASE%%/usr/lib/libGL.so.1
+%%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGL.so.1.7.0 ] || ln -sf libGL.so.1.7.0 %%LINUXBASE%%/usr/lib/libGL.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.X
+%%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1.2.0 ] || ln -sf libGLESv1_CM.so.1.2.0 %%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM_nvidia.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv1_CM_nvidia.so.%%SHLIB_VERSION%%
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2.so.2
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2.so.X
+%%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGLESv2.so.2.1.0 ] || ln -sf libGLESv2.so.2.1.0 %%LINUXBASE%%/usr/lib/libGLESv2.so.2
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2_nvidia.so.2
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLESv2_nvidia.so.%%SHLIB_VERSION%%
-%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX.so
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX.so.0
+%%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGLX.so.0.0.0 ] || ln -sf libGLX.so.0.0.0 %%LINUXBASE%%/usr/lib/libGLX.so.0
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX_indirect.so.0
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX_nvidia.so.0
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libGLX_nvidia.so.%%SHLIB_VERSION%%
-%%LINUX32%%%%LINUXBASE%%/usr/lib/libOpenGL.so
+%%LINUX32%%%%LINUXBASE%%/usr/lib/libGLdispatch.so.0
+%%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libGLdispatch.so.0.0.0 ] || ln -sf libGLdispatch.so.0.0.0 %%LINUXBASE%%/usr/lib/libGLdispatch.so.0
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libOpenGL.so.0
+%%LINUX32%%@postunexec [ ! -e %%LINUXBASE%%/usr/lib/libOpenGL.so.0.0.0 ] || ln -sf libOpenGL.so.0.0.0 %%LINUXBASE%%/usr/lib/libOpenGL.so.0
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libcuda.so
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libcuda.so.1
 %%LINUX32%%%%LINUXBASE%%/usr/lib/libcuda.so.%%SHLIB_VERSION%%
@@ -101,29 +106,34 @@ man/man1/nvidia-smi.1.gz
 %%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%%@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libEGL.so.1.0.0 ] || ln -sf libEGL.so.1.0.0 %%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%%@postunexec [ ! -e %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1.2.0 ] || ln -sf libGL.so.1.2.0 %%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.1
 %%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGL.so.X
-%%LINUX%%%%LINUXBASE%%%%LINUX_LIBDIR%%/libGLdispatch.so.0
+%%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
 %%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%%/libOpenGL.so
+%%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