summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2006-10-28 07:40:37 +0000
committerAlfredo Tupone <tupone@gentoo.org>2006-10-28 07:40:37 +0000
commit47744e5bdb3748cd0aa0aa3ccadf0f4ad6c44313 (patch)
tree739a738fa3d2fbaa19512b70a4c7937091508846 /games-action
parentCorrected the ChangeLog (diff)
downloadhistorical-47744e5bdb3748cd0aa0aa3ccadf0f4ad6c44313.tar.gz
historical-47744e5bdb3748cd0aa0aa3ccadf0f4ad6c44313.tar.bz2
historical-47744e5bdb3748cd0aa0aa3ccadf0f4ad6c44313.zip
Fixing armagetronad dedicated. Bug #119351
Package-Manager: portage-2.1.1
Diffstat (limited to 'games-action')
-rw-r--r--games-action/armagetronad/ChangeLog6
-rw-r--r--games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild12
-rw-r--r--games-action/armagetronad/files/armagetronad-ded10
3 files changed, 19 insertions, 9 deletions
diff --git a/games-action/armagetronad/ChangeLog b/games-action/armagetronad/ChangeLog
index 9e1c7cb7b902..75c6e51d780f 100644
--- a/games-action/armagetronad/ChangeLog
+++ b/games-action/armagetronad/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-action/armagetronad
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/ChangeLog,v 1.9 2006/09/08 05:49:06 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/ChangeLog,v 1.10 2006/10/28 07:40:37 tupone Exp $
+
+ 28 Oct 2006; <tupone@gentoo.org> files/armagetronad-ded,
+ -armagetronad-0.2.7.1.ebuild, armagetronad-0.2.7.1-r1.ebuild:
+ Fixing armagetronad dedicated. Bug #119351 by Matthew Gleed
08 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org>
armagetronad-0.2.7.1-r1.ebuild:
diff --git a/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild b/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild
index fe8e4fc64e5c..c552ef10fdbf 100644
--- a/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild,v 1.2 2006/09/08 05:49:06 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild,v 1.3 2006/10/28 07:40:37 tupone Exp $
inherit flag-o-matic eutils games
@@ -35,6 +35,14 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/${P}-gcc4.patch
epatch "${FILESDIR}"/${P}-security-1.patch
+ if use dedicated; then
+ cp "${FILESDIR}"/${PN}-ded .
+ sed -i \
+ -e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \
+ -e "s:@GAMES_LIBDIR@:${GAMES_LIBDIR}:" \
+ -e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
+ ${PN}-ded
+ fi
}
src_compile() {
@@ -68,7 +76,7 @@ src_install() {
insinto "${GAMES_SYSCONFDIR}/${PN}"
doins -r config/* || die "copying files"
if use dedicated; then
- dogamesbin "${FILESDIR}/${PN}-ded"
+ dogamesbin ${PN}-ded
fi
cd "${S}"
insinto "${GAMES_DATADIR}/${PN}"
diff --git a/games-action/armagetronad/files/armagetronad-ded b/games-action/armagetronad/files/armagetronad-ded
index 2f3c44763a6c..82a23e1721b6 100644
--- a/games-action/armagetronad/files/armagetronad-ded
+++ b/games-action/armagetronad/files/armagetronad-ded
@@ -2,11 +2,9 @@
#
# starts Armagetron Advanced Dedicated Server from the installation directory
- GAME_CONFDIR=/etc/games/armagetronad-ded
- GAME_LIBDIR=/usr/games/lib/armagetronad-ded
- GAME_DATADIR=/usr/share/games/armagetronad-ded
- USER_DATADIR=/etc/games/armagetronad-ded
- CONFIGDIR=/etc/games/armagetronad-ded
+ GAME_CONFDIR=@GAMES_SYSCONFDIR@/armagetronad
+ GAME_LIBDIR=@GAMES_LIBDIR@/armagetronad
+ GAME_DATADIR=@GAMES_DATADIR@/armagetronad
NO=$'\x1b[0;0m'
RD=$'\x1b[31;01m'
@@ -47,4 +45,4 @@ fi
--configdir $GAME_CONFDIR \
--userdatadir $HOME/.armagetronad-ded
done
-fi \ No newline at end of file
+fi