From amdmi3@amdmi3.ru  Mon Oct 29 23:24:52 2007
Return-Path: <amdmi3@amdmi3.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 14EC216A419
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 29 Oct 2007 23:24:52 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from cp65.agava.net (cp65.agava.net [89.108.66.215])
	by mx1.freebsd.org (Postfix) with ESMTP id C512D13C4A3
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 29 Oct 2007 23:24:51 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from [213.148.20.85] (helo=nexii.panopticon)
	by cp65.agava.net with esmtpsa (TLSv1:AES256-SHA:256)
	(Exim 4.44 (FreeBSD))
	id 1ImdyL-000K5t-1r
	for FreeBSD-gnats-submit@freebsd.org; Tue, 30 Oct 2007 02:24:41 +0300
Received: from hades.panopticon (hades.panopticon [192.168.0.2])
	by nexii.panopticon (Postfix) with ESMTP id 980911706A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 30 Oct 2007 02:25:21 +0300 (MSK)
Received: by hades.panopticon (Postfix, from userid 1000)
	id 30F764210; Tue, 30 Oct 2007 02:26:14 +0300 (MSK)
Message-Id: <20071029232614.30F764210@hades.panopticon>
Date: Tue, 30 Oct 2007 02:26:14 +0300 (MSK)
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
Reply-To: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] games/flobopuyo: fix build on amd64/gcc42
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         117649
>Category:       ports
>Synopsis:       [MAINTAINER] games/flobopuyo: fix build on amd64/gcc42
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 29 23:30:00 UTC 2007
>Closed-Date:    Tue Oct 30 13:43:39 UTC 2007
>Last-Modified:  Tue Oct 30 21:20:01 UTC 2007
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 6.1-RELEASE-p20 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p20 FreeBSD 6.1-RELEASE-p20 #1: Tue Oct 23 05:28:10 MSD 2007 root@hades.panopticon:/usr/obj/usr/src/sys/HADES i386


>Description:
Fix build on amd64/gcc42
>How-To-Repeat:
>Fix:

--- flobopuyo.patch begins here ---
diff -ruN flobopuyo.orig/Makefile flobopuyo/Makefile
--- flobopuyo.orig/Makefile	Tue Oct 30 02:10:50 2007
+++ flobopuyo/Makefile	Tue Oct 30 02:25:20 2007
@@ -7,7 +7,7 @@
 
 PORTNAME=	flobopuyo
 PORTVERSION=	0.20
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.ios-software.com/flobopuyo/ \
 		http://www.amdmi3.ru/distfiles/
@@ -20,12 +20,6 @@
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer image
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" && ${OSVERSION} >= 700000
-BROKEN=		Doesn't build
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|g++|${CXX}|' ${WRKSRC}/Makefile
@@ -34,4 +28,4 @@
 	@${REINPLACE_CMD} -e 's|^INSTALL_DATADIR=.*$$|INSTALL_DATADIR=${DATADIR}|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|^INSTALL_BINDIR=.*$$|INSTALL_BINDIR=${PREFIX}/bin|' ${WRKSRC}/Makefile
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN flobopuyo.orig/files/patch-IosVector.cpp flobopuyo/files/patch-IosVector.cpp
--- flobopuyo.orig/files/patch-IosVector.cpp	Thu Jan  1 03:00:00 1970
+++ flobopuyo/files/patch-IosVector.cpp	Tue Oct 30 02:22:59 2007
@@ -0,0 +1,10 @@
+--- IosVector.cpp.orig	Sat Oct  9 02:41:12 2004
++++ IosVector.cpp	Tue Oct 30 02:20:35 2007
+@@ -102,6 +102,6 @@
+ void IosVector::dumpVector() const {
+ 	fprintf(stderr, "Size: %d\n", getSize());
+ 	for (int i = 0, j = getSize() ; i < j ; i++)
+-		fprintf(stderr, "elt[%d]=%d ", i, (int)getElementAt(i));
++		fprintf(stderr, "elt[%d]=%p ", i, getElementAt(i));
+ 	fprintf(stderr, "\n");
+ }
diff -ruN flobopuyo.orig/files/patch-PuyoGame.cpp flobopuyo/files/patch-PuyoGame.cpp
--- flobopuyo.orig/files/patch-PuyoGame.cpp	Thu Jan  1 03:00:00 1970
+++ flobopuyo/files/patch-PuyoGame.cpp	Tue Oct 30 02:20:00 2007
@@ -0,0 +1,11 @@
+--- PuyoGame.cpp.orig	Sat Oct  9 02:41:13 2004
++++ PuyoGame.cpp	Tue Oct 30 02:12:27 2007
+@@ -45,7 +45,7 @@
+ 		return (PuyoState)newItem;
+ 	}
+ 	else
+-		return (PuyoState)(int)(sequenceItems.getElementAt(sequence));
++		return (PuyoState)(long)(sequenceItems.getElementAt(sequence));
+ }
+ 
+ PuyoPuyo::PuyoPuyo(PuyoState state)
--- flobopuyo.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Oct 30 08:00:29 UTC 2007 
Responsible-Changed-Why:  
miwi@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117649 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Tue Oct 30 13:43:38 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117649 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117649: commit references a PR
Date: Tue, 30 Oct 2007 21:15:59 +0000 (UTC)

 miwi        2007-10-30 13:43:25 UTC
 
   FreeBSD ports repository
 
   Modified files:
     games/flobopuyo      Makefile 
   Added files:
     games/flobopuyo/files patch-IosVector.cpp patch-PuyoGame.cpp 
   Log:
   - Fix build on amd64/gcc42
   
   PR:             117649
   Submitted by:   Dmitry Marakasov <amdmi3@amdmi3.ru> (maintainer)
   Approved by:    portmgr (pav)
   
   Revision  Changes    Path
   1.7       +1 -7      ports/games/flobopuyo/Makefile
   1.1       +10 -0     ports/games/flobopuyo/files/patch-IosVector.cpp (new)
   1.1       +11 -0     ports/games/flobopuyo/files/patch-PuyoGame.cpp (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
