Fixes

5 files changed, 38 insertions, 14 deletions

diff --git a/net-www/lighttpd/ChangeLog b/net-www/lighttpd/ChangeLog
index 8d2db894cc60..8918d7ab5a5a 100644
--- a/net-www/lighttpd/ChangeLog
+++ b/net-www/lighttpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/lighttpd
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/lighttpd/ChangeLog,v 1.1 2004/04/23 17:30:26 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/lighttpd/ChangeLog,v 1.2 2004/04/23 22:36:29 stuart Exp $
+
+  23 Apr 2004; Stuart Herbert <stuart@gentoo.org> lighttpd-1.1.8.ebuild,
+  metadata.xml, files/lighttpd-1.1.8-gentoo.diff:
+  Fixes to get the server running; thanks to Boris Wachtmeister
+  <sirro@nurfuerspam.de> once again
 
 *lighttpd-1.1.8 (23 Apr 2004)
 
diff --git a/net-www/lighttpd/Manifest b/net-www/lighttpd/Manifest
index e113b4d75b96..cfcd64aae049 100644
--- a/net-www/lighttpd/Manifest
+++ b/net-www/lighttpd/Manifest
@@ -1,5 +1,6 @@
-MD5 48673477dd5402685933e62ad5218810 lighttpd-1.1.8.ebuild 1537
-MD5 b8f82e430650ab6e1882a45916a42b64 ChangeLog 450
+MD5 4e0124143f05be7f8799debcca25a948 lighttpd-1.1.8.ebuild 1908
+MD5 77f5e4c6107e603fdb3a53cd14c6149f ChangeLog 674
+MD5 3d182d43f7f0341a9a42f96694f04e72 metadata.xml 224
 MD5 eb94c0fc2149e2543beb50e93058de99 files/digest-lighttpd-1.1.8 66
-MD5 1c07ea1036c540aa1db5fc0c9aa507c7 files/lighttpd-1.1.8-gentoo.diff 1303
+MD5 352e2fac9cb73bdae7672f977b044894 files/lighttpd-1.1.8-gentoo.diff 1301
 MD5 b23bbb2c34588e8946e5f7858f3fa2db files/lighttpd.initd 638
diff --git a/net-www/lighttpd/files/lighttpd-1.1.8-gentoo.diff b/net-www/lighttpd/files/lighttpd-1.1.8-gentoo.diff
index 5277018e7f81..f75fd3ccbe20 100644
--- a/net-www/lighttpd/files/lighttpd-1.1.8-gentoo.diff
+++ b/net-www/lighttpd/files/lighttpd-1.1.8-gentoo.diff
@@ -9,7 +9,7 @@
  
  ## where to send error-messages to
 -server.errorlog            = "/www/logs/lighttpd.error.log"
-+server.errorlog            = "/var/logs/lighttpd/error.log"
++server.errorlog            = "/var/log/lighttpd/error.log"
  
  # files to check for if .../ is requested
  server.indexfiles          = ( "index.php", "index.html", 
@@ -18,7 +18,7 @@
  
  #### accesslog module
 -accesslog.filename          = "/www/logs/access.log"
-+accesslog.filename          = "/var/logs/lighttpd/access.log"
++accesslog.filename          = "/var/log/lighttpd/access.log"
  
  ## deny access the file-extensions
  #
diff --git a/net-www/lighttpd/lighttpd-1.1.8.ebuild b/net-www/lighttpd/lighttpd-1.1.8.ebuild
index 6d670c8816bc..09f02276cde1 100644
--- a/net-www/lighttpd/lighttpd-1.1.8.ebuild
+++ b/net-www/lighttpd/lighttpd-1.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/lighttpd/lighttpd-1.1.8.ebuild,v 1.1 2004/04/23 17:30:26 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/lighttpd/lighttpd-1.1.8.ebuild,v 1.2 2004/04/23 22:36:29 stuart Exp $
 
 DESCRIPTION="lighttpd is intented to be a frontend for ad-servers which have to deliver small files concurrently to many connections."
 HOMEPAGE="http://jan.kneschke.de/projects/lighttpd"
@@ -12,11 +12,16 @@ IUSE="mysql ssl"
 DEPEND="virtual/glibc
 		>=dev-libs/libpcre-3.1
 		>=sys-libs/zlib-1.1
-		>=sys-devel/libtool-1.4"
+		>=sys-devel/libtool-1.4
+		mysql? ( >=dev-db/mysql-4.0.0 )
+		ssl?   ( >=dev-libs/openssl-0.9.7 )"
 RDEPEND=">=sys-libs/zlib-1.1
-		 >=sys-devel/libtool-1.4"
+		 >=sys-devel/libtool-1.4
+		 mysql? ( >=dev-db/mysql-4.0.0 )
+		 ssl?   ( >=dev-libs/openssl-0.9.7 )"
 S=${WORKDIR}/${P}
-LIGHTTPD_DIR="/home/lighttpd"
+LIGHTTPD_DIR="/var/www/localhost/htdocs/"
+LOG_DIR="/var/log/lighttpd/"
 
 pkg_setup() {
 	if ! grep -q ^lighttpd: /etc/passwd ; then
@@ -30,7 +35,7 @@ src_compile() {
 	if [ `use ssl` ]; then
 		USE_SSL="--with-openssl"
 	fi
-	econf \
+	econf --libdir=/usr/lib/${PN} \
 		`use_with mysql` \
 		${USE_SSL} \
 		|| die "econf failed"
@@ -39,12 +44,17 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die
+	einstall DESTDIR=${D} || die
 	dodoc README COPYING
 	newdoc doc/lighttpd.conf lighttpd.conf.example
 	dodoc doc/fastcgi.txt doc/authentification.txt
 	insinto /etc/conf.d/;  doins doc/lighttpd.conf
 	exeinto /etc/init.d;   newexe ${FILESDIR}/lighttpd.initd lighttpd
-	dodir ${LIGHTTPD_DIR} ${LIGHTTPD_DIR}/logs
-	chown lighttpd:root ${D}/${LIGHTTPD_DIR} ${D}/${LIGHTTPD_DIR}/logs
+	dodir ${LIGHTTPD_DIR} ${LOG_DIR}
+	chown lighttpd:root ${D}/${LOG_DIR}
+}
+
+pkg_postinst() {
+	einfo "In order to use fast-cgi for php you have to emerge dev-php/php-cgi and"
+	einfo "please read /usr/share/doc/lighttpd-1.1.8/fastcgi.txt.gz for more information"
 }
diff --git a/net-www/lighttpd/metadata.xml b/net-www/lighttpd/metadata.xml
new file mode 100644
index 000000000000..0d59c319c3eb
--- /dev/null
+++ b/net-www/lighttpd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>webapps</herd>
+<maintainer>
+  <email>web-apps@gentoo.org</email>
+</maintainer>
+</pkgmetadata>