summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2008-03-04 03:58:03 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2008-03-04 03:58:03 +0000
commited08b9e1e2d1d33915bc4bc51f361acbc4c463e7 (patch)
treefbfe41b197b3c52548f55b0f175cd42790d4a31d
parentRemoving etqw-demo, since it's now in the tree. (diff)
downloadwolf31o2-ed08b9e1e2d1d33915bc4bc51f361acbc4c463e7.tar.gz
wolf31o2-ed08b9e1e2d1d33915bc4bc51f361acbc4c463e7.tar.bz2
wolf31o2-ed08b9e1e2d1d33915bc4bc51f361acbc4c463e7.zip
Added an updated version of quake4-bin-1.4.2 for testing.
svn path=/; revision=135
-rw-r--r--games-fps/quake4-bin/ChangeLog162
-rw-r--r--games-fps/quake4-bin/Manifest6
-rw-r--r--games-fps/quake4-bin/metadata.xml26
-rw-r--r--games-fps/quake4-bin/quake4-bin-1.3.2.ebuild117
-rw-r--r--games-fps/quake4-bin/quake4-bin-1.4.2.ebuild147
5 files changed, 458 insertions, 0 deletions
diff --git a/games-fps/quake4-bin/ChangeLog b/games-fps/quake4-bin/ChangeLog
new file mode 100644
index 0000000..379d6d1
--- /dev/null
+++ b/games-fps/quake4-bin/ChangeLog
@@ -0,0 +1,162 @@
+# ChangeLog for games-fps/quake4-bin
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-bin/ChangeLog,v 1.34 2007/08/20 17:23:52 wolf31o2 Exp $
+
+ 20 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+ quake4-bin-1.4.2.ebuild:
+ The Czech linguas variable is cs, not cz. Thanks to Mr_Bones_ for pointing
+ it out.
+
+*quake4-bin-1.4.2 (18 Aug 2007)
+
+ 18 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+ +quake4-bin-1.4.2.ebuild:
+ Version bump. Ebuild by Paul Bredbury <brebs@sent.com> and modified by me.
+ Closing bug #173491 and bug #179254.
+
+ 31 Jul 2007; Doug Goldstein <cardoe@gentoo.org> quake4-bin-1.3.2.ebuild:
+ nvidia-legacy-drivers has merged with nvidia-drivers
+
+ 12 Mar 2007; Marius Mauch <genone@gentoo.org> quake4-bin-1.3.2.ebuild:
+ Replacing einfo with elog
+
+ 07 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+ quake4-bin-1.3.2.ebuild:
+ Added QA_* variables.
+
+ 05 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ quake4-bin-1.3.2.ebuild:
+ Removed references to nvidia-glx, since it is no longer in the tree.
+
+ 28 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ -quake4-bin-1.3.ebuild, quake4-bin-1.3.2.ebuild:
+ Stable on amd64/x86, removing older ebuilds, and removing virtual/x11 from
+ dependencies.
+
+*quake4-bin-1.3.2 (06 Sep 2006)
+
+ 06 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ +quake4-bin-1.3.2.ebuild:
+ Version bump to 1.3.2 and closing bug #143720.
+
+ 06 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ -quake4-bin-1.2.1.ebuild:
+ Cleaning out older versions.
+
+ 28 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org> quake4-bin-1.3.ebuild:
+ Stable on amd64/x86.
+
+*quake4-bin-1.3 (01 Aug 2006)
+
+ 01 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ +quake4-bin-1.3.ebuild:
+ Version bump to 1.3, now get out there fragging...
+
+ 07 Jul 2006; Kristopher Kersey <augustus@gentoo.org>
+ quake4-bin-1.2.1.ebuild:
+ Added RDEPEND for new x11-drivers/nvidia-drivers or
+ x11-drivers/nvidia-legacy-drivers.
+
+ 06 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ quake4-bin-1.2.1.ebuild:
+ Added >=app-emulation/emul-linux-x86-xlibs-7.0 to the list of valid 32-bit
+ opengl providers for amd64 per bug #135643.
+
+ 09 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ -quake4-bin-1.2.ebuild:
+ Cleaning up older ebuilds.
+
+ 09 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ quake4-bin-1.2.1.ebuild:
+ Marking stable on amd64 and x86.
+
+ 02 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ quake4-bin-1.2.1.ebuild:
+ Fixed a typo.
+
+ 02 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ quake4-bin-1.2.1.ebuild:
+ Forgot to install quake4smp.x86, so fixing that.
+
+ 01 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ -quake4-bin-1.0.6.ebuild, -quake4-bin-1.0.6-r1.ebuild,
+ quake4-bin-1.2.ebuild:
+ Marked 1.2 stable on amd64 and x86 and removing older ebuilds. I plan on
+ marking 1.2.1 stable in a short time period, provided the crashes with SMP
+ aren't as bad as people say. I haven't had a chance to test it on an SMP
+ machine myself.
+
+*quake4-bin-1.2.1 (01 May 2006)
+
+ 01 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ +quake4-bin-1.2.1.ebuild:
+ Version bump to 1.2.1 and closing bug #131604.
+
+*quake4-bin-1.2 (19 Apr 2006)
+
+ 19 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ +quake4-bin-1.2.ebuild:
+ Version bumped to 1.2 and closing bug #127912.
+
+ 31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ quake4-bin-1.0.6.ebuild, quake4-bin-1.0.6-r1.ebuild:
+ Changed nostrip to strip.
+
+*quake4-bin-1.0.6-r1 (31 Mar 2006)
+
+ 31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ +quake4-bin-1.0.6-r1.ebuild:
+ Made some general code cleanups and closing bug #127934.
+
+ 31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ -quake4-bin-1.1.ebuild:
+ Removing quake4-bin 1.1 patch from portage as it was removed from upstream
+ due to a recall of the Windows patch that will create incompatible net code.
+
+ 29 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> quake4-bin-1.1.ebuild:
+ Fixed typo in SRC_URI.
+
+*quake4-bin-1.1 (29 Mar 2006)
+
+ 29 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ +quake4-bin-1.1.ebuild:
+ Version bump to 1.1 and closing bug #127912.
+
+ 15 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ quake4-bin-1.0.6.ebuild:
+ Changed to use idsoftware thirdpartymirror.
+
+ 22 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ quake4-bin-1.0.6.ebuild:
+ Marking stable on amd64.
+
+ 22 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ quake4-bin-1.0.6.ebuild:
+ Marked stable on x86 and closing bug #119970.
+
+ 05 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ quake4-bin-1.0.6.ebuild:
+ Added modular X dependencies.
+
+*quake4-bin-1.0.6 (13 Dec 2005)
+
+ 13 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+ -quake4-bin-1.0.5.ebuild, +quake4-bin-1.0.6.ebuild:
+ Version bumped to 1.0.6, closing bug #115420, and removing older versions.
+
+ 22 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+ quake4-bin-1.0.5.ebuild:
+ Added full path for bug #111143.
+
+*quake4-bin-1.0.5 (16 Nov 2005)
+
+ 16 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+ +quake4-bin-1.0.5.ebuild, -quake4-bin-1.0.2147.12.ebuild:
+ Version bumped and closing bug #112725.
+
+*quake4-bin-1.0.2147.12 (24 Oct 2005)
+
+ 24 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org> +metadata.xml,
+ +quake4-bin-1.0.2147.12.ebuild:
+ Initial import. Ebuilds by me. Closing bug #109825.
+
diff --git a/games-fps/quake4-bin/Manifest b/games-fps/quake4-bin/Manifest
new file mode 100644
index 0000000..6760dec
--- /dev/null
+++ b/games-fps/quake4-bin/Manifest
@@ -0,0 +1,6 @@
+DIST quake4-linux-1.3-2.x86.run 239448644 RMD160 a5cdf416c225f1b60ae93a26e0185bb719353ccd SHA1 271341e8b14f91c99dbe6c62e8a9dc96d8160549 SHA256 d85d62791aaf56039f131997ccadbddeac17f83d7420102ca5a059af1f284252
+DIST quake4-linux-1.4.2.x86.run 287552973 RMD160 eb55c5c1c0cae68476bea10c58e40db722f2a068 SHA1 870bbda920b846c51904b22c40ce15aac8c9183b SHA256 9203b387b1a4075a1b9ad1eb7be32b49a88141a448d9330d9cbe1f40a145bd6a
+EBUILD quake4-bin-1.3.2.ebuild 3099 RMD160 e4465fe026bef1a07d01ee6e76fcb2c0387f9124 SHA1 43a745d7114a61064bb6b1303e5f828103d646d4 SHA256 69d0098ebfaa980e080f876bbe4542ec117a6eb8ab7deb9de8c8a62781c2fbc6
+EBUILD quake4-bin-1.4.2.ebuild 3753 RMD160 f3a2382a85c93d743871495d48d845c7de6a9e82 SHA1 055644251f80a242df56ace55f42ad671556066a SHA256 521f5ffaf1433fdedc8da50f45929d546e3fb91869cb5fb1353b459c238927c3
+MISC ChangeLog 5422 RMD160 e639aa189fe0973f31c72390ee24a3ac63415326 SHA1 dbf3ec62d9741a74bad5fe08c1cde88582d699f6 SHA256 fa16461ff899b7e1ec521c366ac900b02c09d5ee2d9f17bec2ac829a7806414b
+MISC metadata.xml 1142 RMD160 87e65b25ade5c2a1a54f03d4d7b32320ea117bd8 SHA1 d0aa0f84f9602dda50f3b9ac1612e60dff3e4165 SHA256 35b22179cb9042f1d559c9c6f3a4f83806d8797e9849cf9a3c5701514b015da1
diff --git a/games-fps/quake4-bin/metadata.xml b/games-fps/quake4-bin/metadata.xml
new file mode 100644
index 0000000..c8e85be
--- /dev/null
+++ b/games-fps/quake4-bin/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+<maintainer>
+ <email>wolf31o2@gentoo.org</email>
+ <name>Chris Gianelloni</name>
+</maintainer>
+<longdescription>
+In a desparate war for Earth's survival against and unrelenting alient enemy,
+the only way to defeat them is to become one of them.
+
+Earth is under seige by the Strogg, a barbaric alien race moving through the
+universe consuming, recycling and annihilating any civilization in their path.
+In a deperate attempt to survive, an armada of Earth's finest warriors is sent
+to take the battle to the Strogg home planet.
+
+You are Matthow Kane, an elite member of Rhino Squad and Eath's valiant invasion
+force. Fight alone, with your squad, or in hover tanks and mechanized walkers
+as you engage in a heroic mission the the heart of the Strogg war machine.
+
+Quake 4 is the fourth installment of the extremely popular and successful Quake
+series by id software. This game is commercial software, and requires the data
+from a retail copy of the game to play.
+</longdescription>
+</pkgmetadata>
diff --git a/games-fps/quake4-bin/quake4-bin-1.3.2.ebuild b/games-fps/quake4-bin/quake4-bin-1.3.2.ebuild
new file mode 100644
index 0000000..cf5b1b1
--- /dev/null
+++ b/games-fps/quake4-bin/quake4-bin-1.3.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-bin/quake4-bin-1.3.2.ebuild,v 1.7 2007/07/31 14:37:48 cardoe Exp $
+
+inherit eutils versionator games
+
+MY_PV=$(replace_version_separator 2 '-')
+
+DESCRIPTION="Sequel to Quake 2, an id Software 3D first-person shooter"
+HOMEPAGE="http://www.quake4game.com/"
+SRC_URI="mirror://idsoftware/quake4/linux/quake4-linux-${MY_PV}.x86.run"
+
+LICENSE="QUAKE4"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="alsa cdinstall dedicated opengl"
+RESTRICT="strip"
+
+UIDEPEND="virtual/opengl
+ x86? (
+ x11-libs/libXext
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ media-libs/libsdl
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-sdl
+ app-emulation/emul-linux-x86-xlibs
+ || (
+ >=app-emulation/emul-linux-x86-xlibs-7.0
+ x11-drivers/nvidia-drivers
+ >=x11-drivers/ati-drivers-8.8.25-r1
+ )
+ )
+ alsa? ( >=media-libs/alsa-lib-1.0.6 )"
+RDEPEND="sys-libs/glibc
+ dedicated? ( app-misc/screen )
+ amd64? ( app-emulation/emul-linux-x86-baselibs )
+ opengl? ( ${UIDEPEND} )
+ cdinstall? ( games-fps/quake4-data )
+ !dedicated? ( !opengl? ( ${UIDEPEND} ) )"
+
+S=${WORKDIR}
+
+GAMES_CHECK_LICENSE="yes"
+dir=${GAMES_PREFIX_OPT}/quake4
+Ddir=${D}/${dir}
+
+QA_TEXTRELS="${dir}/libSDL-1.2.id.so.0
+ ${dir}/pb/pbags.so
+ ${dir}/pb/pbcl.so
+ ${dir}/pb/pbag.so
+ ${dir}/pb/pbsv.so
+ ${dir}/pb/pbcls.so"
+QA_EXECSTACK="${dir}/quake4.x86
+ ${dir}/libSDL-1.2.id.so.0
+ ${dir}/q4ded.x86
+ ${dir}/libgcc_s.so.1
+ ${dir}/quake4smp.x86
+ ${dir}/libstdc++.so.6"
+
+src_unpack() {
+ unpack_makeself ${A}
+}
+
+src_install() {
+ insinto "${dir}"
+ exeinto "${dir}"
+
+ doins *.txt README q4icon.bmp us/version.info README-1.3.htm || die "docs"
+ doins -r pb || die "pb"
+ doexe openurl.sh || die "openurl.sh"
+ doexe bin/Linux/x86/quake4.x86 bin/Linux/x86/q4ded.x86 \
+ bin/Linux/x86/libgcc_s.so.1 bin/Linux/x86/libstdc++.so.* \
+ bin/Linux/x86/libSDL-1.2.id.so.0 bin/Linux/x86/quake4smp.x86 \
+ || die "doexe x86 exes/libs"
+
+ insinto "${dir}"/q4base
+ doins q4base/* us/q4base/* || die "doins q4base"
+ if use dedicated
+ then
+ games_make_wrapper quake4-ded ./q4ded.x86 "${dir}" "${dir}"
+ fi
+
+ if use opengl || ! use dedicated
+ then
+ games_make_wrapper quake4 ./quake4.x86 "${dir}" "${dir}"
+ games_make_wrapper quake4-smp ./quake4smp.x86 "${dir}" "${dir}"
+# doicon ${FILESDIR}/quake4.png || die "copying icon"
+# make_desktop_entry quake4 "Quake IV" quake4.png
+# make_desktop_entry quake4-smp "Quake IV (SMP)" quake4.png
+ newicon q4icon.bmp quake4.bmp || die "copying icon"
+ make_desktop_entry quake4 "Quake IV" /usr/share/pixmaps/quake4.bmp
+ make_desktop_entry quake4-smp "Quake IV (SMP)" /usr/share/pixmaps/quake4.bmp
+ fi
+
+ prepgamesdirs
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+
+ if ! use cdinstall
+ then
+ elog "You need to copy pak001.pk4 through pak012.pk4, along with"
+ elog "zpak*.pk4 from either your installation media or your hard drive"
+ elog "to ${dir}/q4base before running the game."
+ echo
+ fi
+ if use opengl || ! use dedicated
+ then
+ elog "To play the game run:"
+ elog " quake4"
+ echo
+ fi
+}
diff --git a/games-fps/quake4-bin/quake4-bin-1.4.2.ebuild b/games-fps/quake4-bin/quake4-bin-1.4.2.ebuild
new file mode 100644
index 0000000..d4a593c
--- /dev/null
+++ b/games-fps/quake4-bin/quake4-bin-1.4.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-bin/quake4-bin-1.4.2.ebuild,v 1.2 2007/08/20 17:23:52 wolf31o2 Exp $
+
+inherit eutils games
+
+DESCRIPTION="Sequel to Quake 2, an id Software 3D first-person shooter"
+HOMEPAGE="http://www.quake4game.com/"
+SRC_URI="mirror://idsoftware/quake4/linux/quake4-linux-${PV}.x86.run"
+
+LICENSE="QUAKE4"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="alsa cdinstall dedicated linguas_cs linguas_fr linguas_it linguas_pl linguas_ru opengl"
+
+RESTRICT="strip"
+
+UIDEPEND="virtual/opengl
+ x86? (
+ x11-libs/libXext
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ media-libs/libsdl )
+ amd64? (
+ app-emulation/emul-linux-x86-compat
+ app-emulation/emul-linux-x86-sdl
+ app-emulation/emul-linux-x86-xlibs
+ || (
+ >=app-emulation/emul-linux-x86-xlibs-7.0
+ x11-drivers/nvidia-drivers
+ >=x11-drivers/ati-drivers-8.8.25-r1 ) )
+ alsa? ( >=media-libs/alsa-lib-1.0.6 )"
+
+RDEPEND="sys-libs/glibc
+ dedicated? ( app-misc/screen )
+ amd64? ( app-emulation/emul-linux-x86-baselibs )
+ opengl? ( ${UIDEPEND} )
+ cdinstall? ( games-fps/quake4-data )
+ !dedicated? ( !opengl? ( ${UIDEPEND} ) )"
+
+S=${WORKDIR}
+dir=${GAMES_PREFIX_OPT}/quake4
+Ddir=${D}/${dir}
+
+GAMES_CHECK_LICENSE="yes"
+
+QA_TEXTRELS="${dir:1}/pb/pbag.so
+ ${dir:1}/pb/pbags.so
+ ${dir:1}/pb/pbcl.so
+ ${dir:1}/pb/pbcls.so
+ ${dir:1}/pb/pbsv.so
+ ${dir:1}/libSDL-1.2.id.so.0"
+QA_EXECSTACK="${dir:1}/quake4.x86
+ ${dir:1}/quake4smp.x86
+ ${dir:1}/q4ded.x86
+ ${dir:1}/libgcc_s.so.1
+ ${dir:1}/libSDL-1.2.id.so.0
+ ${dir:1}/libstdc++.so.6"
+
+zpaklang() {
+ if ! use linguas_${1} ; then
+ einfo "Removing ${2} zpak files"
+ rm -f q4base/zpak_${2}*
+ fi
+}
+
+src_unpack() {
+ unpack_makeself ${A}
+
+ mv q4icon.bmp quake4.bmp || die
+
+ # Am including the Spanish files because Spanish is the default language
+ #zpaklang es spanish
+ zpaklang cs czech
+ zpaklang fr french
+ zpaklang it italian
+ zpaklang pl polish
+ zpaklang ru russian
+
+ # Rename the .off files, so they will be used
+ cd q4base
+ if [[ ! -z $(ls *.off 2> /dev/null) ]] ; then
+ local f
+ for f in *.off ; do
+ einfo "Renaming ${f}"
+ mv "${f}" "${f%.off}" || die "mv ${f}"
+ done
+ fi
+}
+
+src_install() {
+ insinto "${dir}"
+ doins *.{htm,txt} README us/version.info || die "docs"
+ doins -r pb q4mp || die "doins pb q4mp"
+
+ exeinto "${dir}"
+ doexe openurl.sh || die "openurl.sh"
+ doexe bin/Linux/x86/{quake4{,smp}.x86,q4ded.x86,*.so.?} \
+ || die "doexe x86 exes/libs"
+
+ insinto "${dir}"/q4base
+ doins q4base/* us/q4base/* || die "doins q4base"
+ if use dedicated ; then
+ games_make_wrapper quake4-ded ./q4ded.x86 "${dir}" "${dir}"
+ fi
+
+ if use opengl || ! use dedicated ; then
+ doicon quake4.bmp || die "doicon"
+ games_make_wrapper quake4 "./quake4.x86" "${dir}" "${dir}"
+ games_make_wrapper quake4-smp ./quake4smp.x86 "${dir}" "${dir}"
+ icon_path="quake4"
+ if [ -e "${FILESDIR}"/quake4.png ]
+ then
+ doicon "${FILESDIR}"/quake4.png || die "copying icon"
+ elif [ -e "${DISTDIR}"/quake4.png ]
+ doicon "${DISTDIR}"/quake4.png || die "copying icon"
+ else
+ icon_path=/usr/share/pixmaps/quake4.bmp
+ fi
+ make_desktop_entry quake4 "Quake IV" ${icon_path}
+ make_desktop_entry quake4-smp "Quake IV (SMP)" ${icon_path}
+ fi
+
+ prepgamesdirs
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+
+ if ! use cdinstall ; then
+ elog "You need to copy pak001.pk4 through pak012.pk4, along with"
+ elog "zpak*.pk4 from either your installation media or your hard drive"
+ elog "to ${dir}/q4base before running the game."
+ echo
+ fi
+ if use opengl || ! use dedicated ; then
+ elog "To play the game, run: quake4"
+ elog
+ # The default language is Spanish!
+ elog "To reset the language from Spanish to English, run:"
+ elog " sed -i 's:spanish:english:' ~/.quake4/q4base/Quake4Config.cfg"
+ elog
+ elog "Saved games from previous Quake 4 versions might not be compatible."
+ echo
+ fi
+}