From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Apr 30 18:40:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48DFA106567E for ; Wed, 30 Apr 2008 18:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1B5D58FC28 for ; Wed, 30 Apr 2008 18:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m3UIe14e061382 for ; Wed, 30 Apr 2008 18:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m3UIe1VQ061381; Wed, 30 Apr 2008 18:40:01 GMT (envelope-from gnats) Resent-Date: Wed, 30 Apr 2008 18:40:01 GMT Resent-Message-Id: <200804301840.m3UIe1VQ061381@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ganael Laplanche Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8BC4106566B for ; Wed, 30 Apr 2008 18:39:45 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 8DAFB8FC18 for ; Wed, 30 Apr 2008 18:39:45 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m3UId50d057409 for ; Wed, 30 Apr 2008 18:39:05 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m3UId5D3057408; Wed, 30 Apr 2008 18:39:05 GMT (envelope-from nobody) Message-Id: <200804301839.m3UId5D3057408@www.freebsd.org> Date: Wed, 30 Apr 2008 18:39:05 GMT From: Ganael Laplanche To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/123277: Maintainer update: games/openalchemist - Update to v0.2.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Apr 2008 18:40:02 -0000 >Number: 123277 >Category: ports >Synopsis: Maintainer update: games/openalchemist - Update to v0.2.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Apr 30 18:40:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Ganael Laplanche >Release: 7.0-STABLE >Organization: http://contribs.martymac.com >Environment: FreeBSD home.martymac.com 7.0-STABLE FreeBSD 7.0-STABLE #14: Sun Apr 20 14:11:03 CEST 2008 root@home.martymac.com:/usr/obj/usr/src/sys/MYKERNEL amd64 >Description: - Minor update : v0.2 to v0.2.2. - Use ${DATADIR} instead of ${PREFIX}/share/games/${PORTNAME} >How-To-Repeat: >Fix: Patch attached with submission follows: diff -aurN openalchemist.orig/Makefile openalchemist/Makefile --- openalchemist.orig/Makefile 2008-04-30 18:37:28.444092069 +0200 +++ openalchemist/Makefile 2008-04-30 19:48:52.182886773 +0200 @@ -6,7 +6,7 @@ # PORTNAME= openalchemist -PORTVERSION= 0.2 +PORTVERSION= 0.2.2 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -18,10 +18,11 @@ LIB_DEPENDS= clanCore-0.8:${PORTSDIR}/devel/clanlib USE_GNOME= pkgconfig -MAKE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" +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/|"${PREFIX}/share/games/${PORTNAME}/skins/|g' ${WRKSRC}/src/*.cpp + @${REINPLACE_CMD} -E -e 's|CL_System::get_exe_path\(\) \+ "skins/|"${DATADIR}/skins/|g' ${WRKSRC}/src/*.cpp .include diff -aurN openalchemist.orig/distinfo openalchemist/distinfo --- openalchemist.orig/distinfo 2008-04-30 18:37:28.444092069 +0200 +++ openalchemist/distinfo 2008-04-30 19:25:13.520212327 +0200 @@ -1,3 +1,3 @@ -MD5 (openalchemist-0.2-src.tar.gz) = fc2ddfa6b37a6573fb262363804f0c84 -SHA256 (openalchemist-0.2-src.tar.gz) = 5b81dead3532394683a3cec3f5164543ba9fd191ad54f5c1d8329442cea89b29 -SIZE (openalchemist-0.2-src.tar.gz) = 2468509 +MD5 (openalchemist-0.2.2-src.tar.gz) = 1fe3e74e100906258396694f40a8e7cd +SHA256 (openalchemist-0.2.2-src.tar.gz) = 11c60f4e53fe42f349fe248eea09cfa8a984ff395c533d9874d8ccbd293ec1cc +SIZE (openalchemist-0.2.2-src.tar.gz) = 2472519 diff -aurN openalchemist.orig/files/patch-KeyboardKey.h openalchemist/files/patch-KeyboardKey.h --- openalchemist.orig/files/patch-KeyboardKey.h 2008-04-30 18:37:28.444092069 +0200 +++ openalchemist/files/patch-KeyboardKey.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- includes/KeyboardKey.h.orig 2008-03-18 17:51:54.744835728 +0100 -+++ includes/KeyboardKey.h 2008-03-18 17:52:13.290787518 +0100 -@@ -38,7 +38,7 @@ - /** - * Constructor - */ -- KeyboardKey::KeyboardKey(int key, bool repeat = false) -+ KeyboardKey(int key, bool repeat = false) - { - this->key = key; - this->repeat = repeat; diff -aurN openalchemist.orig/files/patch-Makefile openalchemist/files/patch-Makefile --- openalchemist.orig/files/patch-Makefile 2008-04-30 18:37:28.432864943 +0200 +++ openalchemist/files/patch-Makefile 2008-04-30 19:57:41.375645071 +0200 @@ -1,30 +1,23 @@ ---- Makefile.orig 2006-08-13 19:18:16.000000000 +0200 -+++ Makefile 2008-03-26 19:27:29.000000000 +0100 -@@ -1,15 +1,13 @@ +--- 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 ++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 + all: openalchemist skins/aqua.zip skins/brushed.zip @echo "OK" -- -+ - test: - @echo "Test dependances installation" - pkg-config --exists $(PACKAGES) -@@ -60,20 +58,13 @@ - -rm openalchemist - -rm skins/aqua.zip + +@@ -83,18 +81,11 @@ -rm skins/brushed.zip -- -+ + install: openalchemist - mkdir $(INSTALL_DIR) - mkdir $(INSTALL_DIR)/skins @@ -37,12 +30,12 @@ - rm $(INSTALL_DIR)/* -R - rmdir $(INSTALL_DIR) - rm /usr/local/bin/openalchemist -- -+ mkdir -p $(PREFIX)/bin -+ mkdir -p $(PREFIX)/share/games/openalchemist/skins -+ cp openalchemist $(PREFIX)/bin/ -+ cp skins/aqua.zip $(PREFIX)/share/games/openalchemist/skins/aqua.zip -+ cp skins/brushed.zip $(PREFIX)/share/games/openalchemist/skins/brushed.zip +- ++ 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/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 + 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" diff -aurN openalchemist.orig/files/patch-game.h openalchemist/files/patch-game.h --- openalchemist.orig/files/patch-game.h 2008-04-30 18:37:28.432864943 +0200 +++ openalchemist/files/patch-game.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ ---- 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(); - - }; - diff -aurN openalchemist.orig/files/patch-includes-piece.h openalchemist/files/patch-includes-piece.h --- openalchemist.orig/files/patch-includes-piece.h 1970-01-01 01:00:00.000000000 +0100 +++ openalchemist/files/patch-includes-piece.h 2008-04-30 19:55:43.437730056 +0200 @@ -0,0 +1,17 @@ +--- 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); + } diff -aurN openalchemist.orig/files/patch-piece.h openalchemist/files/patch-piece.h --- openalchemist.orig/files/patch-piece.h 2008-04-30 18:37:28.443060932 +0200 +++ openalchemist/files/patch-piece.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ ---- 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); - } diff -aurN openalchemist.orig/pkg-plist openalchemist/pkg-plist --- openalchemist.orig/pkg-plist 2008-04-30 18:37:28.444092069 +0200 +++ openalchemist/pkg-plist 2008-04-30 20:06:55.586263180 +0200 @@ -1,6 +1,5 @@ bin/openalchemist -share/games/openalchemist/skins/aqua.zip -share/games/openalchemist/skins/brushed.zip -@dirrm share/games/openalchemist/skins -@dirrm share/games/openalchemist -@dirrmtry share/games +%%DATADIR%%/skins/aqua.zip +%%DATADIR%%/skins/brushed.zip +@dirrm %%DATADIR%%/skins +@dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted: