update to scummvm 2.1.0

games/scummvm/Makefile

@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.82 2019/07/12 20:46:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.83 2019/10/14 09:18:00 jsg Exp $
 
 COMMENT=	graphical adventure game interpreter
-V=		2.0.0
+V=		2.1.0
 DISTNAME=	scummvm-${V}
 CATEGORIES=	games x11 emulators
 MASTER_SITES=	https://www.scummvm.org/frs/scummvm/${V}/
-REVISION=	5
 
 HOMEPAGE=	https://www.scummvm.org/
 
@@ -21,7 +20,8 @@ WANTLIB += ${COMPILER_LIBCXX} theoradec vorbis vorbisfile z
 # just use a newer compiler everywhere.
 COMPILER=	base-clang ports-gcc
 
-RUN_DEPENDS=	devel/desktop-file-utils
+RUN_DEPENDS=	devel/desktop-file-utils \
+		x11/gtk+3,-guic
 LIB_DEPENDS=	audio/libmad \
 		audio/libvorbis \
 		audio/flac \

games/scummvm/distinfo

@@ -1,2 +1,2 @@
-SHA256 (scummvm-2.0.0.tar.gz) = 9hMTH0X04g7WCIcG40o47OyzJv+XmSbxcLfPa5KX6o0=
-SIZE (scummvm-2.0.0.tar.gz) = 31131945
+SHA256 (scummvm-2.1.0.tar.gz) = 5b0QsZ0Ej7ruF8WP7yYVKLGpEAOVg9NwXFrH7zFkwfg=
+SIZE (scummvm-2.1.0.tar.gz) = 38003223

games/scummvm/patches/patch-Makefile_common

@@ -1,7 +1,8 @@
-$OpenBSD: patch-Makefile_common,v 1.9 2016/11/01 13:03:14 jsg Exp $
---- Makefile.common.orig	Tue Nov  1 20:19:09 2016
-+++ Makefile.common	Tue Nov  1 20:19:36 2016
-@@ -171,22 +171,6 @@ AMIGA_DATE = $(shell gdate '+%d.%m.%Y')
+$OpenBSD: patch-Makefile_common,v 1.10 2019/10/14 09:18:00 jsg Exp $
+Index: Makefile.common
+--- Makefile.common.orig
++++ Makefile.common
+@@ -195,22 +195,6 @@ AMIGA_DATE = $(shell gdate '+%d.%m.%Y')
  base/version.o: CXXFLAGS:=$(CXXFLAGS) -DAMIGA_DATE=\"$(AMIGA_DATE)\"
  endif
  

games/scummvm/patches/patch-configure

@@ -1,17 +1,17 @@
-$OpenBSD: patch-configure,v 1.19 2017/12/21 10:10:01 jsg Exp $
+$OpenBSD: patch-configure,v 1.20 2019/10/14 09:18:00 jsg Exp $
 Index: configure
 --- configure.orig
 +++ configure
-@@ -2024,22 +2024,6 @@ if test "$_use_cxx11" = "yes" ; then
+@@ -2239,22 +2239,6 @@ if test "$_release_build" = yes; then
+ 	append_var DEFINES "-DRELEASE_BUILD"
  fi
- echo $_use_cxx11
  
 -# By default, we add -pedantic to the CXXFLAGS to catch some potentially
 -# non-portable constructs, like use of GNU extensions.
 -# However, some platforms use GNU extensions in system header files, so
 -# for these we must not use -pedantic.
 -case $_host_os in
--android | androidsdl | gamecube | psp | tizen | wii | webos)
+-3ds | android | androidsdl | gamecube | ps2 | psp | switch | tizen | wii | webos)
 -	;;
 -*)
 -	# ICC does not support pedantic, while GCC and clang do.
@@ -24,8 +24,8 @@ Index: configure
 -
  # If possible, we want to use -Wglobal-constructors
  # However, not all compilers support that, so check whether the active one does.
- echocheck "whether -Wglobal-constructors work"
-@@ -3929,16 +3913,15 @@ if test "$_vorbis" = auto ; then
+ echocheck "whether C++ compiler accepts -Wglobal-constructors"
+@@ -4275,16 +4259,15 @@ if test "$_vorbis" = auto ; then
  int main(void) { vorbis_packet_blocksize(0,0); return 0; }
  EOF
  	if test "$_ogg" = yes ; then
@@ -47,7 +47,7 @@ Index: configure
  fi
  define_in_config_if_yes "$_vorbis" 'USE_VORBIS'
  echo "$_vorbis"
-@@ -4002,16 +3985,14 @@ int main(void) {
+@@ -4369,16 +4352,14 @@ int main(void) {
  }
  EOF
  	if test "$_ogg" = yes ; then

games/scummvm/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.14 2018/06/27 21:03:49 espie Exp $
+@comment $OpenBSD: PLIST,v 1.15 2019/10/14 09:18:00 jsg Exp $
 @bin bin/scummvm
 @man man/man6/scummvm.6
 share/appdata/
@@ -10,9 +10,10 @@ share/doc/scummvm/COPYING
 share/doc/scummvm/COPYING.BSD
 share/doc/scummvm/COPYING.FREEFONT
 share/doc/scummvm/COPYING.LGPL
+share/doc/scummvm/COPYING.OFL
 share/doc/scummvm/COPYRIGHT
-share/doc/scummvm/NEWS
-share/doc/scummvm/README
+share/doc/scummvm/NEWS.md
+share/doc/scummvm/README.md
 share/icons/
 share/icons/hicolor/
 share/icons/hicolor/scalable/
@@ -22,7 +23,9 @@ share/pixmaps/
 share/pixmaps/scummvm.xpm
 share/scummvm/
 share/scummvm/access.dat
+share/scummvm/cryomni3d.dat
 share/scummvm/drascula.dat
+share/scummvm/fonts.dat
 share/scummvm/hugo.dat
 share/scummvm/kyra.dat
 share/scummvm/lure.dat
@@ -32,7 +35,9 @@ share/scummvm/pred.dic
 share/scummvm/queen.tbl
 share/scummvm/scummclassic.zip
 share/scummvm/scummmodern.zip
+share/scummvm/scummremastered.zip
 share/scummvm/sky.cpt
+share/scummvm/supernova.dat
 share/scummvm/teenagent.dat
 share/scummvm/titanic.dat
 share/scummvm/tony.dat
@@ -40,3 +45,5 @@ share/scummvm/toon.dat
 share/scummvm/translations.dat
 @tag update-desktop-database
 share/scummvm/wintermute.zip
+share/scummvm/xeen.ccs
+@tag gtk-update-icon-cache %D/share/icons/hicolor