Attachment #109120 for bug #150074

View | Details | Raw Unified | Return to bug 150074
Collapse All | Expand All




#

PORTNAME=	hex-a-hop
PORTVERSION=	1.1.0
PORTREVISION=	4
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME:S/-//g}/${PORTNAME}/${PORTVERSION}
		ftp://ftp.bishopston.net/freebsd/distfiles/ \
		http://critical.ch/distfiles/

MAINTAINER=	jamie@bishopston.net
COMMENT=	A puzzle game based on hexagonal tiles

USE_SDL=	sdl
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"

CPPFLAGS+=	-I${LOCALBASE}/include
CFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

OPTIONS=	PANGO "Use sdl_pango instead of sdl_ttf" off \
		SOUND "Compile sound support" on

MAKE_ARGS+=	SYSTEM_INSTALL_DIR="${DATADIR}/"
DESKTOP_ENTRIES="Hex-a-Hop" "A puzzle game based on hexagonal tiles" \
		"${DATADIR}/icon.bmp" \
		"hex-a-hop" "Application;LogicGame;Game;" false

.include <bsd.port.pre.mk>

.if !defined(WITHOUT_NLS)
USE_GETTEXT=	yes
CONFIGURE_ENV+=	ac_cv_header_libintl_h=yes
LDFLAGS+=	-lintl
.else
CONFIGURE_ENV+=	ac_cv_header_libintl_h=no
.endif

.if !defined(WITHOUT_PANGO)
USE_SDL+=	pango
CONFIGURE_ARGS+=--disable-sdlttf
.else
USE_SDL+=	ttf
.endif

.if !defined(WITHOUT_SOUND)
USE_SDL+=	mixer
.else
CONFIGURE_ARGS+=--disable-sound
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)games/hex-a-hop/distinfo (-3 / +3 lines)
1	MD5 (hex-a-hop-1.0.0.tar.gz) = 0f8623f061eee8508d8ca78d86ed15e2	1	MD5 (hex-a-hop-1.1.0.tar.gz) = cc8d065c2cc0fce9e08852b8c465175e
2	SHA256 (hex-a-hop-1.0.0.tar.gz) = 200b2b88133f532419398224d29d72ca394168fbc7646b7ce50985867ac275a7	2	SHA256 (hex-a-hop-1.1.0.tar.gz) = 80bf19d936a8430cab5bc468ee6827c38052e026c609eb7ece16317e7932a0d6
3	SIZE (hex-a-hop-1.0.0.tar.gz) = 883536	3	SIZE (hex-a-hop-1.1.0.tar.gz) = 9249269

Lines 5-9 The objective is simply to destroy all t Link Here

(-)games/hex-a-hop/pkg-descr (-2 / +1 lines)
5	100 levels. As you progress through the game, more types of tiles are introduced	5	100 levels. As you progress through the game, more types of tiles are introduced
6	which make things more difficult and interesting (hopefully).	6	which make things more difficult and interesting (hopefully).
7		7
8	Author: Tom Beaumont <tombeaumont@yahoo.com>	8	WWW: http://hexahop.sourceforge.net/
9	WWW: http://www.aceinternet.co.uk/~mokona/




bin/hex-a-hop
%%DATADIR%%/emi.dat
%%DATADIR%%/font.dat
%%DATADIR%%/font.ttf
%%DATADIR%%/gradient.dat
%%DATADIR%%/icon.bmp
%%DATADIR%%/graphics/map_top.dat
%%DATADIR%%/graphics/tiles.dat
%%DATADIR%%/graphics/tiles_reflect.dat
%%DATADIR%%/graphics/title.dat
%%DATADIR%%/levels.dat
%%DATADIR%%/map.dat
%%DATADIR%%/map_top.dat
%%DATADIR%%/music-ending-nonfree.ogg
%%DATADIR%%/music-game-nonfree-1.ogg
%%DATADIR%%/music-game-nonfree.ogg
%%DATADIR%%/sound-builder-nonfree.ogg
%%DATADIR%%/sound-collapse-nonfree.ogg
%%DATADIR%%/sound-crack.ogg
%%DATADIR%%/sound-death.ogg
%%DATADIR%%/sound-explode-big.ogg
%%DATADIR%%/sound-explode-small.ogg
%%DATADIR%%/sound-floater-enter.ogg
%%DATADIR%%/sound-found-antiice-nonfree.ogg
%%DATADIR%%/sound-found-jump-nonfree.ogg
%%DATADIR%%/sound-ice.ogg
%%DATADIR%%/sound-laser.ogg
%%DATADIR%%/sound-lift-down-nonfree.ogg
%%DATADIR%%/sound-lift-up-nonfree.ogg
%%DATADIR%%/sound-spinner-nonfree.ogg
%%DATADIR%%/sound-trampoline.ogg
%%DATADIR%%/sound-used-antiice.ogg
%%DATADIR%%/sound-used-jump.ogg
%%DATADIR%%/sound-win.ogg
%%DATADIR%%/tiles.dat
%%DATADIR%%/tiles_reflect.dat
%%DATADIR%%/title.dat
@dirrm %%DATADIR%%




--- Makefile.FreeBSD.orig	Tue Sep 12 17:28:37 2006
+++ Makefile.FreeBSD	Tue Sep 12 17:28:53 2006
@@ -11,13 +11,13 @@
 .endif
 
 hex-a-hop:	gfx.o hex_puzzzle.o
-		$(CXX) $(CXXFLAGS) gfx.o hex_puzzzle.o `sdl11-config --libs` -lm -o hex-a-hop
+		$(CXX) $(CXXFLAGS) gfx.o hex_puzzzle.o `sdl-config --libs` -lm -o hex-a-hop
 
 gfx.o:		gfx.cpp state.h
-		$(CC) $(CXXFLAGS)  `sdl11-config --cflags`  -c -o $@ $<
+		$(CC) $(CXXFLAGS)  `sdl-config --cflags`  -c -o $@ $<
 
 hex_puzzzle.o:	hex_puzzzle.cpp *.h
-		$(CC) $(CXXFLAGS)  `sdl11-config --cflags`  -c -o $@ $<
+		$(CC) $(CXXFLAGS)  `sdl-config --cflags`  -c -o $@ $<
 	
 clean :
 		rm -f gfx.o hex_puzzzle.o hex-a-hop

Removed Link Here

(-)games/hex-a-hop/files/patch-hex_puzzzle.cpp (-11 lines)
1	--- hex_puzzzle.cpp.orig 2006-02-21 07:12:34.000000000 +0300
2	+++ hex_puzzzle.cpp 2008-09-14 21:34:14.296378652 +0400
3	@@ -2313,7 +2313,7 @@
4
5	SDL_Surface* Load(const char * bmp, bool colourKey=true)
6	{
7	- typedef unsigned long uint32;
8	+ typedef unsigned int uint32;
9	uint32* tmp = 0;
10
11	SDL_Surface * g = 0;

Removed Link Here

(-)games/hex-a-hop/files/patch-menus.h (-11 lines)
1	--- menus.h.orig 2006-02-21 06:10:35.000000000 +0300
2	+++ menus.h 2008-09-14 21:34:41.711083734 +0400
3	@@ -1073,7 +1073,7 @@
4	if (under)
5	under->Render();
6
7	- RenderFade(time, dir, (int)this);
8	+ RenderFade(time, dir, reinterpret_cast<intptr_t>(this));
9	}
10	void Update(double timedelta)
11	{

Added Link Here

(-)games/hex-a-hop/files/patch-src-i18n.h (+10 lines)
1	--- src/i18n.h~
2	+++ src/i18n.h
3	@@ -20,6 +20,7 @@
4
5	#ifdef USE_GETTEXT
6
7	+#include <iconv.h>
8	#include <libintl.h>
9	#define _(String) gettext (String)
10




--- src/system-relative.c~
+++ src/system-relative.c
@@ -163,6 +163,8 @@ lisys_relative_exename ()
 	}
 
 	return strdup (name);
+#elif __FreeBSD__
+	return getprogname();
 #else
 #warning "Not supported."
 	return NULL;
@@ -177,7 +179,7 @@ lisys_relative_exename ()
 char*
 lisys_relative_exedir ()
 {
-#if defined WIN32 || defined linux
+#if defined WIN32 || defined linux || defined __FreeBSD__
 	char* tmp;
 	char* ptr;
 

Removed Link Here

(-)games/hex-a-hop/files/patch-state.h (-11 lines)
1	--- state.h.orig Tue Sep 12 17:30:34 2006
2	+++ state.h Tue Sep 12 17:30:40 2006
3	@@ -22,7 +22,7 @@
4
5	// LINUX: SDL/
6	#ifdef __FreeBSD__
7	-#include <SDL11/SDL.h>
8	+#include <SDL/SDL.h>
9	#else
10	#include <SDL/SDL.h>
11	#endif

Return to bug 150074

Lines 6-34 Link Here

(-)games/hex-a-hop/Makefile (-15 / +35 lines)
6	#	6	#
7		7
8	PORTNAME= hex-a-hop	8	PORTNAME= hex-a-hop
9	PORTVERSION= 1.0.0	9	PORTVERSION= 1.1.0
10	PORTREVISION= 4
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= http://ftp.bishopston.net/freebsd/distfiles/ \	11	MASTER_SITES= SF/${PORTNAME:S/-//g}/${PORTNAME}/${PORTVERSION}
13	ftp://ftp.bishopston.net/freebsd/distfiles/ \
14	http://critical.ch/distfiles/
15		12
16	MAINTAINER= jamie@bishopston.net	13	MAINTAINER= jamie@bishopston.net
17	COMMENT= A puzzle game based on hexagonal tiles	14	COMMENT= A puzzle game based on hexagonal tiles
18		15
19	USE_SDL= sdl	16	USE_SDL= sdl
20	MAKEFILE= Makefile.FreeBSD	17	GNU_CONFIGURE= yes
21	ALL_TARGET= ${PORTNAME}	18	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		19
		20	CPPFLAGS+= -I${LOCALBASE}/include
		21	CFLAGS+= -I${LOCALBASE}/include
		22	LDFLAGS+= -L${LOCALBASE}/lib
		23
		24	OPTIONS= PANGO "Use sdl_pango instead of sdl_ttf" off \
		25	SOUND "Compile sound support" on
22		26
23	MAKE_ARGS+= SYSTEM_INSTALL_DIR="${DATADIR}/"
24	DESKTOP_ENTRIES="Hex-a-Hop" "A puzzle game based on hexagonal tiles" \	27	DESKTOP_ENTRIES="Hex-a-Hop" "A puzzle game based on hexagonal tiles" \
25	"${DATADIR}/graphics/icon.bmp" \	28	"${DATADIR}/icon.bmp" \
26	"hex-a-hop" "Application;LogicGame;Game;" false	29	"hex-a-hop" "Application;LogicGame;Game;" false
27		30
28	do-install:	31	.include <bsd.port.pre.mk>
29	${INSTALL_PROGRAM} ${WRKSRC}/hex-a-hop ${PREFIX}/bin	32
30	${MKDIR} ${DATADIR}/graphics	33	.if !defined(WITHOUT_NLS)
31	${INSTALL_DATA} ${WRKSRC}/graphics/* ${DATADIR}/graphics/	34	USE_GETTEXT= yes
32	${INSTALL_DATA} ${WRKSRC}/levels.dat ${DATADIR}/	35	CONFIGURE_ENV+= ac_cv_header_libintl_h=yes
		36	LDFLAGS+= -lintl
		37	.else
		38	CONFIGURE_ENV+= ac_cv_header_libintl_h=no
		39	.endif
		40
		41	.if !defined(WITHOUT_PANGO)
		42	USE_SDL+= pango
		43	CONFIGURE_ARGS+=--disable-sdlttf
		44	.else
		45	USE_SDL+= ttf
		46	.endif
		47
		48	.if !defined(WITHOUT_SOUND)
		49	USE_SDL+= mixer
		50	.else
		51	CONFIGURE_ARGS+=--disable-sound
		52	.endif
33		53
34	.include <bsd.port.mk>	54	.include <bsd.port.post.mk>

Lines 1-13 Link Here

(-)games/hex-a-hop/pkg-plist (-10 / +31 lines)
1	bin/hex-a-hop	1	bin/hex-a-hop
2	%%DATADIR%%/graphics/emi.dat	2	%%DATADIR%%/emi.dat
3	%%DATADIR%%/graphics/font.dat	3	%%DATADIR%%/font.dat
4	%%DATADIR%%/graphics/gradient.dat	4	%%DATADIR%%/font.ttf
5	%%DATADIR%%/graphics/icon.bmp	5	%%DATADIR%%/gradient.dat
6	%%DATADIR%%/graphics/map.dat	6	%%DATADIR%%/icon.bmp
7	%%DATADIR%%/graphics/map_top.dat
8	%%DATADIR%%/graphics/tiles.dat
9	%%DATADIR%%/graphics/tiles_reflect.dat
10	%%DATADIR%%/graphics/title.dat
11	%%DATADIR%%/levels.dat	7	%%DATADIR%%/levels.dat
12	@dirrm %%DATADIR%%/graphics	8	%%DATADIR%%/map.dat
		9	%%DATADIR%%/map_top.dat
		10	%%DATADIR%%/music-ending-nonfree.ogg
		11	%%DATADIR%%/music-game-nonfree-1.ogg
		12	%%DATADIR%%/music-game-nonfree.ogg
		13	%%DATADIR%%/sound-builder-nonfree.ogg
		14	%%DATADIR%%/sound-collapse-nonfree.ogg
		15	%%DATADIR%%/sound-crack.ogg
		16	%%DATADIR%%/sound-death.ogg
		17	%%DATADIR%%/sound-explode-big.ogg
		18	%%DATADIR%%/sound-explode-small.ogg
		19	%%DATADIR%%/sound-floater-enter.ogg
		20	%%DATADIR%%/sound-found-antiice-nonfree.ogg
		21	%%DATADIR%%/sound-found-jump-nonfree.ogg
		22	%%DATADIR%%/sound-ice.ogg
		23	%%DATADIR%%/sound-laser.ogg
		24	%%DATADIR%%/sound-lift-down-nonfree.ogg
		25	%%DATADIR%%/sound-lift-up-nonfree.ogg
		26	%%DATADIR%%/sound-spinner-nonfree.ogg
		27	%%DATADIR%%/sound-trampoline.ogg
		28	%%DATADIR%%/sound-used-antiice.ogg
		29	%%DATADIR%%/sound-used-jump.ogg
		30	%%DATADIR%%/sound-win.ogg
		31	%%DATADIR%%/tiles.dat
		32	%%DATADIR%%/tiles_reflect.dat
		33	%%DATADIR%%/title.dat
13	@dirrm %%DATADIR%%	34	@dirrm %%DATADIR%%

Removed Link Here

(-)games/hex-a-hop/files/patch-Makefile.FreeBSD (-19 lines)
1	--- Makefile.FreeBSD.orig Tue Sep 12 17:28:37 2006
2	+++ Makefile.FreeBSD Tue Sep 12 17:28:53 2006
3	@@ -11,13 +11,13 @@
4	.endif
5
6	hex-a-hop: gfx.o hex_puzzzle.o
7	- $(CXX) $(CXXFLAGS) gfx.o hex_puzzzle.o `sdl11-config --libs` -lm -o hex-a-hop
8	+ $(CXX) $(CXXFLAGS) gfx.o hex_puzzzle.o `sdl-config --libs` -lm -o hex-a-hop
9
10	gfx.o: gfx.cpp state.h
11	- $(CC) $(CXXFLAGS) `sdl11-config --cflags` -c -o $@ $<
12	+ $(CC) $(CXXFLAGS) `sdl-config --cflags` -c -o $@ $<
13
14	hex_puzzzle.o: hex_puzzzle.cpp *.h
15	- $(CC) $(CXXFLAGS) `sdl11-config --cflags` -c -o $@ $<
16	+ $(CC) $(CXXFLAGS) `sdl-config --cflags` -c -o $@ $<
17
18	clean :
19	rm -f gfx.o hex_puzzzle.o hex-a-hop

Added Link Here

(-)games/hex-a-hop/files/patch-src-system-relative.c (+20 lines)
1	--- src/system-relative.c~
2	+++ src/system-relative.c
3	@@ -163,6 +163,8 @@ lisys_relative_exename ()
4	}
5
6	return strdup (name);
7	+#elif __FreeBSD__
8	+ return getprogname();
9	#else
10	#warning "Not supported."
11	return NULL;
12	@@ -177,7 +179,7 @@ lisys_relative_exename ()
13	char*
14	lisys_relative_exedir ()
15	{
16	-#if defined WIN32 \|\| defined linux
17	+#if defined WIN32 \|\| defined linux \|\| defined __FreeBSD__
18	char* tmp;
19	char* ptr;
20