diff options
| -rw-r--r-- | www-servers/monkeyd/ChangeLog | 11 | ||||
| -rw-r--r-- | www-servers/monkeyd/Manifest | 4 | ||||
| -rw-r--r-- | www-servers/monkeyd/files/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch | 78 | ||||
| -rw-r--r-- | www-servers/monkeyd/monkeyd-0.9.2-r1.ebuild | 72 |
4 files changed, 162 insertions, 3 deletions
diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog index 387470083948..a0f9a8a0ec89 100644 --- a/www-servers/monkeyd/ChangeLog +++ b/www-servers/monkeyd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-servers/monkeyd -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.19 2008/10/21 19:30:54 bangert Exp $ +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.20 2009/04/19 18:51:36 bangert Exp $ + +*monkeyd-0.9.2-r1 (19 Apr 2009) + + 19 Apr 2009; Thilo Bangert <bangert@gentoo.org> + +files/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserve + r.patch, +monkeyd-0.9.2-r1.ebuild: + misc qa fixes - fix --as-needed (bug #248483) 21 Oct 2008; Thilo Bangert <bangert@gentoo.org> +files/monkeyd-dont-strip-configure.patch, monkeyd-0.9.1.ebuild, diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest index 610e2d60eaa7..a4753eb02bb3 100644 --- a/www-servers/monkeyd/Manifest +++ b/www-servers/monkeyd/Manifest @@ -1,9 +1,11 @@ +AUX monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch 1890 RMD160 6d10bb69c4a63dc8a80b25039668262269953a03 SHA1 7fc8c6163818d6275c9afe9e24d28079a50491d8 SHA256 3134f3ccd32bc5411dec546737bf5aea28195516296c3bfb803b15d884a7d60d AUX monkeyd-dont-strip-configure.patch 570 RMD160 7ad63949856dcbde0bddbdcd7a64e31d0bcc5d9e SHA1 cf596e8d31540112693d0778dfdbb83e4faf281b SHA256 d273065df34464af7647d87df2f8c1a337c9d328a0e396b0fce3d196687b615d AUX monkeyd.conf.d 278 RMD160 cb1c63336d326d53385745979d7323ab6382809f SHA1 b574167bc11035297c1f784e9cb965edafba86e4 SHA256 403fd75c0a9dbdd6994e6b3dea2583f01c50a048fe2a904be305890b406d5074 AUX monkeyd.init.d 484 RMD160 c25ab63ecb67d6d97698f7d1451093ed2f418bd2 SHA1 5a88a47edc7c75c8756718057f611c8f38fed803 SHA256 a3f1f888cde204182a984138d4b33d3fa6e6a20570012a4a0809d50a27734db8 DIST monkey-0.9.1.tar.gz 84389 RMD160 71fc6e81aa755b5b5f449b213181d1c90ca4a9db SHA1 e54b870c0f597cdfc164e800246ed8445ce6d5fc SHA256 4fe2dbc41d5de1415a07ff9eae442be7ac42e64fe6b3d17d098849753744fc7a DIST monkey-0.9.2.tar.gz 86289 RMD160 fa45e3ad01eb97d4c603dbb0e2b0e9529116ed1f SHA1 1f42b9b1dc925afb6895acaae2caab1a3d4e13e5 SHA256 0f36328dc7e1f0c21ef01351874b68d53cae3fecefe0a21fc98de24a80877a3b EBUILD monkeyd-0.9.1.ebuild 2148 RMD160 8eab471b83d18f386bdd19e2d89cffb01ad65c56 SHA1 cd9f8d3d13dbe28a73aa50266df0cb95870f90ff SHA256 5149fa4c5bbda17053f2042d383aaa64a6747f26a7c205759a219950bbf33251 +EBUILD monkeyd-0.9.2-r1.ebuild 2039 RMD160 edf613fac68c1f2fe0b0d8658111eec09e2d1dae SHA1 049fea5a83c02a1b7b3f1c2f0608f57b6f1c2855 SHA256 e4a2620ba01452e533dda0d8004ecbba40698ab3ab637e89294300a61193c060 EBUILD monkeyd-0.9.2.ebuild 2143 RMD160 5a14acba7de621af7d3c151bb9b41736685a34e3 SHA1 21a51bd64fcf712aa1fe2ad6246c70efed04f4b8 SHA256 d0b2975076604503b52a3806ba8ac34da71b1bc119e789668bcb415e83f3977b -MISC ChangeLog 4148 RMD160 b0fe988eeb832a33e8adeb5597f004bf996cc3f3 SHA1 be486e8973e0bb94a74e57b5c5abbfabbdd975dd SHA256 5c93a578addea9e8f3743023318e5c9dd6519284bc9bd4a20a2d530251b85689 +MISC ChangeLog 4394 RMD160 2754ccac6486d4646e6f63e37294751acb0cee23 SHA1 edee62f618bc6cd741737700f408c50370d3a0f1 SHA256 44705538edf8b72760f52471ade8c87fa864caf728734d213ac04453afc60ae3 MISC metadata.xml 164 RMD160 898ac97013b213230bb265ed2ace7751bc5421bc SHA1 555fbb8a11872e4109122cce6c44861b3bda173d SHA256 23f2af7dc1d37e6e2c95358cd2399e487ebf8858a7e6f1798018196ade3132aa diff --git a/www-servers/monkeyd/files/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch b/www-servers/monkeyd/files/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch new file mode 100644 index 000000000000..a265d329d09b --- /dev/null +++ b/www-servers/monkeyd/files/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch @@ -0,0 +1,78 @@ +improve hand-made buildsystem + - fixes --as-needed link + - fixes jobserver + - fixes strip + +by bangert@gentoo.org +diff -Naur monkey-0.9.2.orig/configure monkey-0.9.2/configure +--- monkey-0.9.2.orig/configure 2008-01-17 12:29:36.000000000 +0100 ++++ monkey-0.9.2/configure 2009-04-19 20:38:00.000000000 +0200 +@@ -251,7 +251,7 @@ + # Monkey HTTP Daemon: Makefile + # ============================ + default: +- @(cd src; make all) ++ @(cd src; \$(MAKE) all) + @echo + @echo " Running Monkey :" + @echo " ----------------" +@@ -261,9 +261,9 @@ + @echo " For more help use '-h' option." + @echo + clean: +- @(cd src; make clean) ++ @(cd src; \$(MAKE) clean) + distclean: +- @(cd src; make distclean) ++ @(cd src; \$(MAKE) distclean) + EOF + } + +@@ -280,14 +280,14 @@ + LOGDIR=${logdir} + + default: +- @(cd src; make all) ++ @(cd src; \$(MAKE) all) + clean: +- @(cd src; make clean) ++ @(cd src; \$(MAKE) clean) + distclean: +- @(cd src; make distclean) ++ @(cd src; \$(MAKE) distclean) + + install: +- make -C src all ++ \$(MAKE) -C src all + install -d \$(BINDIR) + install -d \$(CGIBIN) + install -d \$(SYSCONFDIR) +@@ -296,7 +296,7 @@ + install -d \${DATADIR}/php + install -d \${DATADIR}/docs + install -d \${LOGDIR} +- install -s -m 755 bin/monkey \$(BINDIR) ++ install -m 755 bin/monkey \$(BINDIR) + install -m 755 bin/banana \$(BINDIR) + install -m 755 ./cgi-bin/* \$(CGIBIN) + install -m 600 ./conf/*.* \$(SYSCONFDIR) +@@ -334,9 +334,7 @@ + cat > src/Makefile<<EOF + CC = $CC + DEFS = $mod_defs +-CFLAGS = \$(DEFS) -g -O2 -Wall + INCDIR = ./include +-LDFLAGS = + DESTDIR = ../bin/monkey + LIBS = -lpthread $mod_libs $MORE_LIBS + OBJ = monkey.o method.o mimetype.o request.o \\ +@@ -350,8 +348,7 @@ + $make_script + + ../bin/monkey: \$(OBJ) +- \$(CC) \$(CFLAGS) \$(LIBS) \$(LDFLAGS) -o \$@ \$(OBJ) $mod_obj +- $STRIP ../bin/monkey ++ \$(CC) \$(CFLAGS) \$(LDFLAGS) -o \$@ \$(OBJ) $mod_obj \$(LIBS) + + clean: + rm -rf *.o diff --git a/www-servers/monkeyd/monkeyd-0.9.2-r1.ebuild b/www-servers/monkeyd/monkeyd-0.9.2-r1.ebuild new file mode 100644 index 000000000000..59d386586264 --- /dev/null +++ b/www-servers/monkeyd/monkeyd-0.9.2-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.2-r1.ebuild,v 1.1 2009/04/19 18:51:36 bangert Exp $ + +EAPI="2" + +inherit toolchain-funcs eutils + +WEBROOT=/var/www/localhost + +MY_P="${PN/d}-${PV}" +DESCRIPTION="Fast, efficient, (REALLY) small, and easy to configure web server" +HOMEPAGE="http://monkeyd.sourceforge.net/" +SRC_URI="http://monkeyd.sourceforge.net/versions/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" +IUSE="php" + +RDEPEND="php? ( virtual/httpd-php[cgi] )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + epatch "${FILESDIR}/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch" + + # Don't install the banana script, it is broken as is anyway and the + # functionality is provided by the ${FILESDIR}/monkeyd.init.d script. + sed -i '/install -m 755 bin\/banana/d' configure || die "sed banana" +} + +src_configure() { + # monkey has it's own funky script ... cant use econf + ./configure \ + --prefix=/usr \ + --bindir=/usr/bin \ + --cgibin=${WEBROOT}/cgi-bin \ + --sysconfdir=/etc/${PN} \ + --datadir=${WEBROOT}/htdocs \ + --logdir=/var/log/${PN} \ + --lang=en \ + || die +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed" +} + +src_install() { + make \ + PREFIX="${D}"/usr \ + BINDIR="${D}"/usr/bin \ + CGIBIN="${D}"${WEBROOT}/cgi-bin \ + SYSCONFDIR="${D}"/etc/${PN} \ + DATADIR="${D}"${WEBROOT}/htdocs \ + LOGDIR="${D}"/var/log/${PN} \ + install \ + || die "make install failed" + + if use php ; then + dosed '/^#AddScript application\/x-httpd-php/s:^#::' /etc/monkeyd/monkey.conf + dosed 's:/home/my_home/php/bin/php:/usr/bin/php-cgi:' /etc/monkeyd/monkey.conf + fi + + mv "${D}"${WEBROOT}/htdocs/{index,index-monkey}.html + + dosed "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" /etc/monkeyd/monkey.conf + newinitd "${FILESDIR}"/monkeyd.init.d monkeyd + newconfd "${FILESDIR}"/monkeyd.conf.d monkeyd + dodoc README MODULES *.txt +} |