diff options
| -rw-r--r-- | games-fps/quake3/files/digest-quake3-1.32b | 1 | ||||
| -rw-r--r-- | games-fps/quake3/files/q3ded.conf.d | 6 | ||||
| -rw-r--r-- | games-fps/quake3/files/q3ded.rc | 31 | ||||
| -rw-r--r-- | games-fps/quake3/files/startq3ded | 3 | ||||
| -rw-r--r-- | games-fps/quake3/quake3-1.31.ebuild | 42 | ||||
| -rw-r--r-- | games-fps/quake3/quake3-1.32b-r3.ebuild | 11 | ||||
| -rw-r--r-- | games-fps/quake3/quake3-1.32b.ebuild | 72 |
7 files changed, 54 insertions, 112 deletions
diff --git a/games-fps/quake3/files/digest-quake3-1.32b b/games-fps/quake3/files/digest-quake3-1.32b deleted file mode 100644 index 485ec6077960..000000000000 --- a/games-fps/quake3/files/digest-quake3-1.32b +++ /dev/null @@ -1 +0,0 @@ -MD5 c6afb977ca0357de39db6871c8a3cd37 linuxq3apoint-1.32b.x86.run 31478345 diff --git a/games-fps/quake3/files/q3ded.conf.d b/games-fps/quake3/files/q3ded.conf.d new file mode 100644 index 000000000000..07da92c52ff8 --- /dev/null +++ b/games-fps/quake3/files/q3ded.conf.d @@ -0,0 +1,6 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/files/q3ded.conf.d,v 1.1 2003/12/09 21:34:48 vapier Exp $ + +q3_OPTS="+set com_hunkmegs 24 +set dedicated 1 +set net_port 27960 +map q3tourney2" + diff --git a/games-fps/quake3/files/q3ded.rc b/games-fps/quake3/files/q3ded.rc index 9134a48ca8fe..e72ff8c4039f 100644 --- a/games-fps/quake3/files/q3ded.rc +++ b/games-fps/quake3/files/q3ded.rc @@ -1,24 +1,35 @@ #!/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-fps/quake3/files/q3ded.rc,v 1.4 2003/12/09 21:34:48 vapier Exp $ depend() { need net } start() { - ebegin "Starting baseq3 dedicated..." - export HOME=/root - screen -A -m -d -S q3ded su - q3 -c /opt/quake3/startq3ded - eend $? + ebegin "Starting quake3 dedicated" + screen -A -m -d -S q3ded su - games-ded -c "/usr/games/bin/q3ded ${q3_OPTS}" + eend $? } stop() { - ebegin "Stopping baseq3 dedicated..." - pid=`screen -list | grep q3ded | awk -F . '{ print $1 }' | sed -e s/.//` - kill $pid - eend $? - + ebegin "Stopping quake3 dedicated" + local pid=`screen -list | grep q3ded | awk -F . '{print $1}' | sed -e s/.//` + if [ -z "${pid}" ] ; then + eend 1 "Lost screen session" + else + pid=`pstree -p ${pid} | sed -e 's:^.*q3ded::'` + pid=${pid:1:${#pid}-2} + if [ -z "${pid}" ] ; then + eend 1 "Lost q3ded session" + else + kill ${pid} + eend $? "Could not kill q3ded" + fi + fi } status() { - screen -list | grep q3ded + screen -list | grep q3ded } diff --git a/games-fps/quake3/files/startq3ded b/games-fps/quake3/files/startq3ded deleted file mode 100644 index 126a633a13f3..000000000000 --- a/games-fps/quake3/files/startq3ded +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /opt/quake3 -exec ./q3ded +set com_hunkmegs 24 +set dedicated 1 +set net_port 27960 +map q3tourney2 diff --git a/games-fps/quake3/quake3-1.31.ebuild b/games-fps/quake3/quake3-1.31.ebuild index 145a8192c152..52209e569784 100644 --- a/games-fps/quake3/quake3-1.31.ebuild +++ b/games-fps/quake3/quake3-1.31.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.31.ebuild,v 1.5 2003/10/12 04:36:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.31.ebuild,v 1.6 2003/12/09 21:34:48 vapier Exp $ -inherit eutils games +inherit games -DESCRIPTION="Quake III" +DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter" HOMEPAGE="http://www.idsoftware.com/" SRC_URI="ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${PV}.x86.run" @@ -31,35 +31,39 @@ src_unpack() { } src_install() { - dodir /opt/quake3/ + local dir=${GAMES_PREFIX_OPT}/${PN} + dodir ${dir} - insinto /opt/quake3/baseq3 + insinto ${dir}/baseq3 doins baseq3/*.pk3 - insinto /opt/quake3/missionpack + mv Docs ${D}/${dir}/ + insinto ${dir}/missionpack doins missionpack/*.pk3 + mv pb ${D}/${dir}/ - exeinto /opt/quake3/ - insinto /opt/quake3/ - doexe bin/x86/{quake3.x86,q3ded} ${FILESDIR}/startq3ded - doins quake3.xpm README* Q3A_EULA.txt Help/* - dogamesbin ${FILESDIR}/quake3 + exeinto ${dir} + insinto ${dir} + doexe bin/Linux/x86/{quake3.x86,q3ded} + doins quake3.xpm README* Q3A_EULA.txt + dogamesbin ${FILESDIR}/quake3 ${FILESDIR}/q3ded - exeinto /etc/init.d - newexe ${FILESDIR}/q3ded.rc q3ded + exeinto /etc/init.d ; newexe ${FILESDIR}/q3ded.rc q3ded + insinto /etc/conf.d ; newins ${FILESDIR}/q3ded.conf.d q3ded + insinto /usr/share/pixmaps + doins quake3.xpm - prepgamesdirs /opt/quake3 + prepgamesdirs + make_desktop_entry quake3 "Quake III Arena" quake3.xpm } pkg_postinst() { - enewuser q3 -1 /bin/bash /opt/quake3 ${GAMES_GROUP} + games_pkg_postinst - einfo "You need to copy pak0.pk3 from your Quake3 CD into /opt/quake3/baseq3." + einfo "You need to copy pak0.pk3 from your Quake3 CD into ${dir}/baseq3." einfo "Or if you have got a Window installation of Q3 make a symlink to save space." echo einfo "To start a dedicated server, run" einfo "\t/etc/init.d/q3ded start" echo - einfo "The dedicated server is started under the q3 user account." - - games_pkg_postinst + einfo "The dedicated server is started under the ${GAMES_USER_DED} user account." } diff --git a/games-fps/quake3/quake3-1.32b-r3.ebuild b/games-fps/quake3/quake3-1.32b-r3.ebuild index eaa0d6984db3..e99bef6ba680 100644 --- a/games-fps/quake3/quake3-1.32b-r3.ebuild +++ b/games-fps/quake3/quake3-1.32b-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.32b-r3.ebuild,v 1.1 2003/12/06 15:06:16 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.32b-r3.ebuild,v 1.2 2003/12/09 21:34:48 vapier Exp $ inherit games @@ -43,12 +43,12 @@ src_install() { exeinto ${dir} insinto ${dir} - doexe bin/Linux/x86/{quake3.x86,q3ded} ${FILESDIR}/startq3ded + doexe bin/Linux/x86/{quake3.x86,q3ded} doins quake3.xpm README* Q3A_EULA.txt dogamesbin ${FILESDIR}/quake3 ${FILESDIR}/q3ded - exeinto /etc/init.d - newexe ${FILESDIR}/q3ded.rc q3ded + exeinto /etc/init.d ; newexe ${FILESDIR}/q3ded.rc q3ded + insinto /etc/conf.d ; newins ${FILESDIR}/q3ded.conf.d q3ded insinto /usr/share/pixmaps doins quake3.xpm @@ -59,9 +59,6 @@ src_install() { pkg_postinst() { games_pkg_postinst - # Shouldn't this be using the games user? - # enewuser q3 -1 /bin/bash /opt/quake3 ${GAMES_GROUP} - einfo "You need to copy pak0.pk3 from your Quake3 CD into ${dir}/baseq3." einfo "Or if you have got a Window installation of Q3 make a symlink to save space." echo diff --git a/games-fps/quake3/quake3-1.32b.ebuild b/games-fps/quake3/quake3-1.32b.ebuild deleted file mode 100644 index 5b45b0300d79..000000000000 --- a/games-fps/quake3/quake3-1.32b.ebuild +++ /dev/null @@ -1,72 +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-fps/quake3/quake3-1.32b.ebuild,v 1.5 2003/10/12 04:36:56 vapier Exp $ - -inherit games - -DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter" -HOMEPAGE="http://www.idsoftware.com/" -SRC_URI="ftp://ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${PV}.x86.run" - -LICENSE="Q3AEULA" -SLOT="0" -KEYWORDS="-* x86" -IUSE="${IUSE} X opengl" -RESTRICT="nostrip" - -RDEPEND="virtual/glibc - opengl? ( virtual/opengl ) - X? ( virtual/x11 ) - dedicated? ( app-misc/screen )" - -S=${WORKDIR} - -pkg_setup() { - check_license - games_pkg_setup -} - -src_unpack() { - unpack_makeself -} - -src_install() { - local dir=${GAMES_PREFIX_OPT}/${PN} - dodir ${dir} - - insinto ${dir}/baseq3 - doins baseq3/*.pk3 - mv Docs ${D}/${dir}/ - insinto ${dir}/missionpack - doins missionpack/*.pk3 - mv pb ${D}/${dir}/ - - exeinto ${dir} - insinto ${dir} - doexe bin/x86/{quake3.x86,q3ded} ${FILESDIR}/startq3ded - doins quake3.xpm README* Q3A_EULA.txt - dogamesbin ${FILESDIR}/quake3 ${FILESDIR}/q3ded - - exeinto /etc/init.d - newexe ${FILESDIR}/q3ded.rc q3ded - insinto /usr/share/pixmaps - doins quake3.xpm - - prepgamesdirs - make_desktop_entry quake3 "Quake III Arena" quake3.xpm -} - -pkg_postinst() { - games_pkg_postinst - - # Shouldn't this be using the games user? - # enewuser q3 -1 /bin/bash /opt/quake3 ${GAMES_GROUP} - - einfo "You need to copy pak0.pk3 from your Quake3 CD into ${dir}/baseq3." - einfo "Or if you have got a Window installation of Q3 make a symlink to save space." - echo - einfo "To start a dedicated server, run" - einfo "\t/etc/init.d/q3ded start" - echo - einfo "The dedicated server is started under the ${GAMES_USER_DED} user account." -} |