diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile index 4ebdeed7c97d4..d8eefb5196e02 100644 --- a/games/scummvm-tools/Makefile +++ b/games/scummvm-tools/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2011/04/03 11:20:52 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2012/08/12 22:00:34 wiz Exp $ # -DISTNAME= scummvm-tools-0.9.0 -PKGREVISION= 2 +DISTNAME= scummvm-tools-1.4.0 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/} EXTRACT_SUFX= .tar.bz2 @@ -12,30 +11,22 @@ HOMEPAGE= http://scummvm.sourceforge.net/ COMMENT= Conversion and compression tools for ScummVM LICENSE= gnu-gpl-v2 -DEPENDS+= flac-[0-9]*:../../audio/flac -DEPENDS+= lame-[0-9]*:../../audio/lame -DEPENDS+= vorbis-tools-[0-9]*:../../audio/vorbis-tools - PKG_DESTDIR_SUPPORT= user-destdir -WRKSRC= ${WRKDIR}/tools-0.9.0 USE_LANGUAGES= c c++ USE_TOOLS+= gmake +HAS_CONFIGURE= yes +CONFIGURE_ARGS+= --prefix=${PREFIX} -INSTALLATION_DIRS= bin share/doc/scummvm-tools - -do-install: - for f in compress_kyra compress_queen compress_saga \ - compress_scumm_san compress_scumm_sou compress_scumm_bun \ - compress_simon compress_sword1 compress_sword2 dekyra \ - descumm desword2 encode_dxa extract_kyra extract_loom_tg16 \ - extract_mm_c64 extract_mm_nes extract_scumm_mac \ - extract_simon1_amiga extract_zak_c64; \ - do \ - ${INSTALL_PROGRAM} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/bin; \ - done - ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/scummvm-tools +INSTALLATION_DIRS= bin +.include "../../audio/flac/buildlink3.mk" +.include "../../audio/libmad/buildlink3.mk" +.include "../../audio/libvorbis/buildlink3.mk" +.include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/boost-libs/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../x11/wxGTK28/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/scummvm-tools/PLIST b/games/scummvm-tools/PLIST index 21ebcabaceb72..580cc0b9a385c 100644 --- a/games/scummvm-tools/PLIST +++ b/games/scummvm-tools/PLIST @@ -1,22 +1,20 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:56 joerg Exp $ -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 +@comment $NetBSD: PLIST,v 1.3 2012/08/12 22:00:34 wiz Exp $ +bin/construct_mohawk +bin/create_sjisfnt +bin/decine +bin/decompile +bin/degob bin/dekyra +bin/deriven bin/descumm bin/desword2 -bin/encode_dxa -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 -share/doc/scummvm-tools/README +bin/extract_mohawk +bin/gob_loadcalc +bin/scummvm-tools +bin/scummvm-tools-cli +share/scummvm-tools/detaillogo.jpg +share/scummvm-tools/logo.jpg +share/scummvm-tools/scummvmtools.icns +share/scummvm-tools/scummvmtools.ico +share/scummvm-tools/scummvmtools_128.png +share/scummvm-tools/tile.gif diff --git a/games/scummvm-tools/distinfo b/games/scummvm-tools/distinfo index 10bcef79f614a..6ae13a488599e 100644 --- a/games/scummvm-tools/distinfo +++ b/games/scummvm-tools/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.2 2011/04/03 11:20:46 wiz Exp $ +$NetBSD: distinfo,v 1.3 2012/08/12 22:00:34 wiz Exp $ -SHA1 (scummvm-tools-0.9.0.tar.bz2) = c732c0706ae59fc26778ca3fc341dc3873370649 -RMD160 (scummvm-tools-0.9.0.tar.bz2) = eb9f8cc348150ed9b7d952e99121f152fee5f06d -Size (scummvm-tools-0.9.0.tar.bz2) = 116414 bytes -SHA1 (patch-aa) = de4e3fb5e98acfcb58f1b07d083f78918138fff5 -SHA1 (patch-encode__dxa.cpp) = d96c5a16c8ab4ee000663e52434fb584beffaea9 +SHA1 (scummvm-tools-1.4.0.tar.bz2) = 44a422872180f8aea3eb57e0462d930e22c533ba +RMD160 (scummvm-tools-1.4.0.tar.bz2) = baabb1d8fb99be72c5eafb186aa132b797edc58d +Size (scummvm-tools-1.4.0.tar.bz2) = 943697 bytes diff --git a/games/scummvm-tools/patches/patch-aa b/games/scummvm-tools/patches/patch-aa deleted file mode 100644 index b77fe37cf784b..0000000000000 --- a/games/scummvm-tools/patches/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/07/02 09:47:44 dillo Exp $ - ---- Makefile.orig 2006-06-21 23:11:51.000000000 +0200 -+++ Makefile -@@ -3,17 +3,17 @@ - - SRC=. - --CC := gcc --CXX := g++ --CFLAGS += -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar -+#CC := gcc -+#CXX := g++ -+#CFLAGS += -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar - # LDFLAGS += - - # Additional warnings --CFLAGS+= -Wshadow --CFLAGS+= -pedantic --CFLAGS+= -Wpointer-arith -Wcast-qual -Wcast-align -+#CFLAGS+= -Wshadow -+#CFLAGS+= -pedantic -+#CFLAGS+= -Wpointer-arith -Wcast-qual -Wcast-align - # -Wconversion --CFLAGS+= -Wshadow -Wimplicit -Wundef -Wwrite-strings -+#CFLAGS+= -Wshadow -Wimplicit -Wundef -Wwrite-strings - - TARGETS := \ - compress_kyra$(EXEEXT) \ diff --git a/games/scummvm-tools/patches/patch-encode__dxa.cpp b/games/scummvm-tools/patches/patch-encode__dxa.cpp deleted file mode 100644 index cacde7c5fe865..0000000000000 --- a/games/scummvm-tools/patches/patch-encode__dxa.cpp +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-encode__dxa.cpp,v 1.1 2011/04/03 11:20:47 wiz Exp $ - -Fix build with png-1.5. - ---- encode_dxa.cpp.orig 2006-06-21 21:11:51.000000000 +0000 -+++ encode_dxa.cpp -@@ -217,10 +217,10 @@ int read_png_file(char* filename, unsign - - png_read_info(png_ptr, info_ptr); - -- width = info_ptr->width; -- height = info_ptr->height; -- color_type = info_ptr->color_type; -- bit_depth = info_ptr->bit_depth; -+ width = png_get_image_width(png_ptr, info_ptr); -+ height = png_get_image_height(png_ptr, info_ptr); -+ color_type = png_get_color_type(png_ptr, info_ptr); -+ bit_depth = png_get_bit_depth(png_ptr, info_ptr); - - if (color_type != PNG_COLOR_TYPE_PALETTE) { - palette = NULL; -@@ -236,13 +236,13 @@ int read_png_file(char* filename, unsign - - row_pointers = (png_bytep*) malloc(sizeof(png_bytep) * height); - for (int y=0; yrowbytes); -+ row_pointers[y] = (png_byte*) malloc(png_get_rowbytes(png_ptr, info_ptr)); - - png_read_image(png_ptr, row_pointers); - - image = new unsigned char[width * height]; - for (int y=0; yrowbytes); -+ memcpy(&image[y*width], row_pointers[y], png_get_rowbytes(png_ptr, info_ptr)); - - for (int y=0; y