- Update to 0.9.0

Thanks to:      trasz and ehaupt@

4 files changed, 33 insertions, 11 deletions

diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 830a1a1d708a..5ad867245ba9 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scummvm-tools
-PORTVERSION=	0.8.0
+PORTVERSION=	0.9.0
 CATEGORIES=	games emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scummvm
@@ -19,6 +19,7 @@ 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
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -31,7 +32,7 @@ USE_GCC=	3.3+
 .endif
 
 do-install:
-.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
+.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
 	@${INSTALL_PROGRAM} ${WRKSRC}/$i ${PREFIX}/bin
 .endfor
 
diff --git a/games/scummvm-tools/distinfo b/games/scummvm-tools/distinfo
index 91e070fe5a6f..e954805a76dd 100644
--- a/games/scummvm-tools/distinfo
+++ b/games/scummvm-tools/distinfo
@@ -1,3 +1,3 @@
-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
+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
diff --git a/games/scummvm-tools/files/patch-Makefile b/games/scummvm-tools/files/patch-Makefile
new file mode 100644
index 000000000000..86c89d42dd78
--- /dev/null
+++ b/games/scummvm-tools/files/patch-Makefile
@@ -0,0 +1,22 @@
+--- Makefile.orig	Wed Jun 21 23:11:51 2006
++++ Makefile	Fri Jan 12 17:14:52 2007
+@@ -3,9 +3,7 @@
+ 
+ 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 +=
+ 
+ # 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 $@ $+
diff --git a/games/scummvm-tools/pkg-plist b/games/scummvm-tools/pkg-plist
index d92159e52474..6b784dbf9b1a 100644
--- a/games/scummvm-tools/pkg-plist
+++ b/games/scummvm-tools/pkg-plist
@@ -1,11 +1,13 @@
 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/dekyra
+bin/descumm
+bin/desword2
 bin/extract_kyra
 bin/extract_loom_tg16
 bin/extract_mm_c64
@@ -13,8 +15,5 @@ bin/extract_mm_nes
 bin/extract_scumm_mac
 bin/extract_simon1_amiga
 bin/extract_zak_c64
-bin/dekyra
-bin/descumm
-bin/desword2
-%%PORTDOCS%%share/doc/scummvm-tools/README
-%%PORTDOCS%%@dirrm share/doc/scummvm-tools
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%