diff options
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/monkeyd/ChangeLog | 11 | ||||
| -rw-r--r-- | www-servers/monkeyd/files/digest-monkeyd-0.9.0-r1 (renamed from www-servers/monkeyd/files/digest-monkeyd-0.9.0) | 0 | ||||
| -rw-r--r-- | www-servers/monkeyd/files/monkeyd.init.d | 18 | ||||
| -rw-r--r-- | www-servers/monkeyd/metadata.xml | 2 | ||||
| -rw-r--r-- | www-servers/monkeyd/monkeyd-0.9.0-r1.ebuild (renamed from www-servers/monkeyd/monkeyd-0.9.0.ebuild) | 12 |
5 files changed, 24 insertions, 19 deletions
diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog index 98945186929c..ecb494e3078a 100644 --- a/www-servers/monkeyd/ChangeLog +++ b/www-servers/monkeyd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-servers/monkeyd -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.5 2004/12/09 02:05:56 vapier Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.6 2005/02/20 22:47:11 vapier Exp $ + +*monkeyd-0.9.0-r1 (20 Feb 2005) + + 20 Feb 2005; Mike Frysinger <vapier@gentoo.org> metadata.xml, + files/monkeyd.init.d, +monkeyd-0.9.0-r1.ebuild, -monkeyd-0.9.0.ebuild: + Dont install the banana script #82567 and fix the init.d script to work + better #82566 by James Rowe. *monkeyd-0.9.0 (08 Dec 2004) diff --git a/www-servers/monkeyd/files/digest-monkeyd-0.9.0 b/www-servers/monkeyd/files/digest-monkeyd-0.9.0-r1 index 657420e08189..657420e08189 100644 --- a/www-servers/monkeyd/files/digest-monkeyd-0.9.0 +++ b/www-servers/monkeyd/files/digest-monkeyd-0.9.0-r1 diff --git a/www-servers/monkeyd/files/monkeyd.init.d b/www-servers/monkeyd/files/monkeyd.init.d index e9d6eecca508..a71c9cb0d472 100644 --- a/www-servers/monkeyd/files/monkeyd.init.d +++ b/www-servers/monkeyd/files/monkeyd.init.d @@ -1,28 +1,22 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/files/monkeyd.init.d,v 1.2 2004/09/28 02:02:09 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/files/monkeyd.init.d,v 1.3 2005/02/20 22:47:11 vapier Exp $ depend() { - need net + use net } start() { ebegin "Starting monkeyd" - /usr/bin/monkey -D start &>/dev/null + /usr/bin/monkey -D &> /dev/null eend $? } stop() { ebegin "Stopping monkeyd" - /usr/bin/monkey stop &>/dev/null + start-stop-daemon --stop --quiet --pidfile ${MONKEY_PID} ret=$? + rm -f ${MONKEY_PID} eend ${ret} - - if [ ${ret} -ne 0 ] && [ -f ${MONKEY_PID} ] ; then - ebegin " Killing monkeyd" - kill `cat ${MONKEY_PID}` &>/dev/null - eend $? - rm -f ${MONKEY_PID} &>/dev/null - fi } diff --git a/www-servers/monkeyd/metadata.xml b/www-servers/monkeyd/metadata.xml index 87c085844c38..bf4811e274e0 100644 --- a/www-servers/monkeyd/metadata.xml +++ b/www-servers/monkeyd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>www-servers</herd> +<herd>www-servers</herd> </pkgmetadata> diff --git a/www-servers/monkeyd/monkeyd-0.9.0.ebuild b/www-servers/monkeyd/monkeyd-0.9.0-r1.ebuild index 5727f0e9d2c5..28e43f440494 100644 --- a/www-servers/monkeyd/monkeyd-0.9.0.ebuild +++ b/www-servers/monkeyd/monkeyd-0.9.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.0.ebuild,v 1.1 2004/12/09 02:05:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.0-r1.ebuild,v 1.1 2005/02/20 22:47:11 vapier Exp $ inherit toolchain-funcs @@ -13,7 +13,7 @@ SRC_URI="http://monkeyd.sourceforge.net/versions/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc" +KEYWORDS="~amd64 ppc sparc x86" IUSE="php" DEPEND="virtual/libc @@ -26,11 +26,12 @@ S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} cd ${S} - sed -i -e '/strip /s:.*::' src/Makefile + sed -i -e '/install -m 755 bin\/banana/d' configure || die "sed banana" } src_compile() { # monkey has it's own funky script ... cant use econf + env STRIP=true \ ./configure \ --prefix=/usr \ --bindir=/usr/bin \ @@ -40,6 +41,9 @@ src_compile() { --logdir=/var/log/${PN} \ --lang=en \ || die + # Don't install the banana script, it is broken as is anyway and the + # functionality is provided by the ${FILESDIR}/monkeyd.init.d script. + sed -i '/install -m 755 bin\/banana/d' Makefile emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die } |