summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2014-05-21 12:19:12 +0000
committergdt <gdt@pkgsrc.org>2014-05-21 12:19:12 +0000
commit5624f92d340cb18631874d79731918bb85527e92 (patch)
tree0ce6bdfb6da0a4d774db974e8f2fc18c6540bdbd /misc
parentaf523c673a6d1356b816713126e21b41dad692e8 (diff)
downloadpkgsrc-5624f92d340cb18631874d79731918bb85527e92.tar.gz
Convert qemu-0 and qemu options to an optional group.
No functional change intended; this merely uses PKG_OPTIONS_OPTIONAL_GROUPS to choose qemu-0 vs qemu. (Pointed out by wiz@.)
Diffstat (limited to 'misc')
-rw-r--r--misc/py-anita/options.mk16
1 files changed, 7 insertions, 9 deletions
diff --git a/misc/py-anita/options.mk b/misc/py-anita/options.mk
index 816f18954fd..77b518b076b 100644
--- a/misc/py-anita/options.mk
+++ b/misc/py-anita/options.mk
@@ -1,7 +1,12 @@
-# $NetBSD: options.mk,v 1.4 2014/05/20 18:06:07 gdt Exp $
+# $NetBSD: options.mk,v 1.5 2014/05/21 12:19:12 gdt Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.py-anita
-PKG_SUPPORTED_OPTIONS= qemu-0 qemu xen
+PKG_SUPPORTED_OPTIONS= xen
+# In the future, qemu0 and qemu might install with different names,
+# allowing anita to choose them dynamically. For now, they conflict,
+# so don't permit both.
+PKG_OPTIONS_OPTIONAL_GROUPS= qemu
+PKG_OPTIONS_GROUP.qemu= qemu-0 qemu
PKG_SUGGESTED_OPTIONS=
# To run (but not to build), anita needs some way to run a virtual
@@ -16,13 +21,6 @@ PKG_SUGGESTED_OPTIONS=
.include "../../mk/bsd.options.mk"
-# In the future, qemu0 and qemu might install with different names,
-# allowing anita to choose them dynamically. For now, they conflict,
-# so don't try to build both.
-.if !empty(PKG_OPTIONS:Mqemu-0) && !empty(PKG_OPTIONS:Mqemu)
-.error py-anita: qemu-0 and qemu (currently) conflict
-.endif
-
.if !empty(PKG_OPTIONS:Mqemu-0)
DEPENDS+= qemu>=0.12.3nb2:../../emulators/qemu0
.endif