pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lxqt: revert removal of options.mk, as we want to keep the future possibility of adding other users like for example i3. Add a todo note about the keyword warning.



Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%NetBSD.org@localhost>
Pushed By:	ng0
Date:		Wed Jan 15 23:40:15 2020 +0000
Changeset:	0ac64c8ac3024fff39fcc3f7e7d9efdefdd67167

Modified Files:
	lxqt/Makefile
Added Files:
	lxqt/options.mk

Log Message:
lxqt: revert removal of options.mk, as we want to keep the future
possibility of adding other users like for example i3. Add a todo
note about the keyword warning.

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

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

diffstat:
 lxqt/Makefile   |  4 ++--
 lxqt/options.mk | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diffs:
diff --git a/lxqt/Makefile b/lxqt/Makefile
index 74474fe011..25c3b7f1b5 100644
--- a/lxqt/Makefile
+++ b/lxqt/Makefile
@@ -9,6 +9,8 @@ COMMENT=	Meta-package for LXQt desktop environment
 
 META_PACKAGE=	yes
 
+.include "options.mk"
+
 DEPENDS+=	liblxqt>=0.14.1:../../wip/liblxqt
 DEPENDS+=	lximage-qt>=0.14.1:../../wip/lximage-qt
 DEPENDS+=	lxqt-about>=0.14.1:../../wip/lxqt-about
@@ -28,9 +30,7 @@ DEPENDS+=	libfm-qt>=0.14.1:../../wip/libfm-qt
 DEPENDS+=	lxqt-sudo>=0.14.1:../../wip/lxqt-sudo
 DEPENDS+=	lxqt-themes>=0.14.0:../../wip/lxqt-themes
 DEPENDS+=	qterminal>=0.14.1:../../wip/qterminal
-DEPENDS+=	obconf-qt>=0.14.1:../../wip/obconf-qt
 DEPENDS+=	pavucontrol-qt>=0.14.1:../../wip/pavucontrol-qt
 DEPENDS+=	screengrab>=1.101:../../wip/screengrab
-DEPENDS+=	openbox>=3.6.1:../../wm/openbox
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lxqt/options.mk b/lxqt/options.mk
new file mode 100644
index 0000000000..cf11b61f85
--- /dev/null
+++ b/lxqt/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.lxqt
+PKG_SUPPORTED_OPTIONS=	openbox # which alternatives exist?
+PKG_SUGGESTED_OPTIONS=	openbox
+
+.include "../../mk/bsd.options.mk"
+
+# \todo: When importing, add openbox to options file.
+.if !empty(PKG_OPTIONS:Mopenbox)
+DEPENDS+=	openbox>=3.6.1:../../wm/openbox
+DEPENDS+=	obconf-qt>=0.14.1:../../wip/obconf-qt
+.endif


Home | Main Index | Thread Index | Old Index