From lysander@turandot.net  Wed Jun 30 23:10:34 2004
Return-Path: <lysander@turandot.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5A4F016A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Jun 2004 23:10:34 +0000 (GMT)
Received: from moonbase.turandot.net (spc1-amer1-3-0-cust245.lond.broadband.ntl.com [80.0.199.245])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8F69743D2D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Jun 2004 23:10:33 +0000 (GMT)
	(envelope-from lysander@turandot.net)
Received: by moonbase.turandot.net (Postfix, from userid 1000)
	id AEC0416863D; Thu,  1 Jul 2004 00:11:57 +0100 (BST)
Message-Id: <20040630231157.AEC0416863D@moonbase.turandot.net>
Date: Thu,  1 Jul 2004 00:11:57 +0100 (BST)
From: Alex Trull <alexander@trull.com>
Reply-To: Alex Trull <alexander@trull.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: scummvm-tools updated
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         68533
>Category:       ports
>Synopsis:       scummvm-tools updated
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 30 23:20:11 GMT 2004
>Closed-Date:    Thu Jul 01 02:20:08 GMT 2004
>Last-Modified:  Thu Jul 01 02:20:08 GMT 2004
>Originator:     alexander@trull.com
>Release:        FreeBSD 4.9-RELEASE-p7 i386
>Organization:
>Environment:
System: FreeBSD moonbase.turandot.net 4.9-RELEASE-p7 FreeBSD 4.9-RELEASE-p7 #1: Sun May 9 22:46:08 BST 2004 root@moonbase.turandot.net:/usr/obj/usr/src/sys/MOONBASE i386


>Description:
update to the games/scummvm-tools port, which was somewhat out of date.
now builds under both 4x & 5x

>How-To-Repeat:
>Fix:

diff -urN scummvm-tools.orig/Makefile scummvm-tools/Makefile
--- scummvm-tools.orig/Makefile	Sat May  1 00:37:22 2004
+++ scummvm-tools/Makefile	Wed Jun 30 23:56:34 2004
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	scummvm-tools
-PORTVERSION=	0.4.1
-PORTREVISION=	2
+PORTVERSION=	0.6.0
 CATEGORIES=	games emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scummvm
@@ -16,17 +15,23 @@
 COMMENT=	Tools for use with the SCUMMVM game emulator
 
 RUN_DEPENDS=	scummvm:${PORTSDIR}/games/scummvm
+BUILD_DEPENDS=	lame:${PORTSDIR}/audio/lame \
+		flac:${PORTSDIR}/audio/flac \
+		oggenc:${PORTSDIR}/audio/vorbis-tools \
+		oggdec:${PORTSDIR}/audio/vorbis-tools
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's@:= -g -O@+= ${CFLAGS}@' \
-		${WRKSRC}/Makefile
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+.endif
 
 do-install:
-.for i in extract rescumm descumm descumm6 simon1decr simon2mp3
+.for i in descumm extract md5table mm_nes_extract queenrebuild rescumm
 	@${INSTALL_PROGRAM} ${WRKSRC}/$i ${PREFIX}/bin
 .endfor
 
@@ -35,4 +40,11 @@
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's@:= -g -O@+= ${CFLAGS}@' ${WRKSRC}/Makefile
+.if ${OSVERSION} < 500000
+	@${REINPLACE_CMD} -e 's/gcc/gcc32/g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's/g\+\+/g\+\+32/g' ${WRKSRC}/Makefile
+.endif
+
+.include <bsd.port.post.mk>
diff -urN scummvm-tools.orig/distinfo scummvm-tools/distinfo
--- scummvm-tools.orig/distinfo	Thu Mar 18 11:05:12 2004
+++ scummvm-tools/distinfo	Sun May  9 00:21:22 2004
@@ -1,2 +1,2 @@
-MD5 (scummvm-tools-0.4.1.tar.bz2) = d7415eb6e55a78061964930563f78308
-SIZE (scummvm-tools-0.4.1.tar.bz2) = 39850
+MD5 (scummvm-tools-0.6.0.tar.bz2) = 09ded7a8177fda1b861731052b8693c4
+SIZE (scummvm-tools-0.6.0.tar.bz2) = 75514
diff -urN scummvm-tools.orig/pkg-plist scummvm-tools/pkg-plist
--- scummvm-tools.orig/pkg-plist	Tue Sep  2 23:50:15 2003
+++ scummvm-tools/pkg-plist	Sun May  9 01:25:59 2004
@@ -1,8 +1,8 @@
+bin/descumm
 bin/extract
+bin/md5table
+bin/mm_nes_extract
+bin/queenrebuild
 bin/rescumm
-bin/descumm
-bin/descumm6
-bin/simon1decr
-bin/simon2mp3
 %%PORTDOCS%%share/doc/scummvm-tools/README
 %%PORTDOCS%%@dirrm share/doc/scummvm-tools



>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: adamw 
State-Changed-When: Thu Jul 1 02:19:32 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=68533 
>Unformatted:
