diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2004-04-18 07:22:55 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2004-04-18 07:22:55 +0000 |
| commit | 264055ccbfcb984950b6966d3af64eeb8cc2b02a (patch) | |
| tree | 459a0f6f97657aef0eeb2eaadd7f0d505d6b51fe /games-fps | |
| parent | bump to 1.2.2 to close email requests and some bugs (bug #48162). anyone want... (diff) | |
| download | historical-264055ccbfcb984950b6966d3af64eeb8cc2b02a.tar.gz historical-264055ccbfcb984950b6966d3af64eeb8cc2b02a.tar.bz2 historical-264055ccbfcb984950b6966d3af64eeb8cc2b02a.zip | |
use games_make_wrapper; tidy; fix use_tf() and use_ft()
Diffstat (limited to 'games-fps')
| -rw-r--r-- | games-fps/duke3d/ChangeLog | 6 | ||||
| -rw-r--r-- | games-fps/duke3d/Manifest | 4 | ||||
| -rw-r--r-- | games-fps/duke3d/duke3d-20030817-r1.ebuild | 32 |
3 files changed, 22 insertions, 20 deletions
diff --git a/games-fps/duke3d/ChangeLog b/games-fps/duke3d/ChangeLog index 03f0a305d592..32769bb0daf7 100644 --- a/games-fps/duke3d/ChangeLog +++ b/games-fps/duke3d/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/duke3d # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.10 2004/04/10 09:08:03 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/ChangeLog,v 1.11 2004/04/18 07:22:55 mr_bones_ Exp $ + + 18 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> + duke3d-20030817-r1.ebuild: + use games_make_wrapper; tidy; fix use_tf() and use_ft() 10 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> duke3d-20030817-r1.ebuild: diff --git a/games-fps/duke3d/Manifest b/games-fps/duke3d/Manifest index 7fc0518d1d2f..4f67a762a3ef 100644 --- a/games-fps/duke3d/Manifest +++ b/games-fps/duke3d/Manifest @@ -1,5 +1,5 @@ -MD5 fa60fd5dfbcc1fd5f892e4ac8c146210 ChangeLog 1586 -MD5 b2e0f51ec1b55e6618d8fd83bd55dcfe duke3d-20030817-r1.ebuild 2831 +MD5 20d416f5cbe15527353a0f48d2c3128e ChangeLog 1729 +MD5 198a6de6ee90cc0978857706844bc370 duke3d-20030817-r1.ebuild 2822 MD5 3a1f336e4cfd9b74bc9bacb21ea0b300 metadata.xml 2684 MD5 f61d663b18e338844d9bdab8cd8a113d files/20030817-buildengine-makefile-cflags.patch 523 MD5 7c4ac6336d128a410fc4fb603ad8b8c7 files/20030817-duke3d-makefile-opts.patch 864 diff --git a/games-fps/duke3d/duke3d-20030817-r1.ebuild b/games-fps/duke3d/duke3d-20030817-r1.ebuild index 4caa123a6fa7..943ce0253048 100644 --- a/games-fps/duke3d/duke3d-20030817-r1.ebuild +++ b/games-fps/duke3d/duke3d-20030817-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20030817-r1.ebuild,v 1.12 2004/04/18 06:16:06 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/duke3d/duke3d-20030817-r1.ebuild,v 1.13 2004/04/18 07:22:55 mr_bones_ Exp $ ECVS_PASS="anonymous" ECVS_SERVER="icculus.org:/cvs/cvsroot" @@ -29,8 +29,8 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${ECVS_MODULE}" -use_tf() { use ${1} && echo true || echo false; } -use_ft() { use ${1} && echo false || echo true; } +use_tf() { use ${1} > /dev/null && echo "true" || echo "false"; } +use_ft() { use ${1} > /dev/null && echo "false" || echo "true"; } src_unpack() { local fromcvs=0 @@ -45,25 +45,24 @@ src_unpack() { # configure buildengine cd ${S}/source/buildengine -# -e "/^usephysfs := /s:=.*:= `use_ft nophysfs`:" \ sed -i \ - -e "/^useperl := /s:=.*:= `use_tf perl`:" \ - -e "/^useopengl := /s:=.*:= `use_tf opengl`:" \ - -e "/^usephysfs := /s:=.*:= false:" Makefile \ + -e "/^useperl := / s:=.*:= $(use_tf perl):" \ + -e "/^useopengl := / s:=.*:= $(use_tf opengl):" \ + -e "/^usephysfs := / s:=.*:= false:" Makefile \ || die "sed Makefile failed" if use x86 ; then sed -i \ -e 's:^#USE_ASM:USE_ASM:' Makefile \ || die "sed Makefile failed (x86)" fi - epatch ${FILESDIR}/${PV}-buildengine-makefile-cflags.patch + epatch "${FILESDIR}/${PV}-buildengine-makefile-cflags.patch" sed -i \ -e 's:/usr/lib/perl5/i386-linux/CORE/libperl.a::' Makefile \ - || die "sed Makefile failed" + || die "sed Makefile failed (libperl)" # configure duke3d cd ${S}/source - epatch ${FILESDIR}/${PV}-duke3d-makefile-opts.patch + epatch "${FILESDIR}/${PV}-duke3d-makefile-opts.patch" if use x86 ; then sed -i \ -e '/^#use_asm/s:#::' Makefile \ @@ -86,21 +85,20 @@ src_compile() { } src_install() { - dogamesbin ${FILESDIR}/duke3d - dosed "s:GENTOO_DIR:${GAMES_DATADIR}/${PN}:" ${GAMES_BINDIR}/duke3d + games_make_wrapper duke3d "${GAMES_BINDIR}/duke3d.bin" "${GAMES_DATADIR}/${PN}" newgamesbin source/duke3d duke3d.bin || die "newgamesbin failed" dodoc readme.txt cd testdata - insinto ${GAMES_DATADIR}/${PN} + insinto "${GAMES_DATADIR}/${PN}" newins defs.con DEFS.CON newins game.con GAME.CON newins user.con USER.CON - doins ${FILESDIR}/network.cfg - insinto ${GAMES_SYSCONFDIR} - doins ${FILESDIR}/duke3d.cfg - dosym ${GAMES_SYSCONFDIR}/duke3d.cfg ${GAMES_DATADIR}/${PN}/DUKE3D.CFG + doins "${FILESDIR}/network.cfg" + insinto "${GAMES_SYSCONFDIR}" + doins "${FILESDIR}/duke3d.cfg" + dosym "${GAMES_SYSCONFDIR}/duke3d.cfg" "${GAMES_DATADIR}/${PN}/DUKE3D.CFG" prepgamesdirs } |