update to 1.5.0

changes:
-support more games
-support for TrueType fonts via FreeType2
-custom game and engine options
-speedup, UI improvements
-bugfixes
-translation update

pkgsrc change: cleanup of options -- the "x11" backend doesn't work,
so "sdl" is the only choice left

4 files changed, 12 insertions, 23 deletions

diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index d229d945a07..cee360b9254 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2012/03/03 12:54:17 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2012/08/04 14:45:34 drochner Exp $
 
-DISTNAME=	scummvm-1.4.1
-PKGREVISION=	1
+DISTNAME=	scummvm-1.5.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scummvm/}
 EXTRACT_SUFX=	.tar.bz2
@@ -25,9 +24,11 @@ UNLIMIT_RESOURCES=	datasize
 
 .include "options.mk"
 
+.include "../../devel/SDL/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../multimedia/libmpeg2/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/scummvm/PLIST b/games/scummvm/PLIST
index 4672f3f0692..a7b4a2e0968 100644
--- a/games/scummvm/PLIST
+++ b/games/scummvm/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2011/06/15 13:08:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2012/08/04 14:45:34 drochner Exp $
 bin/scummvm
 man/man6/scummvm.6
 share/doc/scummvm/AUTHORS
 share/doc/scummvm/COPYING
 share/doc/scummvm/COPYING.BSD
+share/doc/scummvm/COPYING.FREEFONT
 share/doc/scummvm/COPYING.LGPL
 share/doc/scummvm/COPYRIGHT
 share/doc/scummvm/NEWS
diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
index 99a04ae07db..e4ccdd1240d 100644
--- a/games/scummvm/distinfo
+++ b/games/scummvm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.40 2012/02/27 13:58:05 adam Exp $
+$NetBSD: distinfo,v 1.41 2012/08/04 14:45:34 drochner Exp $
 
-SHA1 (scummvm-1.4.1.tar.bz2) = f43d1fce764d6e49a9e1d4c069507346212d9b36
-RMD160 (scummvm-1.4.1.tar.bz2) = 058aa7c3cf160d9a722ad348fbc361d464e3f3e5
-Size (scummvm-1.4.1.tar.bz2) = 15703475 bytes
+SHA1 (scummvm-1.5.0.tar.bz2) = cfb793680ba4fc23a6e81d81680466081eb7fdb3
+RMD160 (scummvm-1.5.0.tar.bz2) = 7ef975945c03f344e790502f34067698f8b71068
+Size (scummvm-1.5.0.tar.bz2) = 17455085 bytes
 SHA1 (patch-aa) = dd038b5c60261919130bc670241fc305fb3d0d00
diff --git a/games/scummvm/options.mk b/games/scummvm/options.mk
index e274fa5523d..76a0693ee4f 100644
--- a/games/scummvm/options.mk
+++ b/games/scummvm/options.mk
@@ -1,23 +1,10 @@
-# $NetBSD: options.mk,v 1.7 2012/02/27 13:58:05 adam Exp $
+# $NetBSD: options.mk,v 1.8 2012/08/04 14:45:34 drochner Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.scummvm
-PKG_SUPPORTED_OPTIONS=	sdl x11 fluidsynth
-PKG_SUGGESTED_OPTIONS=	sdl
+PKG_SUPPORTED_OPTIONS=	fluidsynth
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mfluidsynth)
 .include "../../audio/fluidsynth/buildlink3.mk"
 .endif
-
-.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/oss.buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.endif