Update for the various scummvm related utilities.
DXA video encoder not compiled as it seems pointless
to bother with it when a windows binary is required
to dump bink video for use with it.

Tested on amd64/sparc64 thus far.

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/scummvm-tools/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile    8 Jul 2006 04:16:18 -0000       1.9
+++ Makefile    29 Jun 2007 05:11:52 -0000
@@ -2,9 +2,7 @@
 # XXX hardcoded endian list
 
 COMMENT=       "collection of various tools for scummvm"
-DISTNAME=      scummvm-tools-0.9.0
-PKGNAME=       ${DISTNAME}
-WRKDIST=       ${WRKDIR}/${DISTNAME:S/scummvm-//}
+DISTNAME=      scummvm-tools-0.10.0
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=scummvm/}
 
@@ -39,9 +37,10 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/scummvm-tools      
        ${INSTALL_PROGRAM} \
                ${WRKBUILD}/compress_{kyra,queen,saga,scumm_san,scumm_bun} \
-               ${WRKBUILD}/compress_{scumm_sou,simon,sword1,sword2} \
+               ${WRKBUILD}/compress_{scumm_sou,agos,sword1,sword2,touche} \
                ${WRKBUILD}/de{kyra,scumm,sword2} \
-               ${WRKBUILD/extract_{kyra,mm_nes,scumm_mac,zak_c64} \
+               ${WRKBUILD/extract_{agos,kyra,loom_tg16,mm_apple,mm_c64} \
+               ${WRKBUILD}/extract_{mm_nes,scumm_mac,zak_c64} \
                ${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/scummvm-tools/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo    5 Apr 2007 15:38:11 -0000       1.7
+++ distinfo    29 Jun 2007 05:11:52 -0000
@@ -1,5 +1,5 @@
-MD5 (scummvm-tools-0.9.0.tar.gz) = USnTCYau+M3VSFrzPOrByA==
-RMD160 (scummvm-tools-0.9.0.tar.gz) = AuoFvc1dIea71Q7UuGRk9LA4Z5Y=
-SHA1 (scummvm-tools-0.9.0.tar.gz) = VKP/3+eWuiT/uT64EsTkqimuwVk=
-SHA256 (scummvm-tools-0.9.0.tar.gz) = 
Uyr6A51hyggEhLORaoQEXix2AGAIL0ROQhTYqYs5B8c=
-SIZE (scummvm-tools-0.9.0.tar.gz) = 139404
+MD5 (scummvm-tools-0.10.0.tar.gz) = B3dtyNGQAdt7dN3UB8dwiA==
+RMD160 (scummvm-tools-0.10.0.tar.gz) = hio2gVxHgPLfLS3g6yeLE8HauEQ=
+SHA1 (scummvm-tools-0.10.0.tar.gz) = WzNOWyL8uwqyhJuDSvObyke2Tgk=
+SHA256 (scummvm-tools-0.10.0.tar.gz) = 
bjGvqZSaVO8SPlHowGGh03txR4P/ocUv4SzbgVh827U=
+SIZE (scummvm-tools-0.10.0.tar.gz) = 163174
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/games/scummvm-tools/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile      8 Jul 2006 04:16:18 -0000       1.5
+++ patches/patch-Makefile      29 Jun 2007 05:11:52 -0000
@@ -1,40 +1,39 @@
 $OpenBSD: patch-Makefile,v 1.5 2006/07/08 04:16:18 jsg Exp $
---- Makefile.orig      Thu Jun 22 07:11:51 2006
-+++ Makefile   Sat Jul  8 14:01:11 2006
+--- Makefile.orig      Sun Jun 17 07:00:22 2007
++++ Makefile   Tue Jun 26 22:57:57 2007
 @@ -3,9 +3,10 @@
  
  SRC=.
  
 -CC      := gcc
 -CXX     := g++
--CFLAGS  += -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar
+-CFLAGS  += -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar -DUNIX
 +#CC      := gcc
 +#CXX     := g++
-+CFLAGS  += -Wall -Wno-long-long -Wno-multichar
-+CXXFLAGS  += -Wall -Wno-long-long -Wno-multichar
++CFLAGS  += -Wall -Wno-long-long -Wno-multichar -DUNIX
++CXXFLAGS  += -Wall -Wno-long-long -Wno-multichar -DUNIX
  # LDFLAGS +=
  
  # Additional warnings
-@@ -28,7 +29,7 @@ TARGETS := \
+@@ -29,7 +30,6 @@ TARGETS := \
        dekyra$(EXEEXT) \
        descumm$(EXEEXT) \
        desword2$(EXEEXT) \
 -      encode_dxa$(EXEEXT) \
-+#     encode_dxa$(EXEEXT) \
+       extract_agos$(EXEEXT) \
        extract_kyra$(EXEEXT) \
        extract_loom_tg16$(EXEEXT) \
-       extract_mm_c64$(EXEEXT) \
-@@ -61,7 +62,7 @@ compress_scumm_bun$(EXEEXT): compress_sc
+@@ -89,7 +89,7 @@ desword2$(EXEEXT): desword2.o util.o
        $(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 $@ $+
++      $(CXX) $(LDFLAGS) `pkg-config --cflags --libs libpng` -o $@ $+ -lz
  
- extract_loom_tg16$(EXEEXT): extract_loom_tg16.o util.o
+ extract_agos$(EXEEXT): extract_agos.o
        $(CC) $(LDFLAGS) -o $@ $+
-@@ -129,7 +130,7 @@ clean:
-       rm -f *.o $(TARGETS)
+@@ -148,7 +148,7 @@ clean:
+       rm -f *.o utils/*.o $(TARGETS)
  
  .cpp.o:
 -      $(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/scummvm-tools/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   8 Jul 2006 04:16:18 -0000       1.6
+++ pkg/PLIST   29 Jun 2007 05:11:52 -0000
@@ -1,15 +1,19 @@
 @comment $OpenBSD: PLIST,v 1.6 2006/07/08 04:16:18 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_simon
 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
 share/doc/scummvm-tools/
 share/doc/scummvm-tools/README

Reply via email to