4 files changed, 28 insertions, 26 deletions

diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 28deac0c14ee..9af744c4a3c6 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	scummvm-tools
-PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTVERSION=	0.10.0
 CATEGORIES=	games emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scummvm
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lars.engels@0x20.net
 COMMENT=	Tools for use with the SCUMMVM game emulator
 
 RUN_DEPENDS=	scummvm:${PORTSDIR}/games/scummvm
@@ -24,10 +23,14 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/tools-${PORTVERSION}
+WRKSRC=		${WRKDIR}/scummvm-tools-${PORTVERSION}
 
 do-install:
-.for i in compress_queen compress_saga 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
+.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_zak_c64
 	@${INSTALL_PROGRAM} ${WRKSRC}/$i ${PREFIX}/bin
 .endfor
 
@@ -37,6 +40,6 @@ do-install:
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's@:= -g -O@+= ${CFLAGS}@' ${WRKSRC}/Makefile
+	@${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 e954805a76dd..a0fbe2c54309 100644
--- a/games/scummvm-tools/distinfo
+++ b/games/scummvm-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (scummvm-tools-0.9.0.tar.bz2) = c8164fa1cca90b1c3bff1c8949d875a3
-SHA256 (scummvm-tools-0.9.0.tar.bz2) = 0ade56651dba804007e848e0ba57931c780dd59c53c68458a58772e1e6f131b5
-SIZE (scummvm-tools-0.9.0.tar.bz2) = 116414
+MD5 (scummvm-tools-0.10.0.tar.bz2) = c72250ad730243d43cf2d1aea0428acd
+SHA256 (scummvm-tools-0.10.0.tar.bz2) = b3909c1a913bffda75efb2a3f7ac65e1e3d125efc1b17415d39834460569dd15
+SIZE (scummvm-tools-0.10.0.tar.bz2) = 134395
diff --git a/games/scummvm-tools/files/patch-Makefile b/games/scummvm-tools/files/patch-Makefile
index 86c89d42dd78..f79bf78bda07 100644
--- a/games/scummvm-tools/files/patch-Makefile
+++ b/games/scummvm-tools/files/patch-Makefile
@@ -1,22 +1,16 @@
---- Makefile.orig	Wed Jun 21 23:11:51 2006
-+++ Makefile	Fri Jan 12 17:14:52 2007
-@@ -3,9 +3,7 @@
+--- 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
-+CFLAGS  += -Wall -Wuninitialized -Wno-long-long -Wno-multichar -I$(LOCALBASE)/include
- # LDFLAGS +=
+-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
-@@ -61,7 +59,7 @@
- 	$(CXX) $(LDFLAGS) -o $@ $+
- 
- encode_dxa$(EXEEXT): encode_dxa.o compress.o util.o
--	$(CXX) $(LDFLAGS) -o $@ $+ -lpng -lz
-+	$(CXX) $(LDFLAGS) -o $@ $+ -lpng -lz -L$(LOCALBASE)/lib
- 
- extract_loom_tg16$(EXEEXT): extract_loom_tg16.o util.o
- 	$(CC) $(LDFLAGS) -o $@ $+
+ CFLAGS+= -Wshadow
diff --git a/games/scummvm-tools/pkg-plist b/games/scummvm-tools/pkg-plist
index 6b784dbf9b1a..b5756dbe798c 100644
--- a/games/scummvm-tools/pkg-plist
+++ b/games/scummvm-tools/pkg-plist
@@ -1,19 +1,24 @@
+bin/compress_agos
+bin/compress_kyra
 bin/compress_queen
 bin/compress_saga
 bin/compress_scumm_bun
+bin/compress_scumm_san
 bin/compress_scumm_sou
-bin/compress_simon
 bin/compress_sword1
 bin/compress_sword2
+bin/compress_touche
 bin/dekyra
 bin/descumm
 bin/desword2
+bin/encode_dxa
+bin/extract_agos
 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_simon1_amiga
 bin/extract_zak_c64
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%