3 files changed, 34 insertions, 2 deletions
diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 4e35a3051db..f0819e720ad 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2013/11/20 20:04:37 adam Exp $
+# $NetBSD: Makefile,v 1.26 2013/12/15 19:37:41 joerg Exp $
 #
 
 DISTNAME=		scummvm-tools-1.4.0
@@ -19,6 +19,11 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
 INSTALLATION_DIRS=	bin
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+MAKE_ENV+=	CLANG_NO_OPT=-O0
+.endif
+
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
diff --git a/games/scummvm-tools/distinfo b/games/scummvm-tools/distinfo
index 1a53aed4a26..694d46a2f48 100644
--- a/games/scummvm-tools/distinfo
+++ b/games/scummvm-tools/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2012/11/16 00:51:35 joerg Exp $
+$NetBSD: distinfo,v 1.6 2013/12/15 19:37:41 joerg Exp $
 
 SHA1 (scummvm-tools-1.4.0.tar.bz2) = 44a422872180f8aea3eb57e0462d930e22c533ba
 RMD160 (scummvm-tools-1.4.0.tar.bz2) = baabb1d8fb99be72c5eafb186aa132b797edc58d
 Size (scummvm-tools-1.4.0.tar.bz2) = 943697 bytes
+SHA1 (patch-Makefile.common) = d296c951793facfc35835a250b652cedc25b949b
 SHA1 (patch-configure) = cf5da2584ec2fa05fb81faa115f8de0616dd04f7
 SHA1 (patch-decompiler_refcounted.h) = 509b95e42fa52a1f2c1892dbcfae829a9b7c92f6
diff --git a/games/scummvm-tools/patches/patch-Makefile.common b/games/scummvm-tools/patches/patch-Makefile.common
new file mode 100644
index 00000000000..1e4b3c32f32
--- /dev/null
+++ b/games/scummvm-tools/patches/patch-Makefile.common
@@ -0,0 +1,26 @@
+$NetBSD: patch-Makefile.common,v 1.1 2013/12/15 19:37:41 joerg Exp $
+
+--- Makefile.common.orig	2011-11-03 18:13:41.000000000 +0000
++++ Makefile.common
+@@ -360,17 +360,19 @@ ifdef CXX_UPDATE_DEP_FLAG
+ # dependency tracking.
+ %.o: %.cpp
+ 	$(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
+-	$(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
++	$(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o $(CXXFLAGS.$(subst /,_,$(<)))
+ 
+ else
+ 
+ # Dumb compile rule, for C++ compilers that don't allow dependency tracking or
+ # where it is broken (such as GCC 2.95).
+ .cpp.o:
+-	$(QUIET_CXX)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
++	$(QUIET_CXX)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o $(CXXFLAGS.$(subst /,_,$(<)))
+ 
+ endif
+ 
++CXXFLAGS.decompiler_scummv6_disassembler.cpp= ${CLANG_NO_OPT}
++
+ # Include the dependency tracking files.
+ -include $(wildcard $(addsuffix /*.d,$(DEPDIRS)))
+