diff options
author | Tristan Heaven <nyhm@gentoo.org> | 2006-10-17 19:07:23 +0000 |
---|---|---|
committer | Tristan Heaven <nyhm@gentoo.org> | 2006-10-17 19:07:23 +0000 |
commit | ee979345b428b92efe8cf0c04d3eee3e2394c330 (patch) | |
tree | b3c26913812cf95dc1735f32d715789455668ae3 | |
parent | Marking g-cpan-0.14.0 stable for sparc and amd64 (diff) | |
download | gentoo-2-ee979345b428b92efe8cf0c04d3eee3e2394c330.tar.gz gentoo-2-ee979345b428b92efe8cf0c04d3eee3e2394c330.tar.bz2 gentoo-2-ee979345b428b92efe8cf0c04d3eee3e2394c330.zip |
Use autotools eclass; merge patches
(Portage version: 2.1.2_pre3-r3)
-rw-r--r-- | games-puzzle/mures/ChangeLog | 6 | ||||
-rw-r--r-- | games-puzzle/mures/files/mures-0.5-save.patch | 19 | ||||
-rw-r--r-- | games-puzzle/mures/mures-0.5.ebuild | 40 |
3 files changed, 41 insertions, 24 deletions
diff --git a/games-puzzle/mures/ChangeLog b/games-puzzle/mures/ChangeLog index 41a997f62d6a..8e24a6d2eeac 100644 --- a/games-puzzle/mures/ChangeLog +++ b/games-puzzle/mures/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/mures # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mures/ChangeLog,v 1.4 2006/08/15 14:50:18 tcort Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mures/ChangeLog,v 1.5 2006/10/17 19:07:23 nyhm Exp $ + + 17 Oct 2006; Tristan Heaven <nyhm@gentoo.org> files/mures-0.5-save.patch, + -files/mures-0.5-screenshot.patch, mures-0.5.ebuild: + Use autotools eclass; merge patches 15 Aug 2006; Thomas Cort <tcort@gentoo.org> mures-0.5.ebuild: Stable on amd64 wrt Bug #143961 diff --git a/games-puzzle/mures/files/mures-0.5-save.patch b/games-puzzle/mures/files/mures-0.5-save.patch index 20abd91308b6..704dcf1f53bc 100644 --- a/games-puzzle/mures/files/mures-0.5-save.patch +++ b/games-puzzle/mures/files/mures-0.5-save.patch @@ -1,5 +1,5 @@ ---- gi_sdl.c.orig 2004-06-01 21:51:58.000000000 +0300 -+++ gi_sdl.c 2004-06-01 22:13:59.000000000 +0300 +--- gi_sdl.c ++++ gi_sdl.c @@ -606,6 +606,7 @@ { int i,found; @@ -13,8 +13,21 @@ break; case SDLK_F6: - map_save(&g->sim.map, "saved.mus"); -+ sprintf(temp_path, "%s/saved.mus", getenv("HOME")); ++ snprintf(temp_path, 70, "%s/.mures.save", getenv("HOME")); + map_save(&g->sim.map, temp_path); break; case SDLK_F1: game_restart(g); + +--- output.c ++++ output.c +@@ -215,7 +215,8 @@ + + void output_screenshot() + { +- char *l = "shot.bmp"; ++ char l[70]; ++ snprintf(l, 70, "%s/mures_shot.bmp", getenv("HOME")); + SDL_SaveBMP(screen, l); + printf("Screenshot saved to %s.\n", l); + } diff --git a/games-puzzle/mures/mures-0.5.ebuild b/games-puzzle/mures/mures-0.5.ebuild index 4c2d3efc6b88..14f0e016a287 100644 --- a/games-puzzle/mures/mures-0.5.ebuild +++ b/games-puzzle/mures/mures-0.5.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mures/mures-0.5.ebuild,v 1.4 2006/08/15 14:50:18 tcort Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mures/mures-0.5.ebuild,v 1.5 2006/10/17 19:07:23 nyhm Exp $ -inherit eutils games +WANT_AUTOCONF=latest +WANT_AUTOMAKE=latest +inherit autotools eutils games DESCRIPTION="A clone of Sega's Chu Chu Rocket" HOMEPAGE="http://mures.sourceforge.net/" @@ -19,30 +21,31 @@ DEPEND="media-libs/libsdl media-libs/sdl-ttf opengl? ( virtual/opengl )" -dir="${GAMES_DATADIR}/${PN}" +dir=${GAMES_DATADIR}/${PN} src_unpack() { unpack ${A} - cd ${S} + cd "${S}" # Disable OpenGL support if USE flag is not set - if use !opengl ; then - einfo "Disabling OpenGL" + if ! use opengl ; then sed -i \ -e 's: -DHAVE_GL::' \ -e 's: -lGL::' \ - configure.in || die "sed configure.in failed" - sed -i -e 's:./configure \$\*::' \ - autogen.sh || die "sed autogen.sh failed" + configure.in || die "sed failed" fi - cd src + sed -i '$ s/\\//' \ + src/lua/Makefile.am \ + src/maps/battle/Makefile.am \ + || die "sed failed" + + eautoreconf - # Apply savegame patch. Game will be saved in ~/saved.mus - epatch ${FILESDIR}/${P}-save.patch + cd src - # Apply screenshot save patch. It will be saved as ~/mures_shot.bmp - epatch ${FILESDIR}/${P}-screenshot.patch + # Save to HOME + epatch "${FILESDIR}"/${P}-save.patch # Modify game data & scrips path sed -i \ @@ -74,18 +77,15 @@ src_unpack() { } src_compile() { - if use !opengl ; then - ./autogen.sh - fi - egamesconf || die "egamesconf failed" + egamesconf || die emake || die "emake failed" } src_install() { # Remove makefiles before installation rm -f src/*/Makefile* src/*/*/Makefile* || die "removing makefiles" - insinto ${dir} - doins -r src/gui src/images src/sounds src/textures src/maps src/*.lua \ + insinto "${dir}" + doins -r src/{gui,images,sounds,textures,maps,*.lua} \ || die "copying data files" dodoc README TODO ChangeLog AUTHORS || die "dodoc failed" dogamesbin src/mures || die "dogamesbin failed" |