Fix for X11 installation.

Fix for cmake files on Darwin.

3 files changed, 28 insertions, 2 deletions

diff --git a/x11/qt5-qtbase/PLIST b/x11/qt5-qtbase/PLIST
index 757b4692ac9..7d982f6c0c7 100644
--- a/x11/qt5-qtbase/PLIST
+++ b/x11/qt5-qtbase/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2015/10/26 19:03:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2015/10/28 15:52:11 adam Exp $
 lib/pkgconfig/Qt5Bootstrap.pc
 lib/pkgconfig/Qt5Concurrent.pc
 lib/pkgconfig/Qt5Core.pc
@@ -2353,6 +2353,7 @@ qt5/lib/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake
 ${PLIST.mac}qt5/lib/cmake/Qt5Gui/Qt5Gui_QCocoaIntegrationPlugin.cmake
 ${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake
 ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake
+${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSX11IntegrationPlugin.cmake
 qt5/lib/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake
 qt5/lib/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake
 ${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
@@ -2363,6 +2364,7 @@ ${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
 qt5/lib/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
 qt5/lib/cmake/Qt5Gui/Qt5Gui_QTuioTouchPlugin.cmake
 ${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
+${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
 qt5/lib/cmake/Qt5Network/Qt5NetworkConfig.cmake
 qt5/lib/cmake/Qt5Network/Qt5NetworkConfigVersion.cmake
 ${PLIST.mac}qt5/lib/cmake/Qt5Network/Qt5Network_QCoreWlanEnginePlugin.cmake
@@ -2393,6 +2395,8 @@ qt5/lib/libQt5Core.la
 qt5/lib/libQt5Core.prl
 qt5/lib/libQt5DBus.la
 qt5/lib/libQt5DBus.prl
+${PLIST.unix}qt5/lib/libQt5EglDeviceIntegration.la
+${PLIST.unix}qt5/lib/libQt5EglDeviceIntegration.prl
 qt5/lib/libQt5Gui.la
 qt5/lib/libQt5Gui.prl
 qt5/lib/libQt5Network.la
@@ -2419,6 +2423,7 @@ qt5/lib/pkgconfig/Qt5Bootstrap.pc
 qt5/lib/pkgconfig/Qt5Concurrent.pc
 qt5/lib/pkgconfig/Qt5Core.pc
 qt5/lib/pkgconfig/Qt5DBus.pc
+${PLIST.unix}qt5/lib/pkgconfig/Qt5EglDeviceIntegration.pc
 qt5/lib/pkgconfig/Qt5Gui.pc
 qt5/lib/pkgconfig/Qt5Network.pc
 qt5/lib/pkgconfig/Qt5OpenGL.pc
@@ -2789,6 +2794,7 @@ qt5/mkspecs/modules/qt_lib_core.pri
 qt5/mkspecs/modules/qt_lib_core_private.pri
 qt5/mkspecs/modules/qt_lib_dbus.pri
 qt5/mkspecs/modules/qt_lib_dbus_private.pri
+${PLIST.unix}qt5/mkspecs/modules/qt_lib_eglfs_device_lib_private.pri
 qt5/mkspecs/modules/qt_lib_gui.pri
 qt5/mkspecs/modules/qt_lib_gui_private.pri
 qt5/mkspecs/modules/qt_lib_network.pri
@@ -2915,6 +2921,7 @@ ${PLIST.mac}qt5/plugins/bearer/libqcorewlanbearer.la
 qt5/mkspecs/winrt-x86-msvc2015/qmake.conf
 qt5/mkspecs/winrt-x86-msvc2015/qplatformdefs.h
 qt5/plugins/bearer/libqgenericbearer.la
+${PLIST.unix}qt5/plugins/egldeviceintegrations/libqeglfs-x11-integration.la
 qt5/plugins/generic/libqtuiotouchplugin.la
 qt5/plugins/imageformats/libqgif.la
 qt5/plugins/imageformats/libqico.la
@@ -2930,3 +2937,4 @@ ${PLIST.unix}qt5/plugins/platforms/libqxcb.la
 ${PLIST.mac}qt5/plugins/printsupport/libcocoaprintersupport.la
 ${PLIST.cups}qt5/plugins/printsupport/libcupsprintersupport.la
 ${PLIST.unix}qt5/plugins/xcbglintegrations/libqxcb-glx-integration.la
+${PLIST.unix}qt5/plugins/xcbglintegrations/libqxcb-egl-integration.la
diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo
index 28a604a50ce..ee399468f46 100644
--- a/x11/qt5-qtbase/distinfo
+++ b/x11/qt5-qtbase/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2015/10/26 19:03:59 adam Exp $
+$NetBSD: distinfo,v 1.26 2015/10/28 15:52:11 adam Exp $
 
 SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f
 RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44
@@ -6,6 +6,7 @@ SHA512 (qtbase-opensource-src-5.5.1.tar.xz) = 4d31de136870025dfb7544f255798884af
 Size (qtbase-opensource-src-5.5.1.tar.xz) = 46389212 bytes
 SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = 05131870b21ff778b1e6f3d1e7287060b6b88764
 SHA1 (patch-configure) = 7ad9c130af98ffcb703e7be924c46f4cc4be4613
+SHA1 (patch-mkspecs_features_create__cmake.prf) = 46c1b3d16803a6b62d873bce2f743ab5e29774c8
 SHA1 (patch-mkspecs_features_mac_objective__c.prf) = 20838861017d969fbcf171960dfc07db1bd5a177
 SHA1 (patch-mkspecs_features_qt__module__pris.prf) = edaab0b9e407cc52f4682ce1cf8441832c57fe39
 SHA1 (patch-mkspecs_features_simd.prf) = 7dbe61df6252adebeac374e3541bc5ff4c93909b
diff --git a/x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf b/x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf
new file mode 100644
index 00000000000..a70bb5aefaf
--- /dev/null
+++ b/x11/qt5-qtbase/patches/patch-mkspecs_features_create__cmake.prf
@@ -0,0 +1,17 @@
+$NetBSD: patch-mkspecs_features_create__cmake.prf,v 1.1 2015/10/28 15:52:11 adam Exp $
+
+Fix for shared libraries naming on Darwin.
+
+--- mkspecs/features/create_cmake.prf.orig	2015-10-28 08:15:14.000000000 +0000
++++ mkspecs/features/create_cmake.prf
+@@ -213,8 +213,8 @@ mac {
+             CMAKE_LIB_FILE_LOCATION_RELEASE = Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}.framework/Qt$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}
+             CMAKE_BUILD_IS_FRAMEWORK = "true"
+         } else {
+-            CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.$$eval(QT.$${MODULE}.VERSION).dylib
+-            CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$$eval(QT.$${MODULE}.VERSION).dylib
++            CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.$$QT_MAJOR_VERSION.dylib
++            CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$$QT_MAJOR_VERSION.dylib
+         }
+     }
+ } else:win32 {