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)

4 files changed, 47 insertions, 48 deletions

diff --git a/x11-toolkits/linux-c7-qt-x11/Makefile b/x11-toolkits/linux-c7-qt-x11/Makefile
index 0cb104fe2b5c..2105e74ab41f 100644
--- a/x11-toolkits/linux-c7-qt-x11/Makefile
+++ b/x11-toolkits/linux-c7-qt-x11/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qt
-PORTVERSION=	4.8.5
-PORTREVISION=	4
+PORTVERSION=	4.8.7
 CATEGORIES=	x11-toolkits linux
 PKGNAMESUFFIX=	-x11
 LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
@@ -16,7 +15,7 @@ CONFLICTS=	linux-c6-qt47-x11-[0-9]*
 DATADIR=	${PREFIX}/usr/share/${PORTNAME}4
 DESCR=		${.CURDIR}/../../devel/linux-c6-qt47/pkg-descr
 LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
-RPMVERSION=	15.el7_4
+RPMVERSION=	2.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib dri fontconfig jpeg openssl png qt tiff xorglibs
diff --git a/x11-toolkits/linux-c7-qt-x11/distinfo b/x11-toolkits/linux-c7-qt-x11/distinfo
index 0dcd66997417..ce1d049d23aa 100644
--- a/x11-toolkits/linux-c7-qt-x11/distinfo
+++ b/x11-toolkits/linux-c7-qt-x11/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1509045007
-SHA256 (centos/qt-x11-4.8.5-15.el7_4.i686.rpm) = 597b8d5f66780e2820e72c5d83399cd9be950a51d9a30b2cb94b9023bcf3f2d8
-SIZE (centos/qt-x11-4.8.5-15.el7_4.i686.rpm) = 13461768
-SHA256 (centos/qt-x11-4.8.5-15.el7_4.x86_64.rpm) = 37319db1f813f573af2246bf860f450bcf4571d215e3d83ad4f3bceb761ed234
-SIZE (centos/qt-x11-4.8.5-15.el7_4.x86_64.rpm) = 13201932
-SHA256 (centos/qt-4.8.5-15.el7_4.src.rpm) = a6f6b081646c7e2c90a8534df978fba380f8fde0b794643d0fd8a5e0b5fc2da3
-SIZE (centos/qt-4.8.5-15.el7_4.src.rpm) = 240687863
+TIMESTAMP = 1530379389
+SHA256 (centos/qt-x11-4.8.7-2.el7.i686.rpm) = ee2c42e0b7dd14130b64193675f5312dfbe6d3b4ddf0f6157b71f1aa2cf3c6ff
+SIZE (centos/qt-x11-4.8.7-2.el7.i686.rpm) = 13365148
+SHA256 (centos/qt-x11-4.8.7-2.el7.x86_64.rpm) = 8378cd23e89aef1968c485998ca31b0515ee2ac5134bb4e2bca4a643b0bbb03b
+SIZE (centos/qt-x11-4.8.7-2.el7.x86_64.rpm) = 13107460
+SHA256 (centos/qt-4.8.7-2.el7.src.rpm) = 63a3e15d926037bd00b37fb3cb2fc5c81c35e2bbfd339f8fd138743ffa0248b1
+SIZE (centos/qt-4.8.7-2.el7.src.rpm) = 240443274
diff --git a/x11-toolkits/linux-c7-qt-x11/pkg-plist.amd64 b/x11-toolkits/linux-c7-qt-x11/pkg-plist.amd64
index 092d0f273378..c7f9cfea2106 100644
--- a/x11-toolkits/linux-c7-qt-x11/pkg-plist.amd64
+++ b/x11-toolkits/linux-c7-qt-x11/pkg-plist.amd64
@@ -1,38 +1,36 @@
-usr/bin/qmlviewer
 usr/lib/libQt3Support.so.4
 usr/lib/libQt3Support.so.4.8
-usr/lib/libQt3Support.so.4.8.5
+usr/lib/libQt3Support.so.4.8.7
 usr/lib/libQtCLucene.so.4
 usr/lib/libQtCLucene.so.4.8
-usr/lib/libQtCLucene.so.4.8.5
+usr/lib/libQtCLucene.so.4.8.7
 usr/lib/libQtDeclarative.so.4
 usr/lib/libQtDeclarative.so.4.8
-usr/lib/libQtDeclarative.so.4.8.5
+usr/lib/libQtDeclarative.so.4.8.7
 usr/lib/libQtDesigner.so.4
 usr/lib/libQtDesigner.so.4.8
-usr/lib/libQtDesigner.so.4.8.5
+usr/lib/libQtDesigner.so.4.8.7
 usr/lib/libQtDesignerComponents.so.4
 usr/lib/libQtDesignerComponents.so.4.8
-usr/lib/libQtDesignerComponents.so.4.8.5
+usr/lib/libQtDesignerComponents.so.4.8.7
 usr/lib/libQtGui.so.4
 usr/lib/libQtGui.so.4.8
-usr/lib/libQtGui.so.4.8.5
+usr/lib/libQtGui.so.4.8.7
 usr/lib/libQtHelp.so.4
 usr/lib/libQtHelp.so.4.8
-usr/lib/libQtHelp.so.4.8.5
+usr/lib/libQtHelp.so.4.8.7
 usr/lib/libQtMultimedia.so.4
 usr/lib/libQtMultimedia.so.4.8
-usr/lib/libQtMultimedia.so.4.8.5
+usr/lib/libQtMultimedia.so.4.8.7
 usr/lib/libQtOpenGL.so.4
 usr/lib/libQtOpenGL.so.4.8
-usr/lib/libQtOpenGL.so.4.8.5
+usr/lib/libQtOpenGL.so.4.8.7
 usr/lib/libQtScriptTools.so.4
 usr/lib/libQtScriptTools.so.4.8
-usr/lib/libQtScriptTools.so.4.8.5
+usr/lib/libQtScriptTools.so.4.8.7
 usr/lib/libQtSvg.so.4
 usr/lib/libQtSvg.so.4.8
-usr/lib/libQtSvg.so.4.8.5
-usr/lib/qt4/bin/qmlviewer
+usr/lib/libQtSvg.so.4.8.7
 usr/lib/qt4/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
 usr/lib/qt4/imports/Qt/labs/folderlistmodel/qmldir
 usr/lib/qt4/imports/Qt/labs/gestures/libqmlgesturesplugin.so
@@ -73,38 +71,37 @@ usr/lib/qt4/plugins/qmltooling/libqmldbg_tcp.so
 usr/lib/qt4/plugins/script/libqtscriptdbus.so
 usr/lib64/libQt3Support.so.4
 usr/lib64/libQt3Support.so.4.8
-usr/lib64/libQt3Support.so.4.8.5
+usr/lib64/libQt3Support.so.4.8.7
 usr/lib64/libQtCLucene.so.4
 usr/lib64/libQtCLucene.so.4.8
-usr/lib64/libQtCLucene.so.4.8.5
+usr/lib64/libQtCLucene.so.4.8.7
 usr/lib64/libQtDeclarative.so.4
 usr/lib64/libQtDeclarative.so.4.8
-usr/lib64/libQtDeclarative.so.4.8.5
+usr/lib64/libQtDeclarative.so.4.8.7
 usr/lib64/libQtDesigner.so.4
 usr/lib64/libQtDesigner.so.4.8
-usr/lib64/libQtDesigner.so.4.8.5
+usr/lib64/libQtDesigner.so.4.8.7
 usr/lib64/libQtDesignerComponents.so.4
 usr/lib64/libQtDesignerComponents.so.4.8
-usr/lib64/libQtDesignerComponents.so.4.8.5
+usr/lib64/libQtDesignerComponents.so.4.8.7
 usr/lib64/libQtGui.so.4
 usr/lib64/libQtGui.so.4.8
-usr/lib64/libQtGui.so.4.8.5
+usr/lib64/libQtGui.so.4.8.7
 usr/lib64/libQtHelp.so.4
 usr/lib64/libQtHelp.so.4.8
-usr/lib64/libQtHelp.so.4.8.5
+usr/lib64/libQtHelp.so.4.8.7
 usr/lib64/libQtMultimedia.so.4
 usr/lib64/libQtMultimedia.so.4.8
-usr/lib64/libQtMultimedia.so.4.8.5
+usr/lib64/libQtMultimedia.so.4.8.7
 usr/lib64/libQtOpenGL.so.4
 usr/lib64/libQtOpenGL.so.4.8
-usr/lib64/libQtOpenGL.so.4.8.5
+usr/lib64/libQtOpenGL.so.4.8.7
 usr/lib64/libQtScriptTools.so.4
 usr/lib64/libQtScriptTools.so.4.8
-usr/lib64/libQtScriptTools.so.4.8.5
+usr/lib64/libQtScriptTools.so.4.8.7
 usr/lib64/libQtSvg.so.4
 usr/lib64/libQtSvg.so.4.8
-usr/lib64/libQtSvg.so.4.8.5
-usr/lib64/qt4/bin/qmlviewer
+usr/lib64/libQtSvg.so.4.8.7
 usr/lib64/qt4/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
 usr/lib64/qt4/imports/Qt/labs/folderlistmodel/qmldir
 usr/lib64/qt4/imports/Qt/labs/gestures/libqmlgesturesplugin.so
@@ -146,6 +143,7 @@ usr/lib64/qt4/plugins/script/libqtscriptdbus.so
 %%DATADIR%%/translations/assistant_cs.qm
 %%DATADIR%%/translations/assistant_da.qm
 %%DATADIR%%/translations/assistant_de.qm
+%%DATADIR%%/translations/assistant_eu.qm
 %%DATADIR%%/translations/assistant_fr.qm
 %%DATADIR%%/translations/assistant_hu.qm
 %%DATADIR%%/translations/assistant_ja.qm
@@ -159,6 +157,7 @@ usr/lib64/qt4/plugins/script/libqtscriptdbus.so
 %%DATADIR%%/translations/qt_help_cs.qm
 %%DATADIR%%/translations/qt_help_da.qm
 %%DATADIR%%/translations/qt_help_de.qm
+%%DATADIR%%/translations/qt_help_eu.qm
 %%DATADIR%%/translations/qt_help_fr.qm
 %%DATADIR%%/translations/qt_help_gl.qm
 %%DATADIR%%/translations/qt_help_hu.qm
@@ -170,6 +169,8 @@ usr/lib64/qt4/plugins/script/libqtscriptdbus.so
 %%DATADIR%%/translations/qt_help_uk.qm
 %%DATADIR%%/translations/qt_help_zh_CN.qm
 %%DATADIR%%/translations/qt_help_zh_TW.qm
+%%DATADIR%%/translations/qtconfig_eu.qm
+%%DATADIR%%/translations/qtconfig_he.qm
 %%DATADIR%%/translations/qtconfig_hu.qm
 %%DATADIR%%/translations/qtconfig_ja.qm
 %%DATADIR%%/translations/qtconfig_ko.qm
@@ -179,6 +180,7 @@ usr/lib64/qt4/plugins/script/libqtscriptdbus.so
 %%DATADIR%%/translations/qtconfig_uk.qm
 %%DATADIR%%/translations/qtconfig_zh_CN.qm
 %%DATADIR%%/translations/qtconfig_zh_TW.qm
+%%DATADIR%%/translations/qtscript_eu.qm
 @dir usr/lib/qt4/plugins/gui_platform
 @dir usr/lib/qt4/plugins/phonon_backend
 @dir usr/lib/qt4/plugins/styles
diff --git a/x11-toolkits/linux-c7-qt-x11/pkg-plist.i386 b/x11-toolkits/linux-c7-qt-x11/pkg-plist.i386
index 117c785c843c..fde1e3d0349e 100644
--- a/x11-toolkits/linux-c7-qt-x11/pkg-plist.i386
+++ b/x11-toolkits/linux-c7-qt-x11/pkg-plist.i386
@@ -1,38 +1,36 @@
-usr/bin/qmlviewer
 usr/lib/libQt3Support.so.4
 usr/lib/libQt3Support.so.4.8
-usr/lib/libQt3Support.so.4.8.5
+usr/lib/libQt3Support.so.4.8.7
 usr/lib/libQtCLucene.so.4
 usr/lib/libQtCLucene.so.4.8
-usr/lib/libQtCLucene.so.4.8.5
+usr/lib/libQtCLucene.so.4.8.7
 usr/lib/libQtDeclarative.so.4
 usr/lib/libQtDeclarative.so.4.8
-usr/lib/libQtDeclarative.so.4.8.5
+usr/lib/libQtDeclarative.so.4.8.7
 usr/lib/libQtDesigner.so.4
 usr/lib/libQtDesigner.so.4.8
-usr/lib/libQtDesigner.so.4.8.5
+usr/lib/libQtDesigner.so.4.8.7
 usr/lib/libQtDesignerComponents.so.4
 usr/lib/libQtDesignerComponents.so.4.8
-usr/lib/libQtDesignerComponents.so.4.8.5
+usr/lib/libQtDesignerComponents.so.4.8.7
 usr/lib/libQtGui.so.4
 usr/lib/libQtGui.so.4.8
-usr/lib/libQtGui.so.4.8.5
+usr/lib/libQtGui.so.4.8.7
 usr/lib/libQtHelp.so.4
 usr/lib/libQtHelp.so.4.8
-usr/lib/libQtHelp.so.4.8.5
+usr/lib/libQtHelp.so.4.8.7
 usr/lib/libQtMultimedia.so.4
 usr/lib/libQtMultimedia.so.4.8
-usr/lib/libQtMultimedia.so.4.8.5
+usr/lib/libQtMultimedia.so.4.8.7
 usr/lib/libQtOpenGL.so.4
 usr/lib/libQtOpenGL.so.4.8
-usr/lib/libQtOpenGL.so.4.8.5
+usr/lib/libQtOpenGL.so.4.8.7
 usr/lib/libQtScriptTools.so.4
 usr/lib/libQtScriptTools.so.4.8
-usr/lib/libQtScriptTools.so.4.8.5
+usr/lib/libQtScriptTools.so.4.8.7
 usr/lib/libQtSvg.so.4
 usr/lib/libQtSvg.so.4.8
-usr/lib/libQtSvg.so.4.8.5
-usr/lib/qt4/bin/qmlviewer
+usr/lib/libQtSvg.so.4.8.7
 usr/lib/qt4/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
 usr/lib/qt4/imports/Qt/labs/folderlistmodel/qmldir
 usr/lib/qt4/imports/Qt/labs/gestures/libqmlgesturesplugin.so