diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 4f175da1685..0979ee66660 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2003/12/10 21:28:58 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2004/03/31 02:49:36 jolan Exp $
 
 COMMENT=	"play games built around LucasArts' SCUMM"
-DISTNAME=	scummvm-0.5.1
-EXTRACT_SUFX=	.tgz
+DISTNAME=	scummvm-0.6.0
+EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	games x11 emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scummvm/}
 
@@ -20,11 +20,20 @@ LIB_DEPENDS=	SDL::devel/sdl \
 		mad.2::audio/libmad \
 		vorbis.0,vorbisfile.1::audio/libvorbis
 
+CONFIGURE_STYLE=simple
+CONFIGURE_ARGS+=--disable-alsa
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 NO_REGRESS=	Yes
 USE_GMAKE=	Yes
 USE_X11=	Yes
 
-MAKE_ENV+=	CXXFLAGS="${CXXFLAGS} -DSCUMM_NEED_ALIGNMENT" CXX="${CXX}"
+MAKE_ENV+=	CXXFLAGS="${CXXFLAGS}" CXX="${CXX}"
+
+# XXX gcc3 compiling compact.cpp with -O2 gobbles 800MB
+.if ${MACHINE_ARCH} == "sparc64"
+CXXFLAGS+=	-O0
+.endif
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scummvm
diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
index 79fc54cf32b..3f5c50244f2 100644
--- a/games/scummvm/distinfo
+++ b/games/scummvm/distinfo
@@ -1,3 +1,3 @@
-MD5 (scummvm-0.5.1.tgz) = 4d56473cceb36b0271a97986b91a4089
-RMD160 (scummvm-0.5.1.tgz) = ee64a78ff790894268e8c7608752087c993191d7
-SHA1 (scummvm-0.5.1.tgz) = b1b40ec5673ca2e6f3593d955611817ef140b6ed
+MD5 (scummvm-0.6.0.tar.bz2) = efc4207a7f10b24e9fc5afa10ed9c455
+RMD160 (scummvm-0.6.0.tar.bz2) = f0ab6a9d739885d2084bee46fc5e4cbae46454c5
+SHA1 (scummvm-0.6.0.tar.bz2) = ff273d23a9cf75a14ffb4d859e6d9e22a6b44548
diff --git a/games/scummvm/patches/patch-Makefile b/games/scummvm/patches/patch-Makefile
index 05c50dd843a..2c821d48292 100644
--- a/games/scummvm/patches/patch-Makefile
+++ b/games/scummvm/patches/patch-Makefile
@@ -1,35 +1,29 @@
-$OpenBSD: patch-Makefile,v 1.4 2004/01/26 21:54:30 naddy Exp $
---- Makefile.orig	2003-07-16 22:36:38.000000000 +0200
-+++ Makefile	2004-01-26 22:34:01.000000000 +0100
+$OpenBSD: patch-Makefile,v 1.5 2004/03/31 02:49:36 jolan Exp $
+--- Makefile.orig	2004-02-25 04:00:07.000000000 -0600
++++ Makefile	2004-03-16 15:50:02.000000000 -0600
 @@ -1,6 +1,6 @@
- # $Header: /home/cvs/ports/games/scummvm/patches/Attic/patch-Makefile,v 1.4 2004/01/26 21:54:30 naddy Exp $
+ # $Header: /home/cvs/ports/games/scummvm/patches/Attic/patch-Makefile,v 1.5 2004/03/31 02:49:36 jolan Exp $
  
 -CXX     := c++
 +#CXX     := c++
  AR      := ar cru
  RANLIB  := ranlib
- RM      := rm -f
-@@ -17,10 +17,10 @@ CP      := cp
- # Default compilation parameters. Normally don't edit these           #
- #######################################################################
+ MKDIR   := mkdir -p
+@@ -19,7 +19,7 @@ srcdir      ?= .
  
--CXXFLAGS:= -g -O
-+#CXXFLAGS:= -g -O
- DEFINES :=
- LDFLAGS :=
--INCLUDES:= -I. -Icommon
-+INCLUDES:= -I. -Icommon -I${LOCALBASE}/include
- LIBS	:=
- OBJS	:=
+ DEFINES     := -DHAVE_CONFIG_H
+ LDFLAGS     :=
+-INCLUDES    := -I$(srcdir) -I$(srcdir)/common
++INCLUDES    := -I$(srcdir) -I$(srcdir)/common -I${LOCALBASE}/include
+ LIBS	    :=
+ OBJS	    :=
  
-@@ -53,8 +53,8 @@ DEFINES += -DUSE_MAD
- LIBS    += -lmad
+@@ -33,7 +33,7 @@ include config.mak
+ # CXXFLAGS+= -Werror
  
- # Uncomment this to activate the Ogg Vorbis lib for compressed sound files
--# DEFINES += -DUSE_VORBIS
--# LIBS    += -lvorbisfile -lvorbis
-+DEFINES += -DUSE_VORBIS
-+LIBS    += -lvorbisfile -lvorbis -lm -logg
- 
- # Uncomment this to activate the ALSA lib for midi
- # DEFINES += -DUSE_ALSA
+ CXXFLAGS:= -Wall $(CXXFLAGS)
+-CXXFLAGS+= -O -Wuninitialized
++#CXXFLAGS+= -O -Wuninitialized
+ CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
+ # Even more warnings...
+ CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wconversion