Changes 0.7.1:

 General:
   - Added a MT-32 emulator. (It was actually added in 0.7.0 but we forgot to
     put it into the NEWS file :-).
   - Less memory-hungry MPEG movie playback for the Broken Sword games.

 SCUMM:
   - Fixed wrong actor animation in Full Throttle INSANE

 Windows Mobile port (PocketPC / Smartphone) :
   - Fixed FOTAQ crash on all platforms when leaving the hotel AGAIN
   - Better low quality Adlib emulation for FOTAQ
   - Fix randomly broken Hide Toolbar option (thanks iKi)
   - Fix first hardware key mapping (was not displayed before)
   - Fix BASS & Simon hangs on Smartphone when using the Skip hotkey
   - Fix Zone key action on Smartphone (now mapped on key 9)
   - Experimental third party VGA mode (SE-VGA) fix
   - Add Key Mapping option in the launcher (Options / Misc / Keys)
   - Remove AYGSHELL.DLL dependency to work on CE .Net platforms
   - Fix key mapping issues introduced in 0.7.0
   - Full Throttle interactive action sequences should be more playable.
   - New key mapping option "FT Cheat" to win a Full Throttle action sequence
   - Quit Simon game with 'Action key' on Smartphones

 Sword2:
   - Fixed crash caused by attempting to play music from CD1 and CD2 at the
     same time.
   - Fixed crash in the cutscene player if the speech file was missing.

 BASS:
   - Fixed crash when talking to the gardener using spanish text with the
     floppy version.

6 files changed, 41 insertions, 32 deletions

diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 8c9f8e067e6..324f3f7e0bc 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2005/03/27 15:43:36 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2005/03/29 08:48:31 adam Exp $
 
-DISTNAME=	scummvm-0.7.0
-PKGREVISION=	1
+DISTNAME=	scummvm-0.7.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scummvm/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,19 +14,14 @@ USE_DIRS+=		xdg-1.1
 USE_GNU_TOOLS+=		make
 USE_X11=		yes
 HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--prefix=${LOCALBASE}
 
 UNLIMIT_RESOURCES=	datasize
 
-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
-	${INSTALL_DATA} ${WRKSRC}/scummvm.xpm ${PREFIX}/share/pixmaps
+.include "options.mk"
 
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
 .include "../../multimedia/libmpeg2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/scummvm/PLIST b/games/scummvm/PLIST
index d12918c6d74..e069927f2c9 100644
--- a/games/scummvm/PLIST
+++ b/games/scummvm/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2003/09/10 11:02:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/03/29 08:48:31 adam Exp $
 bin/scummvm
 man/man6/scummvm.6
+share/doc/scummvm/AUTHORS
+share/doc/scummvm/COPYING
+share/doc/scummvm/NEWS
 share/doc/scummvm/README
 share/pixmaps/scummvm.xpm
 @dirrm share/doc/scummvm
diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
index d199fe846f6..259dee640d8 100644
--- a/games/scummvm/distinfo
+++ b/games/scummvm/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.17 2005/02/23 23:12:02 agc Exp $
+$NetBSD: distinfo,v 1.18 2005/03/29 08:48:31 adam Exp $
 
-SHA1 (scummvm-0.7.0.tar.bz2) = 67ffacd1797fbdb377e17c53d16241201bac2038
-RMD160 (scummvm-0.7.0.tar.bz2) = 897e0924bcaf8aa881cd364c9b003f0f327e0d3f
-Size (scummvm-0.7.0.tar.bz2) = 2045328 bytes
-SHA1 (patch-aa) = 74ebc406c606b48a2f1b1c4b3731363514fb2a88
+SHA1 (scummvm-0.7.1.tar.bz2) = bfc9af452377fac6026d120a4d784e0311d6a650
+RMD160 (scummvm-0.7.1.tar.bz2) = f5b4662ee2ecb614eedbe692fbd8ea6a3d06de5b
+Size (scummvm-0.7.1.tar.bz2) = 2051004 bytes
+SHA1 (patch-aa) = 9a0b721fb48df378520531377216ea0e120b46a5
 SHA1 (patch-ab) = 4e36e3a0c7ab2d3e9acd187c0cf16fd60c202f0b
-SHA1 (patch-ac) = d165bb41fc8da04dcacbace4fa366f07f2b88626
diff --git a/games/scummvm/options.mk b/games/scummvm/options.mk
new file mode 100644
index 00000000000..26f2216ed1c
--- /dev/null
+++ b/games/scummvm/options.mk
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2005/03/29 08:48:31 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.scummvm
+PKG_DEFAULT_OPTIONS=	sdl
+PKG_SUPPORTED_OPTIONS=	sdl x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Msdl)
+CONFIGURE_ARGS+=	--backend=sdl
+.include "../../devel/SDL/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=	--backend=x11
+.include "../../mk/ossaudio.buildlink3.mk"
+.endif
diff --git a/games/scummvm/patches/patch-aa b/games/scummvm/patches/patch-aa
index 14ce15a3e98..35a664096b6 100644
--- a/games/scummvm/patches/patch-aa
+++ b/games/scummvm/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.13 2005/01/04 13:41:53 adam Exp $
+$NetBSD: patch-aa,v 1.14 2005/03/29 08:48:31 adam Exp $
 
---- Makefile.orig	2004-07-27 15:33:15.000000000 +0000
+--- Makefile.orig	2004-12-20 21:06:22.000000000 +0000
 +++ Makefile
+@@ -9,7 +9,7 @@ srcdir      ?= .
+ DEFINES     := -DHAVE_CONFIG_H
+ LDFLAGS     :=
+ INCLUDES    := -I. -I$(srcdir) -I$(srcdir)/common
+-LIBS	    :=
++LIBS	    := ${LIBOSSAUDIO}
+ OBJS	    :=
+ 
+ MODULES     :=
 @@ -21,8 +21,7 @@ include config.mak
  # Uncomment this for stricter compile time code verification
  # CXXFLAGS+= -Werror
diff --git a/games/scummvm/patches/patch-ac b/games/scummvm/patches/patch-ac
deleted file mode 100644
index 0d5b8b71e85..00000000000
--- a/games/scummvm/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$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"