version bumpage

7 files changed, 104 insertions, 53 deletions

diff --git a/games-puzzle/tetrix/ChangeLog b/games-puzzle/tetrix/ChangeLog
index 5f8446b0ca0b..29c53ffa8d0d 100644
--- a/games-puzzle/tetrix/ChangeLog
+++ b/games-puzzle/tetrix/ChangeLog
@@ -1,13 +1,18 @@
 # ChangeLog for games-puzzle/tetrix
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrix/ChangeLog,v 1.2 2003/09/10 15:48:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrix/ChangeLog,v 1.3 2003/09/14 01:28:52 vapier Exp $
+
+*tetrix-1.13.16.1.40c-r1 (13 Sep 2002)
+
+  13 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + games.eclass support + reworked init script.
+
+*tetrix-1.13.16.1.40c (24 May 2002)
 
   02 Aug 2003; Chris Gianelloni <wolf31o2@gentoo.org>
   tetrix-1.13.16.1.40c.ebuild:
   Fixed to use mirror://sourceforge
 
-*tetrix-1.13.16.1.40c (24 May 2002)
-  
   31 Mar 2003; Philip Walls <malverian@gentoo.org>
   tetrix-1.13.16.1.40c.ebuild, files/tetrix, files/launch_tetrix :
   Initial import.
diff --git a/games-puzzle/tetrix/files/1.13.16.1.40c-paths.patch b/games-puzzle/tetrix/files/1.13.16.1.40c-paths.patch
new file mode 100644
index 000000000000..35b29a748c5d
--- /dev/null
+++ b/games-puzzle/tetrix/files/1.13.16.1.40c-paths.patch
@@ -0,0 +1,42 @@
+--- src/config.h.orig	2003-09-13 21:04:28.894714336 -0400
++++ src/config.h	2003-09-13 21:07:43.610113096 -0400
+@@ -7,16 +7,16 @@
+ */
+ 
+ /* Location of the various external files */
+-#define FILE_MOTD    "game.motd"	/* Message of the Day File */
+-#define FILE_PMOTD    "game.pmotd"	/* Playback motd */
+-#define FILE_CONF    "game.conf"	/* Game configuration File */
+-#define FILE_WINLIST "game.winlist"	/* Winlist storage file */
+-#define FILE_WINLIST2 "game.winlist2"	/* Winlist storage file */
+-#define FILE_WINLIST3 "game.winlist3"	/* Winlist storage file */
++#define FILE_MOTD    "GENTOO_CONFDIR/game.motd"	/* Message of the Day File */
++#define FILE_PMOTD    "GENTOO_CONFDIR/game.pmotd"	/* Playback motd */
++#define FILE_CONF    "GENTOO_CONFDIR/game.conf"	/* Game configuration File */
++#define FILE_WINLIST "GENTOO_STATEDIR/game.winlist"	/* Winlist storage file */
++#define FILE_WINLIST2 "GENTOO_STATEDIR/game.winlist2"	/* Winlist storage file */
++#define FILE_WINLIST3 "GENTOO_STATEDIR/game.winlist3"	/* Winlist storage file */
+ 
+-#define FILE_BAN     "game.ban"		/* List of Banned IP's */
+-#define FILE_BAN_COMPROMISE     "game.ban.compromise"	/* List of Banned IP's */
+-#define FILE_ALLOW   "game.allow"	/* List of allow IP's */
+-#define FILE_LOG     "game.log"		/* Logfile */
+-#define FILE_PID     "game.pid"		/* Default PID */
+-#define FILE_SECURE  "game.secure"	/* Security file */
++#define FILE_BAN     "GENTOO_CONFDIR/game.ban"		/* List of Banned IP's */
++#define FILE_BAN_COMPROMISE     "GENTOO_CONFDIR/game.ban.compromise"	/* List of Banned IP's */
++#define FILE_ALLOW   "GENTOO_CONFDIR/game.allow"	/* List of allow IP's */
++#define FILE_LOG     "GENTOO_LOGDIR/tetrix.log"		/* Logfile */
++#define FILE_PID     "/var/run/tetrix.pid"		/* Default PID */
++#define FILE_SECURE  "GENTOO_CONFDIR/game.secure"	/* Security file */
+--- bin/game.conf.orig	2003-09-13 21:21:03.748473576 -0400
++++ bin/game.conf	2003-09-13 21:21:12.584130352 -0400
+@@ -8,7 +8,7 @@
+ # Any text after a # is ignored, and can be used as comments.
+ 
+ # pidfile [game.pid] - Where should the Process ID be written
+-pidfile=game.pid
++pidfile=/var/run/tetrix.pid
+ 
+ # bindip [0.0.0.0] - What IP should server be bound to (0.0.0.0 means all)
+ bindip=0.0.0.0
diff --git a/games-puzzle/tetrix/files/digest-tetrix-1.13.16.1.40c b/games-puzzle/tetrix/files/digest-tetrix-1.13.16.1.40c-r1
index 90ab0b9dc712..90ab0b9dc712 100644
--- a/games-puzzle/tetrix/files/digest-tetrix-1.13.16.1.40c
+++ b/games-puzzle/tetrix/files/digest-tetrix-1.13.16.1.40c-r1
diff --git a/games-puzzle/tetrix/files/launch_tetrix b/games-puzzle/tetrix/files/launch_tetrix
deleted file mode 100644
index 2064670aa9ca..000000000000
--- a/games-puzzle/tetrix/files/launch_tetrix
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrix/files/launch_tetrix,v 1.1 2003/09/10 06:36:00 vapier Exp $
-
-cd /opt/tetrix
-./tetrix.linux
diff --git a/games-puzzle/tetrix/files/tetrix b/games-puzzle/tetrix/files/tetrix.rc
index 456d8fb3bc33..80e594c15987 100644
--- a/games-puzzle/tetrix/files/tetrix
+++ b/games-puzzle/tetrix/files/tetrix.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrix/files/tetrix,v 1.1 2003/09/10 06:36:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrix/files/tetrix.rc,v 1.1 2003/09/14 01:28:52 vapier Exp $
 
 depend() {
 	need net
@@ -9,12 +9,12 @@ depend() {
 
 start() {
 	ebegin "Starting TetriNET Server"
-	start-stop-daemon --start --quiet --background --pidfile /var/run/tetrix.pid --make-pidfile --exec /opt/tetrix/launch_tetrix
+	/usr/games/bin/tetrix > /dev/null
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping TetriNET Server"
-	start-stop-daemon --stop --quiet --pidfile /opt/tetrix/game.pid --name tetrix.linux
-	eend $?
+	[ -e /var/run/tetrix.pid ] && kill $(</var/run/tetrix.pid)
+	eend $? "Could not kill tetrix server :("
 }
diff --git a/games-puzzle/tetrix/tetrix-1.13.16.1.40c-r1.ebuild b/games-puzzle/tetrix/tetrix-1.13.16.1.40c-r1.ebuild
new file mode 100644
index 000000000000..6f9681e40fc6
--- /dev/null
+++ b/games-puzzle/tetrix/tetrix-1.13.16.1.40c-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrix/tetrix-1.13.16.1.40c-r1.ebuild,v 1.1 2003/09/14 01:28:52 vapier Exp $
+
+inherit games gcc
+
+MY_SV=${PV#*.*.*.}
+MY_PV=${PV%.${MY_SV}}
+MY_P="tetrinetx-${MY_PV}+qirc-${MY_SV}"
+
+DESCRIPTION="A GNU TetriNET server"
+HOMEPAGE="http://tetrinetx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tetrinetx/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+
+DEPEND="net-libs/adns"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-paths.patch
+	sed -i \
+		-e "s:GENTOO_CONFDIR:${GAMES_SYSCONFDIR}/${PN}:" \
+		-e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}/${PN}:" \
+		-e "s:GENTOO_LOGDIR:${GAMES_LOGDIR}:" \
+		src/config.h bin/game.conf
+}
+
+src_compile() {
+	cd src
+	$(gcc-getCC) ${CFLAGS} main.c -o tetrix -ladns || die "compile failed"
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog README README.qirc.spectators
+
+	dogamesbin src/tetrix
+	insinto ${GAMES_SYSCONFDIR}/${PN}
+	doins bin/*
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/tetrix.rc tetrix
+
+	prepgamesdirs
+}
diff --git a/games-puzzle/tetrix/tetrix-1.13.16.1.40c.ebuild b/games-puzzle/tetrix/tetrix-1.13.16.1.40c.ebuild
deleted file mode 100644
index f2228726a4a6..000000000000
--- a/games-puzzle/tetrix/tetrix-1.13.16.1.40c.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrix/tetrix-1.13.16.1.40c.ebuild,v 1.1 2003/09/10 06:36:00 vapier Exp $
-
-
-MY_SV=${PV#*.*.*.}
-MY_PV=${PV%.${MY_SV}}
-
-MY_P="tetrinetx-${MY_PV}+qirc-${MY_SV}"
-
-DESCRIPTION="A GNU TetriNET server"
-SRC_URI="mirror://sourceforge/tetrinetx/${MY_P}.tar.gz"
-
-HOMEPAGE="http://tetrinetx.sourceforge.net/"
-KEYWORDS="x86"
-LICENSE="GPL-2"
-
-SLOT="0"
-
-DEPEND="net-libs/adns"
-
-S="${WORKDIR}/${MY_P}/src"
-
-src_compile() {
-	./c || die "compile failed"
-}
-
-src_install() {
-	dodir /opt/tetrix /etc/init.d
-
-	mv ../bin/* ${D}/opt/tetrix/
-
-	cp ${FILESDIR}/launch_tetrix ${D}/opt/tetrix/
-	cp ${FILESDIR}/tetrix ${D}/etc/init.d/tetrix
-}
-
-pkg_postinst() {
-	chmod ug+rwx /etc/init.d/tetrix /opt/tetrix/launch_tetrix
-}