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