diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index c5b32ad3b8b..eb188a58ae6 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.39 2007/04/24 05:09:41 ckuethe Exp $ +# $OpenBSD: Makefile,v 1.40 2007/04/28 10:08:01 rui Exp $ SHARED_ONLY= Yes COMMENT= "secure, fast, compliant, and very flexible web-server" -DISTNAME= lighttpd-1.4.13 -PKGNAME= ${DISTNAME}p3 +DISTNAME= lighttpd-1.4.15 CATEGORIES= www net MAINTAINER= Brad Smith @@ -25,6 +24,7 @@ WANTLIB= c crypto m ssl z MASTER_SITES= ${HOMEPAGE}download/ USE_LIBTOOL= Yes +LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-openssl \ --without-bzip2 \ @@ -47,13 +47,15 @@ CONFIGURE_ARGS+= --with-mysql LIB_DEPENDS+= mysqlclient.>=10::databases/mysql .endif +pre-build:: + @perl -pi -e "s,/usr/bin/rrdtool,${LOCALBASE}/bin/rrdtool,g" \ + ${WRKSRC}/doc/lighttpd.conf + @perl -pi -e "s,/etc/lighttpd,${SYSCONFDIR},g" \ + ${WRKSRC}/doc/lighttpd.1 + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lighttpd ${INSTALL_DATA} ${WRKSRC}/doc/lighttpd.conf \ ${PREFIX}/share/examples/lighttpd -post-configure: - @perl -pi -e "s,/usr/bin/rrdtool,${LOCALBASE}/bin/rrdtool," \ - ${WRKSRC}/doc/lighttpd.conf - .include diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo index 96427601b73..807128cb85e 100644 --- a/www/lighttpd/distinfo +++ b/www/lighttpd/distinfo @@ -1,5 +1,5 @@ -MD5 (lighttpd-1.4.13.tar.gz) = 13XWR4ORuV2EGhAYyNsLlQ== -RMD160 (lighttpd-1.4.13.tar.gz) = TmfkLcNpLVDARFYcyQPee5BvJgw= -SHA1 (lighttpd-1.4.13.tar.gz) = sXVT5mYJ+FuuxQJjcSpKWuylDKU= -SHA256 (lighttpd-1.4.13.tar.gz) = YtWZf9tBr6lACtzbBA0EofX6lQBF35bj4/WT6PDeVzk= -SIZE (lighttpd-1.4.13.tar.gz) = 797813 +MD5 (lighttpd-1.4.15.tar.gz) = 0s6q8kKys1k/9NgiLVQ2SQ== +RMD160 (lighttpd-1.4.15.tar.gz) = o4y3N5faG4dztMSjTxa+CXZn21c= +SHA1 (lighttpd-1.4.15.tar.gz) = Z7oSeaDq7acoweEUPTAr6zZKA0w= +SHA256 (lighttpd-1.4.15.tar.gz) = fuzU+aOxn0715NS0uWNau2me5qv8CPAp5d8SNGcOGDE= +SIZE (lighttpd-1.4.15.tar.gz) = 794327 diff --git a/www/lighttpd/patches/patch-src_connections_c b/www/lighttpd/patches/patch-src_connections_c deleted file mode 100644 index 617108c4637..00000000000 --- a/www/lighttpd/patches/patch-src_connections_c +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_connections_c,v 1.1 2007/02/02 09:25:19 bernd Exp $ - -Fixes a possible 99% cpu bug when a client connection is dropped. -See http://trac.lighttpd.net/trac/wiki/Release-1.4.13-patches. - ---- src/connections.c.orig Tue Jan 30 10:20:09 2007 -+++ src/connections.c Tue Jan 30 10:20:25 2007 -@@ -970,7 +970,7 @@ int connection_handle_read_state(server - } - } else { - /* a splited \r \n */ -- return -1; -+ break; - } - } - } diff --git a/www/lighttpd/pkg/PFRAG.mysql b/www/lighttpd/pkg/PFRAG.mysql index 51b6bd713c7..895c7e08819 100644 --- a/www/lighttpd/pkg/PFRAG.mysql +++ b/www/lighttpd/pkg/PFRAG.mysql @@ -1,4 +1,3 @@ -@comment $OpenBSD: PFRAG.mysql,v 1.1 2005/10/08 20:05:32 brad Exp $ -@comment lib/lighttpd/mod_mysql_vhost.a +@comment $OpenBSD: PFRAG.mysql,v 1.2 2007/04/28 10:08:01 rui Exp $ @comment lib/lighttpd/mod_mysql_vhost.la lib/lighttpd/mod_mysql_vhost.so diff --git a/www/lighttpd/pkg/PLIST b/www/lighttpd/pkg/PLIST index ce4c9672dab..b03839fb20e 100644 --- a/www/lighttpd/pkg/PLIST +++ b/www/lighttpd/pkg/PLIST @@ -1,96 +1,68 @@ -@comment $OpenBSD: PLIST,v 1.15 2007/04/24 05:09:41 ckuethe Exp $ +@comment $OpenBSD: PLIST,v 1.16 2007/04/28 10:08:01 rui Exp $ @newgroup _lighttpd:585 @newuser _lighttpd:585:_lighttpd:daemon:lighttpd Account:/nonexistent:/sbin/nologin bin/spawn-fcgi lib/lighttpd/ -@comment lib/lighttpd/mod_access.a @comment lib/lighttpd/mod_access.la lib/lighttpd/mod_access.so -@comment lib/lighttpd/mod_accesslog.a @comment lib/lighttpd/mod_accesslog.la lib/lighttpd/mod_accesslog.so -@comment lib/lighttpd/mod_alias.a @comment lib/lighttpd/mod_alias.la lib/lighttpd/mod_alias.so -@comment lib/lighttpd/mod_auth.a @comment lib/lighttpd/mod_auth.la lib/lighttpd/mod_auth.so -@comment lib/lighttpd/mod_cgi.a @comment lib/lighttpd/mod_cgi.la lib/lighttpd/mod_cgi.so -@comment lib/lighttpd/mod_cml.a @comment lib/lighttpd/mod_cml.la lib/lighttpd/mod_cml.so -@comment lib/lighttpd/mod_compress.a @comment lib/lighttpd/mod_compress.la lib/lighttpd/mod_compress.so -@comment lib/lighttpd/mod_dirlisting.a @comment lib/lighttpd/mod_dirlisting.la lib/lighttpd/mod_dirlisting.so -@comment lib/lighttpd/mod_evasive.a @comment lib/lighttpd/mod_evasive.la lib/lighttpd/mod_evasive.so -@comment lib/lighttpd/mod_evhost.a @comment lib/lighttpd/mod_evhost.la lib/lighttpd/mod_evhost.so -@comment lib/lighttpd/mod_expire.a @comment lib/lighttpd/mod_expire.la lib/lighttpd/mod_expire.so -@comment lib/lighttpd/mod_fastcgi.a +@comment lib/lighttpd/mod_extforward.la +lib/lighttpd/mod_extforward.so @comment lib/lighttpd/mod_fastcgi.la lib/lighttpd/mod_fastcgi.so -@comment lib/lighttpd/mod_flv_streaming.a @comment lib/lighttpd/mod_flv_streaming.la lib/lighttpd/mod_flv_streaming.so -@comment lib/lighttpd/mod_indexfile.a @comment lib/lighttpd/mod_indexfile.la lib/lighttpd/mod_indexfile.so -@comment lib/lighttpd/mod_magnet.a @comment lib/lighttpd/mod_magnet.la lib/lighttpd/mod_magnet.so -@comment lib/lighttpd/mod_proxy.a @comment lib/lighttpd/mod_proxy.la lib/lighttpd/mod_proxy.so -@comment lib/lighttpd/mod_redirect.a @comment lib/lighttpd/mod_redirect.la lib/lighttpd/mod_redirect.so -@comment lib/lighttpd/mod_rewrite.a @comment lib/lighttpd/mod_rewrite.la lib/lighttpd/mod_rewrite.so -@comment lib/lighttpd/mod_rrdtool.a @comment lib/lighttpd/mod_rrdtool.la lib/lighttpd/mod_rrdtool.so -@comment lib/lighttpd/mod_scgi.a @comment lib/lighttpd/mod_scgi.la lib/lighttpd/mod_scgi.so -@comment lib/lighttpd/mod_secdownload.a @comment lib/lighttpd/mod_secdownload.la lib/lighttpd/mod_secdownload.so -@comment lib/lighttpd/mod_setenv.a @comment lib/lighttpd/mod_setenv.la lib/lighttpd/mod_setenv.so -@comment lib/lighttpd/mod_simple_vhost.a @comment lib/lighttpd/mod_simple_vhost.la lib/lighttpd/mod_simple_vhost.so -@comment lib/lighttpd/mod_ssi.a @comment lib/lighttpd/mod_ssi.la lib/lighttpd/mod_ssi.so -@comment lib/lighttpd/mod_staticfile.a @comment lib/lighttpd/mod_staticfile.la lib/lighttpd/mod_staticfile.so -@comment lib/lighttpd/mod_status.a @comment lib/lighttpd/mod_status.la lib/lighttpd/mod_status.so -@comment lib/lighttpd/mod_trigger_b4_dl.a @comment lib/lighttpd/mod_trigger_b4_dl.la lib/lighttpd/mod_trigger_b4_dl.so -@comment lib/lighttpd/mod_userdir.a @comment lib/lighttpd/mod_userdir.la lib/lighttpd/mod_userdir.so -@comment lib/lighttpd/mod_usertrack.a @comment lib/lighttpd/mod_usertrack.la lib/lighttpd/mod_usertrack.so -@comment lib/lighttpd/mod_webdav.a @comment lib/lighttpd/mod_webdav.la lib/lighttpd/mod_webdav.so %%mysql%%