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