[58369] trunk/dports/www/lighttpd
ryandesign at macports.org
ryandesign at macports.org
Sun Sep 27 15:47:42 PDT 2009
Revision: 58369
http://trac.macports.org/changeset/58369
Author: ryandesign at macports.org
Date: 2009-09-27 15:47:38 -0700 (Sun, 27 Sep 2009)
Log Message:
-----------
lighttpd: update to 1.4.23, which now doesn't include spawn-fcgi, so add a dependency on spawn-fcgi; add license info; remove unnecessary mandir configure arg; also install doc files; fix some more references in the sample config file to be within ${prefix}; closes #21586 (maintainer timeout)
Modified Paths:
--------------
trunk/dports/www/lighttpd/Portfile
trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf.diff
Modified: trunk/dports/www/lighttpd/Portfile
===================================================================
--- trunk/dports/www/lighttpd/Portfile 2009-09-27 22:21:02 UTC (rev 58368)
+++ trunk/dports/www/lighttpd/Portfile 2009-09-27 22:47:38 UTC (rev 58369)
@@ -3,10 +3,11 @@
PortSystem 1.0
name lighttpd
-version 1.4.22
+version 1.4.23
categories www
platforms darwin
maintainers kallisys.net:pguyot
+license BSD
description A secure, fast, compliant and flexible web-server
long_description lighttpd is a secure, fast, compliant and very flexible\
web-server which has been optimized for high-performance\
@@ -14,10 +15,11 @@
compared to other webservers and takes care of cpu-load.
homepage http://www.lighttpd.net/
master_sites ${homepage}/download/
-checksums md5 949c33a81e83f7718a47280bef21b90c \
- sha1 e5268929dff832c7786e3b623ca67e6bb0c2913e \
- rmd160 0762e55c52cbc8e5c20faecc45817db5885462d4
+checksums md5 41dfad5c366d34d83c3d2b46d4c08f5c \
+ sha1 37f8b4827d7a1f69812d8185fcecf72277020876 \
+ rmd160 696b8e185c8adbf215f00d259e282a426bcd91c3
depends_lib port:pcre \
+ port:spawn-fcgi \
port:zlib
patchfiles patch-doc-lighttpd.conf.diff
@@ -25,8 +27,6 @@
reinplace "s|__PREFIX|${prefix}|g" "${worksrcpath}/doc/lighttpd.conf"
}
-configure.args --mandir=${prefix}/share/man
-
# Startup item.
set lighttpd_config_name lighttpd.conf
set lighttpd_config ${prefix}/etc/${name}/${lighttpd_config_name}
@@ -47,6 +47,14 @@
file mkdir "${destroot}${prefix}/etc/${name}/"
xinstall -m 644 -v "${worksrcpath}/doc/lighttpd.conf" \
"${destroot}${lighttpd_config}.default"
+ set docdir ${destroot}${prefix}/share/doc/${name}
+ xinstall -d ${docdir}
+ xinstall -m 644 -W ${worksrcpath} \
+ AUTHORS \
+ COPYING \
+ NEWS \
+ README \
+ ${docdir}
}
post-install {
Modified: trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf.diff
===================================================================
--- trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf.diff 2009-09-27 22:21:02 UTC (rev 58368)
+++ trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf.diff 2009-09-27 22:47:38 UTC (rev 58369)
@@ -1,9 +1,9 @@
---- doc/lighttpd.conf.orig 2009-08-17 15:34:32.000000000 -0400
-+++ doc/lighttpd.conf 2009-08-17 15:34:49.000000000 -0400
-@@ -37,17 +37,17 @@
+--- doc/lighttpd.conf.orig 2009-04-09 15:02:00.000000000 -0500
++++ doc/lighttpd.conf 2009-09-23 19:20:27.000000000 -0500
+@@ -36,17 +36,17 @@
- ## a static document-root, for virtual-hosting take look at the
- ## server.virtual-* options
+ ## A static document-root. For virtual hosting take a look at the
+ ## mod_simple_vhost module.
-server.document-root = "/srv/www/htdocs/"
+server.document-root = "__PREFIX/www/htdocs/"
@@ -21,7 +21,7 @@
# mimetype mapping
mimetype.assign = (
-@@ -116,7 +116,7 @@
+@@ -115,7 +115,7 @@
# server.tag = "lighttpd"
#### accesslog module
@@ -30,7 +30,7 @@
## deny access the file-extensions
#
-@@ -148,7 +148,7 @@
+@@ -147,7 +147,7 @@
#server.error-handler-404 = "/error-handler.php"
## to help the rc.scripts
@@ -39,7 +39,27 @@
###### virtual hosts
-@@ -189,13 +189,13 @@
+@@ -160,7 +160,7 @@
+ ## or
+ ## virtual-server-root + http-host + virtual-server-docroot
+ ##
+-#simple-vhost.server-root = "/srv/www/vhosts/"
++#simple-vhost.server-root = "__PREFIX/www/vhosts/"
+ #simple-vhost.default-host = "www.example.org"
+ #simple-vhost.document-root = "/htdocs/"
+
+@@ -168,8 +168,8 @@
+ ##
+ ## Format: <errorfile-prefix><status-code>.html
+ ## -> ..../status-404.html for 'File not found'
+-#server.errorfile-prefix = "/usr/share/lighttpd/errors/status-"
+-#server.errorfile-prefix = "/srv/www/errors/status-"
++#server.errorfile-prefix = "__PREFIX/share/lighttpd/errors/status-"
++#server.errorfile-prefix = "__PREFIX/www/errors/status-"
+
+ ## virtual directory listings
+ #dir-listing.activate = "enable"
+@@ -188,13 +188,13 @@
#server.chroot = "/"
## change uid to <uid> (default: don't care)
@@ -56,7 +76,7 @@
#compress.filetype = ("text/plain", "text/html")
#### proxy module
-@@ -215,15 +215,15 @@
+@@ -214,20 +214,20 @@
#fastcgi.server = ( ".php" =>
# ( "localhost" =>
# (
@@ -76,7 +96,22 @@
#
#### SSL engine
-@@ -284,15 +284,15 @@
+ #ssl.engine = "enable"
+-#ssl.pemfile = "/etc/ssl/private/lighttpd.pem"
++#ssl.pemfile = "_PREFIX/etc/ssl/private/lighttpd.pem"
+
+ #### status module
+ #status.status-url = "/server-status"
+@@ -274,7 +274,7 @@
+ # %3 => subdomain 1 name
+ # %4 => subdomain 2 name
+ #
+-#evhost.path-pattern = "/srv/www/vhosts/%3/htdocs/"
++#evhost.path-pattern = "__PREFIX/www/vhosts/%3/htdocs/"
+
+ #### expire module
+ #expire.url = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
+@@ -283,15 +283,15 @@
#ssi.extension = ( ".shtml" )
#### rrdtool
@@ -95,3 +130,14 @@
# trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" )
# trigger-before-download.trigger-url = "^/trigger/"
# trigger-before-download.download-url = "^/download/"
+@@ -312,8 +312,8 @@
+ #index-file.names += (foo + ".php")
+
+ #### include
+-#include /etc/lighttpd/lighttpd-inc.conf
+-## same as above if you run: "lighttpd -f /etc/lighttpd/lighttpd.conf"
++#include __PREFIX/etc/lighttpd/lighttpd-inc.conf
++## same as above if you run: "lighttpd -f __PREFIX/etc/lighttpd/lighttpd.conf"
+ #include "lighttpd-inc.conf"
+
+ #### include_shell
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090927/4d93de1e/attachment.html>
More information about the macports-changes
mailing list