diff -urN scummvm-tools.orig/Makefile scummvm-tools/Makefile
--- scummvm-tools.orig/Makefile	Mon Nov 14 11:09:30 2005
+++ scummvm-tools/Makefile	Thu Nov 17 00:50:59 2005
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	scummvm-tools
-PORTVERSION=	0.7.0
+PORTVERSION=	0.8.0
 CATEGORIES=	games emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scummvm
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd.alex@trull.org
 COMMENT=	Tools for use with the SCUMMVM game emulator
 
 RUN_DEPENDS=	scummvm:${PORTSDIR}/games/scummvm
@@ -23,6 +23,7 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
+WRKSRC=         ${WRKDIR}/tools-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
@@ -31,7 +32,7 @@
 .endif
 
 do-install:
-.for i in descumm extract md5table mm_nes_extract queenrebuild rescumm
+.for i in compress_queen compress_saga compress_san compress_scumm_bun compress_scumm_sou compress_simon compress_sword1 compress_sword2 extract_kyra extract_loom_tg16 extract_mm_c64 extract_mm_nes extract_scumm_mac extract_simon1_amiga extract_zak_c64 dekyra descumm desword2
 	@${INSTALL_PROGRAM} ${WRKSRC}/$i ${PREFIX}/bin
 .endfor
 
diff -urN scummvm-tools.orig/distinfo scummvm-tools/distinfo
--- scummvm-tools.orig/distinfo	Sun Jan  9 23:58:25 2005
+++ scummvm-tools/distinfo	Thu Nov 17 00:03:04 2005
@@ -1,2 +1,3 @@
-MD5 (scummvm-tools-0.7.0.tar.bz2) = eeebbd4e309a8564dd911d5c26fed2f0
-SIZE (scummvm-tools-0.7.0.tar.bz2) = 98664
+MD5 (scummvm-tools-0.8.0.tar.bz2) = cc7e13ea10acf692c10e90b9507074ed
+SHA256 (scummvm-tools-0.8.0.tar.bz2) = b60936416e201eda18c627c85bc29ba742e1b6c98d79bc9935ed4827a2e47fa0
+SIZE (scummvm-tools-0.8.0.tar.bz2) = 92983
diff -urN scummvm-tools.orig/files/patch-simon1descr.c scummvm-tools/files/patch-simon1descr.c
--- scummvm-tools.orig/files/patch-simon1descr.c	Sun Jan  9 23:58:25 2005
+++ scummvm-tools/files/patch-simon1descr.c	Thu Jan  1 01:00:00 1970
@@ -1,19 +0,0 @@
---- simon1decr.c.orig	Mon Apr 12 00:10:19 2004
-+++ simon1decr.c	Tue Jan  4 15:36:39 2005
-@@ -26,14 +26,9 @@
- 
- #define EndGetM32(a)  ((((a)[0])<<24)|(((a)[1])<<16)|(((a)[2])<<8)|((a)[3]))
- 
--#define SD_GETBIT(var) do { \
--  if (!bits--) { s -= 4; if (s < src) return 0; bb=EndGetM32(s); bits=31; } \
--  (var) = bb & 1; bb >>= 1; \
--} while (0)
-+#define SD_GETBIT(var) do { if (!bits--) { s -= 4; if (s < src) return 0; bb=EndGetM32(s); bits=31; } (var) = bb & 1; bb >>= 1; } while (0)
- 
--#define SD_GETBITS(var, nbits) do { \
--  bc=(nbits); (var)=0; while (bc--) {(var)<<=1; SD_GETBIT(bit); (var)|=bit; } \
--} while (0)
-+#define SD_GETBITS(var, nbits) do { bc=(nbits); (var)=0; while (bc--) {(var)<<=1; SD_GETBIT(bit); (var)|=bit; } } while (0)
- 
- #define SD_TYPE_LITERAL (0)
- #define SD_TYPE_MATCH   (1)
diff -urN scummvm-tools.orig/pkg-plist scummvm-tools/pkg-plist
--- scummvm-tools.orig/pkg-plist	Thu Jul  1 03:19:21 2004
+++ scummvm-tools/pkg-plist	Thu Nov 17 00:52:00 2005
@@ -1,8 +1,20 @@
+bin/compress_queen
+bin/compress_saga
+bin/compress_san
+bin/compress_scumm_bun
+bin/compress_scumm_sou
+bin/compress_simon
+bin/compress_sword1
+bin/compress_sword2
+bin/extract_kyra
+bin/extract_loom_tg16
+bin/extract_mm_c64
+bin/extract_mm_nes
+bin/extract_scumm_mac
+bin/extract_simon1_amiga
+bin/extract_zak_c64
+bin/dekyra
 bin/descumm
-bin/extract
-bin/md5table
-bin/mm_nes_extract
-bin/queenrebuild
-bin/rescumm
+bin/desword2
 %%PORTDOCS%%share/doc/scummvm-tools/README
 %%PORTDOCS%%@dirrm share/doc/scummvm-tools
--- scummvm-tools.diff ends here ---