Revision 1:

* Switched to .tar.xz.
* Added missing depednencies; now all supported engines are built.
* FluidSynth is not an option any more.
* Enabled release mode; but without forced compiler optimisations.

5 files changed, 23 insertions, 25 deletions

diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index cc1d456a295..424bb1a4197 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.78 2016/06/11 14:56:17 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2016/07/21 13:48:49 adam Exp $
 
 DISTNAME=	scummvm-1.8.1
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scummvm/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://scummvm.sourceforge.net/
@@ -14,22 +15,26 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		bsdtar gmake
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-debug
+CONFIGURE_ARGS+=	--disable-optimizations
+CONFIGURE_ARGS+=	--enable-release
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
-BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.1
 UNLIMIT_RESOURCES=	datasize
-
 EXTRACT_USING=		bsdtar
 
-.include "options.mk"
-
+BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.1
 .include "../../devel/SDL/buildlink3.mk"
+.include "../../audio/faad2/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
+.include "../../audio/fluidsynth/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 "../../graphics/png/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../multimedia/libmpeg2/buildlink3.mk"
+.include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/scummvm/PLIST b/games/scummvm/PLIST
index 99a5add28a0..5a34b5ab0fe 100644
--- a/games/scummvm/PLIST
+++ b/games/scummvm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2016/06/11 14:56:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2016/07/21 13:48:49 adam Exp $
 bin/scummvm
 man/man6/scummvm.6
 share/doc/scummvm/AUTHORS
@@ -27,3 +27,4 @@ share/scummvm/teenagent.dat
 share/scummvm/tony.dat
 share/scummvm/toon.dat
 share/scummvm/translations.dat
+share/scummvm/wintermute.zip
diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
index 3c1213154f0..fc8711914ea 100644
--- a/games/scummvm/distinfo
+++ b/games/scummvm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.45 2016/06/11 14:56:17 wiz Exp $
+$NetBSD: distinfo,v 1.46 2016/07/21 13:48:49 adam Exp $
 
-SHA1 (scummvm-1.8.1.tar.bz2) = 8daeec95f61e24958fd007f166aab36894dc7d26
-RMD160 (scummvm-1.8.1.tar.bz2) = ce795d7aa6ffb5dd3257519e37e69c73d4ca1503
-SHA512 (scummvm-1.8.1.tar.bz2) = 22d2642890bb890ebd9063db7872a95177bd2c5fe206d0b58c54b3899b310de9344d7ddc7a447665b49ae9a60b5623ca8b4ca9782d56a6549fab81b20c54ce41
-Size (scummvm-1.8.1.tar.bz2) = 22636204 bytes
-SHA1 (patch-aa) = dd038b5c60261919130bc670241fc305fb3d0d00
+SHA1 (scummvm-1.8.1.tar.xz) = df1bab9004d056f473f25c87a6ef296d26207c31
+RMD160 (scummvm-1.8.1.tar.xz) = 137c26fdc483212ddd4c6f7ae9fd36611f7b285d
+SHA512 (scummvm-1.8.1.tar.xz) = e67ee332668b14432dcd675051384bd4fee2c1a0ddf44f6f8aeaf889d5027a834187e2632d18959583fa258cf03f259a54fd2d88120fa62ef7496232b4e6bdb4
+Size (scummvm-1.8.1.tar.xz) = 17807468 bytes
+SHA1 (patch-aa) = eedd2949184813d6089ffdf7df348d57625aa29f
diff --git a/games/scummvm/options.mk b/games/scummvm/options.mk
deleted file mode 100644
index 76a0693ee4f..00000000000
--- a/games/scummvm/options.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: options.mk,v 1.8 2012/08/04 14:45:34 drochner Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.scummvm
-PKG_SUPPORTED_OPTIONS=	fluidsynth
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mfluidsynth)
-.include "../../audio/fluidsynth/buildlink3.mk"
-.endif
diff --git a/games/scummvm/patches/patch-aa b/games/scummvm/patches/patch-aa
index de588d150ed..a59b2b02897 100644
--- a/games/scummvm/patches/patch-aa
+++ b/games/scummvm/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.19 2009/03/02 17:06:42 adam Exp $
+$NetBSD: patch-aa,v 1.20 2016/07/21 13:48:49 adam Exp $
+
+Link against OSS.
 
 --- Makefile.orig	2009-02-22 02:06:44.000000000 +0100
 +++ Makefile