1 |
blueness 14/05/26 17:26:25 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: monkeyd-1.5.0.ebuild |
5 |
Log: |
6 |
Version bump |
7 |
|
8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA) |
9 |
|
10 |
Revision Changes Path |
11 |
1.69 www-servers/monkeyd/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.69&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.69&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?r1=1.68&r2=1.69 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v |
20 |
retrieving revision 1.68 |
21 |
retrieving revision 1.69 |
22 |
diff -u -r1.68 -r1.69 |
23 |
--- ChangeLog 6 Feb 2014 16:12:25 -0000 1.68 |
24 |
+++ ChangeLog 26 May 2014 17:26:25 -0000 1.69 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for www-servers/monkeyd |
27 |
# Copyright 1999- Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.68 2014/02/06 16:12:25 blueness Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.69 2014/05/26 17:26:25 blueness Exp $ |
30 |
+ |
31 |
+*monkeyd-1.5.0 (26 May 2014) |
32 |
+ |
33 |
+ 26 May 2014; Anthony G. Basile <blueness@g.o> |
34 |
+ +files/monkeyd-1.5.0-fix-CPPFLAGS.patch, |
35 |
+ +files/monkeyd-1.5.0-use-system-jemalloc.patch, +monkeyd-1.5.0.ebuild: |
36 |
+ Version bump |
37 |
|
38 |
06 Feb 2014; Anthony G. Basile <blueness@g.o> |
39 |
+files/monkeyd-1.4.0-use-system-jemalloc.patch, |
40 |
|
41 |
|
42 |
|
43 |
1.1 www-servers/monkeyd/monkeyd-1.5.0.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.5.0.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.5.0.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: monkeyd-1.5.0.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2014 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.5.0.ebuild,v 1.1 2014/05/26 17:26:25 blueness Exp $ |
53 |
|
54 |
EAPI="5" |
55 |
|
56 |
inherit toolchain-funcs depend.php multilib |
57 |
|
58 |
MY_P="${PN/d}-${PV}" |
59 |
DESCRIPTION="A small, fast, and scalable web server" |
60 |
HOMEPAGE="http://www.monkey-project.com/" |
61 |
SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz" |
62 |
|
63 |
LICENSE="GPL-2" |
64 |
SLOT="0" |
65 |
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" |
66 |
|
67 |
# ssl is broken, so we turn it off until fixed |
68 |
IUSE="-debug jemalloc php minimal musl uclibc monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril" |
69 |
|
70 |
# uclibc is often compiled without backtrace info so we should |
71 |
# force this off. If someone complains, consider relaxing it. |
72 |
# ssl is borken, so we remove "ssl? ( monkeyd_plugins_polarssl )" |
73 |
REQUIRED_USE="uclibc? ( !debug )" |
74 |
|
75 |
DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )" |
76 |
RDEPEND="php? ( dev-lang/php )" |
77 |
|
78 |
S="${WORKDIR}/${MY_P}" |
79 |
|
80 |
WEBROOT="/var/www/localhost" |
81 |
|
82 |
pkg_setup() { |
83 |
use php && require_php_cgi |
84 |
|
85 |
if use debug; then |
86 |
ewarn |
87 |
ewarn "\033[1;33m**************************************************\033[00m" |
88 |
ewarn "Do not use debug in production!" |
89 |
ewarn "\033[1;33m**************************************************\033[00m" |
90 |
ewarn |
91 |
fi |
92 |
} |
93 |
|
94 |
src_prepare() { |
95 |
# Unconditionally get rid of the bundled jemalloc |
96 |
rm -rf "${S}"/deps |
97 |
epatch "${FILESDIR}"/${PN}-1.5.0-use-system-jemalloc.patch |
98 |
epatch "${FILESDIR}"/${PN}-1.5.0-fix-CPPFLAGS.patch |
99 |
|
100 |
# Don't install the banana script, we use ${FILESDIR}/monkeyd.initd instead |
101 |
sed -i '/Creating bin\/banana/d' configure || die "No configure file" |
102 |
sed -i '/create_banana_script bindir/d' configure || die "No configure file" |
103 |
|
104 |
# Don't explicitly strip files |
105 |
sed -i -e '/$STRIP /d' -e 's/install -s -m 644/install -m 755/' configure || die "No configure file" |
106 |
|
107 |
# We don't need the includes, sym link to libmonkey.so, or monkey.cp when not installing the .so |
108 |
use minimal && { |
109 |
sed -i '/install -d \\$(INCDIR)/d' configure || die "No configure file" |
110 |
sed -i '/install -m 644 src\/include\/\*.h \\$(INCDIR)/d' configure || die "No configure file" |
111 |
sed -i '/ln -sf/d' configure || die "No configure file" |
112 |
sed -i '/install -d \\$(LIBDIR)\/pkgconfig/d' configure || die "No configure file" |
113 |
sed -i '/install -m 644 monkey.pc \\$(LIBDIR)\/pkgconfig/d' configure || die "No configure file" |
114 |
} |
115 |
|
116 |
# Unquiet build |
117 |
sed -i '/^CC\s/d' configure || die "No configure file" |
118 |
sed -i 's/^\(CC_QUIET=\).*/\1 \\\$(CC)/' configure || die "No configure file" |
119 |
sed -i 's/^\(.*MAKE.*\)-s\(.*\)$/\1\2/' configure || die "No configure file" |
120 |
makes=$(find . -iname Makefile.in) |
121 |
for f in ${makes}; do |
122 |
sed -i '/^CC\s/d' $f || die "No file "$f |
123 |
sed -i 's/^\(CC_QUIET=\).*/\1 \$(CC)/' $f || die "No file "$f |
124 |
done |
125 |
} |
126 |
|
127 |
src_configure() { |
128 |
local myconf="" |
129 |
|
130 |
use uclibc && myconf+=" --uclib-mode" |
131 |
use musl && myconf+=" --musl-mode" |
132 |
|
133 |
use minimal || myconf+=" --enable-shared" |
134 |
use jemalloc || myconf+=" --malloc-libc" |
135 |
|
136 |
if use debug; then |
137 |
myconf+=" --debug --trace" |
138 |
else |
139 |
myconf+=" --no-backtrace" |
140 |
fi |
141 |
|
142 |
local enable_plugins="" |
143 |
local disable_plugins="" |
144 |
for p in ${PLUGINS}; do |
145 |
cp=${p/monkeyd_plugins_/} |
146 |
use $p && enable_plugins+="${cp}," || disable_plugins+="${cp}," |
147 |
done |
148 |
myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}" |
149 |
|
150 |
# Non-autotools configure |
151 |
./configure \ |
152 |
--prefix=/usr \ |
153 |
--bindir=/usr/bin \ |
154 |
--datadir=${WEBROOT}/htdocs \ |
155 |
--logdir=/var/log/${PN} \ |
156 |
--mandir=/usr/share/man \ |
157 |
--libdir=/usr/$(get_libdir) \ |
158 |
--plugdir=/usr/$(get_libdir)/monkeyd/plugins \ |
159 |
--sysconfdir=/etc/${PN} \ |
160 |
--platform="generic" \ |
161 |
${myconf} \ |
162 |
|| die |
163 |
} |
164 |
|
165 |
src_compile() { |
166 |
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" |
167 |
|
168 |
# Don't install the banana script man page |
169 |
rm "${S}"/man/banana.1 |
170 |
} |
171 |
|
172 |
src_install() { |
173 |
default |
174 |
|
175 |
if use php ; then |
176 |
sed -i -e '/^#AddScript application\/x-httpd-php/s:^#::' "${D}"/etc/monkeyd/monkey.conf || die |
177 |
sed -i -e 's:/home/my_home/php/bin/php:/usr/bin/php-cgi:' "${D}"/etc/monkeyd/monkey.conf || die |
178 |
fi |
179 |
|
180 |
sed -i -e "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" "${D}"/etc/monkeyd/monkey.conf || die |
181 |
newinitd "${FILESDIR}"/monkeyd.initd monkeyd |
182 |
newconfd "${FILESDIR}"/monkeyd.confd monkeyd |
183 |
|
184 |
#move htdocs to docdir, bug #429632 |
185 |
docompress -x /usr/share/doc/"${PF}"/htdocs.dist |
186 |
mv "${D}"${WEBROOT}/htdocs \ |
187 |
"${D}"/usr/share/doc/"${PF}"/htdocs.dist |
188 |
mkdir "${D}"${WEBROOT}/htdocs |
189 |
|
190 |
keepdir \ |
191 |
/var/log/monkeyd \ |
192 |
${WEBROOT}/htdocs |
193 |
} |