From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 20 22:10:17 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 683B116A420 for ; Sun, 20 Nov 2005 22:10:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2262243D55 for ; Sun, 20 Nov 2005 22:10:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jAKMAFPa072574 for ; Sun, 20 Nov 2005 22:10:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jAKMAFih072573; Sun, 20 Nov 2005 22:10:15 GMT (envelope-from gnats) Resent-Date: Sun, 20 Nov 2005 22:10:15 GMT Resent-Message-Id: <200511202210.jAKMAFih072573@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, freebsd.alex@trull.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 44CD316A41F for ; Sun, 20 Nov 2005 22:07:17 +0000 (GMT) (envelope-from lysander@porksoda.turandot.net) Received: from porksoda.turandot.net (porksoda.turandot.net [82.110.87.139]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6804D43D45 for ; Sun, 20 Nov 2005 22:07:16 +0000 (GMT) (envelope-from lysander@porksoda.turandot.net) Received: by porksoda.turandot.net (Postfix, from userid 1000) id D80CE208E; Sun, 20 Nov 2005 22:07:14 +0000 (GMT) Message-Id: <20051120220714.D80CE208E@porksoda.turandot.net> Date: Sun, 20 Nov 2005 22:07:14 +0000 (GMT) From: freebsd.alex@trull.org To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/89331: maintainer-update of scummvm and related ports X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd.alex@trull.org List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Nov 2005 22:10:17 -0000 >Number: 89331 >Category: ports >Synopsis: maintainer-update of scummvm and related ports >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Nov 20 22:10:15 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Alex Trull >Release: FreeBSD 6.0-RELEASE i386 >Organization: >Environment: System: FreeBSD porksoda.turandot.net 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Sat Nov 5 02:54:38 GMT 2005 root@porksoda.turandot.net:/usr/obj/usr/src/sys/PORKSODA i386 >Description: Update games/scummvm & games/scummvm-tools to 0.8 (latest stable release) Update games/bass to version 1.2 (required for scummvm 0.8) + non-english-language fixes. Update maintainer contact for all ports mentioned above + games/fotaq >How-To-Repeat: >Fix: Multiple diffs included, find 'begins here' and 'ends here' lines for delimitation. --- bass.diff begins here --- diff -urN bass.orig/Makefile bass/Makefile --- bass.orig/Makefile Mon Nov 14 11:09:30 2005 +++ bass/Makefile Thu Nov 17 00:18:16 2005 @@ -1,19 +1,18 @@ # New ports collection makefile for: bass (Beneath a Steel Sky) # Date created: Tue Sep 2 23:34:32 BST 2003 -# Whom: Alex Trull +# Whom: Alex Trull # # $FreeBSD: ports/games/bass/Makefile,v 1.6 2005/11/14 11:09:30 edwin Exp $ # PORTNAME= bass -PORTVERSION= 1.0 -PORTREVISION= 2 +PORTVERSION= 1.2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= scummvm -DISTNAME= BASS-CD +DISTNAME= bass-cd-1.2 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= freebsd.alex@trull.org COMMENT= Beneath a Steel Sky: a post-apocalyptic futuristic graphical adventure RUN_DEPENDS= scummvm:${PORTSDIR}/games/scummvm @@ -21,13 +20,14 @@ USE_ZIP= yes NO_BUILD= yes -WRKSRC= ${WRKDIR}/sky-cd +WRKSRC= ${WRKDIR}/${DISTNAME} PKGMESSAGE= ${WRKDIR}/pkg-message do-install: ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/sky.dnr ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/sky.dsk ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/sky.cpt ${DATADIR} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff -urN bass.orig/distinfo bass/distinfo --- bass.orig/distinfo Wed Mar 31 04:07:50 2004 +++ bass/distinfo Thu Nov 17 00:04:08 2005 @@ -1,2 +1,3 @@ -MD5 (BASS-CD.zip) = 18f9045e90d56fdfc3263b7f264791fd -SIZE (BASS-CD.zip) = 69310444 +MD5 (bass-cd-1.2.zip) = 1d4401cd663715332abe8bb5431e356d +SHA256 (bass-cd-1.2.zip) = 53209b9400eab6fd7fa71518b2f357c8de75cfeaa5ba57024575ab79cc974593 +SIZE (bass-cd-1.2.zip) = 69377781 --- bass.diff ends here --- --- fotaq.diff begins here --- diff -urN fotaq.orig/Makefile fotaq/Makefile --- fotaq.orig/Makefile Mon Nov 14 11:09:30 2005 +++ fotaq/Makefile Wed Nov 16 22:46:46 2005 @@ -1,6 +1,6 @@ # New ports collection makefile for: fotaq (Flight of the Amazon Queen) # Date created: Fri Mar 26 23:34:32 BST 2004 -# Whom: Alex Trull +# Whom: Alex Trull # # $FreeBSD: ports/games/fotaq/Makefile,v 1.4 2005/11/14 11:09:30 edwin Exp $ # @@ -12,7 +12,7 @@ MASTER_SITE_SUBDIR= scummvm DISTNAME= FOTAQ_Talkie -MAINTAINER= ports@FreeBSD.org +MAINTAINER= freebsd.alex@trull.org COMMENT= Flight of the Amazon Queen: a classic graphical adventure RUN_DEPENDS= scummvm:${PORTSDIR}/games/scummvm diff -urN fotaq.orig/distinfo fotaq/distinfo --- fotaq.orig/distinfo Fri Mar 26 23:33:50 2004 +++ fotaq/distinfo Thu Nov 17 00:04:24 2005 @@ -1,2 +1,3 @@ MD5 (FOTAQ_Talkie.zip) = 02376cd721165448e5c3ca50dc574588 +SHA256 (FOTAQ_Talkie.zip) = 022bb3d163c47ae85f8d4a9818deb958ead18724d968de1f0a9829161a117e48 SIZE (FOTAQ_Talkie.zip) = 36523116 --- fotaq.diff ends here --- --- scummvm.diff begins here --- diff -urN scummvm.orig/Makefile scummvm/Makefile --- scummvm.orig/Makefile Wed Jun 1 10:28:56 2005 +++ scummvm/Makefile Wed Nov 16 22:48:07 2005 @@ -1,12 +1,12 @@ # New ports collection makefile for: scummvm # Date created: Tue Sep 2 23:34:32 BST 2003 -# Whom: Alex Trull +# Whom: Alex Trull # # $FreeBSD: ports/games/scummvm/Makefile,v 1.31 2005/06/01 09:28:56 vs Exp $ # PORTNAME= scummvm -PORTVERSION= 0.7.1 +PORTVERSION= 0.8.0 CATEGORIES= games emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff -urN scummvm.orig/distinfo scummvm/distinfo --- scummvm.orig/distinfo Wed Jun 1 10:28:56 2005 +++ scummvm/distinfo Thu Nov 17 00:02:47 2005 @@ -1,2 +1,3 @@ -MD5 (scummvm-0.7.1.tar.bz2) = a935499011c59441fcce8322ea1c4f1d -SIZE (scummvm-0.7.1.tar.bz2) = 2051004 +MD5 (scummvm-0.8.0.tar.bz2) = 56bfbcfbe5adde42a2a9e3d6dc3d9068 +SHA256 (scummvm-0.8.0.tar.bz2) = ba1607691f0859974543b3d3759edf21860415f2c9d2bc4bdf1639a28f88a1a2 +SIZE (scummvm-0.8.0.tar.bz2) = 2654730 --- scummvm.diff ends here --- --- scummvm-tools.diff begins here --- diff -urN scummvm-tools.orig/Makefile scummvm-tools/Makefile --- scummvm-tools.orig/Makefile Mon Nov 14 11:09:30 2005 +++ scummvm-tools/Makefile Thu Nov 17 00:50:59 2005 @@ -6,12 +6,12 @@ # PORTNAME= scummvm-tools -PORTVERSION= 0.7.0 +PORTVERSION= 0.8.0 CATEGORIES= games emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= scummvm -MAINTAINER= ports@FreeBSD.org +MAINTAINER= freebsd.alex@trull.org COMMENT= Tools for use with the SCUMMVM game emulator RUN_DEPENDS= scummvm:${PORTSDIR}/games/scummvm @@ -23,6 +23,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes +WRKSRC= ${WRKDIR}/tools-${PORTVERSION} .include @@ -31,7 +32,7 @@ .endif do-install: -.for i in descumm extract md5table mm_nes_extract queenrebuild rescumm +.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 @${INSTALL_PROGRAM} ${WRKSRC}/$i ${PREFIX}/bin .endfor diff -urN scummvm-tools.orig/distinfo scummvm-tools/distinfo --- scummvm-tools.orig/distinfo Sun Jan 9 23:58:25 2005 +++ scummvm-tools/distinfo Thu Nov 17 00:03:04 2005 @@ -1,2 +1,3 @@ -MD5 (scummvm-tools-0.7.0.tar.bz2) = eeebbd4e309a8564dd911d5c26fed2f0 -SIZE (scummvm-tools-0.7.0.tar.bz2) = 98664 +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 diff -urN scummvm-tools.orig/files/patch-simon1descr.c scummvm-tools/files/patch-simon1descr.c --- scummvm-tools.orig/files/patch-simon1descr.c Sun Jan 9 23:58:25 2005 +++ scummvm-tools/files/patch-simon1descr.c Thu Jan 1 01:00:00 1970 @@ -1,19 +0,0 @@ ---- simon1decr.c.orig Mon Apr 12 00:10:19 2004 -+++ simon1decr.c Tue Jan 4 15:36:39 2005 -@@ -26,14 +26,9 @@ - - #define EndGetM32(a) ((((a)[0])<<24)|(((a)[1])<<16)|(((a)[2])<<8)|((a)[3])) - --#define SD_GETBIT(var) do { \ -- if (!bits--) { s -= 4; if (s < src) return 0; bb=EndGetM32(s); bits=31; } \ -- (var) = bb & 1; bb >>= 1; \ --} while (0) -+#define SD_GETBIT(var) do { if (!bits--) { s -= 4; if (s < src) return 0; bb=EndGetM32(s); bits=31; } (var) = bb & 1; bb >>= 1; } while (0) - --#define SD_GETBITS(var, nbits) do { \ -- bc=(nbits); (var)=0; while (bc--) {(var)<<=1; SD_GETBIT(bit); (var)|=bit; } \ --} while (0) -+#define SD_GETBITS(var, nbits) do { bc=(nbits); (var)=0; while (bc--) {(var)<<=1; SD_GETBIT(bit); (var)|=bit; } } while (0) - - #define SD_TYPE_LITERAL (0) - #define SD_TYPE_MATCH (1) diff -urN scummvm-tools.orig/pkg-plist scummvm-tools/pkg-plist --- scummvm-tools.orig/pkg-plist Thu Jul 1 03:19:21 2004 +++ scummvm-tools/pkg-plist Thu Nov 17 00:52:00 2005 @@ -1,8 +1,20 @@ +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/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 +bin/dekyra bin/descumm -bin/extract -bin/md5table -bin/mm_nes_extract -bin/queenrebuild -bin/rescumm +bin/desword2 %%PORTDOCS%%share/doc/scummvm-tools/README %%PORTDOCS%%@dirrm share/doc/scummvm-tools --- scummvm-tools.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: