Fix scons to honour wrappers.

4 files changed, 45 insertions, 4 deletions

diff --git a/emulators/gambatte/Makefile b/emulators/gambatte/Makefile
index d00a2accac5..676b1c52b5b 100644
--- a/emulators/gambatte/Makefile
+++ b/emulators/gambatte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/06/06 12:54:18 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2013/06/26 21:25:02 joerg Exp $
 #
 
 DISTNAME=	gambatte_src-0.4.1
@@ -25,8 +25,8 @@ SUBST_STAGE.sdl=	pre-build
 .include "options.mk"
 
 do-build:
-	cd ${WRKSRC}/libgambatte && ${SETENV} ${MAKE_ENV} scons
-	cd ${WRKSRC}/gambatte_sdl && ${SETENV} ${MAKE_ENV} scons
+	cd ${WRKSRC}/libgambatte && ${PKGSRC_SETENV} ${MAKE_ENV} scons
+	cd ${WRKSRC}/gambatte_sdl && ${PKGSRC_SETENV} ${MAKE_ENV} scons
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gambatte_sdl/gambatte_sdl \
diff --git a/emulators/gambatte/distinfo b/emulators/gambatte/distinfo
index a8a40830e6c..1ba1fdd8df9 100644
--- a/emulators/gambatte/distinfo
+++ b/emulators/gambatte/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.3 2011/08/14 19:05:03 wiz Exp $
+$NetBSD: distinfo,v 1.4 2013/06/26 21:25:02 joerg Exp $
 
 SHA1 (gambatte_src-0.4.1.tar.gz) = 1374720b9cad35b2dace20822bf9b4b2ea0d2059
 RMD160 (gambatte_src-0.4.1.tar.gz) = 2b09971498c8f474c71c5e53cbaf444df84b28f8
 Size (gambatte_src-0.4.1.tar.gz) = 263391 bytes
 SHA1 (patch-aa) = 96fd6b152afa1ec603864068b747ac50ec830b7d
 SHA1 (patch-ab) = c9d7cf6ca8bfa98c0d970a60ecfc34812756447e
+SHA1 (patch-gambatte__sdl_SConstruct) = 0d09014df7f0c1f23597366ad59612df6c61b67d
 SHA1 (patch-gambatte__sdl_src_gambatte__sdl.cpp) = 896c97289976a85c69fe291a9a7df2995809f7ca
+SHA1 (patch-libgambatte_SConstruct) = ced1c6a50627ce856b3d8a81f13b3d1c96514168
diff --git a/emulators/gambatte/patches/patch-gambatte__sdl_SConstruct b/emulators/gambatte/patches/patch-gambatte__sdl_SConstruct
new file mode 100644
index 00000000000..93aaecf85c7
--- /dev/null
+++ b/emulators/gambatte/patches/patch-gambatte__sdl_SConstruct
@@ -0,0 +1,20 @@
+$NetBSD: patch-gambatte__sdl_SConstruct,v 1.1 2013/06/26 21:25:02 joerg Exp $
+
+--- gambatte_sdl/SConstruct.orig	2013-06-26 20:25:50.000000000 +0000
++++ gambatte_sdl/SConstruct
+@@ -1,3 +1,5 @@
++import os
++
+ global_cflags = ARGUMENTS.get('CFLAGS', '-Wall -Wextra -O2 -fomit-frame-pointer')
+ global_cxxflags = ARGUMENTS.get('CXXFLAGS', global_cflags + ' -fno-exceptions -fno-rtti')
+ global_defines = ' -DHAVE_STDINT_H'
+@@ -6,7 +8,8 @@ env = Environment(CPPPATH = ['src', '../
+                   LIBS = ['gambatte'],
+                   LIBPATH = '../libgambatte',
+                   CFLAGS = global_cflags + global_defines,
+-                  CXXFLAGS = global_cxxflags + global_defines)
++                  CXXFLAGS = global_cxxflags + global_defines,
++                  ENV = { 'PATH': os.environ['PATH'] })
+ 
+ env.ParseConfig('sdl-config --cflags --libs')
+ 
diff --git a/emulators/gambatte/patches/patch-libgambatte_SConstruct b/emulators/gambatte/patches/patch-libgambatte_SConstruct
new file mode 100644
index 00000000000..294b203c507
--- /dev/null
+++ b/emulators/gambatte/patches/patch-libgambatte_SConstruct
@@ -0,0 +1,19 @@
+$NetBSD: patch-libgambatte_SConstruct,v 1.1 2013/06/26 21:25:02 joerg Exp $
+
+--- libgambatte/SConstruct.orig	2013-06-26 20:24:31.000000000 +0000
++++ libgambatte/SConstruct
+@@ -1,10 +1,13 @@
++import os
++
+ global_cflags = ARGUMENTS.get('CFLAGS', '-Wall -Wextra -O2 -fomit-frame-pointer')
+ global_cxxflags = ARGUMENTS.get('CXXFLAGS', global_cflags + ' -fno-exceptions -fno-rtti')
+ global_defines = ' -DHAVE_STDINT_H -DCHAR_WIDTH_8'
+ 
+ env = Environment(CPPPATH = ['src', 'include', '../common'],
+                   CFLAGS = global_cflags + global_defines,
+-                  CXXFLAGS = global_cxxflags + global_defines)
++                  CXXFLAGS = global_cxxflags + global_defines,
++                  ENV = { 'PATH': os.environ['PATH'] })
+ 
+ sourceFiles = Split('''
+ 			src/bitmap_font.cpp