version bump + #22081

9 files changed, 50 insertions, 55 deletions

diff --git a/net-www/monkeyd/ChangeLog b/net-www/monkeyd/ChangeLog
index dfffeb8b519a..c93e574d4738 100644
--- a/net-www/monkeyd/ChangeLog
+++ b/net-www/monkeyd/ChangeLog
@@ -1,9 +1,11 @@
 # ChangeLog for net-www/monkeyd
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/monkeyd/ChangeLog,v 1.3 2003/04/28 07:19:49 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/monkeyd/ChangeLog,v 1.4 2003/06/13 18:40:53 vapier Exp $
 
-  28 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> monkeyd-0.6.3.ebuild:
-  Unmasked
+*monkeyd-0.7.1 (13 Jun 2003)
+
+  13 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + init script (#22081).
 
 *monkeyd-0.6.3 (16 Apr 2003)
 
diff --git a/net-www/monkeyd/Manifest b/net-www/monkeyd/Manifest
index cd5e7edf0d34..fcffd483d607 100644
--- a/net-www/monkeyd/Manifest
+++ b/net-www/monkeyd/Manifest
@@ -1,5 +1,5 @@
-MD5 03896887927bb8e15927b9df91877fe7 ChangeLog 555
-MD5 f043543b446ade0b87641c7b50850c21 monkeyd-0.6.1.ebuild 1075
-MD5 fb7b0b378b57dd5597a16b0c5498ea62 monkeyd-0.6.3.ebuild 1073
-MD5 43f3037078d84a3cf94de358cf8f6a27 files/digest-monkeyd-0.6.1 63
-MD5 a14ca00d61f3b1c975ee8fb723e6867f files/digest-monkeyd-0.6.3 63
+MD5 67d0bfe55dd9af4fae40ffebdce2d59e monkeyd-0.7.1.ebuild 1282
+MD5 001491e6888383f59c11492bcc497753 ChangeLog 595
+MD5 2684524154c9644f7d7e4913f8586751 files/digest-monkeyd-0.7.1 63
+MD5 4e93557968ed9b45e8016886daab7ec1 files/monkeyd.conf.d 277
+MD5 2c88febbee00d27c364488e8811dec69 files/monkeyd.init.d 520
diff --git a/net-www/monkeyd/files/digest-monkeyd-0.6.1 b/net-www/monkeyd/files/digest-monkeyd-0.6.1
deleted file mode 100644
index 59bab0eeba73..000000000000
--- a/net-www/monkeyd/files/digest-monkeyd-0.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5e32d9c7c0f9d993f775fbdcda14081 monkey-0.6.1.tar.gz 62219
diff --git a/net-www/monkeyd/files/digest-monkeyd-0.6.3 b/net-www/monkeyd/files/digest-monkeyd-0.6.3
deleted file mode 100644
index d86dbd2d6caa..000000000000
--- a/net-www/monkeyd/files/digest-monkeyd-0.6.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d744cd3ab8d2b52079d385314e3975fb monkey-0.6.3.tar.gz 64136
diff --git a/net-www/monkeyd/files/digest-monkeyd-0.7.1 b/net-www/monkeyd/files/digest-monkeyd-0.7.1
new file mode 100644
index 000000000000..feb60a16d03d
--- /dev/null
+++ b/net-www/monkeyd/files/digest-monkeyd-0.7.1
@@ -0,0 +1 @@
+MD5 b5d2475cd251a690c5beffa440ce36ce monkey-0.7.1.tar.gz 74249
diff --git a/net-www/monkeyd/files/monkeyd.conf.d b/net-www/monkeyd/files/monkeyd.conf.d
new file mode 100644
index 000000000000..eab9a13bbbc1
--- /dev/null
+++ b/net-www/monkeyd/files/monkeyd.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/net-www/monkeyd/files/monkeyd.conf.d,v 1.1 2003/06/13 18:40:54 vapier Exp $
+
+# this should be fine
+MONKEY_PID=/var/run/monkey.pid
diff --git a/net-www/monkeyd/files/monkeyd.init.d b/net-www/monkeyd/files/monkeyd.init.d
new file mode 100644
index 000000000000..ec92e2888bbe
--- /dev/null
+++ b/net-www/monkeyd/files/monkeyd.init.d
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/monkeyd/files/monkeyd.init.d,v 1.1 2003/06/13 18:40:54 vapier Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting monkeyd"
+	/usr/bin/monkey -D start &>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping monkeyd"
+	/usr/bin/monkey stop &>/dev/null
+	ret=$?
+	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/net-www/monkeyd/monkeyd-0.6.3.ebuild b/net-www/monkeyd/monkeyd-0.6.3.ebuild
deleted file mode 100644
index f6106f398e42..000000000000
--- a/net-www/monkeyd/monkeyd-0.6.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/monkeyd/monkeyd-0.6.3.ebuild,v 1.2 2003/04/28 07:19:49 aliz Exp $
-
-MY_P="${PN/d}-${PV}"
-DESCRIPTION="fast, efficient, (REALLY) small, and easy to configure web server"
-SRC_URI="http://monkeyd.sourceforge.net/versions/${MY_P}.tar.gz"
-HOMEPAGE="http://monkeyd.sourceforge.net/"
-
-KEYWORDS="x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/glibc"
-RDEPEND="virtual/glibc"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--cgibin=/home/httpd/cgi-bin \
-		--sysconfdir=/etc/${PN} \
-		--datadir=/home/httpd/htdocs \
-		--logdir=/var/log/${PN} \
-		--lang=en \
-		|| die
-	emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	make \
-		PREFIX=${D}/usr \
-		BINDIR=${D}/usr/bin \
-		CGIBIN=${D}/home/httpd/cgi-bin \
-		SYSCONFDIR=${D}/etc/${PN} \
-		DATADIR=${D}/home/httpd/htdocs \
-		LOGDIR=${D}/var/log/${PN} \
-		install \
-		|| die
-	dodoc CREDITOS HowItWorks.txt README ChangeLog NEWS
-}
diff --git a/net-www/monkeyd/monkeyd-0.6.1.ebuild b/net-www/monkeyd/monkeyd-0.7.1.ebuild
index 80de1b66f104..d79b953469f3 100644
--- a/net-www/monkeyd/monkeyd-0.6.1.ebuild
+++ b/net-www/monkeyd/monkeyd-0.7.1.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/net-www/monkeyd/monkeyd-0.6.1.ebuild,v 1.1 2003/03/04 08:43:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/monkeyd/monkeyd-0.7.1.ebuild,v 1.1 2003/06/13 18:40:54 vapier Exp $
 
 MY_P="${PN/d}-${PV}"
 DESCRIPTION="fast, efficient, (REALLY) small, and easy to configure web server"
@@ -39,5 +39,8 @@ src_install() {
 		LOGDIR=${D}/var/log/${PN} \
 		install \
 		|| die
-	dodoc CREDITOS HowItWorks.txt README ChangeLog NEWS
+	dosed "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" /etc/monkeyd/monkey.conf
+	exeinto /etc/init.d ; newexe ${FILESDIR}/monkeyd.init.d monkeyd
+	insinto /etc/conf.d ; newins ${FILESDIR}/monkeyd.conf.d monkeyd
+	dodoc MODULES HowItWorks.txt README ChangeLog
 }