* [gentoo-commits] gentoo-x86 commit in www-servers/monkeyd: ChangeLog monkeyd-1.0.1-r1.ebuild
@ 2012-08-08 12:17 Anthony G. Basile (blueness)
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile (blueness) @ 2012-08-08 12:17 UTC (permalink / raw
To: gentoo-commits
blueness 12/08/08 12:17:18
Modified: ChangeLog
Added: monkeyd-1.0.1-r1.ebuild
Log:
Move distribution's htdocs to doc dir, bug #429632
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Revision Changes Path
1.43 www-servers/monkeyd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?r1=1.42&r2=1.43
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog 1 Aug 2012 15:57:03 -0000 1.42
+++ ChangeLog 8 Aug 2012 12:17:18 -0000 1.43
@@ -1,6 +1,12 @@
# ChangeLog for www-servers/monkeyd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.42 2012/08/01 15:57:03 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.43 2012/08/08 12:17:18 blueness Exp $
+
+*monkeyd-1.0.1-r1 (08 Aug 2012)
+
+ 08 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+ +monkeyd-1.0.1-r1.ebuild:
+ Move distribution's htdocs to doc dir, bug #429632
01 Aug 2012; Anthony G. Basile <blueness@gentoo.org> monkeyd-1.0.1.ebuild:
Stable arm, bug #426664
1.1 www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild?rev=1.1&content-type=text/plain
Index: monkeyd-1.0.1-r1.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild,v 1.1 2012/08/08 12:17:18 blueness Exp $
EAPI="4"
inherit toolchain-funcs depend.php multilib
WEBROOT="/var/www/localhost"
MY_P="${PN/d}-${PV}"
DESCRIPTION="A small, fast, and scalable web server"
HOMEPAGE="http://www.monkey-project.com/"
SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
IUSE="php"
RDEPEND="php? ( virtual/httpd-php )"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
use php && require_php_cgi
}
src_prepare() {
# Don't install the banana script, we use ${FILESDIR}/monkeyd.initd
sed -i '/install -m 755 bin\/banana/d' configure || die "sed banana"
# Don't explicitly strip files
sed -i -e '/$STRIP /d' -e 's/install -s -m 644/install -m 755/' configure || die
}
src_configure() {
# Non-autotools configure
./configure \
--prefix=/usr \
--bindir=/usr/bin \
--datadir=${WEBROOT}/htdocs \
--logdir=/var/log/${PN} \
--mandir=/usr/share/man \
--plugdir=/usr/$(get_libdir)/monkeyd/plugins \
--sysconfdir=/etc/${PN} \
|| die
}
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
# Don't install the banana script man page
rm "${S}"/man/banana.1
}
src_install() {
default
if use php ; then
sed -i -e '/^#AddScript application\/x-httpd-php/s:^#::' "${D}"/etc/monkeyd/monkey.conf || die
sed -i -e 's:/home/my_home/php/bin/php:/usr/bin/php-cgi:' "${D}"/etc/monkeyd/monkey.conf || die
fi
sed -i -e "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" "${D}"/etc/monkeyd/monkey.conf || die
newinitd "${FILESDIR}"/monkeyd.initd monkeyd
newconfd "${FILESDIR}"/monkeyd.confd monkeyd
docompress -x /usr/share/doc/"${PF}"/htdocs.dist
mv "${D}"${WEBROOT}/htdocs \
"${D}"/usr/share/doc/"${PF}"/htdocs.dist
mkdir "${D}"${WEBROOT}/htdocs
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/monkeyd: ChangeLog monkeyd-1.0.1-r1.ebuild
@ 2012-08-08 12:35 Anthony G. Basile (blueness)
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile (blueness) @ 2012-08-08 12:35 UTC (permalink / raw
To: gentoo-commits
blueness 12/08/08 12:35:24
Modified: ChangeLog monkeyd-1.0.1-r1.ebuild
Log:
Add keepdir for empty directories
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Revision Changes Path
1.44 www-servers/monkeyd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?r1=1.43&r2=1.44
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog 8 Aug 2012 12:17:18 -0000 1.43
+++ ChangeLog 8 Aug 2012 12:35:24 -0000 1.44
@@ -1,12 +1,15 @@
# ChangeLog for www-servers/monkeyd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.43 2012/08/08 12:17:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.44 2012/08/08 12:35:24 blueness Exp $
+
+ 08 Aug 2012; Anthony G. Basile <blueness@gentoo.org> monkeyd-1.0.1-r1.ebuild:
+ Add keepdir for empty directories
*monkeyd-1.0.1-r1 (08 Aug 2012)
08 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+monkeyd-1.0.1-r1.ebuild:
- Move distribution's htdocs to doc dir, bug #429632
+ Move htdocs to docdir, bug #429632
01 Aug 2012; Anthony G. Basile <blueness@gentoo.org> monkeyd-1.0.1.ebuild:
Stable arm, bug #426664
1.2 www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild?r1=1.1&r2=1.2
Index: monkeyd-1.0.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monkeyd-1.0.1-r1.ebuild 8 Aug 2012 12:17:18 -0000 1.1
+++ monkeyd-1.0.1-r1.ebuild 8 Aug 2012 12:35:24 -0000 1.2
@@ -1,13 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild,v 1.1 2012/08/08 12:17:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild,v 1.2 2012/08/08 12:35:24 blueness Exp $
EAPI="4"
inherit toolchain-funcs depend.php multilib
-WEBROOT="/var/www/localhost"
-
MY_P="${PN/d}-${PV}"
DESCRIPTION="A small, fast, and scalable web server"
HOMEPAGE="http://www.monkey-project.com/"
@@ -22,6 +20,8 @@
S="${WORKDIR}/${MY_P}"
+WEBROOT="/var/www/localhost"
+
pkg_setup() {
use php && require_php_cgi
}
@@ -66,10 +66,13 @@
newinitd "${FILESDIR}"/monkeyd.initd monkeyd
newconfd "${FILESDIR}"/monkeyd.confd monkeyd
+ #move htdocs to docdir, bug #429632
docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-
mv "${D}"${WEBROOT}/htdocs \
"${D}"/usr/share/doc/"${PF}"/htdocs.dist
-
mkdir "${D}"${WEBROOT}/htdocs
+
+ keepdir \
+ /var/log/monkeyd \
+ ${WEBROOT}/htdocs
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-08 12:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-08 12:35 [gentoo-commits] gentoo-x86 commit in www-servers/monkeyd: ChangeLog monkeyd-1.0.1-r1.ebuild Anthony G. Basile (blueness)
-- strict thread matches above, loose matches on Subject: below --
2012-08-08 12:17 Anthony G. Basile (blueness)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox