ports/127385: [PATCH] games/hex-a-hop: fix on 64 bit systems, use DATADIR

Sun Sep 14 18:10:01 UTC 2008

>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:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 14 18:10:00 UTC 2008
>Closed-Date:
>Last-Modified:
>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 at 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 at 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
- at dirrm games/hex-a-hop/graphics/
- at dirrm games/hex-a-hop/
- at 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
+ at dirrm %%DATADIR%%/graphics
+ at 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:
>Unformatted:

