Changes 1.4.28:

* Rename fdevent_event_add to _set to reflect what the function does. Fix some
  handlers.
* Fix buffer.h to include stdio.h as it is needer for SEGFAULT()

Changes 1.4.27:
* Fix handling return value of SSL_CTX_set_options
* Fix mod_proxy HUP handling (send final chunk, fix usage counter)
* mod_proxy: close connection on write error
* Check uri instead of physical path for directory redirect
* Fix detecting git repository
* [mod_compress] Fix segfault when etags are disabled
* Reset uri.authority before TLS servername handling, reset all "keep-alive"
  data in connection_del
* Print double quotes properly when dumping config file
* Include IP addresses on error log on password failures
* Fix stalls while reading from ssl sockets
* Fix etag formatting on boxes with 32-bit longs
* Fix two compiler warnings
* mod_accesslog: fix %p for ipv6 sockets
* mod_fastcgi: Send 502 "Bad Gateway" if we couldn't open the file for
  X-Sendfile
* mod_staticfile: add debug output if we ignore a file with
  static-file.exclude-extensions
* mod_cgi: fix race condition leaving response not forwarded to client
* mod_accesslog: Fix var declarations mixed in source
* mod_status: Add version to status page
* mod_accesslog: optimize accesslog_append_escaped
* openssl: silence annoying error messages for errno==0
* array.c: improve array_get_unused_element to check data type; fix mem leak if
  unused_element didn't find a matching entry
* add check to stop loading plugins twice
* cleanup fdevent code, removed linux-rtsig handler, replaced some fprintf calls
* only require FDEVENT_IN bit to be set for listening connections
* add libev fdevent handler: server.event-handler = "libev"
* mod_proxy: return response as soon as it is available
* don't overwrite global server.force-lowercase-filenames setting
* bind to IPV6-only if ipv6 address was specified

3 files changed, 62 insertions, 39 deletions

diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index c8d4b954b9f..0ba2c28d417 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,27 +1,23 @@
-# $NetBSD: Makefile,v 1.25 2010/03/23 15:20:09 gson Exp $
+# $NetBSD: Makefile,v 1.26 2011/04/05 08:29:26 adam Exp $
 
-DISTNAME=	lighttpd-1.4.26
-PKGREVISION=	1
+DISTNAME=	lighttpd-1.4.28
 CATEGORIES=	www
 MASTER_SITES=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://www.lighttpd.net/
 COMMENT=	Fast, light-footprint HTTP server
+LICENSE=	modified-bsd
 
-#PATCHFILES=	fix-2147-in-1.4.x.patch
-#PATCH_SITES=	http://redmine.lighttpd.net/attachments/download/1091/
-#PATCH_DIST_STRIP.fix-2147-in-1.4.x.patch= -p1
-
-PATCHFILES=	08-ssl-retval-fix.patch
-PATCH_SITES=	http://redmine.lighttpd.net/attachments/download/1095/
-PATCH_DIST_STRIP.08-ssl-retval-fix.patch= -p1
+#PATCHFILES=	08-ssl-retval-fix.patch
+#PATCH_SITES=	http://redmine.lighttpd.net/attachments/download/1095/
+#PATCH_DIST_STRIP.08-ssl-retval-fix.patch= -p1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	# empty
-
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/${PKGBASE}
 CONFIGURE_ARGS+=	--with-pcre
@@ -29,27 +25,34 @@ CONFIGURE_ARGS+=	--with-pcre
 DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 PKG_SYSCONFSUBDIR=	${PKGBASE}
-
 RCD_SCRIPTS=		lighttpd
-CONF_FILES=		${EGDIR}/lighttpd.conf ${PKG_SYSCONFDIR}/lighttpd.conf
-
-INSTALLATION_DIRS=	${DOCDIR} ${EGDIR}
 
 .include "options.mk"
 
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
+CNFS_cmd=		${SED} -ne "s,^share/examples/lighttpd/,,p" PLIST
+CNFS=			${CNFS_cmd:sh}
+.for file in ${CNFS}
+CONF_FILES+=		${EGDIR}/${file:Q} ${PKG_SYSCONFDIR}/${file:Q}
+.endfor
+
+INSTALLATION_DIRS=	${DOCDIR} ${EGDIR} ${EGDIR}/conf.d ${EGDIR}/vhosts.d
+OWN_DIRS=		${PKG_SYSCONFDIR}/conf.d
+OWN_DIRS+=		${PKG_SYSCONFDIR}/vhosts.d
 
 post-install:
-	cd ${WRKSRC}; for f in doc/*.css doc/*.dot doc/*.txt; do	\
-		${INSTALL_DATA} $$f ${DESTDIR}${DOCDIR};		\
-	done
-	for f in AUTHORS COPYING ChangeLog NEWS README; do		\
-		${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${DOCDIR};	\
-	done
-	for f in lighttpd.conf rrdtool-graph.sh spawn-php.sh; do	\
-		${INSTALL_DATA} ${WRKSRC}/doc/$$f ${DESTDIR}${EGDIR};	\
-	done
+	set -e; cd ${WRKSRC}/doc;				\
+	for f in *.css *.dot *.txt; do				\
+		${INSTALL_DATA} $$f ${DESTDIR}${DOCDIR};	\
+	done;							\
+	for f in config/*.conf scripts/*.sh; do			\
+		${INSTALL_DATA} $$f ${DESTDIR}${EGDIR};		\
+	done;							\
+	for f in config/conf.d/*.conf config/conf.d/mod.*; do	\
+		${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}/conf.d;	\
+	done;							\
+	${INSTALL_DATA} config/vhosts.d/*.template ${DESTDIR}${EGDIR}/vhosts.d
 
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/lighttpd/PLIST b/www/lighttpd/PLIST
index 5937415d046..70bd54c5fba 100644
--- a/www/lighttpd/PLIST
+++ b/www/lighttpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2010/02/08 14:47:54 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2011/04/05 08:29:26 adam Exp $
 lib/lighttpd/mod_access.la
 lib/lighttpd/mod_accesslog.la
 lib/lighttpd/mod_alias.la
@@ -34,10 +34,6 @@ lib/lighttpd/mod_webdav.la
 man/man8/lighttpd.8
 sbin/lighttpd
 sbin/lighttpd-angel
-share/doc/lighttpd/AUTHORS
-share/doc/lighttpd/COPYING
-share/doc/lighttpd/NEWS
-share/doc/lighttpd/README
 share/doc/lighttpd/access.txt
 share/doc/lighttpd/accesslog.txt
 share/doc/lighttpd/alias.txt
@@ -79,7 +75,34 @@ share/doc/lighttpd/traffic-shaping.txt
 share/doc/lighttpd/trigger_b4_dl.txt
 share/doc/lighttpd/userdir.txt
 share/doc/lighttpd/webdav.txt
+share/examples/lighttpd/conf.d/access_log.conf
+share/examples/lighttpd/conf.d/auth.conf
+share/examples/lighttpd/conf.d/cgi.conf
+share/examples/lighttpd/conf.d/cml.conf
+share/examples/lighttpd/conf.d/compress.conf
+share/examples/lighttpd/conf.d/debug.conf
+share/examples/lighttpd/conf.d/dirlisting.conf
+share/examples/lighttpd/conf.d/evhost.conf
+share/examples/lighttpd/conf.d/expire.conf
+share/examples/lighttpd/conf.d/fastcgi.conf
+share/examples/lighttpd/conf.d/geoip.conf
+share/examples/lighttpd/conf.d/magnet.conf
+share/examples/lighttpd/conf.d/mime.conf
+share/examples/lighttpd/conf.d/mod.template
+share/examples/lighttpd/conf.d/mysql_vhost.conf
+share/examples/lighttpd/conf.d/proxy.conf
+share/examples/lighttpd/conf.d/rrdtool.conf
+share/examples/lighttpd/conf.d/scgi.conf
+share/examples/lighttpd/conf.d/secdownload.conf
+share/examples/lighttpd/conf.d/simple_vhost.conf
+share/examples/lighttpd/conf.d/ssi.conf
+share/examples/lighttpd/conf.d/status.conf
+share/examples/lighttpd/conf.d/trigger_b4_dl.conf
+share/examples/lighttpd/conf.d/userdir.conf
+share/examples/lighttpd/conf.d/webdav.conf
 share/examples/lighttpd/lighttpd.conf
+share/examples/lighttpd/modules.conf
 share/examples/lighttpd/rrdtool-graph.sh
 share/examples/lighttpd/spawn-php.sh
+share/examples/lighttpd/vhosts.d/vhosts.template
 share/examples/rc.d/lighttpd
diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo
index 67d89e48903..a57655e727a 100644
--- a/www/lighttpd/distinfo
+++ b/www/lighttpd/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.18 2010/03/23 15:20:09 gson Exp $
+$NetBSD: distinfo,v 1.19 2011/04/05 08:29:26 adam Exp $
 
-SHA1 (08-ssl-retval-fix.patch) = fb8fc92f8af7225a5f33839d5fe7b298aac3b532
-RMD160 (08-ssl-retval-fix.patch) = 98a74fc65f27766bdd378d0c57e7f00a57db9b31
-Size (08-ssl-retval-fix.patch) = 580 bytes
-SHA1 (lighttpd-1.4.26.tar.gz) = c22642dc3616043293fb895b9f049b9270dbb2a0
-RMD160 (lighttpd-1.4.26.tar.gz) = 0b073d66405efb8b2a2ba89dff08ae5813771065
-Size (lighttpd-1.4.26.tar.gz) = 780352 bytes
+SHA1 (lighttpd-1.4.28.tar.bz2) = 42915dffe2af4f870cc1cdc0218edb60a0a315c2
+RMD160 (lighttpd-1.4.28.tar.bz2) = 5af6c848dd251c9d15f5185f54411744ae41c67b
+Size (lighttpd-1.4.28.tar.bz2) = 641702 bytes