Thu Jul 21 13:48:49 2016 UTC ()
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.


(adam)
diff -r1.78 -r1.79 pkgsrc/games/scummvm/Makefile
diff -r1.15 -r1.16 pkgsrc/games/scummvm/PLIST
diff -r1.45 -r1.46 pkgsrc/games/scummvm/distinfo
diff -r1.8 -r0 pkgsrc/games/scummvm/options.mk
diff -r1.19 -r1.20 pkgsrc/games/scummvm/patches/patch-aa
cvs diff -r1.78 -r1.79 pkgsrc/games/scummvm/Makefile (expand / switch to unified diff)

--- pkgsrc/games/scummvm/Makefile 2016/06/11 14:56:17 1.78
+++ pkgsrc/games/scummvm/Makefile 2016/07/21 13:48:49 1.79
@@ -1,35 +1,40 @@ @@ -1,35 +1,40 @@
1# $NetBSD: Makefile,v 1.78 2016/06/11 14:56:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.79 2016/07/21 13:48:49 adam Exp $
2 2
3DISTNAME= scummvm-1.8.1 3DISTNAME= scummvm-1.8.1
 4PKGREVISION= 1
4CATEGORIES= games 5CATEGORIES= games
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/}
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.xz
7 8
8MAINTAINER= adam@NetBSD.org 9MAINTAINER= adam@NetBSD.org
9HOMEPAGE= http://scummvm.sourceforge.net/ 10HOMEPAGE= http://scummvm.sourceforge.net/
10COMMENT= LucasArts Script Creation Utility for Maniac Mansion 11COMMENT= LucasArts Script Creation Utility for Maniac Mansion
11LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
12 13
13USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
14USE_TOOLS+= bsdtar gmake 15USE_TOOLS+= bsdtar gmake
15HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
16CONFIGURE_ARGS+= --disable-debug 17CONFIGURE_ARGS+= --disable-debug
 18CONFIGURE_ARGS+= --disable-optimizations
 19CONFIGURE_ARGS+= --enable-release
17CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 20CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
18CONFIGURE_ARGS+= --prefix=${PREFIX} 21CONFIGURE_ARGS+= --prefix=${PREFIX}
19 22
20BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.1 
21UNLIMIT_RESOURCES= datasize 23UNLIMIT_RESOURCES= datasize
22 
23EXTRACT_USING= bsdtar 24EXTRACT_USING= bsdtar
24 25
25.include "options.mk" 26BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.1
26 
27.include "../../devel/SDL/buildlink3.mk" 27.include "../../devel/SDL/buildlink3.mk"
 28.include "../../audio/faad2/buildlink3.mk"
28.include "../../audio/flac/buildlink3.mk" 29.include "../../audio/flac/buildlink3.mk"
 30.include "../../audio/fluidsynth/buildlink3.mk"
29.include "../../audio/libmad/buildlink3.mk" 31.include "../../audio/libmad/buildlink3.mk"
30.include "../../audio/libvorbis/buildlink3.mk" 32.include "../../audio/libvorbis/buildlink3.mk"
31.include "../../devel/zlib/buildlink3.mk" 33.include "../../devel/zlib/buildlink3.mk"
32.include "../../multimedia/libmpeg2/buildlink3.mk" 
33.include "../../graphics/freetype2/buildlink3.mk" 34.include "../../graphics/freetype2/buildlink3.mk"
 35.include "../../graphics/png/buildlink3.mk"
34.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 36.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 37.include "../../multimedia/libmpeg2/buildlink3.mk"
 38.include "../../multimedia/libtheora/buildlink3.mk"
 39.include "../../mk/jpeg.buildlink3.mk"
35.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/games/scummvm/PLIST (expand / switch to unified diff)

--- pkgsrc/games/scummvm/PLIST 2016/06/11 14:56:17 1.15
+++ pkgsrc/games/scummvm/PLIST 2016/07/21 13:48:49 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.15 2016/06/11 14:56:17 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.16 2016/07/21 13:48:49 adam Exp $
2bin/scummvm 2bin/scummvm
3man/man6/scummvm.6 3man/man6/scummvm.6
4share/doc/scummvm/AUTHORS 4share/doc/scummvm/AUTHORS
5share/doc/scummvm/COPYING 5share/doc/scummvm/COPYING
6share/doc/scummvm/COPYING.BSD 6share/doc/scummvm/COPYING.BSD
7share/doc/scummvm/COPYING.FREEFONT 7share/doc/scummvm/COPYING.FREEFONT
8share/doc/scummvm/COPYING.LGPL 8share/doc/scummvm/COPYING.LGPL
9share/doc/scummvm/COPYRIGHT 9share/doc/scummvm/COPYRIGHT
10share/doc/scummvm/NEWS 10share/doc/scummvm/NEWS
11share/doc/scummvm/README 11share/doc/scummvm/README
12share/icons/hicolor/scalable/apps/scummvm.svg 12share/icons/hicolor/scalable/apps/scummvm.svg
13share/pixmaps/scummvm.xpm 13share/pixmaps/scummvm.xpm
14share/scummvm/access.dat 14share/scummvm/access.dat
@@ -17,13 +17,14 @@ share/scummvm/hugo.dat @@ -17,13 +17,14 @@ share/scummvm/hugo.dat
17share/scummvm/kyra.dat 17share/scummvm/kyra.dat
18share/scummvm/lure.dat 18share/scummvm/lure.dat
19share/scummvm/mort.dat 19share/scummvm/mort.dat
20share/scummvm/neverhood.dat 20share/scummvm/neverhood.dat
21share/scummvm/pred.dic 21share/scummvm/pred.dic
22share/scummvm/queen.tbl 22share/scummvm/queen.tbl
23share/scummvm/scummclassic.zip 23share/scummvm/scummclassic.zip
24share/scummvm/scummmodern.zip 24share/scummvm/scummmodern.zip
25share/scummvm/sky.cpt 25share/scummvm/sky.cpt
26share/scummvm/teenagent.dat 26share/scummvm/teenagent.dat
27share/scummvm/tony.dat 27share/scummvm/tony.dat
28share/scummvm/toon.dat 28share/scummvm/toon.dat
29share/scummvm/translations.dat 29share/scummvm/translations.dat
 30share/scummvm/wintermute.zip
cvs diff -r1.45 -r1.46 pkgsrc/games/scummvm/distinfo (expand / switch to unified diff)

--- pkgsrc/games/scummvm/distinfo 2016/06/11 14:56:17 1.45
+++ pkgsrc/games/scummvm/distinfo 2016/07/21 13:48:49 1.46
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.45 2016/06/11 14:56:17 wiz Exp $ 1$NetBSD: distinfo,v 1.46 2016/07/21 13:48:49 adam Exp $
2 2
3SHA1 (scummvm-1.8.1.tar.bz2) = 8daeec95f61e24958fd007f166aab36894dc7d26 3SHA1 (scummvm-1.8.1.tar.xz) = df1bab9004d056f473f25c87a6ef296d26207c31
4RMD160 (scummvm-1.8.1.tar.bz2) = ce795d7aa6ffb5dd3257519e37e69c73d4ca1503 4RMD160 (scummvm-1.8.1.tar.xz) = 137c26fdc483212ddd4c6f7ae9fd36611f7b285d
5SHA512 (scummvm-1.8.1.tar.bz2) = 22d2642890bb890ebd9063db7872a95177bd2c5fe206d0b58c54b3899b310de9344d7ddc7a447665b49ae9a60b5623ca8b4ca9782d56a6549fab81b20c54ce41 5SHA512 (scummvm-1.8.1.tar.xz) = e67ee332668b14432dcd675051384bd4fee2c1a0ddf44f6f8aeaf889d5027a834187e2632d18959583fa258cf03f259a54fd2d88120fa62ef7496232b4e6bdb4
6Size (scummvm-1.8.1.tar.bz2) = 22636204 bytes 6Size (scummvm-1.8.1.tar.xz) = 17807468 bytes
7SHA1 (patch-aa) = dd038b5c60261919130bc670241fc305fb3d0d00 7SHA1 (patch-aa) = eedd2949184813d6089ffdf7df348d57625aa29f
File Deleted: pkgsrc/games/scummvm/Attic/options.mk
cvs diff -r1.19 -r1.20 pkgsrc/games/scummvm/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/scummvm/patches/Attic/patch-aa 2009/03/02 17:06:42 1.19
+++ pkgsrc/games/scummvm/patches/Attic/patch-aa 2016/07/21 13:48:49 1.20
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-aa,v 1.19 2009/03/02 17:06:42 adam Exp $ 1$NetBSD: patch-aa,v 1.20 2016/07/21 13:48:49 adam Exp $
 2
 3Link against OSS.
2 4
3--- Makefile.orig 2009-02-22 02:06:44.000000000 +0100 5--- Makefile.orig 2009-02-22 02:06:44.000000000 +0100
4+++ Makefile 6+++ Makefile
5@@ -10,7 +10,7 @@ srcdir ?= . 7@@ -10,7 +10,7 @@ srcdir ?= .
6 DEFINES := -DHAVE_CONFIG_H 8 DEFINES := -DHAVE_CONFIG_H
7 LDFLAGS := 9 LDFLAGS :=
8 INCLUDES := -I. -I$(srcdir) -I$(srcdir)/engines 10 INCLUDES := -I. -I$(srcdir) -I$(srcdir)/engines
9-LIBS := 11-LIBS :=
10+LIBS := ${LIBOSSAUDIO} 12+LIBS := ${LIBOSSAUDIO}
11 OBJS := 13 OBJS :=
12 DEPDIR := .deps 14 DEPDIR := .deps
13  15