Index: head/games/scummvm/Makefile
===================================================================
--- head/games/scummvm/Makefile	(revision 528845)
+++ head/games/scummvm/Makefile	(revision 528846)
@@ -1,88 +1,90 @@
 # Created by: Alex Trull <freebsd.alex@trull.org>
 # $FreeBSD$
 
 PORTNAME=	scummvm
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 CATEGORIES=	games emulators
 MASTER_SITES=	http://www.scummvm.org/frs/scummvm/${PORTVERSION}/
 
 PATCH_SITES=	https://github.com/scummvm/scummvm/commit/
 PATCHFILES=	8593a9e1e4e8dd1f5dfac9b1304a417df9a742e6.patch:-p1 \
 		68758a879e0c8ecc0d40962516d4e808aa4e15e5.patch:-p1
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Interpreter for several adventure games
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfaad.so:audio/faad \
 		libfreetype.so:print/freetype2 \
 		libmpeg2.so:multimedia/libmpeg2 \
 		libtheoradec.so:multimedia/libtheora
 
-USES=		gmake gnome jpeg sdl tar:xz
+USES=		gmake gnome iconv jpeg sdl tar:xz
 HAS_CONFIGURE=	yes
 USE_SDL=	sdl2
 INSTALLS_ICONS=	yes
 
 CONFIGURE_ARGS=	--disable-alsa \
 		--disable-debug \
 		--disable-nasm \
 		--disable-tremor \
 		--enable-verbose-build \
 		--with-jpeg-prefix=${LOCALBASE} \
 		--with-sdl-prefix=${LOCALBASE} \
 		--with-zlib-prefix=/usr
 
 LDFLAGS+=	-lpthread
 
 OPTIONS_DEFINE=		DOCS FLAC FLUIDSYNTH MP3 MT32EMU PNG SNDIO VORBIS
 OPTIONS_DEFAULT=	MP3 MT32EMU PNG VORBIS
+OPTIONS_SUB=		yes
 
 MT32EMU_DESC=	MT-32 emulator
 
 VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
 			libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ON=	--with-ogg-prefix=${LOCALBASE} \
 			--with-vorbis-prefix=${LOCALBASE}
-VORBIS_CONFIGURE_OFF=	--disable-vorbis
+VORBIS_CONFIGURE_OFF=	--disable-vorbis \
+			--disable-ogg
 
 MP3_LIB_DEPENDS=	libmad.so:audio/libmad
 MP3_CONFIGURE_ON=	--with-mad-prefix=${LOCALBASE}
 MP3_CONFIGURE_OFF=	--disable-mad
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_ON=	--with-png-prefix=${LOCALBASE}
 PNG_CONFIGURE_OFF=	--disable-png
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_ON=	--with-flac-prefix=${LOCALBASE}
 FLAC_CONFIGURE_OFF=	--disable-flac
 
 FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CONFIGURE_ON=	--with-fluidsynth-prefix=${LOCALBASE}
 FLUIDSYNTH_CONFIGURE_OFF=	--disable-fluidsynth
 
 MT32EMU_CONFIGURE_OFF=	--disable-mt32emu
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CONFIGURE_ON=	--with-sndio-prefix=${LOCALBASE}
 SNDIO_CONFIGURE_OFF=	--disable-sndio
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7
 CONFIGURE_ENV+=	ASFLAGS=-meabi=5
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^mandir=/s/datarootdir/prefix/' \
 		${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dists/${PORTNAME}.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.post.mk>
Index: head/games/scummvm/distinfo
===================================================================
--- head/games/scummvm/distinfo	(revision 528845)
+++ head/games/scummvm/distinfo	(revision 528846)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1580656626
-SHA256 (scummvm-2.1.0.tar.xz) = 6b50c6596a1536b52865f556dc05ded20f86b6ffabe4bccbd746b5587b15f727
-SIZE (scummvm-2.1.0.tar.xz) = 27188916
+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
Index: head/games/scummvm/pkg-plist
===================================================================
--- head/games/scummvm/pkg-plist	(revision 528845)
+++ head/games/scummvm/pkg-plist	(revision 528846)
@@ -1,38 +1,38 @@
 bin/scummvm
 man/man6/scummvm.6.gz
 share/applications/scummvm.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.BSD
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.FREEFONT
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.LGPL
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.OFL
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/NEWS.md
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 share/appdata/scummvm.appdata.xml
 share/icons/hicolor/scalable/apps/scummvm.svg
 share/pixmaps/scummvm.xpm
 %%DATADIR%%/access.dat
 %%DATADIR%%/cryomni3d.dat
 %%DATADIR%%/drascula.dat
 %%DATADIR%%/fonts.dat
 %%DATADIR%%/hugo.dat
 %%DATADIR%%/kyra.dat
 %%DATADIR%%/lure.dat
 %%DATADIR%%/mort.dat
 %%DATADIR%%/neverhood.dat
 %%DATADIR%%/pred.dic
 %%DATADIR%%/queen.tbl
 %%DATADIR%%/scummclassic.zip
 %%DATADIR%%/scummmodern.zip
 %%DATADIR%%/scummremastered.zip
 %%DATADIR%%/sky.cpt
 %%DATADIR%%/supernova.dat
 %%DATADIR%%/teenagent.dat
-%%DATADIR%%/titanic.dat
+%%MP3%%%%DATADIR%%/titanic.dat
 %%DATADIR%%/tony.dat
 %%DATADIR%%/toon.dat
 %%DATADIR%%/translations.dat
 %%DATADIR%%/wintermute.zip
 %%DATADIR%%/xeen.ccs