Update to latest release, 0.9.13. Move SDL and OpenGL to the options

framework, the former being enabled while the latter not. The OpenGL
renderer has caused crashes on the prior few versions and now we're getting
reports of these crashes on non-NetBSD, non-pkgsrc platforms. There's no
need to enable this option by default if it's not working properly. We can
re-enable it when it's fixed upstream. This version adds Dutch language
support. Also, we have SDL2 support in this version. From Changelog:

0.9.12 -> 0.9.13
 general:
  - Removed Carbon, PSP, Wii and Windows ports
  - Removed autotools based build
  - Removed autopackage
  - mdf/mds images support (CyberWarriorX)
  - Safeguard to reject unsupported cue files (CyberWarriorX)
  - CD+G support (CyberWarriorX)
  - Improved "manual mode" (Guillaume)
  - Made it possible to build Yabause to ouput 16BPP (Guillaume)
  - Hat support in SDL joystick code (anonymous)
  - gdb stub (Guillaume)
  - Improved emulated bios (CyberWarriorX)
 sound:
  - Fixed most of the distorted cd audio issues with the scsp core (CyberWarriorX)
 video:
  - Improvements to the software renderer (transparency, frameskip,  (Guillaume)
 qt port:
  - Memory editor and search (CyberWarriorX)
  - Improvements to the SH2 debugger: Back trace support, step over, step out (CyberWarriorX)
  - Infinite loop tracking (CyberWarriorX)
  - Don't restart emulation after every settings change (AmonX)
  - Made Yabause compilable with Qt5 and SDL2 (CyberWarriorX)
  - Log window can now be hidden (Guillaume)
  - Save and restore window position (Guillaume)
  - Can use .ini files in the application dir (Guillaume)
  - Mouse and 3D control pad support (CyberWarriorX)
  - Made drives and languages settings more user friendly (CyberWarriorX)
  - Changing to fullscreen now updates resolution too (CyberWarriorX)
  - Shortcuts editing (CyberWarriorX)

4 files changed, 34 insertions, 14 deletions

diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile
index bf4f4b3b4ba..177611bfa20 100644
--- a/emulators/yabause/Makefile
+++ b/emulators/yabause/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2013/10/10 14:42:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.35 2014/01/06 04:44:16 rodent Exp $
 
-DISTNAME=	yabause-0.9.12
-PKGREVISION=	6
+DISTNAME=	yabause-0.9.13
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=yabause/}
 
@@ -18,8 +17,6 @@ CONFIGURE_ENV+=	PKGMANDIR=${PKGMANDIR:Q}
 
 .include "options.mk"
 
-.include "../../graphics/glut/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/yabause/PLIST b/emulators/yabause/PLIST
index 8e43204d032..88e4a07ea73 100644
--- a/emulators/yabause/PLIST
+++ b/emulators/yabause/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/09/12 14:06:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/01/06 04:44:16 rodent Exp $
 bin/yabause
 man/man1/yabause.1
 share/applications/yabause.desktop
@@ -8,6 +8,7 @@ share/yabause/yts/es.yts
 share/yabause/yts/fr.yts
 share/yabause/yts/it.yts
 share/yabause/yts/lt.yts
+share/yabause/yts/nl.yts
 share/yabause/yts/pt.yts
 share/yabause/yts/pt_BR.yts
 share/yabause/yts/sv.yts
diff --git a/emulators/yabause/distinfo b/emulators/yabause/distinfo
index fb02603216b..36df32fb740 100644
--- a/emulators/yabause/distinfo
+++ b/emulators/yabause/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2013/02/12 09:50:56 wiz Exp $
+$NetBSD: distinfo,v 1.7 2014/01/06 04:44:16 rodent Exp $
 
-SHA1 (yabause-0.9.12.tar.gz) = 72739cb3b652bbca68ca6309bcadf7e6989e587a
-RMD160 (yabause-0.9.12.tar.gz) = 5fc101240f45f8ad084ea9ed63a3a0169612f14c
-Size (yabause-0.9.12.tar.gz) = 2199145 bytes
+SHA1 (yabause-0.9.13.tar.gz) = ecba2399a1cae8b641b726a828c393655975fcdf
+RMD160 (yabause-0.9.13.tar.gz) = 73b3fa5a8550012aed7abae3c1ee7825fd7ea23e
+Size (yabause-0.9.13.tar.gz) = 1635104 bytes
diff --git a/emulators/yabause/options.mk b/emulators/yabause/options.mk
index 09c874eb7e8..e6d00d1de2e 100644
--- a/emulators/yabause/options.mk
+++ b/emulators/yabause/options.mk
@@ -1,11 +1,12 @@
-# $NetBSD: options.mk,v 1.2 2012/10/31 22:48:54 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2014/01/06 04:44:16 rodent Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.yabause
-PKG_SUPPORTED_OPTIONS=	openal
-PKG_OPTIONS_OPTIONAL_GROUPS=	GUI
+PKG_SUPPORTED_OPTIONS=	openal opengl
+PKG_OPTIONS_OPTIONAL_GROUPS=	GUI SDL
 PKG_OPTIONS_GROUP.GUI=		gtk qt
+PKG_OPTIONS_GROUP.SDL=		sdl sdl2
 
-PKG_SUGGESTED_OPTIONS=	qt
+PKG_SUGGESTED_OPTIONS=	qt sdl
 
 .include "../../mk/bsd.options.mk"
 
@@ -29,4 +30,25 @@ BUILDLINK_API_DEPENDS.gtkglext+=        gtkglext>=1.2.0nb4
 
 .if !empty(PKG_OPTIONS:Mopenal)
 .include "../../audio/openal/buildlink3.mk"
+CMAKE_ARGS+=	-DYAB_WANT_OPENAL=ON
+.else
+CMAKE_ARGS+=	-DYAB_WANT_OPENAL=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mopengl)
+.include "../../graphics/glut/buildlink3.mk"
+CMAKE_ARGS+=	-DYAB_WANT_OPENGL=ON
+.else
+CMAKE_ARGS+=	-DYAB_WANT_OPENGL=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Msdl)
+.include "../../devel/SDL/buildlink3.mk"
+CMAKE_ARGS+=	-DYAB_WANT_SDL=ON
+.elif !empty(PKG_OPTIONS:Msdl2)
+.include "../../devel/SDL2/buildlink3.mk"
+CMAKE_ARGS+=	-DYAB_WANT_SDL=ON
+BUILDLINK_TRANSFORM+=	l:SDL:SDL2
+.else
+CMAKE_ARGS+=	-DYAB_WANT_SDL=OFF
 .endif