From flynn@energyhq.homeip.net  Tue May 14 06:00:38 2002
Return-Path: <flynn@energyhq.homeip.net>
Received: from energyhq.homeip.net (213-97-200-73.uc.nombres.ttd.es [213.97.200.73])
	by hub.freebsd.org (Postfix) with ESMTP id 258AA37B403
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 14 May 2002 06:00:37 -0700 (PDT)
Received: by energyhq.homeip.net (Postfix, from userid 1001)
	id 0AA583FC58; Tue, 14 May 2002 15:00:37 +0200 (CEST)
Message-Id: <20020514130037.0AA583FC58@energyhq.homeip.net>
Date: Tue, 14 May 2002 15:00:37 +0200 (CEST)
From: Miguel Mendez <flynn@energyhq.homeip.net>
Reply-To: Miguel Mendez <flynn@energyhq.homeip.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Maintainer Update] games/scummvm to 0.2.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         38072
>Category:       ports
>Synopsis:       [Maintainer Update] games/scummvm to 0.2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 14 06:10:01 PDT 2002
>Closed-Date:    Tue May 14 14:21:47 PDT 2002
>Last-Modified:  Tue May 14 14:21:47 PDT 2002
>Originator:     Miguel Mendez
>Release:        FreeBSD 4.6-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD energyhq.homeip.net 4.6-PRERELEASE FreeBSD 4.6-PRERELEASE #0: Thu May 2 22:23:19 CEST 2002 root@energyhq.homeip.net:/storage2/obj/storage2/src/sys/ENERGYHQ i386
>Description:
The ScummVM team today announced version 0.2.0 of ScummVM, a modern                  
interpreter for LucasFilm/LucasArts adventures. ScummVM allows you to                
replay the 'classics', such as Loom, Monkey Island, Day of the Tentacle,             
etc on many modern platforms - Linux, *BSD, Windows 98-XP, PocketPCs like            
the iPaq, and many more - even on your Dreamcast!                                    
                                                                                     
The 0.2.0 release of scummvm includes the usual bugfixes and new features,           
as well as support for the rare 256 color fmTowns version of Zak                     
McKracken, the CD version of Loom and (although it's not from LucasArts),    
Simon The Sorcerer. The ScummVM team now plans to complete the (currently            
experimental in 0.2.0) support for Full Throttle and The Dig, before 
moving on to games like Maniac Mansion.                                      

>How-To-Repeat:
	
>Fix:

	

--- scummvm.diff begins here ---
diff -ruN scummvm.old/Makefile scummvm/Makefile
--- scummvm.old/Makefile	Wed Apr 17 14:37:57 2002
+++ scummvm/Makefile	Tue May 14 14:54:37 2002
@@ -6,19 +6,22 @@
 #
 
 PORTNAME=	scummvm
-PORTVERSION=	0.1.0
+PORTVERSION=	0.2.0
 CATEGORIES=	games emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}b
+DISTNAME=	${PORTNAME}_${PORTVERSION}-src
 
 MAINTAINER=	flynn@energyhq.homeip.net
 
-LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12
+EXTRACT_SUFX=	.tgz
 
-USE_ZIP=	yes
+LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12
 USE_GMAKE=	yes
-NO_WRKSUBDIR=	yes
+
+WRKSRC=         ${WRKDIR}/${PORTNAME}
+
+#MAKEFILE=	Makefile.x11
 
 pre-patch:
 	@${FIND} -E ${WRKSRC} -type f -iregex ".*\.(cpp|h|txt)" \
diff -ruN scummvm.old/distinfo scummvm/distinfo
--- scummvm.old/distinfo	Tue Mar 26 20:28:45 2002
+++ scummvm/distinfo	Tue May 14 13:53:23 2002
@@ -1 +1 @@
-MD5 (scummvm-0.1.0b.zip) = 890866eadd9bb577294c8cc08ea67261
+MD5 (scummvm_0.2.0-src.tgz) = faba7c1541c1e656813adeb65cc5fe72
diff -ruN scummvm.old/files/patch-Makefile scummvm/files/patch-Makefile
--- scummvm.old/files/patch-Makefile	Tue Mar 26 20:28:47 2002
+++ scummvm/files/patch-Makefile	Tue May 14 14:14:01 2002
@@ -1,32 +1,20 @@
---- Makefile.orig	Tue Jan 15 08:06:24 2002
-+++ Makefile	Tue Mar 26 13:17:48 2002
-@@ -1,12 +1,10 @@
- # $Header: /cvsroot/scummvm/scummvm/Makefile,v 1.19 2002/01/13 19:48:30 strigeus Exp $
- 
--CC      = gcc
--CFLAGS  = -g -Wno-multichar
- DEFINES = -DUNIX -DUSE_ADLIB
+--- Makefile.orig	Tue May 14 13:56:04 2002
++++ Makefile	Tue May 14 13:59:12 2002
+@@ -1,14 +1,14 @@
+ # $Header: /cvsroot/scummvm/scummvm/Makefile,v 1.41 2002/04/27 16:58:28 ender Exp $
+ 
+ CC      = g++
+-CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
++CFLAGS  += -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
+ DEFINES = -DUNIX
  LDFLAGS :=
 -INCLUDES:= `sdl-config --cflags` -I./ -I./sound
--CPPFLAGS= $(DEFINES) $(INCLUDES)
--LIBS	= `sdl-config --libs` -lreadline -lncurses -lhistory -lm
 +INCLUDES:= `sdl11-config --cflags` -I./ -I./sound
-+CPPFLAGS+= $(DEFINES) $(INCLUDES)
-+LIBS	= `sdl11-config --libs` -lreadline -lncurses -lhistory -lm
- ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
- 
- INCS	= scumm.h scummsys.h stdafx.h
-@@ -22,12 +20,12 @@
- 	scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h
- 
- .cpp.o:
--	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-+	$(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+ CPPFLAGS= $(DEFINES) $(INCLUDES)
  
- all: scummvm
+ # Add -lmad for -DCOMPRESSED_SOUND_FILE
+-LIBS	= `sdl-config --libs` -lncurses
++LIBS	= `sdl11-config --libs` -lncurses
  
- scummvm: $(OBJS)
--	$(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
-+	$(CXX) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
+ OBJS	= sdl.o
  
- $(OBJS): Makefile 
diff -ruN scummvm.old/files/patch-Makefile.x11 scummvm/files/patch-Makefile.x11
--- scummvm.old/files/patch-Makefile.x11	Thu Jan  1 01:00:00 1970
+++ scummvm/files/patch-Makefile.x11	Tue May 14 14:11:59 2002
@@ -0,0 +1,21 @@
+--- Makefile.x11.orig	Tue May 14 13:56:11 2002
++++ Makefile.x11	Tue May 14 14:01:06 2002
+@@ -1,14 +1,14 @@
+ # $Header: /cvsroot/scummvm/scummvm/Makefile.x11,v 1.4 2002/04/27 11:06:27 fingolfin Exp $
+ 
+ CC      = gcc
+-CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -DCOMPRESSED_SOUND_FILE
++CFLAGS  += -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -DCOMPRESSED_SOUND_FILE
+ DEFINES = -DUNIX_X11
+-LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
+-INCLUDES:= -I/usr/X11R6/include -I./ -I./sound -I/usr/local/include
++LDFLAGS := -L${X11BASE}/lib -L${LOCALBASE}/lib
++INCLUDES:= -I${X11BASE}/include -I./ -I./sound -I/usr/local/include
+ CPPFLAGS= $(DEFINES) $(INCLUDES)
+ 
+ # Add -lmad for -DCOMPRESSED_SOUND_FILE
+-LIBS	= -lXext -lX11 -lncurses -lm -lmad -lpthread
++LIBS	= -lXext -lX11 -lncurses -lm -lmad ${PTHREAD_LIBS}
+ 
+ OBJS	= x11.o
+ 
--- scummvm.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pat 
State-Changed-When: Tue May 14 14:21:39 PDT 2002 
State-Changed-Why:  
Committed, Thanks! 

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