Update scummvm-tools to 0.13.0, this is a set of script decompilers,
resource recompressors/extractors/encoders useful for games/scummvm.
wxwidgets frontend not included as it seems fairly useless.
As per main scummvm update only tested on amd64 at the moment
with sparc and sparc64 on the todo list.
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/scummvm-tools/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 19 Jan 2008 01:30:18 -0000 1.12
+++ Makefile 6 Mar 2009 12:16:59 -0000
@@ -2,7 +2,7 @@
# XXX hardcoded endian list
COMMENT= collection of various tools for scummvm
-DISTNAME= scummvm-tools-0.11.0
+DISTNAME= scummvm-tools-0.13.0
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/}
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m stdc++ z
+WANTLIB= c m ogg stdc++ vorbis vorbisenc z
NO_REGRESS= Yes
USE_GMAKE= Yes
@@ -28,9 +28,11 @@ CFLAGS+= -DSCUMM_BIG_ENDIAN
CXXFLAGS+= -DSCUMM_BIG_ENDIAN
.endif
+LIB_DEPENDS= FLAC::audio/flac \
+ png::graphics/png
+
RUN_DEPENDS= ::audio/lame \
- ::audio/vorbis-tools \
- ::audio/flac
+ ::audio/vorbis-tools
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scummvm-tools
@@ -38,9 +40,12 @@ do-install:
${INSTALL_PROGRAM} \
${WRKBUILD}/compress_{kyra,queen,saga,scumm_san,scumm_bun} \
${WRKBUILD}/compress_{scumm_sou,agos,sword1,sword2,touche} \
- ${WRKBUILD}/de{kyra,scumm,sword2} \
- ${WRKBUILD/extract_{agos,kyra,loom_tg16,mm_apple,mm_c64} \
- ${WRKBUILD}/extract_{mm_nes,scumm_mac,zak_c64} \
+ ${WRKBUILD}/compress_tucker \
+ ${WRKBUILD}/de{cine,kyra,scumm,sword2,gob} \
+ ${WRKBUILD}/encode_dxa \
+ ${WRKBUILD}/extract_{agos,cine,kyra,loom_tg16,mm_apple,mm_c64} \
+ ${WRKBUILD}/extract_{mm_nes,parallaction,scumm_mac,t7g_mac} \
+ ${WRKBUILD}/extract_{zak_c64,gob_stk} \
${PREFIX}/bin
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/scummvm-tools/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 19 Jan 2008 01:30:18 -0000 1.9
+++ distinfo 6 Mar 2009 12:16:59 -0000
@@ -1,5 +1,5 @@
-MD5 (scummvm-tools-0.11.0.tar.gz) = lmS0ugMiNqecXGrhT7KCvw==
-RMD160 (scummvm-tools-0.11.0.tar.gz) = Iof+GqR0j+zKpohySGZXrxkcRxo=
-SHA1 (scummvm-tools-0.11.0.tar.gz) = gR6MDVuy8Phge3eTziIYh9YLlJ4=
-SHA256 (scummvm-tools-0.11.0.tar.gz) =
jRoO3j8JgEFq47vyroPiksNUqr1tuDbBJWCcLJ+o3bI=
-SIZE (scummvm-tools-0.11.0.tar.gz) = 169162
+MD5 (scummvm-tools-0.13.0.tar.gz) = VkucZfe4AhQ8QIe6klG4kA==
+RMD160 (scummvm-tools-0.13.0.tar.gz) = WxyeDGN9iFIivcoX0rr8HDwXP6M=
+SHA1 (scummvm-tools-0.13.0.tar.gz) = Gg2qM0gjEmcvvnquNNKlSVYHQP4=
+SHA256 (scummvm-tools-0.13.0.tar.gz) =
yQNreJNloaLpU0tuF3T9uVEG1mJ7YnQCi4cOTaTXu88=
+SIZE (scummvm-tools-0.13.0.tar.gz) = 337750
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/games/scummvm-tools/patches/patch-Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Makefile
--- patches/patch-Makefile 7 Jul 2007 01:39:47 -0000 1.6
+++ patches/patch-Makefile 6 Mar 2009 12:16:59 -0000
@@ -1,43 +1,101 @@
$OpenBSD: patch-Makefile,v 1.6 2007/07/07 01:39:47 jsg Exp $
---- Makefile.orig Sun Jun 17 07:00:22 2007
-+++ Makefile Tue Jun 26 22:57:57 2007
-@@ -3,9 +3,10 @@
+--- Makefile.orig Thu Feb 19 10:16:35 2009
++++ Makefile Fri Mar 6 22:55:56 2009
+@@ -9,7 +9,7 @@ srcdir ?= .
+
+ DEFINES := -DUNIX
+ LDFLAGS := $(LDFLAGS)
+-INCLUDES := -I. -I$(srcdir)
++INCLUDES := -I. -I$(srcdir) `pkg-config --cflags libpng vorbis vorbisenc`
+ LIBS :=
+ OBJS :=
+ DEPDIR := .deps
+@@ -19,8 +19,6 @@ DEPDIR := .deps
+ # manually create a config.mk files with overrides, if needed.
+ -include config.mk
- SRC=.
+-CXXFLAGS += -g -O -Wuninitialized
+-
+ # Additional warnings
+ CXXFLAGS:= -Wall $(CXXFLAGS)
+ # Turn off some annoying and not-so-useful warnings
+@@ -46,8 +44,8 @@ RM ?= rm -f
+ RM_REC ?= $(RM) -r
+ ZIP ?= zip -q
-CC := gcc
-CXX := g++
--CFLAGS += -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar -DUNIX
+#CC := gcc
+#CXX := g++
-+CFLAGS += -Wall -Wno-long-long -Wno-multichar -DUNIX
-+CXXFLAGS += -Wall -Wno-long-long -Wno-multichar -DUNIX
- # LDFLAGS +=
- # Additional warnings
-@@ -29,7 +30,6 @@ TARGETS := \
- dekyra$(EXEEXT) \
- descumm$(EXEEXT) \
- desword2$(EXEEXT) \
-- encode_dxa$(EXEEXT) \
- extract_agos$(EXEEXT) \
- extract_kyra$(EXEEXT) \
- extract_loom_tg16$(EXEEXT) \
-@@ -89,7 +89,7 @@ desword2$(EXEEXT): desword2.o util.o
+ #######################################################################
+
+@@ -86,8 +84,8 @@ TARGETS := \
+ extract_scumm_mac$(EXEEXT) \
+ extract_t7g_mac$(EXEEXT) \
+ extract_zak_c64$(EXEEXT) \
+- extract_gob_stk$(EXEEXT) \
+- tools_gui$(EXEEXT)
++ extract_gob_stk$(EXEEXT)
++# tools_gui$(EXEEXT)
+
+ UTILS := \
+ utils/adpcm.o \
+@@ -114,37 +112,37 @@ bundle: $(TARGETS)
+ mv $(bundle_name)/Contents/Resources/tools_gui
$(bundle_name)/Contents/MacOS/
+
+ compress_agos$(EXEEXT): compress_agos.o compress.o util.o
+- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
++ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
+
+ compress_kyra$(EXEEXT): compress_kyra.o kyra_pak.o compress.o util.o
+- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
++ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
+
+ compress_queen$(EXEEXT): compress_queen.o compress.o util.o
+- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
++ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
+
+ compress_saga$(EXEEXT): compress_saga.o compress.o util.o $(UTILS)
+- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
++ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
+
+ compress_scumm_bun$(EXEEXT): compress_scumm_bun.o compress.o util.o
+- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
++ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
+
+ compress_scumm_san$(EXEEXT): compress_scumm_san.o compress.o util.o
+- $(CXX) $(LDFLAGS) -o $@ $+ -lz -lvorbis -logg -lvorbisenc -lFLAC
++ $(CXX) $(LDFLAGS) -o $@ $+ -lz `pkg-config --libs vorbis vorbisenc flac`
+
+ compress_scumm_sou$(EXEEXT): compress_scumm_sou.o compress.o util.o
+- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
++ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
+
+ compress_sword1$(EXEEXT): compress_sword1.o compress.o util.o
+- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
++ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
+
+ compress_sword2$(EXEEXT): compress_sword2.o compress.o util.o
+- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
++ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
+
+ compress_touche$(EXEEXT): compress_touche.o compress.o util.o
+- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
++ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
+
+ compress_tucker$(EXEEXT): compress_tucker.o compress.o util.o
+- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
++ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
+
+ decine$(EXEEXT): decine.o
+ $(CXX) $(LDFLAGS) -o $@ $+
+@@ -162,7 +160,7 @@ degob$(EXEEXT): degob.o degob_script.o degob_script_v1
$(CXX) $(LDFLAGS) -o $@ $+
encode_dxa$(EXEEXT): encode_dxa.o compress.o util.o
-- $(CXX) $(LDFLAGS) -o $@ $+ -lpng -lz
-+ $(CXX) $(LDFLAGS) `pkg-config --cflags --libs libpng` -o $@ $+ -lz
-
- extract_agos$(EXEEXT): extract_agos.o
- $(CC) $(LDFLAGS) -o $@ $+
-@@ -148,7 +148,7 @@ clean:
- rm -f *.o utils/*.o $(TARGETS)
-
- .cpp.o:
-- $(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+- $(CXX) $(LDFLAGS) -o $@ $+ -lpng -lz -lvorbis -logg -lvorbisenc -lFLAC
++ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs libpng vorbis vorbisenc
flac`
- .c.o:
- $(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+ extract_cine$(EXEEXT): extract_cine.o util.o
+ $(CXX) $(LDFLAGS) -o $@ $+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/scummvm-tools/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 7 Jul 2007 01:39:47 -0000 1.7
+++ pkg/PLIST 6 Mar 2009 12:16:59 -0000
@@ -1,19 +1,32 @@
@comment $OpenBSD: PLIST,v 1.7 2007/07/07 01:39:47 jsg Exp $
-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_sword1
-bin/compress_sword2
-bin/compress_touche
-bin/dekyra
-bin/descumm
-bin/desword2
-bin/extract_mm_nes
-bin/extract_scumm_mac
-bin/extract_zak_c64
+...@bin bin/compress_agos
+...@bin bin/compress_kyra
+...@bin bin/compress_queen
+...@bin bin/compress_saga
+...@bin bin/compress_scumm_bun
+...@bin bin/compress_scumm_san
+...@bin bin/compress_scumm_sou
+...@bin bin/compress_sword1
+...@bin bin/compress_sword2
+...@bin bin/compress_touche
+...@bin bin/compress_tucker
+...@bin bin/decine
+...@bin bin/degob
+...@bin bin/dekyra
+...@bin bin/descumm
+...@bin bin/desword2
+...@bin bin/encode_dxa
+...@bin bin/extract_agos
+...@bin bin/extract_cine
+...@bin bin/extract_gob_stk
+...@bin bin/extract_kyra
+...@bin bin/extract_loom_tg16
+...@bin bin/extract_mm_apple
+...@bin bin/extract_mm_c64
+...@bin bin/extract_mm_nes
+...@bin bin/extract_parallaction
+...@bin bin/extract_scumm_mac
+...@bin bin/extract_t7g_mac
+...@bin bin/extract_zak_c64
share/doc/scummvm-tools/
share/doc/scummvm-tools/README
