Ticket #21586: lighttpd-1.4.23.diff

files/patch-doc-lighttpd.conf.diff

@@ -1 @@
---- 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 +21 @@
  
  # mimetype mapping
  mimetype.assign             = (
-@@ -116,7 +116,7 @@
+@@ -115,7 +115,7 @@
  # server.tag                 = "lighttpd"
  
  #### accesslog module
@@ -30 +30 @@
  
  ## 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 +39 @@
  
  
  ###### 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 +76 @@
  #compress.filetype          = ("text/plain", "text/html")
  
  #### proxy module
-@@ -215,15 +215,15 @@
+@@ -214,20 +214,20 @@
  #fastcgi.server             = ( ".php" =>
  #                               ( "localhost" =>
  #                                 (
@@ -76 +96 @@
  #
  
  #### 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 +130 @@
  # 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

Portfile

@@ -3 +3 @@
 
 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 +15 @@
                   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 +27 @@
     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 +47 @@
    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 {