From f0fef5a77a0a566780d19799d75480036fb54c7d Mon Sep 17 00:00:00 2001 From: sthen Date: Tue, 17 Feb 2009 12:44:17 +0000 Subject: [PATCH] update to 1.4.21 and tidy Makefile from Brad; lots of bug fixes. --- www/lighttpd/Makefile | 20 ++++++++++---------- www/lighttpd/distinfo | 10 +++++----- www/lighttpd/patches/patch-doc_lighttpd_conf | 10 +++++----- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index 362c73e0a54..151709e7fff 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -1,19 +1,16 @@ -# $OpenBSD: Makefile,v 1.54 2008/10/23 20:29:17 brad Exp $ +# $OpenBSD: Makefile,v 1.55 2009/02/17 12:44:17 sthen Exp $ SHARED_ONLY= Yes COMMENT= secure, fast, compliant, and very flexible web-server -DISTNAME= lighttpd-1.4.20 +DISTNAME= lighttpd-1.4.21 CATEGORIES= www net MASTER_SITES= ${HOMEPAGE}/download/ -MAINTAINER= Brad Smith - HOMEPAGE= http://www.lighttpd.net/ -LIB_DEPENDS+= pcre::devel/pcre \ - lua.>=5.1::lang/lua +MAINTAINER= Brad Smith # BSD PERMIT_PACKAGE_CDROM= Yes @@ -22,13 +19,16 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c crypto m ssl z +LIB_DEPENDS+= pcre::devel/pcre \ + lua.>=5.1::lang/lua + USE_LIBTOOL= Yes LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --with-openssl \ - --without-bzip2 \ - --libdir="${PREFIX}/lib/lighttpd" \ - --with-lua +CONFIGURE_ARGS+= --libdir="${PREFIX}/lib/lighttpd" \ + --with-lua \ + --with-openssl \ + --without-bzip2 CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo index 3233fd8aae9..f955a1f4666 100644 --- a/www/lighttpd/distinfo +++ b/www/lighttpd/distinfo @@ -1,5 +1,5 @@ -MD5 (lighttpd-1.4.20.tar.gz) = fOfu+0h2grYdmwa0GGTGSg== -RMD160 (lighttpd-1.4.20.tar.gz) = Ii6cabYUZ/k3Z2j5Kl7uOt15YCA= -SHA1 (lighttpd-1.4.20.tar.gz) = YXkMAtnpbDyyP/05B/HK7mTEdd0= -SHA256 (lighttpd-1.4.20.tar.gz) = MqJa0ZNyvVvkUQ2TR5VqywM3D9hs/t3tYfQjtze33bE= -SIZE (lighttpd-1.4.20.tar.gz) = 827538 +MD5 (lighttpd-1.4.21.tar.gz) = X/TnB1ZS9swgD6J46isflg== +RMD160 (lighttpd-1.4.21.tar.gz) = bULPAy5To9pIa33FJ3k4IsfhCHI= +SHA1 (lighttpd-1.4.21.tar.gz) = a0JXCwsZz7y0MkeAxhYlsTn2744= +SHA256 (lighttpd-1.4.21.tar.gz) = xezub5Z+yjUDXE9+oEPDwKmhQn9TpSV4vNxL995IaiQ= +SIZE (lighttpd-1.4.21.tar.gz) = 840950 diff --git a/www/lighttpd/patches/patch-doc_lighttpd_conf b/www/lighttpd/patches/patch-doc_lighttpd_conf index 9e49910b23e..f9594590928 100644 --- a/www/lighttpd/patches/patch-doc_lighttpd_conf +++ b/www/lighttpd/patches/patch-doc_lighttpd_conf @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_lighttpd_conf,v 1.6 2008/04/16 20:42:35 jasper Exp $ ---- doc/lighttpd.conf.orig Thu Jan 17 07:41:14 2008 -+++ doc/lighttpd.conf Wed Apr 9 21:50:55 2008 +$OpenBSD: patch-doc_lighttpd_conf,v 1.7 2009/02/17 12:44:17 sthen Exp $ +--- doc/lighttpd.conf.orig Tue Sep 23 15:03:06 2008 ++++ doc/lighttpd.conf Fri Feb 6 13:33:09 2009 @@ -37,18 +37,24 @@ server.modules = ( ## a static document-root, for virtual-hosting take look at the @@ -69,7 +69,7 @@ $OpenBSD: patch-doc_lighttpd_conf,v 1.6 2008/04/16 20:42:35 jasper Exp $ ###### virtual hosts ## ## If you want name-based virtual hosting add the next three settings and load -@@ -181,17 +176,12 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fc +@@ -183,17 +178,12 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fc #debug.log-request-handling = "enable" #debug.log-file-not-found = "enable" @@ -91,7 +91,7 @@ $OpenBSD: patch-doc_lighttpd_conf,v 1.6 2008/04/16 20:42:35 jasper Exp $ #### compress module #compress.cache-dir = "/var/cache/lighttpd/compress/" #compress.filetype = ("text/plain", "text/html") -@@ -282,7 +272,7 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fc +@@ -284,7 +274,7 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fc #ssi.extension = ( ".shtml" ) #### rrdtool