5 files changed, 34 insertions, 21 deletions
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 39d619a2a6a..a8764ace283 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2004/10/06 09:29:35 tron Exp $
+# $NetBSD: Makefile,v 1.30 2005/01/04 13:41:53 adam Exp $
 
-DISTNAME=	scummvm-0.6.1b
-PKGREVISION=	1
+DISTNAME=	scummvm-0.7.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scummvm/}
 EXTRACT_SUFX=	.tar.bz2
@@ -25,6 +24,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/scummvm
 	${INSTALL_DATA} ${WRKSRC}/scummvm.xpm ${PREFIX}/share/pixmaps
 
+.include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
index ec6908bc87c..25de72c5ebe 100644
--- a/games/scummvm/distinfo
+++ b/games/scummvm/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.15 2004/08/09 11:24:41 adam Exp $
+$NetBSD: distinfo,v 1.16 2005/01/04 13:41:53 adam Exp $
 
-SHA1 (scummvm-0.6.1b.tar.bz2) = 3384624c5b8d5c825f722e9c8ccee68bd90e8c6d
-Size (scummvm-0.6.1b.tar.bz2) = 1626950 bytes
-SHA1 (patch-aa) = e38b7efdd69701e77aa3421769fc2484389cd4c7
-SHA1 (patch-ab) = 8e694dab27d76d3df00be07f510094b1e326ca6c
+SHA1 (scummvm-0.7.0.tar.bz2) = 67ffacd1797fbdb377e17c53d16241201bac2038
+Size (scummvm-0.7.0.tar.bz2) = 2045328 bytes
+SHA1 (patch-aa) = 74ebc406c606b48a2f1b1c4b3731363514fb2a88
+SHA1 (patch-ab) = 4e36e3a0c7ab2d3e9acd187c0cf16fd60c202f0b
+SHA1 (patch-ac) = d165bb41fc8da04dcacbace4fa366f07f2b88626
diff --git a/games/scummvm/patches/patch-aa b/games/scummvm/patches/patch-aa
index 7e688084cd8..14ce15a3e98 100644
--- a/games/scummvm/patches/patch-aa
+++ b/games/scummvm/patches/patch-aa
@@ -1,15 +1,14 @@
-$NetBSD: patch-aa,v 1.12 2004/07/27 13:40:36 adam Exp $
+$NetBSD: patch-aa,v 1.13 2005/01/04 13:41:53 adam Exp $
 
---- Makefile.orig	2004-04-12 12:50:21.000000000 +0000
+--- Makefile.orig	2004-07-27 15:33:15.000000000 +0000
 +++ Makefile
-@@ -2,3 +2,3 @@
- 
--CXX     := c++
-+#CXX     := c++
- AR      := ar cru
-@@ -35,4 +35,3 @@ include config.mak
+@@ -21,8 +21,7 @@ include config.mak
+ # Uncomment this for stricter compile time code verification
+ # CXXFLAGS+= -Werror
  
 -CXXFLAGS:= -Wall $(CXXFLAGS)
 -CXXFLAGS+= -O -Wuninitialized
 +CXXFLAGS+= -Wall -Wuninitialized
  CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
+ # Even more warnings...
+ CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wconversion
diff --git a/games/scummvm/patches/patch-ab b/games/scummvm/patches/patch-ab
index 756d6cbb3c9..442b7f2a266 100644
--- a/games/scummvm/patches/patch-ab
+++ b/games/scummvm/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2004/03/29 01:09:56 dillo Exp $
+$NetBSD: patch-ab,v 1.4 2005/01/04 13:41:53 adam Exp $
 
---- common.rules.orig	Fri Sep 19 23:47:14 2003
+--- common.rules.orig	2004-05-07 14:43:02.000000000 +0000
 +++ common.rules
-@@ -28,6 +28,8 @@ clean: clean-$(MODULE)
- clean-$(MODULE): clean-% :
- 	-$(RM) $(MODULE_OBJS-$*) $(MODULE_LIB-$*) $(PLUGIN-$*)
+@@ -26,6 +26,8 @@ MODULE_LIB-$(MODULE) := $(MODULE)/lib$(n
+ # If not building as a plugin, add the object files to the main OBJS list
+ OBJS += $(MODULE_LIB-$(MODULE))
  
 +CPPFLAGS+=	-I$(BUILDLINK_DIR)/include
 +
diff --git a/games/scummvm/patches/patch-ac b/games/scummvm/patches/patch-ac
new file mode 100644
index 00000000000..0d5b8b71e85
--- /dev/null
+++ b/games/scummvm/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2005/01/04 13:41:53 adam Exp $
+
+--- base/gameDetector.cpp.orig	2005-01-04 14:38:58.000000000 +0000
++++ base/gameDetector.cpp
+@@ -37,7 +37,7 @@
+ #endif
+ 
+ #ifdef UNIX
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <sys/stat.h>
+ #ifdef MACOSX
+ #define DEFAULT_SAVE_PATH "Documents/ScummVM Savegames"