Index: Makefile
===================================================================
RCS file: /cvs/ports/games/scummvm-tools/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 7 Aug 2009 13:01:52 -0000 1.14
+++ Makefile 14 Nov 2009 11:13:44 -0000
@@ -2,8 +2,7 @@
# XXX hardcoded endian list
COMMENT= collection of various tools for scummvm
-DISTNAME= scummvm-tools-0.13.0
-PKGNAME= ${DISTNAME}p0
+DISTNAME= scummvm-tools-1.0.0
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/}
@@ -40,14 +39,14 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scummvm-tools
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/scummvm-tools
${INSTALL_PROGRAM} \
- ${WRKBUILD}/compress_{kyra,queen,saga,scumm_san,scumm_bun} \
- ${WRKBUILD}/compress_{scumm_sou,agos,sword1,sword2,touche} \
- ${WRKBUILD}/compress_tucker \
+ ${WRKBUILD}/compress_{agos,gob,kyra,queen,saga} \
+ ${WRKBUILD}/compress_{scumm_bun,scumm_san,scumm_sou} \
+ ${WRKBUILD}/compress_{sword1,sword2,tinsel,touche,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} \
+ ${WRKBUILD}/extract_{agos,cine,cruise_pc,kyra,loom_tg16} \
+ ${WRKBUILD}/extract_{mm_apple,mm_c64,mm_nes,parallaction} \
+ ${WRKBUILD}/extract_{scumm_mac,t7g_mac,zak_c64,gob_stk} \
${PREFIX}/bin
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/scummvm-tools/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 21 May 2009 12:52:57 -0000 1.10
+++ distinfo 14 Nov 2009 11:00:59 -0000
@@ -1,5 +1,5 @@
-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
+MD5 (scummvm-tools-1.0.0.tar.gz) = 3gw1+HUfTi8P+KePK4whKQ==
+RMD160 (scummvm-tools-1.0.0.tar.gz) = BqZ2xRkw+o/j6VRkSjhOXDVbbPQ=
+SHA1 (scummvm-tools-1.0.0.tar.gz) = DidAPads1cDcZN1FkdmnlBBh63M=
+SHA256 (scummvm-tools-1.0.0.tar.gz) =
9/nJWa6FL6QqBfG8q0THuCpJHxt/kOxs30lACKQB4CU=
+SIZE (scummvm-tools-1.0.0.tar.gz) = 292372
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/games/scummvm-tools/patches/patch-Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Makefile
--- patches/patch-Makefile 21 May 2009 12:52:57 -0000 1.7
+++ patches/patch-Makefile 14 Nov 2009 11:06:20 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.7 2009/05/21 12:52:57 jsg Exp $
---- Makefile.orig Thu Feb 19 10:16:35 2009
-+++ Makefile Fri Mar 6 22:55:56 2009
+--- Makefile.orig Sat Nov 7 00:56:59 2009
++++ Makefile Sat Nov 14 12:05:40 2009
@@ -9,7 +9,7 @@ srcdir ?= .
DEFINES := -DUNIX
@@ -30,7 +30,7 @@ $OpenBSD: patch-Makefile,v 1.7 2009/05/2
#######################################################################
-@@ -86,8 +84,8 @@ TARGETS := \
+@@ -89,8 +87,8 @@ TARGETS := \
extract_scumm_mac$(EXEEXT) \
extract_t7g_mac$(EXEEXT) \
extract_zak_c64$(EXEEXT) \
@@ -41,13 +41,16 @@ $OpenBSD: patch-Makefile,v 1.7 2009/05/2
UTILS := \
utils/adpcm.o \
-@@ -114,37 +112,37 @@ bundle: $(TARGETS)
+@@ -117,43 +115,43 @@ 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_gob$(EXEEXT): compress_gob.o util.o
+ $(CXX) $(LDFLAGS) -o $@ $+
+
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`
@@ -80,6 +83,10 @@ $OpenBSD: patch-Makefile,v 1.7 2009/05/2
- $(CXX) $(LDFLAGS) -o $@ $+ -lvorbis -logg -lvorbisenc -lFLAC
+ $(CXX) $(LDFLAGS) -o $@ $+ `pkg-config --libs vorbis vorbisenc flac`
+ compress_tinsel$(EXEEXT): compress_tinsel.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`
@@ -90,7 +97,7 @@ $OpenBSD: patch-Makefile,v 1.7 2009/05/2
decine$(EXEEXT): decine.o
$(CXX) $(LDFLAGS) -o $@ $+
-@@ -162,7 +160,7 @@ degob$(EXEEXT): degob.o degob_script.o degob_script_v1
+@@ -171,7 +169,7 @@ degob$(EXEEXT): degob.o degob_script.o degob_script_v1
$(CXX) $(LDFLAGS) -o $@ $+
encode_dxa$(EXEEXT): encode_dxa.o compress.o util.o
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/scummvm-tools/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 21 May 2009 12:52:57 -0000 1.8
+++ pkg/PLIST 14 Nov 2009 11:15:07 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.8 2009/05/21 12:52:57 jsg Exp $
@bin bin/compress_agos
+...@bin bin/compress_gob
@bin bin/compress_kyra
@bin bin/compress_queen
@bin bin/compress_saga
@@ -8,6 +9,7 @@
@bin bin/compress_scumm_sou
@bin bin/compress_sword1
@bin bin/compress_sword2
+...@bin bin/compress_tinsel
@bin bin/compress_touche
@bin bin/compress_tucker
@bin bin/decine
@@ -18,6 +20,7 @@
@bin bin/encode_dxa
@bin bin/extract_agos
@bin bin/extract_cine
+...@bin bin/extract_cruise_pc
@bin bin/extract_gob_stk
@bin bin/extract_kyra
@bin bin/extract_loom_tg16
