Update to 0.6.0:

This release contains many bugfixes and improvements, two new
graphics scalers (HQ2X/HQ3X), better launcher/options support and
support for the following new games: V1 versions of the LucasArts
games Maniac Mansion and Zak McKracken, the LucasArts game Full
Throttle, Broken Sword 1/2, and Flight of the Amazon Queen.

4 files changed, 14 insertions, 39 deletions

diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 5b91a3cddfd..5a687862423 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2004/03/08 19:40:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/03/29 01:09:56 dillo Exp $
 
-DISTNAME=	scummvm-0.5.1
-PKGREVISION=	3
+DISTNAME=	scummvm-0.6.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scummvm/}
 EXTRACT_SUFX=	.tar.bz2
@@ -28,4 +27,5 @@ do-install:
 .include "../../audio/libmad/buildlink2.mk"
 .include "../../audio/libvorbis/buildlink2.mk"
 .include "../../devel/SDL/buildlink2.mk"
+.include "../../graphics/libmpeg2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
index 3b17908230d..1fbd4d40a27 100644
--- a/games/scummvm/distinfo
+++ b/games/scummvm/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.11 2004/01/17 21:25:41 adam Exp $
+$NetBSD: distinfo,v 1.12 2004/03/29 01:09:56 dillo Exp $
 
-SHA1 (scummvm-0.5.1.tar.bz2) = cbeb01bee5c86bb4844ca04d199814fbcd752710
-Size (scummvm-0.5.1.tar.bz2) = 1149076 bytes
-SHA1 (patch-aa) = 037b809ab439802c3c39a23c8b5ee25762c562f2
-SHA1 (patch-ab) = 86c74b6d31695a02d05dacf6161da0f3c09b42cf
+SHA1 (scummvm-0.6.0.tar.bz2) = ff273d23a9cf75a14ffb4d859e6d9e22a6b44548
+Size (scummvm-0.6.0.tar.bz2) = 1631951 bytes
+SHA1 (patch-ab) = 8e694dab27d76d3df00be07f510094b1e326ca6c
diff --git a/games/scummvm/patches/patch-aa b/games/scummvm/patches/patch-aa
deleted file mode 100644
index 38f4706b06d..00000000000
--- a/games/scummvm/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2004/01/17 21:25:41 adam Exp $
-
---- Makefile.orig	2003-07-16 20:36:38.000000000 +0000
-+++ Makefile
-@@ -2,3 +2,3 @@
- 
--CXX     := c++
-+#CXX     := c++
- AR      := ar cru
-@@ -19,7 +19,5 @@ CP      := cp
- 
--CXXFLAGS:= -g -O
-+CXXFLAGS+=${CFLAGS}
- DEFINES :=
--LDFLAGS :=
- INCLUDES:= -I. -Icommon
--LIBS	:=
- OBJS	:=
-@@ -55,4 +53,4 @@ LIBS    += -lmad
- # Uncomment this to activate the Ogg Vorbis lib for compressed sound files
--# DEFINES += -DUSE_VORBIS
--# LIBS    += -lvorbisfile -lvorbis
-+DEFINES += -DUSE_VORBIS
-+LIBS    += -lvorbisfile -lvorbis
- 
diff --git a/games/scummvm/patches/patch-ab b/games/scummvm/patches/patch-ab
index 0100de0d26c..756d6cbb3c9 100644
--- a/games/scummvm/patches/patch-ab
+++ b/games/scummvm/patches/patch-ab
@@ -1,12 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2003/08/04 08:21:05 adam Exp $
+$NetBSD: patch-ab,v 1.3 2004/03/29 01:09:56 dillo Exp $
 
---- common.rules.orig	2003-07-20 03:01:47.000000000 +0200
-+++ common.rules	2003-08-04 09:47:58.000000000 +0200
-@@ -1,5 +1,7 @@
- # Common build rules, used by the sub modules and their module.mk files
+--- common.rules.orig	Fri Sep 19 23:47:14 2003
++++ common.rules
+@@ -28,6 +28,8 @@ clean: clean-$(MODULE)
+ clean-$(MODULE): clean-% :
+ 	-$(RM) $(MODULE_OBJS-$*) $(MODULE_LIB-$*) $(PLUGIN-$*)
  
 +CPPFLAGS+=	-I$(BUILDLINK_DIR)/include
 +
  # Convenience library target
- $(MODULE)/lib$(MODULE).a: $(MODULE_OBJS)
+ $(MODULE_LIB-$(MODULE)): $(MODULE_OBJS)
  	-$(RM) $@