4 files changed, 49 insertions, 31 deletions

diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index b50ea4218a11..2a3c7cbe2d87 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scummvm-tools
-PORTVERSION=	0.11.0
+PORTVERSION=	0.13.0
 CATEGORIES=	games emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scummvm
@@ -18,19 +18,49 @@ RUN_DEPENDS=	scummvm:${PORTSDIR}/games/scummvm
 BUILD_DEPENDS=	lame:${PORTSDIR}/audio/lame \
 		flac:${PORTSDIR}/audio/flac \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
-		oggdec:${PORTSDIR}/audio/vorbis-tools
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+		oggdec:${PORTSDIR}/audio/vorbis-tools \
+
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		vorbis.4:${PORTSDIR}/audio/libvorbis
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+
 WRKSRC=		${WRKDIR}/scummvm-tools-${PORTVERSION}
 
+MAKE_JOBS_SAFE=	yes
+
+MAKE_ENV=	"LDFLAGS= -L${LOCALBASE}/lib"
+CXXFLAGS=	-I${LOCALBASE}/include
+
+OPTIONS=	WX "Build wxWidgets GUI" On
+
+.if defined(WITH_WX)
+USE_WX=		2.4+
+WX_CONFIG=	${LOCALBASE}/bin/wxgtk2-2.8-config
+WX_COMP=	wx:lib:build
+GUI_BIN=	tools_gui
+PLIST_SUB=	WX=""
+.else
+PLIST_SUB=	WX="@comment "
+.endif
+
+post-patch:
+.if defined(WITH_WX)
+	@${REINPLACE_CMD} -e 's,wx-config,${WX_CONFIG},' ${WRKSRC}/Makefile
+.else
+	@${REINPLACE_CMD} -e '/tools_gui$$(EXEEXT)$$/d' ${WRKSRC}/Makefile
+.endif
+
 do-install:
-.for i in compress_agos compress_kyra compress_queen compress_saga compress_scumm_bun \
-		compress_scumm_san compress_scumm_sou compress_sword1 compress_sword2 \
-		compress_touche dekyra descumm desword2 encode_dxa extract_agos \
-		extract_kyra extract_loom_tg16 extract_mm_apple extract_mm_c64 \
-		extract_mm_nes extract_scumm_mac extract_parallaction extract_zak_c64
+.for i in compress_agos compress_kyra compress_queen compress_saga \
+		compress_scumm_bun compress_scumm_san compress_scumm_sou \
+		compress_sword1 compress_sword2 compress_touche compress_tucker \
+		decine dekyra descumm desword2 degob encode_dxa extract_agos \
+		extract_cine extract_kyra extract_loom_tg16 extract_mm_apple \
+		extract_mm_c64 extract_mm_nes extract_parallaction \
+		extract_scumm_mac extract_t7g_mac extract_zak_c64 \
+		extract_gob_stk ${GUI_BIN}
 	@${INSTALL_PROGRAM} ${WRKSRC}/$i ${PREFIX}/bin
 .endfor
 
@@ -39,7 +69,4 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's@:= -g -O@+= ${CFLAGS}@' -e "s@%%PREFIX%%@${PREFIX}@" ${WRKSRC}/Makefile
-
 .include <bsd.port.mk>
diff --git a/games/scummvm-tools/distinfo b/games/scummvm-tools/distinfo
index 0fff558800e4..8c5a5bb5a4ab 100644
--- a/games/scummvm-tools/distinfo
+++ b/games/scummvm-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (scummvm-tools-0.11.0.tar.bz2) = 13dbc307fb88604e3ad6ba6ae15719fc
-SHA256 (scummvm-tools-0.11.0.tar.bz2) = df79b2a6a4fe09321f8c383513b63ce04d3f6216dd4d449aa86f67bc2b1f16f1
-SIZE (scummvm-tools-0.11.0.tar.bz2) = 139292
+MD5 (scummvm-tools-0.13.0.tar.bz2) = 57031b2b8b209e2e6f705788f2056a3d
+SHA256 (scummvm-tools-0.13.0.tar.bz2) = ccce1e6c4d252520bd15e86962b06ab65ea5a712d8efbd042cfd11ea23fc7582
+SIZE (scummvm-tools-0.13.0.tar.bz2) = 278230
diff --git a/games/scummvm-tools/files/patch-Makefile b/games/scummvm-tools/files/patch-Makefile
deleted file mode 100644
index f79bf78bda07..000000000000
--- a/games/scummvm-tools/files/patch-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.orig	2007-06-16 23:00:22.000000000 +0200
-+++ Makefile	2007-06-30 16:37:15.000000000 +0200
-@@ -3,10 +3,9 @@
- 
- SRC=.
- 
--CC      := gcc
--CXX     := g++
--CFLAGS  += -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar -DUNIX
--# LDFLAGS +=
-+CFLAGS  += -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar -DUNIX -I/usr/local/include
-+CXXFLAGS  += -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar -DUNIX -I/usr/local/include
-+LDFLAGS += -L/usr/local/lib
- 
- # Additional warnings
- CFLAGS+= -Wshadow
diff --git a/games/scummvm-tools/pkg-plist b/games/scummvm-tools/pkg-plist
index a0a21733a3b6..c172e32525e7 100644
--- a/games/scummvm-tools/pkg-plist
+++ b/games/scummvm-tools/pkg-plist
@@ -8,18 +8,25 @@ bin/compress_scumm_sou
 bin/compress_sword1
 bin/compress_sword2
 bin/compress_touche
+bin/compress_tucker
+bin/decine
+bin/degob
 bin/dekyra
 bin/descumm
 bin/desword2
 bin/encode_dxa
 bin/extract_agos
+bin/extract_cine
+bin/extract_gob_stk
 bin/extract_kyra
 bin/extract_loom_tg16
 bin/extract_mm_apple
 bin/extract_mm_c64
 bin/extract_mm_nes
-bin/extract_scumm_mac
 bin/extract_parallaction
+bin/extract_scumm_mac
+bin/extract_t7g_mac
 bin/extract_zak_c64
+%%WX%%bin/tools_gui
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%