pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/emulators/yabause Put gtk and qt in a mutual-exclusive...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a992f482108
branches:  trunk
changeset: 610618:5a992f482108
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Oct 31 22:48:54 2012 +0000

description:
Put gtk and qt in a mutual-exclusive group, and switch to qt by default,
since that's preferred by upstream. From diro%nixsyspaus.org@localhost in PR 47148.

Bump PKGREVISION.

diffstat:

 emulators/yabause/Makefile   |   4 ++--
 emulators/yabause/options.mk |  21 +++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diffs (54 lines):

diff -r 8653fe9c9c8c -r 5a992f482108 emulators/yabause/Makefile
--- a/emulators/yabause/Makefile        Wed Oct 31 22:45:47 2012 +0000
+++ b/emulators/yabause/Makefile        Wed Oct 31 22:48:54 2012 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2012/10/16 17:47:20 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2012/10/31 22:48:54 wiz Exp $
 
 DISTNAME=      yabause-0.9.11.1
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=yabause/}
 
diff -r 8653fe9c9c8c -r 5a992f482108 emulators/yabause/options.mk
--- a/emulators/yabause/options.mk      Wed Oct 31 22:45:47 2012 +0000
+++ b/emulators/yabause/options.mk      Wed Oct 31 22:48:54 2012 +0000
@@ -1,8 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2011/11/30 12:07:52 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2012/10/31 22:48:54 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.yabause
-PKG_SUPPORTED_OPTIONS= gtk openal qt
-PKG_SUGGESTED_OPTIONS= gtk
+PKG_SUPPORTED_OPTIONS= openal
+PKG_OPTIONS_OPTIONAL_GROUPS=   GUI
+PKG_OPTIONS_GROUP.GUI=         gtk qt
+
+PKG_SUGGESTED_OPTIONS= qt
 
 .include "../../mk/bsd.options.mk"
 
@@ -10,7 +13,11 @@
 #BUILD_DEPENDS+=       doxygen>=1.6.3:../../devel/doxygen
 #.endif
 
-.if !empty(PKG_OPTIONS:Mgtk)
+.if !empty(PKG_OPTIONS:Mqt)
+CONFIGURE_ENV+=        YAB_PORTS=qt
+CMAKE_ARGS+=   -DYAB_PORTS=qt
+.include "../../x11/qt4-tools/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mgtk)
 CONFIGURE_ENV+=        YAB_PORTS=gtk
 CMAKE_ARGS+=   -DYAB_PORTS=gtk
 CMAKE_ARGS+=   -DGTK2_GDKCONFIG_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.gtk2}/lib/gtk-2.0/include
@@ -23,9 +30,3 @@
 .if !empty(PKG_OPTIONS:Mopenal)
 .include "../../audio/openal/buildlink3.mk"
 .endif
-
-.if !empty(PKG_OPTIONS:Mqt)
-CONFIGURE_ENV+=        YAB_PORTS=qt
-CMAKE_ARGS+=   -DYAB_PORTS=qt
-.include "../../x11/qt4-tools/buildlink3.mk"
-.endif



Home | Main Index | Thread Index | Old Index