| 1 |
bangert 08/06/28 19:12:54 |
| 2 |
|
| 3 |
Modified: monkeyd-0.9.1.ebuild ChangeLog |
| 4 |
Added: monkeyd-0.9.2.ebuild |
| 5 |
Log: |
| 6 |
version bump - bug #207306 - thanks Florian |
| 7 |
(Portage version: 2.1.4.4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.9 www-servers/monkeyd/monkeyd-0.9.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.1.ebuild?rev=1.9&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.1.ebuild?rev=1.9&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.1.ebuild?r1=1.8&r2=1.9 |
| 15 |
|
| 16 |
Index: monkeyd-0.9.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.1.ebuild,v |
| 19 |
retrieving revision 1.8 |
| 20 |
retrieving revision 1.9 |
| 21 |
diff -u -r1.8 -r1.9 |
| 22 |
--- monkeyd-0.9.1.ebuild 23 Feb 2007 19:39:50 -0000 1.8 |
| 23 |
+++ monkeyd-0.9.1.ebuild 28 Jun 2008 19:12:54 -0000 1.9 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2007 Gentoo Foundation |
| 26 |
+# Copyright 1999-2008 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.1.ebuild,v 1.8 2007/02/23 19:39:50 bangert Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.1.ebuild,v 1.9 2008/06/28 19:12:54 bangert Exp $ |
| 30 |
|
| 31 |
inherit toolchain-funcs depend.php |
| 32 |
|
| 33 |
@@ -26,7 +26,7 @@ |
| 34 |
|
| 35 |
src_unpack() { |
| 36 |
unpack ${A} |
| 37 |
- cd ${S} |
| 38 |
+ cd "${S}" |
| 39 |
sed -i '/install -m 755 bin\/banana/d' configure || die "sed banana" |
| 40 |
} |
| 41 |
|
| 42 |
@@ -50,12 +50,12 @@ |
| 43 |
|
| 44 |
src_install() { |
| 45 |
make \ |
| 46 |
- PREFIX=${D}/usr \ |
| 47 |
- BINDIR=${D}/usr/bin \ |
| 48 |
- CGIBIN=${D}${WEBROOT}/cgi-bin \ |
| 49 |
- SYSCONFDIR=${D}/etc/${PN} \ |
| 50 |
- DATADIR=${D}${WEBROOT}/htdocs \ |
| 51 |
- LOGDIR=${D}/var/log/${PN} \ |
| 52 |
+ PREFIX="${D}"/usr \ |
| 53 |
+ BINDIR="${D}"/usr/bin \ |
| 54 |
+ CGIBIN="${D}"${WEBROOT}/cgi-bin \ |
| 55 |
+ SYSCONFDIR="${D}"/etc/${PN} \ |
| 56 |
+ DATADIR="${D}"${WEBROOT}/htdocs \ |
| 57 |
+ LOGDIR="${D}"/var/log/${PN} \ |
| 58 |
install \ |
| 59 |
|| die "make install failed" |
| 60 |
|
| 61 |
@@ -65,10 +65,10 @@ |
| 62 |
fi |
| 63 |
|
| 64 |
[[ -e ${WEBROOT}/htdocs/index.html ]] && \ |
| 65 |
- mv ${D}${WEBROOT}/htdocs/{index,index-monkey}.html |
| 66 |
+ mv "${D}"${WEBROOT}/htdocs/{index,index-monkey}.html |
| 67 |
|
| 68 |
dosed "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" /etc/monkeyd/monkey.conf |
| 69 |
- newinitd ${FILESDIR}/monkeyd.init.d monkeyd |
| 70 |
- newconfd ${FILESDIR}/monkeyd.conf.d monkeyd |
| 71 |
+ newinitd "${FILESDIR}"/monkeyd.init.d monkeyd |
| 72 |
+ newconfd "${FILESDIR}"/monkeyd.conf.d monkeyd |
| 73 |
dodoc README MODULES *.txt |
| 74 |
} |
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.18 www-servers/monkeyd/ChangeLog |
| 79 |
|
| 80 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.18&view=markup |
| 81 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.18&content-type=text/plain |
| 82 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/monkeyd/ChangeLog?r1=1.17&r2=1.18 |
| 83 |
|
| 84 |
Index: ChangeLog |
| 85 |
=================================================================== |
| 86 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v |
| 87 |
retrieving revision 1.17 |
| 88 |
retrieving revision 1.18 |
| 89 |
diff -u -r1.17 -r1.18 |
| 90 |
--- ChangeLog 23 Feb 2007 19:39:50 -0000 1.17 |
| 91 |
+++ ChangeLog 28 Jun 2008 19:12:54 -0000 1.18 |
| 92 |
@@ -1,6 +1,12 @@ |
| 93 |
# ChangeLog for www-servers/monkeyd |
| 94 |
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 95 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.17 2007/02/23 19:39:50 bangert Exp $ |
| 96 |
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 97 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.18 2008/06/28 19:12:54 bangert Exp $ |
| 98 |
+ |
| 99 |
+*monkeyd-0.9.2 (28 Jun 2008) |
| 100 |
+ |
| 101 |
+ 28 Jun 2008; Thilo Bangert <bangert@g.o> monkeyd-0.9.1.ebuild, |
| 102 |
+ +monkeyd-0.9.2.ebuild: |
| 103 |
+ version bump - bug #207306 |
| 104 |
|
| 105 |
23 Feb 2007; Thilo Bangert <bangert@g.o> monkeyd-0.9.1.ebuild: |
| 106 |
fix ROOT misuse |
| 107 |
|
| 108 |
|
| 109 |
|
| 110 |
1.1 www-servers/monkeyd/monkeyd-0.9.2.ebuild |
| 111 |
|
| 112 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.2.ebuild?rev=1.1&view=markup |
| 113 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.2.ebuild?rev=1.1&content-type=text/plain |
| 114 |
|
| 115 |
Index: monkeyd-0.9.2.ebuild |
| 116 |
=================================================================== |
| 117 |
# Copyright 1999-2008 Gentoo Foundation |
| 118 |
# Distributed under the terms of the GNU General Public License v2 |
| 119 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.2.ebuild,v 1.1 2008/06/28 19:12:54 bangert Exp $ |
| 120 |
|
| 121 |
inherit toolchain-funcs depend.php |
| 122 |
|
| 123 |
WEBROOT=/var/www/localhost |
| 124 |
|
| 125 |
MY_P="${PN/d}-${PV}" |
| 126 |
DESCRIPTION="fast, efficient, (REALLY) small, and easy to configure web server" |
| 127 |
HOMEPAGE="http://monkeyd.sourceforge.net/" |
| 128 |
SRC_URI="http://monkeyd.sourceforge.net/versions/${MY_P}.tar.gz" |
| 129 |
|
| 130 |
LICENSE="GPL-2" |
| 131 |
SLOT="0" |
| 132 |
KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" |
| 133 |
IUSE="php" |
| 134 |
|
| 135 |
RDEPEND="php? ( virtual/httpd-php )" |
| 136 |
|
| 137 |
S="${WORKDIR}/${MY_P}" |
| 138 |
|
| 139 |
pkg_setup() { |
| 140 |
use php && require_php_cgi |
| 141 |
} |
| 142 |
|
| 143 |
src_unpack() { |
| 144 |
unpack ${A} |
| 145 |
cd "${S}" |
| 146 |
sed -i '/install -m 755 bin\/banana/d' configure || die "sed banana" |
| 147 |
} |
| 148 |
|
| 149 |
src_compile() { |
| 150 |
# monkey has it's own funky script ... cant use econf |
| 151 |
env STRIP=true \ |
| 152 |
./configure \ |
| 153 |
--prefix=/usr \ |
| 154 |
--bindir=/usr/bin \ |
| 155 |
--cgibin=${WEBROOT}/cgi-bin \ |
| 156 |
--sysconfdir=/etc/${PN} \ |
| 157 |
--datadir=${WEBROOT}/htdocs \ |
| 158 |
--logdir=/var/log/${PN} \ |
| 159 |
--lang=en \ |
| 160 |
|| die |
| 161 |
# Don't install the banana script, it is broken as is anyway and the |
| 162 |
# functionality is provided by the ${FILESDIR}/monkeyd.init.d script. |
| 163 |
sed -i '/install -m 755 bin\/banana/d' Makefile |
| 164 |
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed" |
| 165 |
} |
| 166 |
|
| 167 |
src_install() { |
| 168 |
make \ |
| 169 |
PREFIX="${D}"/usr \ |
| 170 |
BINDIR="${D}"/usr/bin \ |
| 171 |
CGIBIN="${D}"${WEBROOT}/cgi-bin \ |
| 172 |
SYSCONFDIR="${D}"/etc/${PN} \ |
| 173 |
DATADIR="${D}"${WEBROOT}/htdocs \ |
| 174 |
LOGDIR="${D}"/var/log/${PN} \ |
| 175 |
install \ |
| 176 |
|| die "make install failed" |
| 177 |
|
| 178 |
if use php ; then |
| 179 |
dosed '/^#AddScript application\/x-httpd-php/s:^#::' /etc/monkeyd/monkey.conf |
| 180 |
dosed 's:/home/my_home/php/bin/php:/usr/bin/php-cgi:' /etc/monkeyd/monkey.conf |
| 181 |
fi |
| 182 |
|
| 183 |
[[ -e ${WEBROOT}/htdocs/index.html ]] && \ |
| 184 |
mv "${D}"${WEBROOT}/htdocs/{index,index-monkey}.html |
| 185 |
|
| 186 |
dosed "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" /etc/monkeyd/monkey.conf |
| 187 |
newinitd "${FILESDIR}"/monkeyd.init.d monkeyd |
| 188 |
newconfd "${FILESDIR}"/monkeyd.conf.d monkeyd |
| 189 |
dodoc README MODULES *.txt |
| 190 |
} |
| 191 |
|
| 192 |
|
| 193 |
|
| 194 |
-- |
| 195 |
gentoo-commits@l.g.o mailing list |
Archives