Attachment #86783 for bug #123277

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




#

PORTNAME=	openalchemist
PORTVERSION=	0.2.2
CATEGORIES=	games
MASTER_SITES=	SF
DISTNAME=	${PORTNAME}-${PORTVERSION}-src

LIB_DEPENDS=	clanCore-0.8:${PORTSDIR}/devel/clanlib

USE_GNOME=	pkgconfig
MAKE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
		DATADIR="${DATADIR}"

# Allow relocation of skins (by default, must be in the skins/ sub-dir)
post-patch:
	@${REINPLACE_CMD} -E -e 's|CL_System::get_exe_path\(\) \+ "skins/|"${DATADIR}/skins/|g' ${WRKSRC}/src/*.cpp

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)openalchemist/distinfo (-3 / +3 lines)
1	MD5 (openalchemist-0.2-src.tar.gz) = fc2ddfa6b37a6573fb262363804f0c84	1	MD5 (openalchemist-0.2.2-src.tar.gz) = 1fe3e74e100906258396694f40a8e7cd
2	SHA256 (openalchemist-0.2-src.tar.gz) = 5b81dead3532394683a3cec3f5164543ba9fd191ad54f5c1d8329442cea89b29	2	SHA256 (openalchemist-0.2.2-src.tar.gz) = 11c60f4e53fe42f349fe248eea09cfa8a984ff395c533d9874d8ccbd293ec1cc
3	SIZE (openalchemist-0.2-src.tar.gz) = 2468509	3	SIZE (openalchemist-0.2.2-src.tar.gz) = 2472519

Lines 1-11 Link Here

(-)openalchemist/files/patch-KeyboardKey.h (-11 lines)
1	--- includes/KeyboardKey.h.orig 2008-03-18 17:51:54.744835728 +0100
2	+++ includes/KeyboardKey.h 2008-03-18 17:52:13.290787518 +0100
3	@@ -38,7 +38,7 @@
4	/**
5	* Constructor
6	*/
7	- KeyboardKey::KeyboardKey(int key, bool repeat = false)
8	+ KeyboardKey(int key, bool repeat = false)
9	{
10	this->key = key;
11	this->repeat = repeat;




--- Makefile.orig	2006-09-03 20:17:13.000000000 +0200
+++ Makefile	2008-04-30 19:57:29.216855616 +0200
@@ -1,12 +1,10 @@
 PACKAGES = clanCore-0.8 clanDisplay-0.8 clanApp-0.8 clanGL-0.8 clanSDL-0.8
-LIBS = `pkg-config --libs $(PACKAGES)`
-OPTIONS =  -Iincludes -Wall -g
+LIBS = `pkg-config --libs $(PACKAGES)` $(PTHREAD_LIBS)
+OPTIONS = -Iincludes -I/usr/local/include -Wall -g
 LINKER_OPTIONS =  #-u malloc -lefence
 STATIC_LIBS = `pkg-config --libs $(PACKAGES) --static`
 CFLAGS = `pkg-config --cflags $(PACKAGES)`
 
-INSTALL_DIR = /usr/local/games/openalchemist
-
 all: openalchemist skins/aqua.zip skins/brushed.zip
 	@echo "OK"
 
@@ -83,18 +81,11 @@
 test: 
 	@echo "Test dependances installation"
 	pkg-config --exists $(PACKAGES)
@@ -60,20 +58,13 @@
 	-rm openalchemist
 	-rm skins/aqua.zip
 	-rm skins/brushed.zip
 
+
 install: openalchemist
-	mkdir $(INSTALL_DIR)
-	mkdir $(INSTALL_DIR)/skins

-	rm $(INSTALL_DIR)/* -R
-	rmdir $(INSTALL_DIR)
-	rm /usr/local/bin/openalchemist
-
+	install -d -o root -g wheel -m 755 $(PREFIX)/bin
+	install -d -o root -g wheel -m 755 $(DATADIR)/skins
+	install -s -o root -g wheel -m 555 openalchemist $(PREFIX)/bin/
+	install -o root -g wheel -m 444 skins/aqua.zip $(DATADIR)/skins/aqua.zip
+	install -o root -g wheel -m 444 skins/brushed.zip $(DATADIR)/skins/brushed.zip
 
 static: includes/*.h bin/misc.o bin/main.o bin/game.o bin/key_events.o bin/detect_to_destroy.o bin/detect_to_fall.o bin/drawing.o bin/hightscores.o bin/pause.o bin/preferences.o bin/skins-selector.o skins/aqua.zip skins/brushed.zip
 	@echo "On assemble le fichier final"




--- includes/game.h.orig	2008-03-18 17:50:34.816043102 +0100
+++ includes/game.h	2008-03-18 17:50:57.531984095 +0100
@@ -219,47 +219,47 @@
   public:
 
   //Constructor
-  Game::Game(CL_DisplayWindow *window, bool opengl);
+  Game(CL_DisplayWindow *window, bool opengl);
   //Destructor
-  Game::~Game();
+  ~Game();
 
   // Some methods
-  void Game::choose_skin();
-  void Game::load_gfx();
-  void Game::unload_gfx();
-  void Game::toggle_screen();
-  void Game::main_loop();
+  void choose_skin();
+  void load_gfx();
+  void unload_gfx();
+  void toggle_screen();
+  void main_loop();
 
   // Methods to draw the game
-  void Game::draw_game();  
-  void Game::draw_playing();
-  void Game::draw_falling();
-  void Game::draw_destroying();
-  void Game::draw_to_playing();
-  void Game::draw_game_over();
-  void Game::draw_new_hightscore();
-  void Game::draw_pause();
+  void draw_game();  
+  void draw_playing();
+  void draw_falling();
+  void draw_destroying();
+  void draw_to_playing();
+  void draw_game_over();
+  void draw_new_hightscore();
+  void draw_pause();
   
-  void Game::draw_progress_bar();
-  void Game::draw_skins_selector();
+  void draw_progress_bar();
+  void draw_skins_selector();
 
-  void Game::calc_score();
+  void calc_score();
  
-  void Game::load_preferences();
-  void Game::save_preferences();
-  void Game::read_scores();
-  void Game::save_scores();
-  void Game::key_events();
-  void Game::key_events_playing();
-  void Game::key_events_pause();
-  void Game::key_events_skins_selector();
-  void Game::undo_last();
-  void Game::new_game(short difficulty);
-  void Game::fall();
-  void Game::detect_to_destroy();
-  void Game::detect_to_fall();
+  void load_preferences();
+  void save_preferences();
+  void read_scores();
+  void save_scores();
+  void key_events();
+  void key_events_playing();
+  void key_events_pause();
+  void key_events_skins_selector();
+  void undo_last();
+  void new_game(short difficulty);
+  void fall();
+  void detect_to_destroy();
+  void detect_to_fall();
 
-  void Game::stop();
+  void stop();
 
 };
 




--- includes/piece.h.orig	2008-03-18 17:51:15.254937990 +0100
+++ includes/piece.h	2008-03-18 17:51:38.315878696 +0100
@@ -81,12 +81,12 @@
   }
  
   // Methods to display - be carefull, if current_prite is not initialized
-  void Piece::draw(CL_GraphicContext* context = 0)
+  void draw(CL_GraphicContext* context = 0)
     {
       current_sprite -> draw(x, y, context);
     }
 
-  void Piece::draw_mini(CL_GraphicContext* context = 0)
+  void draw_mini(CL_GraphicContext* context = 0)
     {
       mini_sprite -> draw(x, y, context); 
     }




--- includes/piece.h.orig	2008-03-18 17:51:15.254937990 +0100
+++ includes/piece.h	2008-03-18 17:51:38.315878696 +0100
@@ -81,12 +81,12 @@
   }
  
   // Methods to display - be carefull, if current_prite is not initialized
-  void Piece::draw(CL_GraphicContext* context = 0)
+  void draw(CL_GraphicContext* context = 0)
     {
       current_sprite -> draw(x, y, context);
     }
 
-  void Piece::draw_mini(CL_GraphicContext* context = 0)
+  void draw_mini(CL_GraphicContext* context = 0)
     {
       mini_sprite -> draw(x, y, context); 
     }

Lines 1-6 Link Here

(-)openalchemist/pkg-plist (-5 / +4 lines)
1	bin/openalchemist	1	bin/openalchemist
2	share/games/openalchemist/skins/aqua.zip	2	%%DATADIR%%/skins/aqua.zip
3	share/games/openalchemist/skins/brushed.zip	3	%%DATADIR%%/skins/brushed.zip
4	@dirrm share/games/openalchemist/skins	4	@dirrm %%DATADIR%%/skins
5	@dirrm share/games/openalchemist	5	@dirrm %%DATADIR%%
6	@dirrmtry share/games

Return to bug 123277

Lines 6-12 Link Here

(-)openalchemist/Makefile (-3 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= openalchemist	8	PORTNAME= openalchemist
9	PORTVERSION= 0.2	9	PORTVERSION= 0.2.2
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	12	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
Lines 18-27 Link Here
18	LIB_DEPENDS= clanCore-0.8:${PORTSDIR}/devel/clanlib	18	LIB_DEPENDS= clanCore-0.8:${PORTSDIR}/devel/clanlib
19		19
20	USE_GNOME= pkgconfig	20	USE_GNOME= pkgconfig
21	MAKE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}"	21	MAKE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" \
		22	DATADIR="${DATADIR}"
22		23
23	# Allow relocation of skins (by default, must be in the skins/ sub-dir)	24	# Allow relocation of skins (by default, must be in the skins/ sub-dir)
24	post-patch:	25	post-patch:
25	@${REINPLACE_CMD} -E -e 's\|CL_System::get_exe_path\(\) \+ "skins/\|"${PREFIX}/share/games/${PORTNAME}/skins/\|g' ${WRKSRC}/src/*.cpp	26	@${REINPLACE_CMD} -E -e 's\|CL_System::get_exe_path\(\) \+ "skins/\|"${DATADIR}/skins/\|g' ${WRKSRC}/src/*.cpp
26		27
27	.include <bsd.port.mk>	28	.include <bsd.port.mk>

Lines 1-30 Link Here

(-)openalchemist/files/patch-Makefile (-22 / +15 lines)
1	--- Makefile.orig 2006-08-13 19:18:16.000000000 +0200	1	--- Makefile.orig 2006-09-03 20:17:13.000000000 +0200
2	+++ Makefile 2008-03-26 19:27:29.000000000 +0100	2	+++ Makefile 2008-04-30 19:57:29.216855616 +0200
3	@@ -1,15 +1,13 @@	3	@@ -1,12 +1,10 @@
4	PACKAGES = clanCore-0.8 clanDisplay-0.8 clanApp-0.8 clanGL-0.8 clanSDL-0.8	4	PACKAGES = clanCore-0.8 clanDisplay-0.8 clanApp-0.8 clanGL-0.8 clanSDL-0.8
5	-LIBS = `pkg-config --libs $(PACKAGES)`	5	-LIBS = `pkg-config --libs $(PACKAGES)`
6	-OPTIONS = -Iincludes -Wall -g	6	-OPTIONS = -Iincludes -Wall -g
7	+LIBS = `pkg-config --libs $(PACKAGES)` $(PTHREAD_LIBS)	7	+LIBS = `pkg-config --libs $(PACKAGES)` $(PTHREAD_LIBS)
8	+OPTIONS = -Iincludes -I/usr/local/include -Wall -g	8	+OPTIONS = -Iincludes -I/usr/local/include -Wall -g
9	LINKER_OPTIONS = #-u malloc -lefence	9	LINKER_OPTIONS = #-u malloc -lefence
10	STATIC_LIBS = `pkg-config --libs $(PACKAGES) --static`	10	STATIC_LIBS = `pkg-config --libs $(PACKAGES) --static`
11	CFLAGS = `pkg-config --cflags $(PACKAGES)`	11	CFLAGS = `pkg-config --cflags $(PACKAGES)`
12		12
13	-INSTALL_DIR = /usr/local/games/openalchemist	13	-INSTALL_DIR = /usr/local/games/openalchemist
14	-	14	-
15	all: openalchemist	15	all: openalchemist skins/aqua.zip skins/brushed.zip
16	@echo "OK"	16	@echo "OK"
17	-	17
18	+	18	@@ -83,18 +81,11 @@
19	test:
20	@echo "Test dependances installation"
21	pkg-config --exists $(PACKAGES)
22	@@ -60,20 +58,13 @@
23	-rm openalchemist
24	-rm skins/aqua.zip
25	-rm skins/brushed.zip	19	-rm skins/brushed.zip
26	-	20
27	+
28	install: openalchemist	21	install: openalchemist
29	- mkdir $(INSTALL_DIR)	22	- mkdir $(INSTALL_DIR)
30	- mkdir $(INSTALL_DIR)/skins	23	- mkdir $(INSTALL_DIR)/skins
Lines 37-48 Link Here
37	- rm $(INSTALL_DIR)/* -R	30	- rm $(INSTALL_DIR)/* -R
38	- rmdir $(INSTALL_DIR)	31	- rmdir $(INSTALL_DIR)
39	- rm /usr/local/bin/openalchemist	32	- rm /usr/local/bin/openalchemist
40	-	33	-
41	+ mkdir -p $(PREFIX)/bin	34	+ install -d -o root -g wheel -m 755 $(PREFIX)/bin
42	+ mkdir -p $(PREFIX)/share/games/openalchemist/skins	35	+ install -d -o root -g wheel -m 755 $(DATADIR)/skins
43	+ cp openalchemist $(PREFIX)/bin/	36	+ install -s -o root -g wheel -m 555 openalchemist $(PREFIX)/bin/
44	+ cp skins/aqua.zip $(PREFIX)/share/games/openalchemist/skins/aqua.zip	37	+ install -o root -g wheel -m 444 skins/aqua.zip $(DATADIR)/skins/aqua.zip
45	+ cp skins/brushed.zip $(PREFIX)/share/games/openalchemist/skins/brushed.zip	38	+ install -o root -g wheel -m 444 skins/brushed.zip $(DATADIR)/skins/brushed.zip
46		39
47	static: includes/*.h bin/main.o bin/game.o bin/key_events.o bin/detect_to_destroy.o bin/detect_to_fall.o bin/drawing.o bin/hightscores.o bin/pause.o bin/preferences.o bin/skins-selector.o skins/aqua.zip skins/brushed.zip	40	static: includes/*.h bin/misc.o bin/main.o bin/game.o bin/key_events.o bin/detect_to_destroy.o bin/detect_to_fall.o bin/drawing.o bin/hightscores.o bin/pause.o bin/preferences.o bin/skins-selector.o skins/aqua.zip skins/brushed.zip
48	@echo "On assemble le fichier final"	41	@echo "On assemble le fichier final"

Lines 1-82 Link Here

(-)openalchemist/files/patch-game.h (-82 lines)
1	--- includes/game.h.orig 2008-03-18 17:50:34.816043102 +0100
2	+++ includes/game.h 2008-03-18 17:50:57.531984095 +0100
3	@@ -219,47 +219,47 @@
4	public:
5
6	//Constructor
7	- Game::Game(CL_DisplayWindow *window, bool opengl);
8	+ Game(CL_DisplayWindow *window, bool opengl);
9	//Destructor
10	- Game::~Game();
11	+ ~Game();
12
13	// Some methods
14	- void Game::choose_skin();
15	- void Game::load_gfx();
16	- void Game::unload_gfx();
17	- void Game::toggle_screen();
18	- void Game::main_loop();
19	+ void choose_skin();
20	+ void load_gfx();
21	+ void unload_gfx();
22	+ void toggle_screen();
23	+ void main_loop();
24
25	// Methods to draw the game
26	- void Game::draw_game();
27	- void Game::draw_playing();
28	- void Game::draw_falling();
29	- void Game::draw_destroying();
30	- void Game::draw_to_playing();
31	- void Game::draw_game_over();
32	- void Game::draw_new_hightscore();
33	- void Game::draw_pause();
34	+ void draw_game();
35	+ void draw_playing();
36	+ void draw_falling();
37	+ void draw_destroying();
38	+ void draw_to_playing();
39	+ void draw_game_over();
40	+ void draw_new_hightscore();
41	+ void draw_pause();
42
43	- void Game::draw_progress_bar();
44	- void Game::draw_skins_selector();
45	+ void draw_progress_bar();
46	+ void draw_skins_selector();
47
48	- void Game::calc_score();
49	+ void calc_score();
50
51	- void Game::load_preferences();
52	- void Game::save_preferences();
53	- void Game::read_scores();
54	- void Game::save_scores();
55	- void Game::key_events();
56	- void Game::key_events_playing();
57	- void Game::key_events_pause();
58	- void Game::key_events_skins_selector();
59	- void Game::undo_last();
60	- void Game::new_game(short difficulty);
61	- void Game::fall();
62	- void Game::detect_to_destroy();
63	- void Game::detect_to_fall();
64	+ void load_preferences();
65	+ void save_preferences();
66	+ void read_scores();
67	+ void save_scores();
68	+ void key_events();
69	+ void key_events_playing();
70	+ void key_events_pause();
71	+ void key_events_skins_selector();
72	+ void undo_last();
73	+ void new_game(short difficulty);
74	+ void fall();
75	+ void detect_to_destroy();
76	+ void detect_to_fall();
77
78	- void Game::stop();
79	+ void stop();
80
81	};
82

Line 0 Link Here

(-)openalchemist/files/patch-includes-piece.h (+17 lines)
	1	--- includes/piece.h.orig 2008-03-18 17:51:15.254937990 +0100
	2	+++ includes/piece.h 2008-03-18 17:51:38.315878696 +0100
	3	@@ -81,12 +81,12 @@
	4	}
	5
	6	// Methods to display - be carefull, if current_prite is not initialized
	7	- void Piece::draw(CL_GraphicContext* context = 0)
	8	+ void draw(CL_GraphicContext* context = 0)
	9	{
	10	current_sprite -> draw(x, y, context);
	11	}
	12
	13	- void Piece::draw_mini(CL_GraphicContext* context = 0)
	14	+ void draw_mini(CL_GraphicContext* context = 0)
	15	{
	16	mini_sprite -> draw(x, y, context);
	17	}

Lines 1-17 Link Here

(-)openalchemist/files/patch-piece.h (-17 lines)
1	--- includes/piece.h.orig 2008-03-18 17:51:15.254937990 +0100
2	+++ includes/piece.h 2008-03-18 17:51:38.315878696 +0100
3	@@ -81,12 +81,12 @@
4	}
5
6	// Methods to display - be carefull, if current_prite is not initialized
7	- void Piece::draw(CL_GraphicContext* context = 0)
8	+ void draw(CL_GraphicContext* context = 0)
9	{
10	current_sprite -> draw(x, y, context);
11	}
12
13	- void Piece::draw_mini(CL_GraphicContext* context = 0)
14	+ void draw_mini(CL_GraphicContext* context = 0)
15	{
16	mini_sprite -> draw(x, y, context);
17	}