Index: head/games/scummvm/Makefile =================================================================== --- head/games/scummvm/Makefile (revision 414234) +++ head/games/scummvm/Makefile (revision 414235) @@ -1,74 +1,76 @@ # Created by: Alex Trull # $FreeBSD$ PORTNAME= scummvm -DISTVERSION= 1.7.0 -PORTREVISION= 4 +DISTVERSION= 1.8.0 CATEGORIES= games emulators MASTER_SITES= SF MAINTAINER= lme@FreeBSD.org COMMENT= Interpreter for several adventure games +LICENSE= GPLv2 + USES= gmake jpeg tar:bzip2 HAS_CONFIGURE= yes USE_SDL= sdl +INSTALLS_ICONS= yes CONFIGURE_ARGS= --with-sdl-prefix=${LOCALBASE} \ --with-jpeg-prefix=${LOCALBASE} \ --disable-alsa \ --with-zlib-prefix=/usr \ --disable-debug \ --disable-nasm \ --disable-tremor .if defined(BATCH) || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --enable-verbose-build .endif LDFLAGS+= -lpthread OPTIONS_DEFINE= VORBIS MP3 PNG FLAC FLUIDSYNTH MT32EMU DOCS MT32EMU_DESC= MT-32 emulator OPTIONS_DEFAULT= VORBIS MP3 PNG MT32EMU 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 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 .include .if ${ARCH} == "armv6" 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 Index: head/games/scummvm/distinfo =================================================================== --- head/games/scummvm/distinfo (revision 414234) +++ head/games/scummvm/distinfo (revision 414235) @@ -1,2 +1,2 @@ -SHA256 (scummvm-1.7.0.tar.bz2) = d9ff0e8cf911afa466d5456d28fef692a17d47ddecfd428bf2fef591237c2e66 -SIZE (scummvm-1.7.0.tar.bz2) = 20018016 +SHA256 (scummvm-1.8.0.tar.bz2) = 01ec715e2972b3aedc23e141643acdcff44d0e56638c0df44d931a84fe7e7f38 +SIZE (scummvm-1.8.0.tar.bz2) = 22025706 Index: head/games/scummvm/files/patch-configure =================================================================== --- head/games/scummvm/files/patch-configure (revision 414234) +++ head/games/scummvm/files/patch-configure (revision 414235) @@ -1,21 +1,21 @@ ---- configure.orig 2014-07-11 21:10:26 UTC +--- configure.orig 2016-04-28 17:55:03 UTC +++ configure -@@ -2300,7 +2300,7 @@ case $_host_os in - LDFLAGS="$LDFLAGS -L$DEVKITPRO/libnds/lib" - LIBS="$LIBS -lnds9" +@@ -2380,7 +2380,7 @@ case $_host_os in + append_var LDFLAGS "-L$DEVKITPRO/libnds/lib" + append_var LIBS "-lnds9" ;; - freebsd*) + dragonfly*|freebsd*) - LDFLAGS="$LDFLAGS -L/usr/local/lib" - CXXFLAGS="$CXXFLAGS -I/usr/local/include" + append_var LDFLAGS "-L/usr/local/lib" + append_var CXXFLAGS "-I/usr/local/include" ;; -@@ -3106,6 +3106,9 @@ case $_host_os in - android | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos) +@@ -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) _posix=yes ;; + dragonfly*) + _posix=yes + ;; os2-emx*) _posix=yes # FIXME: Really??? ;; Index: head/games/scummvm/pkg-plist =================================================================== --- head/games/scummvm/pkg-plist (revision 414234) +++ head/games/scummvm/pkg-plist (revision 414235) @@ -1,28 +1,30 @@ 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%%/COPYRIGHT %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README +share/icons/hicolor/scalable/apps/scummvm.svg share/pixmaps/scummvm.xpm +%%DATADIR%%/access.dat %%DATADIR%%/drascula.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%%/sky.cpt %%DATADIR%%/teenagent.dat %%DATADIR%%/tony.dat %%DATADIR%%/toon.dat %%DATADIR%%/translations.dat %%DATADIR%%/wintermute.zip Index: head/games/scummvm-tools/Makefile =================================================================== --- head/games/scummvm-tools/Makefile (revision 414234) +++ head/games/scummvm-tools/Makefile (revision 414235) @@ -1,61 +1,60 @@ # Created by: Adam Weinberger # $FreeBSD$ PORTNAME= scummvm-tools -DISTVERSION= 1.7.0 -PORTREVISION= 3 +DISTVERSION= 1.8.0 CATEGORIES= games emulators MASTER_SITES= SF/scummvm/${PORTNAME}/${DISTVERSION} MAINTAINER= lme@FreeBSD.org COMMENT= Tools for use with the SCUMMVM game emulator LICENSE= GPLv2 RUN_DEPENDS:= ${BUILD_DEPENDS} BUILD_DEPENDS= lame:audio/lame \ flac:audio/flac \ oggenc:audio/vorbis-tools LIB_DEPENDS= libpng.so:graphics/png \ libvorbis.so:audio/libvorbis USES= gmake tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_TARGET= -STRIP_FILES= construct_mohawk create_sjisfnt decine degob dekyra \ - deriven descumm desword2 extract_mohawk gob_loadcalc \ +STRIP_FILES= construct_mohawk create_sjisfnt decine decompile degob \ + dekyra deriven descumm desword2 extract_mohawk gob_loadcalc \ scummvm-tools-cli OPTIONS_DEFINE= WXGTK DOCS OPTIONS_DEFAULT= WXGTK .include .if ${PORT_OPTIONS:MWXGTK} USE_WX= 2.8 WX_COMP= wx:lib:build WX_UNICODE= yes WX_CONFIG_ARGS= absolute GUI_BIN= tools_gui PLIST_SUB= WX="" STRIP_FILES+= scummvm-tools .else CONFIGURE_ARGS+= --disable-wxwidgets PLIST_SUB= WX="@comment " .endif pre-patch: @${REINPLACE_CMD} -e 's|wxgtk2-2.8-config|${WX_CONFIG:C/.*\///}|' \ ${WRKSRC}/configure pre-install: @${STRIP_CMD} ${STRIP_FILES:S|^|${WRKSRC}/|} post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Index: head/games/scummvm-tools/distinfo =================================================================== --- head/games/scummvm-tools/distinfo (revision 414234) +++ head/games/scummvm-tools/distinfo (revision 414235) @@ -1,2 +1,2 @@ -SHA256 (scummvm-tools-1.7.0.tar.bz2) = b4005c3d68e4c5bda4fa9e31f3998fc5b45b7c9381890ed3d5f0b57f77a62589 -SIZE (scummvm-tools-1.7.0.tar.bz2) = 956801 +SHA256 (scummvm-tools-1.8.0.tar.bz2) = f99369e4bcf61e3fa82abff542d8ca93502725f248e62b3799dd342878ccaf73 +SIZE (scummvm-tools-1.8.0.tar.bz2) = 966187 Index: head/games/scummvm-tools/pkg-plist =================================================================== --- head/games/scummvm-tools/pkg-plist (revision 414234) +++ head/games/scummvm-tools/pkg-plist (revision 414235) @@ -1,19 +1,20 @@ bin/construct_mohawk bin/create_sjisfnt bin/decine +bin/decompile bin/degob bin/dekyra bin/deriven bin/descumm bin/desword2 bin/extract_mohawk bin/gob_loadcalc %%WX%%bin/scummvm-tools bin/scummvm-tools-cli %%PORTDOCS%%%%DOCSDIR%%/README %%DATADIR%%/detaillogo.jpg %%DATADIR%%/logo.jpg %%DATADIR%%/scummvmtools.icns %%DATADIR%%/scummvmtools.ico %%DATADIR%%/scummvmtools_128.png %%DATADIR%%/tile.gif