From 99b181f256106db2b3358e5cc3f90f1c67bd182b Mon Sep 17 00:00:00 2001 From: Ryan Phillips Date: Thu, 31 Oct 2002 21:44:22 +0000 Subject: Tweaked file name... My mistake --- app-emulation/xmame/ChangeLog | 6 +- app-emulation/xmame/files/digest-xmame-0.61.1-r5 | 10 - app-emulation/xmame/files/digest-xmame-0.61.1_pre1 | 10 + app-emulation/xmame/xmame-0.61.1-r5.ebuild | 204 --------------------- app-emulation/xmame/xmame-0.61.1_pre1.ebuild | 204 +++++++++++++++++++++ 5 files changed, 217 insertions(+), 217 deletions(-) delete mode 100644 app-emulation/xmame/files/digest-xmame-0.61.1-r5 create mode 100644 app-emulation/xmame/files/digest-xmame-0.61.1_pre1 delete mode 100644 app-emulation/xmame/xmame-0.61.1-r5.ebuild create mode 100644 app-emulation/xmame/xmame-0.61.1_pre1.ebuild (limited to 'app-emulation') diff --git a/app-emulation/xmame/ChangeLog b/app-emulation/xmame/ChangeLog index 585a9d52b89c..f043a4f472d1 100644 --- a/app-emulation/xmame/ChangeLog +++ b/app-emulation/xmame/ChangeLog @@ -1,10 +1,10 @@ # ChangeLog for app-games/xmame # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmame/ChangeLog,v 1.10 2002/10/31 21:23:44 rphillips Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmame/ChangeLog,v 1.11 2002/10/31 21:44:22 rphillips Exp $ -*xmame-0.60.1-r5 (31 Oct 2002) +*xmame-0.60.1_pre1 (31 Oct 2002) - 31 Oct 2002; Ryan Phillips xmame-0.61.1-r5.ebuild : + 31 Oct 2002; Ryan Phillips xmame-0.61.1_pre1.ebuild : Version bump.. Submitted by Caleb Shay. Fixes #8904 diff --git a/app-emulation/xmame/files/digest-xmame-0.61.1-r5 b/app-emulation/xmame/files/digest-xmame-0.61.1-r5 deleted file mode 100644 index 8d35d406eea4..000000000000 --- a/app-emulation/xmame/files/digest-xmame-0.61.1-r5 +++ /dev/null @@ -1,10 +0,0 @@ -MD5 887e3956e410b06b92165637ba219070 xmame-0.60.1.tar.bz2 5569579 -MD5 3dfb79f65466931a92d74fe3c1f3c935 0.60.1-0.61.1-pr1.diff.bz2 797886 -MD5 184127a255f0ed29738899dbdee10aff 0.61.1-pr1-0.61.1-pr2.diff.bz2 6448 -MD5 5432594fbd80d462e5d2fd3ca8e0d418 0.61.1-pr2-0.61.1-pr3.diff.bz2 2423 -MD5 9362afac14b3303e42d7181402f3aaba 0.61.1-pr3-0.61.1-pr4.diff.bz2 2250575 -MD5 bb7f008a13839d4b84b78ea090ffef43 0.61.1-pr4-0.61.1-pr5.diff.bz2 974 -MD5 ae51326602ec6baf5fceea735c65728d 0.61.1-pr5-0.61.1-pr6.diff.bz2 851 -MD5 6f4b24e1a8cdf8e8ee05df64cfceb9ae 0.61.1-pr6-0.61.1-pr7.diff.bz2 16015 -MD5 9040847e805e0d61feaab654ef2220ef 0.61.1-pr7-0.61.1-pr8.diff.bz2 13381 -MD5 0b7d12ad5ac0ff929a620cd0e05c5b96 0.61.1-pr8-0.61.1-pr9.diff.bz2 326969 diff --git a/app-emulation/xmame/files/digest-xmame-0.61.1_pre1 b/app-emulation/xmame/files/digest-xmame-0.61.1_pre1 new file mode 100644 index 000000000000..8d35d406eea4 --- /dev/null +++ b/app-emulation/xmame/files/digest-xmame-0.61.1_pre1 @@ -0,0 +1,10 @@ +MD5 887e3956e410b06b92165637ba219070 xmame-0.60.1.tar.bz2 5569579 +MD5 3dfb79f65466931a92d74fe3c1f3c935 0.60.1-0.61.1-pr1.diff.bz2 797886 +MD5 184127a255f0ed29738899dbdee10aff 0.61.1-pr1-0.61.1-pr2.diff.bz2 6448 +MD5 5432594fbd80d462e5d2fd3ca8e0d418 0.61.1-pr2-0.61.1-pr3.diff.bz2 2423 +MD5 9362afac14b3303e42d7181402f3aaba 0.61.1-pr3-0.61.1-pr4.diff.bz2 2250575 +MD5 bb7f008a13839d4b84b78ea090ffef43 0.61.1-pr4-0.61.1-pr5.diff.bz2 974 +MD5 ae51326602ec6baf5fceea735c65728d 0.61.1-pr5-0.61.1-pr6.diff.bz2 851 +MD5 6f4b24e1a8cdf8e8ee05df64cfceb9ae 0.61.1-pr6-0.61.1-pr7.diff.bz2 16015 +MD5 9040847e805e0d61feaab654ef2220ef 0.61.1-pr7-0.61.1-pr8.diff.bz2 13381 +MD5 0b7d12ad5ac0ff929a620cd0e05c5b96 0.61.1-pr8-0.61.1-pr9.diff.bz2 326969 diff --git a/app-emulation/xmame/xmame-0.61.1-r5.ebuild b/app-emulation/xmame/xmame-0.61.1-r5.ebuild deleted file mode 100644 index f922ba16e5a3..000000000000 --- a/app-emulation/xmame/xmame-0.61.1-r5.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# Based on the 0.59.1 ebuild by Ben Lutgens -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmame/xmame-0.61.1-r5.ebuild,v 1.1 2002/10/31 21:23:44 rphillips Exp $ - -IUSE="sdl dga xv alsa esd opengl X 3dfx" - -A="xmame-0.60.1" -S=${WORKDIR}/${A} -DESCRIPTION="Multiple Arcade Machine Emulator for X11" -SRC_URI="http://x.mame.net/download/${A}.tar.bz2 - http://x.mame.net/download/0.60.1-0.61.1-pr1.diff.bz2 - http://x.mame.net/download/0.61.1-pr1-0.61.1-pr2.diff.bz2 - http://x.mame.net/download/0.61.1-pr2-0.61.1-pr3.diff.bz2 - http://x.mame.net/download/0.61.1-pr3-0.61.1-pr4.diff.bz2 - http://x.mame.net/download/0.61.1-pr4-0.61.1-pr5.diff.bz2 - http://x.mame.net/download/0.61.1-pr5-0.61.1-pr6.diff.bz2 - http://x.mame.net/download/0.61.1-pr6-0.61.1-pr7.diff.bz2 - http://x.mame.net/download/0.61.1-pr7-0.61.1-pr8.diff.bz2 - http://x.mame.net/download/0.61.1-pr8-0.61.1-pr9.diff.bz2" -HOMEPAGE="http://x.mame.net" -SLOT="0" -LICENSE="xmame" -DEPEND="xv? ( virtual/x11 ) - dga? ( virtual/x11 ) - sdl? ( >=media-libs/libsdl-1.2.0 ) - >=sys-libs/zlib-1.1.3-r2 - alsa? ( media-libs/alsa-lib ) - xv? ( >=x11-base/xfree-4.1.0 ) - dga? ( >=x11-base/xfree-4.1.0 ) - esd? ( >=media-sound/esound-0.2.29 )" - -# Please note modifications for ppc in this ebuild. If you update the ebuild, -# please either test on ppc, or send it to a ppc developer for testing before -# you commit the ebuild. Thanks :-) - -KEYWORDS="~x86 ~ppc" - -src_unpack() { - unpack ${A}.tar.bz2 - cd ${S} - bzcat ${DISTDIR}/0.60.1-0.61.1-pr1.diff.bz2 | patch -p1 - bzcat ${DISTDIR}/0.61.1-pr1-0.61.1-pr2.diff.bz2 | patch -p1 - bzcat ${DISTDIR}/0.61.1-pr2-0.61.1-pr3.diff.bz2 | patch -p1 - bzcat ${DISTDIR}/0.61.1-pr3-0.61.1-pr4.diff.bz2 | patch -p1 - bzcat ${DISTDIR}/0.61.1-pr4-0.61.1-pr5.diff.bz2 | patch -p1 - bzcat ${DISTDIR}/0.61.1-pr5-0.61.1-pr6.diff.bz2 | patch -p1 - bzcat ${DISTDIR}/0.61.1-pr6-0.61.1-pr7.diff.bz2 | patch -p1 - bzcat ${DISTDIR}/0.61.1-pr7-0.61.1-pr8.diff.bz2 | patch -p1 - bzcat ${DISTDIR}/0.61.1-pr8-0.61.1-pr9.diff.bz2 | patch -p1 - - sed -e "s:CFLAGS = -O -Wall:\#CFLAGS=:g" -e \ - "s:PREFIX = /usr/local:PREFIX = /usr:g" -e \ - "s:MANDIR = \$\(PREFIX\)/man/man6:MANDIR = \$\(PREFIX\)/share/man/man6:g" \ - makefile.unix > makefile.unix.tmp - mv makefile.unix.tmp makefile.unix - - if [ ${ARCH} = "x86" ] - then - # Enable joystick support - sed -e "s/\# JOY_I386/JOY_I386/g" makefile.unix > makefile.unix.tmp - mv makefile.unix.tmp makefile.unix - fi - - if [ ${ARCH} = "ppc" ] - then - sed -e "s:MY_CPU = i386:\#MY_CPU = i386:g" -e \ - "s:\# MY_CPU = risc$:MY_CPU = risc:" makefile.unix > makefile.unix.tmp - mv makefile.unix.tmp makefile.unix - fi - - if [ "`use esd`" ]; then - sed -e "s/\# SOUND_ESOUND/SOUND_ESOUND/g" makefile.unix > makefile.unix.tmp - mv makefile.unix.tmp makefile.unix - fi - - if [ "`use alsa`" ]; then - sed -e "s/\# SOUND_ALSA/SOUND_ALSA/g" makefile.unix > makefile.unix.tmp - mv makefile.unix.tmp makefile.unix - fi - - if [ "`use X`" ] || [ "`use dga`" ] || [ "`use xv`" ]; then - cp makefile.unix makefile.x11; - fi - - if [ "`use sdl`" ]; then - cp makefile.unix makefile.SDL - sed -e "s/DISPLAY_METHOD = x11/DISPLAY_METHOD = SDL/g" \ - makefile.SDL > makefile.SDL.tmp - mv makefile.SDL.tmp makefile.SDL - fi - - if [ "`use dga`" ]; then - sed -e "s/\# X11_DGA = 1/X11_DGA = 1/g" \ - makefile.x11 > makefile.x11.tmp - mv makefile.x11.tmp makefile.x11 - if [ "`use 3dfx`"]; then - sed -e "s/\# TDFX_DGA_WORKAROUND/TDFX_DGA_WORKAROUND/g" \ - makefile.x11 > makefile.x11.tmp - mv makefile.x11.tmp makefile.x11 - fi - if [ "`use sdl`" ]; then - sed -e "s/\# X11_DGA = 1/X11_DGA = 1/g" \ - makefile.SDL > makefile.SDL.tmp - mv makefile.SDL.tmp makefile.SDL - if [ "`use 3dfx`"]; then - sed -e "s/\# TDFX_DGA_WORKAROUND/TDFX_DGA_WORKAROUND/g" \ - makefile.SDL > makefile.SDL.tmp - mv makefile.SDL.tmp makefile.SDL - fi - fi - fi - -# Caleb Shay 08 Oct 2002 -# xmame.xgl is currently broken -# if [ "`use opengl`"; then -# cp makefile.x11 makefile.xgl -# sed -e "s:DISPLAY_METHOD = x11:DISPLAY_METHOD = xgl:g" \ -# makefile.xgl > makefile.xgl.tmp -# mv makefile.xgl.tmp makefile.xgl -# fi - - if [ "`use xv`" ]; then - sed -e "s/\# X11_XV = 1/X11_XV = 1/g" makefile.x11 > makefile.x11.tmp - mv makefile.x11.tmp makefile.x11 - fi -} - -src_compile() { - local MYFLAGS - MYFLAGS="" - # 08 Oct 2002 Caleb Shay - # Parallel makes breaks the build - MAKEOPTS="" - - if [ ${ARCH} = "ppc" ] ; then - # add Makefile suggested flags for ppc - MYFLAGS="${CFLAGS} -funroll-loops \ - -fstrength-reduce -fomit-frame-pointer -ffast-math -fsigned-char" - fi - if [ ${ARCH} = "x86" ] ; then - # add Makefile suggested flags for x86 - MYFLAGS="${CFLAGS} -O3 -Wall -Wno-unused -funroll-loops \ - -fstrength-reduce -fomit-frame-pointer -ffast-math -falign-functions=2 \ - -falign-jumps=2 -falign-loops=2" - fi - - # rphillips 23 Jul 2002 - # compile doesn't work on x86 platforms with -O3 optimizations - # Caleb Shay 08 Oct 2002 - # No longer true - # MYFLAGS=`echo $MYFLAGS | sed 's/-O3/-O2/'` - if [ "`use X`" ] || [ "`use dga`" ] || [ "`use xv`" ]; then - cp makefile.x11 Makefile - emake CFLAGS="${MYFLAGS}" || die - fi - if [ "`use sdl`" ]; then - cp makefile.SDL Makefile - emake CFLAGS="${MYFLAGS}" || die - fi -} - -src_install () { - - if [ "`use X`" ] || [ "`use dga`" ] || [ "`use xv`" ]; then - cp makefile.x11 Makefile - make \ - PREFIX=${D}/usr \ - MANDIR=${D}/usr/share/man/man6 \ - install - fi - if [ "`use sdl`" ]; then - cp makefile.SDL Makefile - make \ - PREFIX=${D}/usr \ - MANDIR=${D}/usr/share/man/man6 \ - install - fi - - dodoc doc/{changes.*,dga2.txt,gamelist.mame,readme.mame,xmamerc.dist} - dodoc doc/{xmame-doc.ps,xmame-doc.txt} - - dohtml -r doc - - if [ "`use sdl`" ]; then - dosym xmame.SDL /usr/bin/xmame - else - dosym xmame.x11 /usr/bin/xmame - fi - -} - -pkg_postinst() { - - if [ "`use sdl`" ]; then - einfo "xmame is a symbolic link to xmame.SDL" - if [ "`use X`" ] || [ "`use dga`" ] || [ "`use xv`" ]; then - einfo "If you wish to use x11 (non-SDL) mame, use xmame.x11" - fi - else - einfo "xmame is a symbolic link to xmame.x11" - fi - -} diff --git a/app-emulation/xmame/xmame-0.61.1_pre1.ebuild b/app-emulation/xmame/xmame-0.61.1_pre1.ebuild new file mode 100644 index 000000000000..84fd6ada22cd --- /dev/null +++ b/app-emulation/xmame/xmame-0.61.1_pre1.ebuild @@ -0,0 +1,204 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# Based on the 0.59.1 ebuild by Ben Lutgens +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmame/xmame-0.61.1_pre1.ebuild,v 1.1 2002/10/31 21:44:22 rphillips Exp $ + +IUSE="sdl dga xv alsa esd opengl X 3dfx" + +A="xmame-0.60.1" +S=${WORKDIR}/${A} +DESCRIPTION="Multiple Arcade Machine Emulator for X11" +SRC_URI="http://x.mame.net/download/${A}.tar.bz2 + http://x.mame.net/download/0.60.1-0.61.1-pr1.diff.bz2 + http://x.mame.net/download/0.61.1-pr1-0.61.1-pr2.diff.bz2 + http://x.mame.net/download/0.61.1-pr2-0.61.1-pr3.diff.bz2 + http://x.mame.net/download/0.61.1-pr3-0.61.1-pr4.diff.bz2 + http://x.mame.net/download/0.61.1-pr4-0.61.1-pr5.diff.bz2 + http://x.mame.net/download/0.61.1-pr5-0.61.1-pr6.diff.bz2 + http://x.mame.net/download/0.61.1-pr6-0.61.1-pr7.diff.bz2 + http://x.mame.net/download/0.61.1-pr7-0.61.1-pr8.diff.bz2 + http://x.mame.net/download/0.61.1-pr8-0.61.1-pr9.diff.bz2" +HOMEPAGE="http://x.mame.net" +SLOT="0" +LICENSE="xmame" +DEPEND="xv? ( virtual/x11 ) + dga? ( virtual/x11 ) + sdl? ( >=media-libs/libsdl-1.2.0 ) + >=sys-libs/zlib-1.1.3-r2 + alsa? ( media-libs/alsa-lib ) + xv? ( >=x11-base/xfree-4.1.0 ) + dga? ( >=x11-base/xfree-4.1.0 ) + esd? ( >=media-sound/esound-0.2.29 )" + +# Please note modifications for ppc in this ebuild. If you update the ebuild, +# please either test on ppc, or send it to a ppc developer for testing before +# you commit the ebuild. Thanks :-) + +KEYWORDS="~x86 ~ppc" + +src_unpack() { + unpack ${A}.tar.bz2 + cd ${S} + bzcat ${DISTDIR}/0.60.1-0.61.1-pr1.diff.bz2 | patch -p1 + bzcat ${DISTDIR}/0.61.1-pr1-0.61.1-pr2.diff.bz2 | patch -p1 + bzcat ${DISTDIR}/0.61.1-pr2-0.61.1-pr3.diff.bz2 | patch -p1 + bzcat ${DISTDIR}/0.61.1-pr3-0.61.1-pr4.diff.bz2 | patch -p1 + bzcat ${DISTDIR}/0.61.1-pr4-0.61.1-pr5.diff.bz2 | patch -p1 + bzcat ${DISTDIR}/0.61.1-pr5-0.61.1-pr6.diff.bz2 | patch -p1 + bzcat ${DISTDIR}/0.61.1-pr6-0.61.1-pr7.diff.bz2 | patch -p1 + bzcat ${DISTDIR}/0.61.1-pr7-0.61.1-pr8.diff.bz2 | patch -p1 + bzcat ${DISTDIR}/0.61.1-pr8-0.61.1-pr9.diff.bz2 | patch -p1 + + sed -e "s:CFLAGS = -O -Wall:\#CFLAGS=:g" -e \ + "s:PREFIX = /usr/local:PREFIX = /usr:g" -e \ + "s:MANDIR = \$\(PREFIX\)/man/man6:MANDIR = \$\(PREFIX\)/share/man/man6:g" \ + makefile.unix > makefile.unix.tmp + mv makefile.unix.tmp makefile.unix + + if [ ${ARCH} = "x86" ] + then + # Enable joystick support + sed -e "s/\# JOY_I386/JOY_I386/g" makefile.unix > makefile.unix.tmp + mv makefile.unix.tmp makefile.unix + fi + + if [ ${ARCH} = "ppc" ] + then + sed -e "s:MY_CPU = i386:\#MY_CPU = i386:g" -e \ + "s:\# MY_CPU = risc$:MY_CPU = risc:" makefile.unix > makefile.unix.tmp + mv makefile.unix.tmp makefile.unix + fi + + if [ "`use esd`" ]; then + sed -e "s/\# SOUND_ESOUND/SOUND_ESOUND/g" makefile.unix > makefile.unix.tmp + mv makefile.unix.tmp makefile.unix + fi + + if [ "`use alsa`" ]; then + sed -e "s/\# SOUND_ALSA/SOUND_ALSA/g" makefile.unix > makefile.unix.tmp + mv makefile.unix.tmp makefile.unix + fi + + if [ "`use X`" ] || [ "`use dga`" ] || [ "`use xv`" ]; then + cp makefile.unix makefile.x11; + fi + + if [ "`use sdl`" ]; then + cp makefile.unix makefile.SDL + sed -e "s/DISPLAY_METHOD = x11/DISPLAY_METHOD = SDL/g" \ + makefile.SDL > makefile.SDL.tmp + mv makefile.SDL.tmp makefile.SDL + fi + + if [ "`use dga`" ]; then + sed -e "s/\# X11_DGA = 1/X11_DGA = 1/g" \ + makefile.x11 > makefile.x11.tmp + mv makefile.x11.tmp makefile.x11 + if [ "`use 3dfx`"]; then + sed -e "s/\# TDFX_DGA_WORKAROUND/TDFX_DGA_WORKAROUND/g" \ + makefile.x11 > makefile.x11.tmp + mv makefile.x11.tmp makefile.x11 + fi + if [ "`use sdl`" ]; then + sed -e "s/\# X11_DGA = 1/X11_DGA = 1/g" \ + makefile.SDL > makefile.SDL.tmp + mv makefile.SDL.tmp makefile.SDL + if [ "`use 3dfx`"]; then + sed -e "s/\# TDFX_DGA_WORKAROUND/TDFX_DGA_WORKAROUND/g" \ + makefile.SDL > makefile.SDL.tmp + mv makefile.SDL.tmp makefile.SDL + fi + fi + fi + +# Caleb Shay 08 Oct 2002 +# xmame.xgl is currently broken +# if [ "`use opengl`"; then +# cp makefile.x11 makefile.xgl +# sed -e "s:DISPLAY_METHOD = x11:DISPLAY_METHOD = xgl:g" \ +# makefile.xgl > makefile.xgl.tmp +# mv makefile.xgl.tmp makefile.xgl +# fi + + if [ "`use xv`" ]; then + sed -e "s/\# X11_XV = 1/X11_XV = 1/g" makefile.x11 > makefile.x11.tmp + mv makefile.x11.tmp makefile.x11 + fi +} + +src_compile() { + local MYFLAGS + MYFLAGS="" + # 08 Oct 2002 Caleb Shay + # Parallel makes breaks the build + MAKEOPTS="" + + if [ ${ARCH} = "ppc" ] ; then + # add Makefile suggested flags for ppc + MYFLAGS="${CFLAGS} -funroll-loops \ + -fstrength-reduce -fomit-frame-pointer -ffast-math -fsigned-char" + fi + if [ ${ARCH} = "x86" ] ; then + # add Makefile suggested flags for x86 + MYFLAGS="${CFLAGS} -O3 -Wall -Wno-unused -funroll-loops \ + -fstrength-reduce -fomit-frame-pointer -ffast-math -falign-functions=2 \ + -falign-jumps=2 -falign-loops=2" + fi + + # rphillips 23 Jul 2002 + # compile doesn't work on x86 platforms with -O3 optimizations + # Caleb Shay 08 Oct 2002 + # No longer true + # MYFLAGS=`echo $MYFLAGS | sed 's/-O3/-O2/'` + if [ "`use X`" ] || [ "`use dga`" ] || [ "`use xv`" ]; then + cp makefile.x11 Makefile + emake CFLAGS="${MYFLAGS}" || die + fi + if [ "`use sdl`" ]; then + cp makefile.SDL Makefile + emake CFLAGS="${MYFLAGS}" || die + fi +} + +src_install () { + + if [ "`use X`" ] || [ "`use dga`" ] || [ "`use xv`" ]; then + cp makefile.x11 Makefile + make \ + PREFIX=${D}/usr \ + MANDIR=${D}/usr/share/man/man6 \ + install + fi + if [ "`use sdl`" ]; then + cp makefile.SDL Makefile + make \ + PREFIX=${D}/usr \ + MANDIR=${D}/usr/share/man/man6 \ + install + fi + + dodoc doc/{changes.*,dga2.txt,gamelist.mame,readme.mame,xmamerc.dist} + dodoc doc/{xmame-doc.ps,xmame-doc.txt} + + dohtml -r doc + + if [ "`use sdl`" ]; then + dosym xmame.SDL /usr/bin/xmame + else + dosym xmame.x11 /usr/bin/xmame + fi + +} + +pkg_postinst() { + + if [ "`use sdl`" ]; then + einfo "xmame is a symbolic link to xmame.SDL" + if [ "`use X`" ] || [ "`use dga`" ] || [ "`use xv`" ]; then + einfo "If you wish to use x11 (non-SDL) mame, use xmame.x11" + fi + else + einfo "xmame is a symbolic link to xmame.x11" + fi + +} -- cgit v1.2.3-65-gdbad