[pkgsrc/trunk]: pkgsrc/x11/qt5-qtbase Make latest egl file additions optional...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cdd1c8e8874a
branches:  trunk
changeset: 650853:cdd1c8e8874a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Apr 27 10:38:04 2015 +0000

description:
Make latest egl file additions optional depending on the use of X.org
from pkgsrc or the existence of a particular header file.

Suggested by tnn.

diffstat:

 x11/qt5-qtbase/Makefile |   7 ++++++-
 x11/qt5-qtbase/PLIST    |  10 +++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r 61ab751cef91 -r cdd1c8e8874a x11/qt5-qtbase/Makefile
--- a/x11/qt5-qtbase/Makefile   Mon Apr 27 10:33:49 2015 +0000
+++ b/x11/qt5-qtbase/Makefile   Mon Apr 27 10:38:04 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2015/04/25 14:25:17 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2015/04/27 10:38:04 wiz Exp $
 
 DISTNAME=      qtbase-opensource-src-${QTVERSION}
 PKGNAME=       qt5-qtbase-${QTVERSION}
@@ -50,6 +50,11 @@
 QMAKE_CONF=            qmake.conf.mac
 .endif
 
+PLIST_VARS+=           egl
+.if ${X11_TYPE} == "modular" || exists(${X11BASE}/include/EGL/egl.h)
+PLIST.egl=             yes
+.endif
+
 .include "../../mk/compiler.mk"
 
 .if ${OPSYS} == "SunOS"
diff -r 61ab751cef91 -r cdd1c8e8874a x11/qt5-qtbase/PLIST
--- a/x11/qt5-qtbase/PLIST      Mon Apr 27 10:33:49 2015 +0000
+++ b/x11/qt5-qtbase/PLIST      Mon Apr 27 10:38:04 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2015/04/27 08:36:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/04/27 10:38:04 wiz Exp $
 lib/pkgconfig/Qt5Bootstrap.pc
 lib/pkgconfig/Qt5Concurrent.pc
 lib/pkgconfig/Qt5Core.pc
@@ -2277,11 +2277,11 @@
 qt5/lib/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake
 ${PLIST.mac}qt5/lib/cmake/Qt5Gui/Qt5Gui_QCocoaIntegrationPlugin.cmake
 ${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake
-qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake
+${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake
 qt5/lib/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake
 qt5/lib/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake
 qt5/lib/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake
-qt5/lib/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake
+${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake
 qt5/lib/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake
 ${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
 qt5/lib/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
@@ -2833,9 +2833,9 @@
 qt5/plugins/imageformats/libqjpeg.la
 ${PLIST.unix}qt5/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.la
 ${PLIST.mac}qt5/plugins/platforms/libqcocoa.la
-qt5/plugins/platforms/libqeglfs.la
+${PLIST.egl}qt5/plugins/platforms/libqeglfs.la
 qt5/plugins/platforms/libqminimal.la
-qt5/plugins/platforms/libqminimalegl.la
+${PLIST.egl}qt5/plugins/platforms/libqminimalegl.la
 qt5/plugins/platforms/libqoffscreen.la
 ${PLIST.unix}qt5/plugins/platforms/libqxcb.la
 ${PLIST.mac}qt5/plugins/printsupport/libcocoaprintersupport.la