diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2010-05-05 20:28:22 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-05-05 20:28:22 +0000 |
| commit | 00a246582bb6eb56747fd8426612a871519ee2d7 (patch) | |
| tree | e2701cc782dd2ea4b0683773e8f623f64db87744 /games-roguelike | |
| parent | Updated init-scripts. Now support setting debug and trace options in config f... (diff) | |
| download | gentoo-2-00a246582bb6eb56747fd8426612a871519ee2d7.tar.gz gentoo-2-00a246582bb6eb56747fd8426612a871519ee2d7.tar.bz2 gentoo-2-00a246582bb6eb56747fd8426612a871519ee2d7.zip | |
EAPI=2; honor LDFLAGS; read hours file correctly (bug #316389)
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'games-roguelike')
| -rw-r--r-- | games-roguelike/moria/ChangeLog | 8 | ||||
| -rw-r--r-- | games-roguelike/moria/files/5.5.2-hours.patch | 30 | ||||
| -rw-r--r-- | games-roguelike/moria/moria-5.5.2.ebuild | 18 |
3 files changed, 46 insertions, 10 deletions
diff --git a/games-roguelike/moria/ChangeLog b/games-roguelike/moria/ChangeLog index 496212da429f..3539925cecf4 100644 --- a/games-roguelike/moria/ChangeLog +++ b/games-roguelike/moria/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-roguelike/moria -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/moria/ChangeLog,v 1.8 2006/07/18 07:59:25 flameeyes Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/moria/ChangeLog,v 1.9 2010/05/05 20:28:21 mr_bones_ Exp $ + + 05 May 2010; Michael Sterrett <mr_bones_@gentoo.org> + +files/5.5.2-hours.patch, moria-5.5.2.ebuild: + EAPI=2; honor LDFLAGS; read hours file correctly (bug #316389) 18 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> +files/5.5.2-fbsd.patch, files/5.5.2-glibc.patch, moria-5.5.2.ebuild: diff --git a/games-roguelike/moria/files/5.5.2-hours.patch b/games-roguelike/moria/files/5.5.2-hours.patch new file mode 100644 index 000000000000..3d1c329d9b9b --- /dev/null +++ b/games-roguelike/moria/files/5.5.2-hours.patch @@ -0,0 +1,30 @@ +diff -ru umoria.orig/source/files.c umoria/source/files.c +--- umoria.orig/source/files.c 1994-07-21 21:47:22.000000000 -0400 ++++ umoria/source/files.c 2010-05-05 14:51:44.334588483 -0400 +@@ -130,19 +130,19 @@ + if (strlen(in_line) > 3) + { + if (!strncmp(in_line, "SUN:", 4)) +- (void) strcpy(days[0], in_line); ++ (void) snprintf(days[0], sizeof(days[0]), "%s", in_line); + else if (!strncmp(in_line, "MON:", 4)) +- (void) strcpy(days[1], in_line); ++ (void) snprintf(days[1], sizeof(days[0]), "%s", in_line); + else if (!strncmp(in_line, "TUE:", 4)) +- (void) strcpy(days[2], in_line); ++ (void) snprintf(days[2], sizeof(days[0]), "%s", in_line); + else if (!strncmp(in_line, "WED:", 4)) +- (void) strcpy(days[3], in_line); ++ (void) snprintf(days[3], sizeof(days[0]), "%s", in_line); + else if (!strncmp(in_line, "THU:", 4)) +- (void) strcpy(days[4], in_line); ++ (void) snprintf(days[4], sizeof(days[0]), "%s", in_line); + else if (!strncmp(in_line, "FRI:", 4)) +- (void) strcpy(days[5], in_line); ++ (void) snprintf(days[5], sizeof(days[0]), "%s", in_line); + else if (!strncmp(in_line, "SAT:", 4)) +- (void) strcpy(days[6], in_line); ++ (void) snprintf(days[6], sizeof(days[0]), "%s", in_line); + } + (void) fclose(file1); + } diff --git a/games-roguelike/moria/moria-5.5.2.ebuild b/games-roguelike/moria/moria-5.5.2.ebuild index 825685874db3..8f51392922f0 100644 --- a/games-roguelike/moria/moria-5.5.2.ebuild +++ b/games-roguelike/moria/moria-5.5.2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/moria/moria-5.5.2.ebuild,v 1.11 2006/07/18 07:59:25 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/moria/moria-5.5.2.ebuild,v 1.12 2010/05/05 20:28:21 mr_bones_ Exp $ +EAPI=2 inherit eutils toolchain-funcs games DESCRIPTION="Rogue-like D&D curses game similar to nethack (BUT BETTER)" @@ -21,16 +22,14 @@ DEPEND=">=sys-libs/ncurses-5" S=${WORKDIR}/umoria -src_unpack() { +src_prepare() { local f - unpack ${A} - cd "${S}" - epatch \ "${FILESDIR}"/${PV}-gentoo-paths.patch \ "${FILESDIR}"/${PV}-glibc.patch \ - "${FILESDIR}"/${PV}-fbsd.patch + "${FILESDIR}"/${PV}-fbsd.patch \ + "${FILESDIR}"/${PV}-hours.patch for f in source/* unix/* ; do ln -s ${f} $(basename ${f}) @@ -42,6 +41,8 @@ src_unpack() { -e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}:" \ config.h \ || die "sed failed" + echo "#include <stdlib.h>" >> config.h + echo "#include <stdio.h>" >> config.h sed -i \ -e "/^STATEDIR =/s:=.*:=\$(DESTDIR)${GAMES_STATEDIR}:" \ -e "/^BINDIR = /s:=.*:=\$(DESTDIR)${GAMES_BINDIR}:" \ @@ -50,6 +51,7 @@ src_unpack() { -e "/^OWNER = /s:=.*:=${GAMES_USER}:" \ -e "/^GROUP = /s:=.*:=${GAMES_GROUP}:" \ -e "/^CC = /s:=.*:=$(tc-getCC):" \ + -e '/^LFLAGS = /s:=.*:= $(LDFLAGS):' \ Makefile \ || die "sed failed" mv doc/moria.6 "${S}" || die "mv failed" @@ -57,7 +59,7 @@ src_unpack() { src_install() { dodir "${GAMES_BINDIR}" "${GAMES_DATADIR}/${PN}" "${GAMES_STATEDIR}" - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "emake install failed" doman moria.6 dodoc README doc/* "${WORKDIR}"/${PN}-extras/* |