Index: head/games/scummvm/Makefile =================================================================== --- head/games/scummvm/Makefile (revision 558445) +++ head/games/scummvm/Makefile (revision 558446) @@ -1,91 +1,96 @@ # Created by: Alex Trull # $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+ 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 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_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} \ --with-vorbis-prefix=${LOCALBASE} 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 .if ${ARCH} == armv6 || ${ARCH} == armv7 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: ${INSTALL_DATA} ${WRKSRC}/dists/${PORTNAME}.desktop \ ${STAGEDIR}${DESKTOPDIR} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include Index: head/games/scummvm/distinfo =================================================================== --- head/games/scummvm/distinfo (revision 558445) +++ head/games/scummvm/distinfo (revision 558446) @@ -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 Index: head/games/scummvm/files/patch-configure =================================================================== --- head/games/scummvm/files/patch-configure (revision 558445) +++ head/games/scummvm/files/patch-configure (revision 558446) @@ -1,21 +1,25 @@ ---- 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*) + _posix=yes + ;; os2-emx*) _posix=yes # FIXME: Really??? ;; Index: head/games/scummvm/pkg-plist =================================================================== --- head/games/scummvm/pkg-plist (revision 558445) +++ head/games/scummvm/pkg-plist (revision 558446) @@ -1,38 +1,40 @@ 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 %%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/man/man6/scummvm.6.gz +share/metainfo/scummvm.appdata.xml 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 %%MP3%%%%DATADIR%%/titanic.dat %%DATADIR%%/tony.dat %%DATADIR%%/toon.dat %%DATADIR%%/translations.dat -%%DATADIR%%/wintermute.zip +%%DATADIR%%/ultima.dat +%%PNG%%%%DATADIR%%/wintermute.zip %%DATADIR%%/xeen.ccs