From amdmi3@amdmi3.ru  Sun Sep 14 18:01:38 2008
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 C7C7A1065670
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 14 Sep 2008 18:01:38 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from smtp.timeweb.ru (smtp.timeweb.ru [217.170.79.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 40B408FC21
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 14 Sep 2008 18:01:37 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from [213.148.20.85] (helo=hive.panopticon)
	by smtp.timeweb.ru with esmtpsa (TLSv1:AES256-SHA:256)
	(Exim 4.69)
	(envelope-from <amdmi3@amdmi3.ru>)
	id 1Kevul-0005rY-9s; Sun, 14 Sep 2008 22:01:39 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.32])
	by hive.panopticon (Postfix) with ESMTP id 387DB11B09;
	Sun, 14 Sep 2008 22:01:51 +0400 (MSD)
Received: by hades.panopticon (Postfix, from userid 1000)
	id D00FD17031; Sun, 14 Sep 2008 22:01:28 +0400 (MSD)
Message-Id: <20080914180128.D00FD17031@hades.panopticon>
Date: Sun, 14 Sep 2008 22:01:28 +0400 (MSD)
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jamie@bishopston.net
Subject: [PATCH] games/hex-a-hop: fix on 64 bit systems, use DATADIR
X-Send-Pr-Version: 3.113
X-GNATS-Notify: jamie@bishopston.net

>Number:         127385
>Category:       ports
>Synopsis:       [PATCH] games/hex-a-hop: fix on 64 bit systems, use DATADIR
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    amdmi3
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 14 18:10:00 UTC 2008
>Closed-Date:    Tue Sep 30 09:20:25 UTC 2008
>Last-Modified:  Sun Oct 19 15:10:02 UTC 2008
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 7.0-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #1: Wed Jun 25 15:36:22 MSD 2008
>Description:
- Fix build and runtime errors on 64bit systems (sparc64 untested)
- Use DATADIR instead of unexpected share/games

Added file(s):
- files/patch-hex_puzzzle.cpp
- files/patch-menus.h

Port maintainer (jamie@bishopston.net) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- hex-a-hop-1.0.0_4.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/games/hex-a-hop/Makefile,v
retrieving revision 1.7
diff -u -u -r1.7 Makefile
--- Makefile	13 Mar 2008 14:27:45 -0000	1.7
+++ Makefile	14 Sep 2008 17:45:01 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	hex-a-hop
 PORTVERSION=	1.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://ftp.bishopston.net/freebsd/distfiles/ \
 		ftp://ftp.bishopston.net/freebsd/distfiles/ \
@@ -16,23 +16,19 @@
 MAINTAINER=	jamie@bishopston.net
 COMMENT=	A puzzle game based on hexagonal tiles
 
-NOT_FOR_ARCHS=	amd64 sparc64
-NOT_FOR_ARCHS_REASON_amd64=	Probably an easy fix, but I've no access to an amd64 machine. Offers of help appreciated!
-NOT_FOR_ARCHS_REASON_sparc64=	Probably an easy fix, but I've no access to an sparc64 machine. Offers of help appreciated!
-
 USE_SDL=	sdl
 MAKEFILE=	Makefile.FreeBSD
 ALL_TARGET=	${PORTNAME}
 
-MAKE_ARGS+=	SYSTEM_INSTALL_DIR="${PREFIX}/games/hex-a-hop/"
+MAKE_ARGS+=	SYSTEM_INSTALL_DIR="${DATADIR}/"
 DESKTOP_ENTRIES="Hex-a-Hop" "A puzzle game based on hexagonal tiles" \
 		"${PREFIX}/games/hex-a-hop/graphics/icon.bmp" \
 		"hex-a-hop" "Application;LogicGame;Game;" false
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hex-a-hop ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/games/hex-a-hop/graphics/
-	${INSTALL_DATA} ${WRKSRC}/graphics/* ${PREFIX}/games/hex-a-hop/graphics
-	${INSTALL_DATA} ${WRKSRC}/levels.dat ${PREFIX}/games/hex-a-hop
+	${MKDIR} ${DATADIR}/graphics
+	${INSTALL_DATA} ${WRKSRC}/graphics/* ${DATADIR}/graphics/
+	${INSTALL_DATA} ${WRKSRC}/levels.dat ${DATADIR}/
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/games/hex-a-hop/pkg-plist,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-plist
--- pkg-plist	20 Mar 2006 19:50:18 -0000	1.1
+++ pkg-plist	14 Sep 2008 17:38:38 -0000
@@ -1,14 +1,13 @@
 bin/hex-a-hop
-games/hex-a-hop/graphics/emi.dat
-games/hex-a-hop/graphics/font.dat
-games/hex-a-hop/graphics/gradient.dat
-games/hex-a-hop/graphics/icon.bmp
-games/hex-a-hop/graphics/map.dat
-games/hex-a-hop/graphics/map_top.dat
-games/hex-a-hop/graphics/tiles.dat
-games/hex-a-hop/graphics/tiles_reflect.dat
-games/hex-a-hop/graphics/title.dat
-games/hex-a-hop/levels.dat
-@dirrm games/hex-a-hop/graphics/
-@dirrm games/hex-a-hop/
-@dirrmtry games/
+%%DATADIR%%/graphics/emi.dat
+%%DATADIR%%/graphics/font.dat
+%%DATADIR%%/graphics/gradient.dat
+%%DATADIR%%/graphics/icon.bmp
+%%DATADIR%%/graphics/map.dat
+%%DATADIR%%/graphics/map_top.dat
+%%DATADIR%%/graphics/tiles.dat
+%%DATADIR%%/graphics/tiles_reflect.dat
+%%DATADIR%%/graphics/title.dat
+%%DATADIR%%/levels.dat
+@dirrm %%DATADIR%%/graphics
+@dirrm %%DATADIR%%
Index: files/patch-hex_puzzzle.cpp
===================================================================
RCS file: files/patch-hex_puzzzle.cpp
diff -N files/patch-hex_puzzzle.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-hex_puzzzle.cpp	14 Sep 2008 17:35:09 -0000
@@ -0,0 +1,11 @@
+--- hex_puzzzle.cpp.orig	2006-02-21 07:12:34.000000000 +0300
++++ hex_puzzzle.cpp	2008-09-14 21:34:14.296378652 +0400
+@@ -2313,7 +2313,7 @@
+ 
+ 	SDL_Surface* Load(const char * bmp, bool colourKey=true)
+ 	{
+-		typedef unsigned long uint32;
++		typedef unsigned int uint32;
+ 		uint32* tmp = 0;
+ 
+ 		SDL_Surface * g = 0;
Index: files/patch-menus.h
===================================================================
RCS file: files/patch-menus.h
diff -N files/patch-menus.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-menus.h	14 Sep 2008 17:35:09 -0000
@@ -0,0 +1,11 @@
+--- menus.h.orig	2006-02-21 06:10:35.000000000 +0300
++++ menus.h	2008-09-14 21:34:41.711083734 +0400
+@@ -1073,7 +1073,7 @@
+ 		if (under)
+ 			under->Render();
+ 
+-		RenderFade(time, dir, (int)this);
++		RenderFade(time, dir, reinterpret_cast<intptr_t>(this));
+ 	}
+ 	void Update(double timedelta)
+ 	{
--- hex-a-hop-1.0.0_4.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Sep 14 18:10:09 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: jamie@bishopston.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/127385: [PATCH] games/hex-a-hop: fix on 64 bit systems, use DATADIR
Date: Sun, 14 Sep 2008 18:10:08 UT

 Maintainer of games/hex-a-hop,
 
 Please note that PR ports/127385 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/127385
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->amdmi3 
Responsible-Changed-By: amdmi3 
Responsible-Changed-When: Sun Sep 14 18:32:32 UTC 2008 
Responsible-Changed-Why:  
My PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127385 
State-Changed-From-To: feedback->closed 
State-Changed-By: amdmi3 
State-Changed-When: Tue Sep 30 09:20:23 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/127385: commit references a PR
Date: Tue, 30 Sep 2008 09:20:28 +0000 (UTC)

 amdmi3      2008-09-30 09:20:15 UTC
 
   FreeBSD ports repository
 
   Modified files:
     games/hex-a-hop      Makefile pkg-plist 
   Added files:
     games/hex-a-hop/files patch-hex_puzzzle.cpp patch-menus.h 
   Log:
   - Fix build errors and runtime issues on 64 bit platforms
   - Use DATADIR
   
   PR:             127385
   Submitted by:   myself
   Approved by:    maintainer timeout
   
   Revision  Changes    Path
   1.8       +5 -9      ports/games/hex-a-hop/Makefile
   1.1       +11 -0     ports/games/hex-a-hop/files/patch-hex_puzzzle.cpp (new)
   1.1       +11 -0     ports/games/hex-a-hop/files/patch-menus.h (new)
   1.2       +12 -13    ports/games/hex-a-hop/pkg-plist
 _______________________________________________
 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"
 

From: Jamie Jones <jamie@bishopston.net>
To: jamie@bishopston.net, bug-followup@FreeBSD.ORG
Cc: bug-followup@FreeBSD.ORG
Subject: Re: ports/127385: [PATCH] games/hex-a-hop: fix on 64 bit systems, use DATADIR
Date: Sun, 19 Oct 2008 16:05:59 +0100

 PATCH APPROVED (Sorry for delay, been away over a month)
 
 jamie.
 
>Unformatted:
