gambas3-runtime: Introduce more options

[bgermann <bastiangermann%fishpost.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	bgermann <bastiangermann%fishpost.de@localhost>
Pushed By:	bgermann
Date:		Sat Sep 29 18:37:45 2018 +0200
Changeset:	cd4356abb4066c253b753920a56aaea9280e9921

Modified Files:
	gambas3-runtime/PLIST
	gambas3-runtime/options.mk

Log Message:
gambas3-runtime: Introduce more options

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cd4356abb4066c253b753920a56aaea9280e9921

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gambas3-runtime/PLIST      | 32 ++++++++++++++++----------------
 gambas3-runtime/options.mk | 26 ++++++++++++++++----------
 2 files changed, 32 insertions(+), 26 deletions(-)

diffs:
diff --git a/gambas3-runtime/PLIST b/gambas3-runtime/PLIST
index 2c2f1986b6..e079438beb 100644
--- a/gambas3-runtime/PLIST
+++ b/gambas3-runtime/PLIST
@@ -14,14 +14,14 @@ ${PLIST.gui}lib/gambas3/gb.gui.base.component
 ${PLIST.gui}lib/gambas3/gb.gui.base.gambas
 ${PLIST.gui}lib/gambas3/gb.gui.component
 ${PLIST.gui}lib/gambas3/gb.gui.la
-${PLIST.gui}lib/gambas3/gb.gui.opengl.component
-${PLIST.gui}lib/gambas3/gb.gui.opengl.la
-${PLIST.gui}lib/gambas3/gb.gui.qt.component
-${PLIST.gui}lib/gambas3/gb.gui.qt.la
-${PLIST.gui}lib/gambas3/gb.gui.qt.opengl.component
-${PLIST.gui}lib/gambas3/gb.gui.qt.opengl.la
-${PLIST.gui}lib/gambas3/gb.gui.qt.webkit.component
-${PLIST.gui}lib/gambas3/gb.gui.qt.webkit.la
+${PLIST.gui.opengl}lib/gambas3/gb.gui.opengl.component
+${PLIST.gui.opengl}lib/gambas3/gb.gui.opengl.la
+${PLIST.gui.qt}lib/gambas3/gb.gui.qt.component
+${PLIST.gui.qt}lib/gambas3/gb.gui.qt.la
+${PLIST.gui.qt}lib/gambas3/gb.gui.qt.opengl.component
+${PLIST.gui.qt}lib/gambas3/gb.gui.qt.opengl.la
+${PLIST.gui.qt}lib/gambas3/gb.gui.qt.webkit.component
+${PLIST.gui.qt}lib/gambas3/gb.gui.qt.webkit.la
 lib/gambas3/gb.gui.trayicon.component
 lib/gambas3/gb.gui.trayicon.la
 share/gambas3/icons/application-x-gambas3.png
@@ -33,14 +33,14 @@ ${PLIST.gui}share/gambas3/info/gb.gui.base.info
 ${PLIST.gui}share/gambas3/info/gb.gui.base.list
 ${PLIST.gui}share/gambas3/info/gb.gui.info
 ${PLIST.gui}share/gambas3/info/gb.gui.list
-${PLIST.gui}share/gambas3/info/gb.gui.opengl.info
-${PLIST.gui}share/gambas3/info/gb.gui.opengl.list
-${PLIST.gui}share/gambas3/info/gb.gui.qt.info
-${PLIST.gui}share/gambas3/info/gb.gui.qt.list
-${PLIST.gui}share/gambas3/info/gb.gui.qt.opengl.info
-${PLIST.gui}share/gambas3/info/gb.gui.qt.opengl.list
-${PLIST.gui}share/gambas3/info/gb.gui.qt.webkit.info
-${PLIST.gui}share/gambas3/info/gb.gui.qt.webkit.list
+${PLIST.gui.opengl}share/gambas3/info/gb.gui.opengl.info
+${PLIST.gui.opengl}share/gambas3/info/gb.gui.opengl.list
+${PLIST.gui.qt}share/gambas3/info/gb.gui.qt.info
+${PLIST.gui.qt}share/gambas3/info/gb.gui.qt.list
+${PLIST.gui.qt}share/gambas3/info/gb.gui.qt.opengl.info
+${PLIST.gui.qt}share/gambas3/info/gb.gui.qt.opengl.list
+${PLIST.gui.qt}share/gambas3/info/gb.gui.qt.webkit.info
+${PLIST.gui.qt}share/gambas3/info/gb.gui.qt.webkit.list
 share/gambas3/info/gb.gui.trayicon.info
 share/gambas3/info/gb.gui.trayicon.list
 share/gambas3/info/gb.info
diff --git a/gambas3-runtime/options.mk b/gambas3-runtime/options.mk
index 207f98c469..f0f22c006b 100644
--- a/gambas3-runtime/options.mk
+++ b/gambas3-runtime/options.mk
@@ -3,27 +3,33 @@
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gambas3-runtime
 PKG_SUPPORTED_OPTIONS=	qt4 qt5 gtk2 gtk3
 PKG_SUGGESTED_OPTIONS=	qt4
-PLIST_VARS+=		gui
+PLIST_VARS+=		gui gui.opengl gui.qt
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgtk2)
-BUILD_DEPENDS+=	gambas3-gb-gtk-opengl-${GB_VERSION}:../../wip/gambas3-gb-gtk-opengl
-PLIST.gui=	yes
+BUILD_DEPENDS+=		gambas3-gb-gtk-opengl-${GB_VERSION}:../../wip/gambas3-gb-gtk-opengl
+PLIST.gui=		yes
+PLIST.gui.opengl=	yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mgtk3)
-BUILD_DEPENDS+=	gambas3-gb-gtk3-${GB_VERSION}:../../wip/gambas3-gb-gtk3
-PLIST.gui=	yes
+BUILD_DEPENDS+=		gambas3-gb-gtk3-${GB_VERSION}:../../wip/gambas3-gb-gtk3
+PLIST.gui=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mqt4)
-BUILD_DEPENDS+=	gambas3-gb-qt4-opengl-${GB_VERSION}:../../wip/gambas3-gb-qt4-opengl
-BUILD_DEPENDS+=	gambas3-gb-qt4-webkit-${GB_VERSION}:../../wip/gambas3-gb-qt4-webkit
-PLIST.gui=	yes
+BUILD_DEPENDS+=		gambas3-gb-qt4-opengl-${GB_VERSION}:../../wip/gambas3-gb-qt4-opengl
+BUILD_DEPENDS+=		gambas3-gb-qt4-webkit-${GB_VERSION}:../../wip/gambas3-gb-qt4-webkit
+PLIST.gui=		yes
+PLIST.gui.opengl=	yes
+PLIST.gui.qt=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mqt5)
-BUILD_DEPENDS+=	gambas3-gb-qt5-${GB_VERSION}:../../wip/gambas3-gb-qt5
-PLIST.gui=	yes
+BUILD_DEPENDS+=		gambas3-gb-qt5-opengl-${GB_VERSION}:../../wip/gambas3-gb-qt5-opengl
+BUILD_DEPENDS+=		gambas3-gb-qt5-webkit-${GB_VERSION}:../../wip/gambas3-gb-qt5-webkit
+PLIST.gui=		yes
+PLIST.gui.opengl=	yes
+PLIST.gui.qt=		yes
 .endif