Update to 0.3.0b. Based on update supplied by Adam Ciarcinski, with some

changes by me.
Changes:
- fix major race condition resulting in extremely frequent crashes on
  MorphOS/PocketPC
- massive cleanup work for iMUSE. Sam and Max music now plays correctly
- many bugfixes for Zak256, + sound and music support
- music support for Simon the Sorcerer on any platform with real MIDI
- experimental support for Indy3 (VGA) - Indiana Jones + Last Crusade
- completed support for Monkey1 VGA Floppy, The Dig
- added akos16 implementation for The Dig and Full Throttle costumes
- added digital iMUSE implementation for The Dig and Full Throttle music.
- Loom CD speech+music syncronisation improved greatly
- added midi-emulation via adlib, for platforms without sequencer support
- code seperation of various engine parts into several libraries
- several fixes to prevent Simon the Sorcerer crashing and hanging
- hundreds of bugfixes for many other games
- new SMUSH video engine, for Full Throttle and The Dig
- new in-game GUI
- launcher dialog

4 files changed, 26 insertions, 27 deletions

diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 64c127cfab0..20da2ae6aa0 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,23 +1,27 @@
-# $NetBSD: Makefile,v 1.2 2002/11/02 20:52:51 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/12/10 12:48:46 wiz Exp $
 
-DISTNAME=	scummvm_0.2.0-src
-PKGNAME=	scummvm-0.2.0
+DISTNAME=	scummvm_0.3.0b-src
+PKGNAME=	scummvm-0.3.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scummvm/}
-EXTRACT_SUFX=	.tgz
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://scummvm.sourceforge.net/
 COMMENT=	LucasArts Script Creation Utility for Maniac Mansion
 
 USE_BUILDLINK2=	yes
+USE_GMAKE=	yes
 USE_X11=	yes
-WRKSRC=		${WRKDIR}/scummvm
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+HAS_CONFIGURE=	yes
 
 do-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scummvm
 	${INSTALL_PROGRAM} ${WRKSRC}/scummvm ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/scummvm.6 ${PREFIX}/man/man6
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/scummvm
 
 .include "../../devel/SDL/buildlink2.mk"
-#.include "../../devel/readline/buildlink2.mk"
+.include "../../audio/mad/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/scummvm/PLIST b/games/scummvm/PLIST
index 4139c16058d..23f2603df83 100644
--- a/games/scummvm/PLIST
+++ b/games/scummvm/PLIST
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/12 00:38:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/10 12:48:46 wiz Exp $
 bin/scummvm
 man/man6/scummvm.6
+share/doc/scummvm/README
+@dirrm share/doc/scummvm
diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
index eb2b35eb336..1cba72f8e5a 100644
--- a/games/scummvm/distinfo
+++ b/games/scummvm/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/12 00:38:30 wiz Exp $
+$NetBSD: distinfo,v 1.2 2002/12/10 12:48:46 wiz Exp $
 
-SHA1 (scummvm_0.2.0-src.tgz) = 09101528c72f55723e293457546fbae4bd772f0f
-Size (scummvm_0.2.0-src.tgz) = 668774 bytes
-SHA1 (patch-aa) = 3fde63866828bf8d901a72f6c98122eeee44675c
+SHA1 (scummvm_0.3.0b-src.tar.bz2) = 77272ac8eb4fd152da8832751f66031fed2d0970
+Size (scummvm_0.3.0b-src.tar.bz2) = 585967 bytes
+SHA1 (patch-aa) = beca14fd7c70078eb88badfec633b8f3306bb396
diff --git a/games/scummvm/patches/patch-aa b/games/scummvm/patches/patch-aa
index 14a0ccf8c19..2bca039832a 100644
--- a/games/scummvm/patches/patch-aa
+++ b/games/scummvm/patches/patch-aa
@@ -1,18 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/12 00:38:30 wiz Exp $
-
---- Makefile.orig	Sat Apr 27 18:58:28 2002
-+++ Makefile
-@@ -2,5 +2,5 @@
+--- Makefile.orig	Sun Dec  1 21:29:19 2002
++++ Makefile	Mon Dec  9 17:02:17 2002
+@@ -17,7 +17,7 @@
+ # Default compilation parameters. Normally don't edit these           #
+ #######################################################################
  
- CC      = g++
--CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
-+CFLAGS  += -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
- DEFINES = -DUNIX
+-CFLAGS  := -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
++CFLAGS  += -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
+ DEFINES :=
  LDFLAGS :=
-@@ -9,5 +9,5 @@ CPPFLAGS= $(DEFINES) $(INCLUDES)
- 
- # Add -lmad for -DCOMPRESSED_SOUND_FILE
--LIBS	= `sdl-config --libs` -lncurses
-+LIBS	= `sdl-config --libs` -lcurses
- 
- OBJS	= sdl.o
+ INCLUDES:= -I. -Icommon