Update lighttpd to 1.4.6. Take maintainership.

Activate memcache option, now that devel/libmemcache is imported.

From NEWS:
- 1.4.6 - 2005-10-09

  * fixed compilation on MacOS X and cygwin
  * fixed compressed output if caching was disabled (seen in IE and
Opera)
  * fixed range-request option
  * fixed mysql-vhost module (was broken in 1.4.5)
  * fixed false positive in the detection of case-insensitive FS

- 1.4.5 - 2005-10-02

  * added all DeltaV methods as known methods
  * added buffer-to-disk of request content
  * added warning for unused variables in conditionals
  * added global index-generators to mod_indexfile
  * fixed caching for remote-ip conditionals with keep-alive
  * fixed redirects with content
  * fixed infinite loop in exec-cmd in mod_ssi
  * fixed segfault in config handling for mod_mysql_vhost
  * fixed segfault on FIFOs/Sockets
  * fixed possible crash on uninit memory if If-Modified-Since was too long
  * fixed accounting of mem-chunks
  * fixed starving of connections on high load
  * fixed crc errors in mod_compress on 64bit platforms
  * fixed handling of overlapping fastcgi packets (bug added in 1.4.4)
  * fixed logic of conditionals if a header was not set
  * fixed a segfault in mod_rewrite if %1 references were used
  * fixed handling of empty request URIs in HTTP requests

- 1.4.4 - 2005-09-16
  * added support for %V in mod_accesslog
  * added a option for a FastCGI responser to send static files
  * added md5 and blowfish hashes to htpasswd
  * fixed METHOD in mod_accesslog of WebDAV methods
  * fixed check for permission before files in sent
  * fixed mod-proxy and content for non-POST requests
  * fixed compilation of mod_cml on MacOS X
  * fixed SSL errmsg after accept()
  * fixed memleak in stat-cache
  * fixed aborted connections if file was moved while in transfer
  * fixed mem-usage for large FastCGI transfers

4 files changed, 13 insertions, 27 deletions

diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index c1af107f877..4b774fc219c 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2005/09/28 12:27:52 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2005/10/11 15:44:00 joerg Exp $
 
-DISTNAME=	lighttpd-1.4.3
+DISTNAME=	lighttpd-1.4.6
 CATEGORIES=	www
 MASTER_SITES=	http://www.lighttpd.net/download/
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://www.lighttpd.net/
 COMMENT=	Fast, light-footprint HTTP server
 
diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo
index 5a818a58d99..130ac4afb29 100644
--- a/www/lighttpd/distinfo
+++ b/www/lighttpd/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/09/04 06:37:05 jlam Exp $
+$NetBSD: distinfo,v 1.2 2005/10/11 15:44:00 joerg Exp $
 
-SHA1 (lighttpd-1.4.3.tar.gz) = 67bff414ff2c2ac025565330b57514980adf734c
-RMD160 (lighttpd-1.4.3.tar.gz) = aac19b2576f8c30c446013d27e2bcc8513a19cbc
-Size (lighttpd-1.4.3.tar.gz) = 765903 bytes
-SHA1 (patch-aa) = eecd1782e720028b112389322ecdea2f789d14f2
+SHA1 (lighttpd-1.4.6.tar.gz) = d880958aaf080abb672ba2b675fbfeb446be84ea
+RMD160 (lighttpd-1.4.6.tar.gz) = fa23043d494d8c25514158e686d3d33a38e17ada
+Size (lighttpd-1.4.6.tar.gz) = 774879 bytes
diff --git a/www/lighttpd/options.mk b/www/lighttpd/options.mk
index 057ea94c13a..69feaaed9a8 100644
--- a/www/lighttpd/options.mk
+++ b/www/lighttpd/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/09/04 06:37:05 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2005/10/11 15:44:00 joerg Exp $
 
 PKG_OPTIONS_VAR =       PKG_OPTIONS.lighttpd
-PKG_SUPPORTED_OPTIONS=  bzip fam gdbm inet6 ldap lua mysql ssl
+PKG_SUPPORTED_OPTIONS=  bzip fam gdbm inet6 ldap lua mysql ssl memcache
 PKG_SUGGESTED_OPTIONS=	inet6 ssl
 
 .include "../../mk/bsd.options.mk"
@@ -59,10 +59,10 @@ CONFIGURE_ARGS+=	--with-lua
 ### Support using memcached as an in-memory caching system for the
 ### "trigger before download" and CML modules.
 ###
-#.if !empty(PKG_OPTIONS:Mmemcache)
-#.  include "../../devel/libmemcache/buildlink3.mk"
-#CONFIGURE_ARGS+=	--with-memcache
-#.endif
+.if !empty(PKG_OPTIONS:Mmemcache)
+.  include "../../devel/libmemcache/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-memcache
+.endif
 
 ###
 ### Allow using MySQL for virtual host configuration.
diff --git a/www/lighttpd/patches/patch-aa b/www/lighttpd/patches/patch-aa
deleted file mode 100644
index f6bc870a66b..00000000000
--- a/www/lighttpd/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/09/04 06:37:05 jlam Exp $
-
---- configure.orig	Wed Aug 31 11:33:24 2005
-+++ configure
-@@ -26112,7 +26112,7 @@ if test `eval echo '${'$as_ac_Header'}'`
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
--                 LUA_LIB=-llua -llualib
-+                 LUA_LIB="-llua -llualib"
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LUA 1