Index: head/games/scummvm/Makefile
===================================================================
--- head/games/scummvm/Makefile	(revision 396247)
+++ head/games/scummvm/Makefile	(revision 396248)
@@ -1,72 +1,75 @@
 # Created by: Alex Trull <freebsd.alex@trull.org>
 # $FreeBSD$
 
 PORTNAME=	scummvm
 DISTVERSION=	1.7.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games emulators
 MASTER_SITES=	SF
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Interpreter for several adventure games
 
-USES=		gmake tar:bzip2
+USES=		gmake jpeg tar:bzip2
 HAS_CONFIGURE=	yes
 USE_SDL=	sdl
 
 CONFIGURE_ARGS=	--with-sdl-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
 FLUIDSYNTH_DESC=	FluidSynth MIDI synthesizer
 MT32EMU_DESC=	MT-32 emulator
 OPTIONS_DEFAULT=	VORBIS MP3 PNG MT32EMU
 
 VORBIS_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
 			libvorbis.so:${PORTSDIR}/audio/libvorbis
 VORBIS_CONFIGURE_ON=	--with-ogg-prefix=${LOCALBASE} \
 			--with-vorbis-prefix=${LOCALBASE}
 VORBIS_CONFIGURE_OFF=	--disable-vorbis
 
 MP3_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
 MP3_CONFIGURE_ON=	--with-mad-prefix=${LOCALBASE}
 MP3_CONFIGURE_OFF=	--disable-mad
 
 PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 PNG_CONFIGURE_ON=	--with-png-prefix=${LOCALBASE}
 PNG_CONFIGURE_OFF=	--disable-png
 
 FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
 FLAC_CONFIGURE_ON=	--with-flac-prefix=${LOCALBASE}
 FLAC_CONFIGURE_OFF=	--disable-flac
 
 FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
 FLUIDSYNTH_CONFIGURE_ON=	--with-fluidsynth-prefix=${LOCALBASE}
 FLUIDSYNTH_CONFIGURE_OFF=	--disable-fluidsynth
 
 MT32EMU_CONFIGURE_OFF=	--disable-mt32emu
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile on ia64, powerpc, or sparc64
-.endif
-
 .if ${ARCH} == "armv6"
 CONFIGURE_ENV+=	ASFLAGS=-meabi=5
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^mandir=/s/datarootdir/prefix/' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/^mandir=/s/datarootdir/prefix/' \
+		${WRKSRC}/configure
 
 post-install:
-	${MKDIR} ${STAGEDIR}${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/dists/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/
+	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/dists/${PORTNAME}.desktop \
+		${STAGEDIR}${DESKTOPDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.post.mk>
Index: head/games/scummvm/pkg-plist
===================================================================
--- head/games/scummvm/pkg-plist	(revision 396247)
+++ head/games/scummvm/pkg-plist	(revision 396248)
@@ -1,27 +1,28 @@
 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/pixmaps/scummvm.xpm
 %%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