From aa1f2209b688131308de17f2a3a798ef461e98ae Mon Sep 17 00:00:00 2001
From: bentley <bentley@openbsd.org>
Date: Sat, 21 Sep 2013 05:48:48 +0000
Subject: [PATCH] Update to gambatte-0.5.0.537.

---
 emulators/gambatte/Makefile                   |  4 +--
 emulators/gambatte/distinfo                   |  4 +--
 .../patches/patch-gambatte_sdl_SConstruct     | 26 -------------------
 .../patches/patch-testrunner_SConstruct       | 22 +++++-----------
 4 files changed, 10 insertions(+), 46 deletions(-)
 delete mode 100644 emulators/gambatte/patches/patch-gambatte_sdl_SConstruct

diff --git a/emulators/gambatte/Makefile b/emulators/gambatte/Makefile
index d3a4e39eceb..fa81e6efc24 100644
--- a/emulators/gambatte/Makefile
+++ b/emulators/gambatte/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2013/05/31 15:34:55 bentley Exp $
+# $OpenBSD: Makefile,v 1.7 2013/09/21 05:48:48 bentley Exp $
 
 COMMENT =		highly accurate Game Boy Color emulator
 
-REV =			532
+REV =			537
 DISTNAME =		gambatte_src-r${REV}
 PKGNAME =		gambatte-0.5.0.${REV}
 
diff --git a/emulators/gambatte/distinfo b/emulators/gambatte/distinfo
index 4361901ab54..6dbce5eb4db 100644
--- a/emulators/gambatte/distinfo
+++ b/emulators/gambatte/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gambatte_src-r532.tar.gz) = 9iXBbqHmmpMlM++2aDWXlSlH+NeN8y12kTQ6apQYTvc=
-SIZE (gambatte_src-r532.tar.gz) = 520626
+SHA256 (gambatte_src-r537.tar.gz) = OXWxQyfMaIXM2Unu2dds9b30paDBMY5iDAfbSbaUCxY=
+SIZE (gambatte_src-r537.tar.gz) = 520699
diff --git a/emulators/gambatte/patches/patch-gambatte_sdl_SConstruct b/emulators/gambatte/patches/patch-gambatte_sdl_SConstruct
deleted file mode 100644
index 214ba821ea1..00000000000
--- a/emulators/gambatte/patches/patch-gambatte_sdl_SConstruct
+++ /dev/null
@@ -1,26 +0,0 @@
-$OpenBSD: patch-gambatte_sdl_SConstruct,v 1.1 2013/05/31 15:34:55 bentley Exp $
---- gambatte_sdl/SConstruct.orig	Thu May 30 10:38:24 2013
-+++ gambatte_sdl/SConstruct	Thu May 30 10:38:40 2013
-@@ -9,7 +9,7 @@ vars.Add('CXX')
- env = Environment(CPPPATH = ['src', '../libgambatte/include', '../common'],
-                   CFLAGS = cflags,
-                   CXXFLAGS = cxxflags,
--                  CPPDEFINES = { 'HAVE_STDINT_H': None },
-+                  CPPDEFINES = [ 'HAVE_STDINT_H', None ],
-                   variables = vars)
- env.ParseConfig('sdl-config --cflags --libs')
- 
-@@ -44,11 +44,11 @@ conf = env.Configure()
- conf.CheckLib('z')
- conf.Finish()
- 
--version_str_def = { 'GAMBATTE_SDL_VERSION_STR': r'\"r532\"' }
-+version_str_def = [ 'GAMBATTE_SDL_VERSION_STR', r'\"r532\"' ]
- if Dir('../.git').exists():
- 	try:
- 		git_revno = subprocess.check_output("git rev-list HEAD --count", shell=True).strip()
--		version_str_def = { 'GAMBATTE_SDL_VERSION_STR': r'\"r' + git_revno + r'\"' }
-+		version_str_def = [ 'GAMBATTE_SDL_VERSION_STR', r'\"r' + git_revno + r'\"' ]
- 	except subprocess.CalledProcessError:
- 		pass
- 
diff --git a/emulators/gambatte/patches/patch-testrunner_SConstruct b/emulators/gambatte/patches/patch-testrunner_SConstruct
index a5b86080dcb..c1be0db60bb 100644
--- a/emulators/gambatte/patches/patch-testrunner_SConstruct
+++ b/emulators/gambatte/patches/patch-testrunner_SConstruct
@@ -1,21 +1,11 @@
-$OpenBSD: patch-testrunner_SConstruct,v 1.3 2013/06/04 15:41:19 naddy Exp $
---- testrunner/SConstruct.orig	Sun May 12 08:51:24 2013
-+++ testrunner/SConstruct	Tue Jun  4 11:04:54 2013
-@@ -1,11 +1,16 @@
- global_cflags = ARGUMENTS.get('CFLAGS', '-Wall -Wextra -O2 -g')
- global_cxxflags = ARGUMENTS.get('CXXFLAGS', global_cflags + ' -fno-exceptions -fno-rtti')
- global_defines = ' -DHAVE_STDINT_H'
-+vars = Variables()
-+vars.Add('CC')
-+vars.Add('CXX')
- 
+$OpenBSD: patch-testrunner_SConstruct,v 1.4 2013/09/21 05:48:48 bentley Exp $
+--- testrunner/SConstruct.orig	Fri Sep 20 23:31:43 2013
++++ testrunner/SConstruct	Fri Sep 20 23:32:29 2013
+@@ -8,6 +8,7 @@ vars.Add('CXX')
  env = Environment(CPPPATH = ['.', '../libgambatte/include'],
                    CFLAGS = global_cflags + global_defines,
                    CXXFLAGS = global_cxxflags + global_defines,
--                  LIBS = 'm')
 +                  LIBPATH = '${LOCALBASE}/lib',
-+                  LIBS = 'm',
-+                  variables = vars)
+                   LIBS = 'm',
+                   variables = vars)
  
- sourceFiles = Split('''
- 			testrunner.cpp