games/scummvm: Update to 2.2.0

* Introduce A52 and CURL options to avoid possible QA stage errors with
  build environments that have already audio/liba52 or ftp/curl installed
  because the configure script automatically adds them as an additional
  dependencies in that case. [1]

  Set the A52 option as default as it improves the user experience with the
  "zvision" engine regarding audio/video playback.

  Leave the CURL option as non-default for now, because the ScummVM cloud
  storage is a fairly new feature that has been introduced since the 2.1.0
  release.  That option can be set as default later if there's great demand.

* Remove now obsolete patches which were required for newer versions of
  FluidSynth.

* Rebase the patch and post-processing of the configure script, switch to
  the new preferred location of man pages (since r523104) and avoid
  hardcoded occurences of ${LOCALBASE}.

* Many thanks to lme@ who maintained the port for over 13 years and offered
  me to take over maintainership.

Changelog:

https://downloads.scummvm.org/frs/scummvm/2.2.0/ReleaseNotes.html

PR:		245741
Submitted by:	Andy Mender [1]
Approved by:	lme (maintainer, via private e-mail)

games/scummvm/Makefile

@@ -2,16 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	scummvm
-PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	games emulators
-MASTER_SITES=	http://www.scummvm.org/frs/scummvm/${PORTVERSION}/
+MASTER_SITES=	https://downloads.scummvm.org/frs/${PORTNAME}/${PORTVERSION}/
 
-PATCH_SITES=	https://github.com/scummvm/scummvm/commit/
-PATCHFILES=	8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch:-p1 \
-		68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch:-p1
-
-MAINTAINER=	lme@FreeBSD.org
+MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Interpreter for several adventure games
 
 LICENSE=	GPLv2+
@@ -19,6 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfaad.so:audio/faad \
 		libfreetype.so:print/freetype2 \
+		libfribidi.so:converters/fribidi \
 		libmpeg2.so:multimedia/libmpeg2 \
 		libtheoradec.so:multimedia/libtheora
 
@@ -38,12 +34,21 @@ CONFIGURE_ARGS=	--disable-alsa \
 
 LDFLAGS+=	-lpthread
 
-OPTIONS_DEFINE=		DOCS FLAC FLUIDSYNTH MP3 MT32EMU PNG SNDIO VORBIS
-OPTIONS_DEFAULT=	MP3 MT32EMU PNG VORBIS
+OPTIONS_DEFINE=		A52 CURL DOCS FLAC FLUIDSYNTH MP3 MT32EMU PNG SNDIO VORBIS
+OPTIONS_DEFAULT=	A52 MP3 MT32EMU PNG VORBIS
 OPTIONS_SUB=		yes
 
+CURL_DESC=	Enable ScummVM cloud storage backend
 MT32EMU_DESC=	MT-32 emulator
 
+A52_LIB_DEPENDS=	liba52.so:audio/liba52
+A52_CONFIGURE_ON=	--with-a52-prefix=${LOCALBASE}
+A52_CONFIGURE_OFF=	--disable-a52
+
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+CURL_CONFIGURE_ON=	--with-libcurl-prefix=${LOCALBASE}
+CURL_CONFIGURE_OFF=	--disable-libcurl
+
 VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
 			libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ON=	--with-ogg-prefix=${LOCALBASE} \
@@ -80,7 +85,7 @@ CONFIGURE_ENV+=	ASFLAGS=-meabi=5
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^mandir=/s/datarootdir/prefix/' \
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/configure
 
 post-install:

games/scummvm/distinfo

@@ -1,7 +1,3 @@
-TIMESTAMP = 1581614684
-SHA256 (scummvm-2.1.1.tar.xz) = 5753769356f3396fde1e614b40496c61392a2903c53ca436b721dde58353dca8
-SIZE (scummvm-2.1.1.tar.xz) = 27291080
-SHA256 (8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch) = dc625481aa58fb87a659d33e10c11a86f085b72bf754b43f4c538ceab72f02a9
-SIZE (8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch) = 977
-SHA256 (68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch) = 847caba0fd2fedc3bd365a6306539a9665b84f3b0653b771a294415f5450d25b
-SIZE (68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch) = 1889
+TIMESTAMP = 1608146920
+SHA256 (scummvm-2.2.0.tar.xz) = 1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387
+SIZE (scummvm-2.2.0.tar.xz) = 63652348

games/scummvm/files/patch-configure

@@ -1,16 +1,20 @@
---- configure.orig	2016-04-28 17:55:03 UTC
+--- configure.orig	2020-09-13 21:05:37 UTC
 +++ configure
-@@ -2380,7 +2380,7 @@ case $_host_os in
- 		append_var LDFLAGS "-L$DEVKITPRO/libnds/lib"
+@@ -2947,9 +2947,9 @@ EOF
+ 		append_var LIBS "-specs=ds_arm9.specs"
  		append_var LIBS "-lnds9"
  		;;
--	freebsd*)
-+	dragonfly*|freebsd*)
- 		append_var LDFLAGS "-L/usr/local/lib"
- 		append_var CXXFLAGS "-I/usr/local/include"
+-	freebsd* | openbsd*)
+-		append_var LDFLAGS "-L/usr/local/lib"
+-		append_var CXXFLAGS "-I/usr/local/include"
++	dragonfly* | freebsd* | openbsd*)
++		append_var LDFLAGS "-L%%LOCALBASE%%/lib"
++		append_var CXXFLAGS "-I%%LOCALBASE%%/include"
  		;;
-@@ -3259,6 +3259,9 @@ case $_host_os in
- 	android | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | ios7 | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
+ 	gamecube)
+ 		_optimization_level=-Os
+@@ -3920,6 +3920,9 @@ case $_host_os in
+ 	3ds | android | androidsdl | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | ios7 | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | switch | uclinux*)
  		_posix=yes
  		;;
 +	dragonfly*)

games/scummvm/pkg-plist

@@ -1,7 +1,7 @@
 bin/scummvm
-man/man6/scummvm.6.gz
 share/applications/scummvm.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.BSD
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.FREEFONT
@@ -10,8 +10,9 @@ share/applications/scummvm.desktop
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/NEWS.md
 %%PORTDOCS%%%%DOCSDIR%%/README.md
-share/appdata/scummvm.appdata.xml
 share/icons/hicolor/scalable/apps/scummvm.svg
+share/man/man6/scummvm.6.gz
+share/metainfo/scummvm.appdata.xml
 share/pixmaps/scummvm.xpm
 %%DATADIR%%/access.dat
 %%DATADIR%%/cryomni3d.dat
@@ -34,5 +35,6 @@ share/pixmaps/scummvm.xpm
 %%DATADIR%%/tony.dat
 %%DATADIR%%/toon.dat
 %%DATADIR%%/translations.dat
-%%DATADIR%%/wintermute.zip
+%%DATADIR%%/ultima.dat
+%%PNG%%%%DATADIR%%/wintermute.zip
 %%DATADIR%%/xeen.ccs