[73869] trunk/dports/www/lighttpd

ryandesign at macports.org ryandesign at macports.org
Sat Nov 27 08:08:32 PST 2010


Revision: 73869
          http://trac.macports.org/changeset/73869
Author:   ryandesign at macports.org
Date:     2010-11-27 08:08:28 -0800 (Sat, 27 Nov 2010)
Log Message:
-----------
lighttpd: update to 1.4.28, overhaul config file patches, default event-handler is now libev to address constant crashes on Snow Leopard (and possibly Leopard); see #22174, #26752, #27470

Modified Paths:
--------------
    trunk/dports/www/lighttpd/Portfile

Added Paths:
-----------
    trunk/dports/www/lighttpd/files/patch-conf-darwin.diff
    trunk/dports/www/lighttpd/files/patch-conf.diff

Removed Paths:
-------------
    trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf.diff

Modified: trunk/dports/www/lighttpd/Portfile
===================================================================
--- trunk/dports/www/lighttpd/Portfile	2010-11-27 15:12:35 UTC (rev 73868)
+++ trunk/dports/www/lighttpd/Portfile	2010-11-27 16:08:28 UTC (rev 73869)
@@ -3,8 +3,7 @@
 
 PortSystem 1.0
 name              lighttpd
-version           1.4.26
-revision          1
+version           1.4.28
 set branch        [join [lrange [split ${version} .] 0 1] .]
 categories        www
 platforms         darwin
@@ -19,35 +18,63 @@
 master_sites      http://download.lighttpd.net/lighttpd/releases-${branch}.x/
 use_bzip2         yes
 
-checksums         md5     a682c8efce47a2f4263a247ba0813c9b \
-                  sha1    f9710da0152792d83c223a1248345a2d145d6f32 \
-                  rmd160  2d294083fbcd4040dc8efec06090cf1c1bf66bbf
+checksums                   sha1    42915dffe2af4f870cc1cdc0218edb60a0a315c2 \
+                            rmd160  5af6c848dd251c9d15f5185f54411744ae41c67b
 
-depends_lib       port:pcre \
+depends_build-append        port:pkgconfig
+
+depends_lib                 port:bzip2 \
+                            port:pcre \
                   port:spawn-fcgi \
                   port:zlib
-patchfiles        patch-doc-lighttpd.conf.diff
 
+patchfiles                  patch-conf.diff
+
 post-patch {
-    reinplace "s|__PREFIX|${prefix}|g" "${worksrcpath}/doc/lighttpd.conf"
+    reinplace "s|@PREFIX@|${prefix}|g" \
+        ${worksrcpath}/doc/config/conf.d/cgi.conf \
+        ${worksrcpath}/doc/config/conf.d/fastcgi.conf \
+        ${worksrcpath}/doc/config/conf.d/mysql_vhost.conf \
+        ${worksrcpath}/doc/config/conf.d/rrdtool.conf \
+        ${worksrcpath}/doc/config/lighttpd.conf
 }
 
-# Startup item.
-set lighttpd_config_name   lighttpd.conf
-set lighttpd_config        ${prefix}/etc/${name}/${lighttpd_config_name}
+platform darwin {
+    depends_lib-append      port:libev
+    patchfiles-append       patch-conf-darwin.diff
+    post-patch {
+        if {${os.major} <= 8} {
+            set user "www"
+            set group "www"
+        } else {
+            set user "_www"
+            set group "_www"
+        }
+        reinplace "s|@USER@|${user}|g" ${worksrcpath}/doc/config/lighttpd.conf
+        reinplace "s|@GROUP@|${group}|g" ${worksrcpath}/doc/config/lighttpd.conf
+    }
+    configure.args-append   --with-libev
+}
 
+set lighttpd_config_dir     ${prefix}/etc/${name}
+
 startupitem.create  yes
-startupitem.executable ${prefix}/sbin/lighttpd -D -f ${lighttpd_config}
+startupitem.executable      ${prefix}/sbin/lighttpd -D -f ${lighttpd_config_dir}/lighttpd.conf
 
 destroot.keepdirs   ${destroot}${prefix}/var/log/lighttpd \
                     ${destroot}${prefix}/www/htdocs \
                     ${destroot}${prefix}/var/run/lighttpd \
-                    ${destroot}${prefix}/var/lib/lighttpd \
+                    ${destroot}${prefix}/var/lib/lighttpd/sockets \
                     ${destroot}${prefix}/var/cache/lighttpd/compress
 post-destroot {
-   file mkdir "${destroot}${prefix}/etc/${name}/"
-   xinstall -m 644 -v "${worksrcpath}/doc/lighttpd.conf" \
-                      "${destroot}${lighttpd_config}.default"
+    xinstall -d ${destroot}${lighttpd_config_dir}/conf.d
+    foreach f [glob ${worksrcpath}/doc/config/*.conf] {
+        xinstall -m 644 ${f} ${destroot}${lighttpd_config_dir}/[file tail ${f}].default
+    }
+    foreach f [glob ${worksrcpath}/doc/config/conf.d/*.conf] {
+        xinstall -m 644 ${f} ${destroot}${lighttpd_config_dir}/conf.d/[file tail ${f}].default
+    }
+
    set docdir ${destroot}${prefix}/share/doc/${name}
    xinstall -d ${docdir}
    xinstall -m 644 -W ${worksrcpath} \
@@ -60,43 +87,43 @@
 
 install.asroot      yes
 
-post-install {
-  ui_msg "\n Before starting lighttpd it must be configured.\n\
-    Lighttpd is configured by editing ${lighttpd_config}\n\
-    There's a sample config file at ${lighttpd_config}.default."
+post-activate {
+    # Copy default conf files if not present
+    foreach f [glob ${lighttpd_config_dir}/*.conf.default] {
+        set f [file rootname ${f}]
+        if {![file exists ${f}]} {
+            copy ${f}.default ${f}
+        }
+    }
+    foreach f [glob ${lighttpd_config_dir}/conf.d/*.conf.default] {
+        set f [file rootname ${f}]
+        if {![file exists ${f}]} {
+            copy ${f}.default ${f}
+        }
+    }
 }
 
-
 variant mysql4 conflicts mysql5 {
    depends_lib-append    port:mysql4
    configure.args-append --with-mysql=${prefix}/bin/mysql_config
-
-   post-configure {
-      reinplace "s|<mysql/mysql.h>|\"${prefix}/include/mysql/mysql.h\"|g" \
-                "${worksrcpath}/src/mod_mysql_vhost.c"
-   }
+   #configure.cppflags-append -I${prefix}/include/mysql
 }
 
 variant mysql5 conflicts mysql4 {
    depends_lib-append    path:bin/mysql_config5:mysql5
    configure.args-append --with-mysql=${prefix}/bin/mysql_config5
-
-   post-configure {
-      reinplace "s|<mysql/mysql.h>|\"${prefix}/include/mysql5/mysql/mysql.h\"|g" \
-                "${worksrcpath}/src/mod_mysql_vhost.c"
-   }
+   #configure.cppflags-append -I${prefix}/include/mysql5/mysql
 }
 
 variant ssl {
    depends_lib-append   port:openssl
-   configure.args-append --with-openssl=${prefix}/include/openssl
+    configure.args-append   --with-openssl
 }
 
 variant cml {
    depends_lib-append   port:lua \
                         port:libmemcache \
-                        port:memcached \
-                        port:pkgconfig
+                        port:memcached
                         
    configure.args-append --with-lua \
                          --with-memcache
@@ -104,10 +131,20 @@
 
 variant davprops {
    depends_lib-append   port:libxml2 \
-                        port:sqlite3 \
-                        port:pkgconfig
+                        port:sqlite3
                         
    configure.args-append --with-webdav-props
 }
 
 default_variants            +ssl
+
+notes "
+Before starting lighttpd it must be configured.\
+Basic server configuration is in the file ${lighttpd_config_dir}/lighttpd.conf.\
+Select which modules you want enabled in ${lighttpd_config_dir}/modules.conf.\
+Individual modules' settings are in ${lighttpd_config_dir}/conf.d.
+
+Sample config files have the .conf.default extension.\
+When updating lighttpd, you should investigate whether you need to update\
+your .conf files with changes from the corresponding .conf.default files.
+"

Added: trunk/dports/www/lighttpd/files/patch-conf-darwin.diff
===================================================================
--- trunk/dports/www/lighttpd/files/patch-conf-darwin.diff	                        (rev 0)
+++ trunk/dports/www/lighttpd/files/patch-conf-darwin.diff	2010-11-27 16:08:28 UTC (rev 73869)
@@ -0,0 +1,46 @@
+--- doc/config/conf.d/userdir.conf.orig	2010-07-11 12:01:32.000000000 -0500
++++ doc/config/conf.d/userdir.conf	2010-10-17 05:12:17.000000000 -0500
+@@ -9,16 +9,17 @@
+ server.modules += ( "mod_userdir" )
+ 
+ ##
+-## usually it should be set to "public_html" to take ~/public_html/ as
+-## the document root
++## On most UNIX-like operating systems it should be set to "public_html" to
++## take ~/public_html/ as the document root.
++## On Mac OS X it should be set to "Sites" to take ~/Sites as the document root.
+ ## Default: empty (document root is the home directory)
+ ##
+-userdir.path = "public_html"
++userdir.path = "Sites"
+ 
+ ##
+ ## If set, don't check /etc/passwd for homedir
+ ## Default: empty
+-#userdir.basepath = server_root + "/users/"
++userdir.basepath = "/Users/"
+ 
+ ##
+ ## list of usernames which may not use this feature
+--- doc/config/lighttpd.conf.orig	2010-07-11 12:01:32.000000000 -0500
++++ doc/config/lighttpd.conf	2010-10-17 05:28:45.000000000 -0500
+@@ -101,8 +101,8 @@
+ ## Run as a different username/groupname.
+ ## This requires root permissions during startup. 
+ ##
+-server.username  = "lighttpd"
+-server.groupname = "lighttpd"
++server.username  = "@USER@"
++server.groupname = "@GROUP@"
+ 
+ ## 
+ ## enable core files.
+@@ -178,7 +178,7 @@
+ ##
+ ## linux-sysepoll is recommended on kernel 2.6.
+ ##
+-server.event-handler = "linux-sysepoll"
++server.event-handler = "libev"
+ 
+ ##
+ ## The basic network interface for all platforms at the syscalls read()

Copied: trunk/dports/www/lighttpd/files/patch-conf.diff (from rev 72454, trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf.diff)
===================================================================
--- trunk/dports/www/lighttpd/files/patch-conf.diff	                        (rev 0)
+++ trunk/dports/www/lighttpd/files/patch-conf.diff	2010-11-27 16:08:28 UTC (rev 73869)
@@ -0,0 +1,168 @@
+--- doc/config/conf.d/auth.conf.orig	2010-07-11 12:01:32.000000000 -0500
++++ doc/config/conf.d/auth.conf	2010-10-17 05:20:42.000000000 -0500
+@@ -8,8 +8,8 @@
+ ##
+ 
+ #auth.backend                 = "plain"
+-#auth.backend.plain.userfile  = "/etc/lighttpd/lighttpd.user"
+-#auth.backend.plain.groupfile = "/etc/lighttpd/lighttpd.group"
++#auth.backend.plain.userfile  = conf_dir + "/lighttpd.user"
++#auth.backend.plain.groupfile = conf_dir + "/lighttpd.group"
+ 
+ #auth.backend.ldap.hostname = "localhost"
+ #auth.backend.ldap.base-dn  = "dc=my-domain,dc=com"
+--- doc/config/conf.d/cgi.conf.orig	2010-07-11 12:01:32.000000000 -0500
++++ doc/config/conf.d/cgi.conf	2010-10-17 05:19:33.000000000 -0500
+@@ -12,11 +12,11 @@
+ ##
+ ## For PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini.
+ ##
+-cgi.assign                 = ( ".pl"  => "/usr/bin/perl",
+-                               ".cgi" => "/usr/bin/perl",
+-                               ".rb"  => "/usr/bin/ruby",
+-                               ".erb" => "/usr/bin/eruby",
+-                               ".py"  => "/usr/bin/python" )
++cgi.assign                 = ( ".pl"  => "@PREFIX@/bin/perl",
++                               ".cgi" => "@PREFIX@/bin/perl",
++                               ".rb"  => "@PREFIX@/bin/ruby",
++                               ".erb" => "@PREFIX@/bin/eruby",
++                               ".py"  => "@PREFIX@/bin/python2.6" )
+ 
+ ##
+ ## to get the old cgi-bin behavior of apache
+--- doc/config/conf.d/fastcgi.conf.orig	2010-07-11 12:01:32.000000000 -0500
++++ doc/config/conf.d/fastcgi.conf	2010-10-17 05:03:24.000000000 -0500
+@@ -23,7 +23,7 @@
+ #                   ( "php-local" =>
+ #                     (
+ #                       "socket" => socket_dir + "/php-fastcgi-1.socket",
+-#                       "bin-path" => server_root + "/cgi-bin/php5",
++#                       "bin-path" => "@PREFIX@/bin/php-cgi",
+ #                       "max-procs" => 1,
+ #                       "broken-scriptfilename" => "enable",
+ #                     )
+@@ -40,7 +40,7 @@
+ #                   ( "php-num-procs" =>
+ #                     (
+ #                       "socket" => socket_dir + "/php-fastcgi-2.socket",
+-#                       "bin-path" => server_root + "/cgi-bin/php5",
++#                       "bin-path" => "@PREFIX@/bin/php",
+ #                       "bin-environment" => (
+ #                         "PHP_FCGI_CHILDREN" => "16",
+ #                         "PHP_FCGI_MAX_REQUESTS" => "10000",
+@@ -115,7 +115,7 @@
+ 
+ ## chrooted webserver + external PHP
+ ##
+-## $ spawn-fcgi -f /usr/bin/php-cgi -p 2000 -a 127.0.0.1 -C 8
++## $ spawn-fcgi -f @PREFIX@/bin/php-cgi -p 2000 -a 127.0.0.1 -C 8
+ ##
+ ## webserver chrooted to /srv/www/
+ ## php running outside the chroot
+@@ -128,7 +128,7 @@
+ #  )))
+ #
+ #server.chroot = "/srv/www"
+-#server.document-root = "/servers/wwww.example.org/htdocs/"
++#server.document-root = "/servers/www.example.org/htdocs/"
+ #
+ 
+ ##
+--- doc/config/conf.d/mysql_vhost.conf.orig	2010-07-11 12:01:32.000000000 -0500
++++ doc/config/conf.d/mysql_vhost.conf	2010-10-17 05:14:56.000000000 -0500
+@@ -12,7 +12,7 @@
+ ##
+ ## Local path to the mysql socket
+ ##
+-#mysql-vhost.sock           = "/var/lib/mysql/mysql.sock"
++mysql-vhost.sock           = "@PREFIX@/var/run/mysql5/mysqld.sock"
+ 
+ ##
+ ## Host of the MySQL server. 
+--- doc/config/conf.d/rrdtool.conf.orig	2010-07-11 12:01:32.000000000 -0500
++++ doc/config/conf.d/rrdtool.conf	2010-10-17 05:07:35.000000000 -0500
+@@ -10,12 +10,12 @@
+ ##
+ ## Path to the rrdtool binary.
+ ##
+-rrdtool.binary             = "/usr/bin/rrdtool"
++rrdtool.binary             = "@PREFIX@/bin/rrdtool"
+ 
+ ##
+ ## Path to the rrdtool database. You can override this in conditionals.
+ ##
+-rrdtool.db-name            = "/var/lib/lighttpd/lighttpd.rrd"
++rrdtool.db-name            = home_dir + "/lighttpd.rrd"
+ 
+ ##
+ #######################################################################
+--- doc/config/lighttpd.conf.orig	2010-07-11 12:01:32.000000000 -0500
++++ doc/config/lighttpd.conf	2010-10-17 05:28:45.000000000 -0500
+@@ -13,11 +13,11 @@
+ ## if you add a variable here. Add the corresponding variable in the
+ ## chroot example aswell.
+ ##
+-var.log_root    = "/var/log/lighttpd"
+-var.server_root = "/srv/www"
+-var.state_dir   = "/var/run"
+-var.home_dir    = "/var/lib/lighttpd"
+-var.conf_dir    = "/etc/lighttpd"
++var.log_root    = "@PREFIX@/var/log/lighttpd"
++var.server_root = "@PREFIX@/www"
++var.state_dir   = "@PREFIX@/var/run/lighttpd"
++var.home_dir    = "@PREFIX@/var/lib/lighttpd"
++var.conf_dir    = "@PREFIX@/etc/lighttpd"
+ 
+ ## 
+ ## run the server chrooted.
+@@ -58,7 +58,7 @@
+ ## used in:
+ ## conf.d/compress.conf
+ ##
+-var.cache_dir   = "/var/cache/lighttpd"
++var.cache_dir   = "@PREFIX@/var/cache/lighttpd"
+ 
+ ##
+ ## Base directory for sockets.
+@@ -345,7 +345,7 @@
+ ## Format: <errorfile-prefix><status-code>.html
+ ## -> ..../status-404.html for 'File not found'
+ ##
+-#server.errorfile-prefix    = "/srv/www/htdocs/errors/status-"
++#server.errorfile-prefix    = server.document-root + /errors/status-"
+ 
+ ##
+ ## mimetype mapping
+@@ -393,19 +393,19 @@
+ ##
+ ##   $SERVER["socket"] == "10.0.0.1:443" {
+ ##     ssl.engine                  = "enable"
+-##     ssl.pemfile                 = "/etc/ssl/private/www.example.com.pem"
++##     ssl.pemfile                 = "@PREFIX@/etc/ssl/private/www.example.com.pem"
+ ##     server.name                 = "www.example.com"
+ ##
+-##     server.document-root        = "/srv/www/vhosts/example.com/www/"
++##     server.document-root        = "@PREFIX@/www/vhosts/example.com/www/"
+ ##   }
+ ##
+ 
+ ## If you have a .crt and a .key file, cat them together into a
+ ## single PEM file:
+-## $ cat /etc/ssl/private/lighttpd.key /etc/ssl/certs/lighttpd.crt \
+-##   > /etc/ssl/private/lighttpd.pem
++## $ cat @PREFIX@/etc/ssl/private/lighttpd.key @PREFIX@/etc/ssl/certs/lighttpd.crt \
++##   > @PREFIX@/etc/ssl/private/lighttpd.pem
+ ##
+-#ssl.pemfile = "/etc/ssl/private/lighttpd.pem"
++#ssl.pemfile = "@PREFIX@/etc/ssl/private/lighttpd.pem"
+ 
+ ##
+ ## optionally pass the CA certificate here.
+@@ -421,6 +421,6 @@
+ ## custom includes like vhosts.
+ ##
+ #include "conf.d/config.conf"
+-#include_shell "cat /etc/lighttpd/vhosts.d/*.conf"
++#include_shell "cat @PREFIX@/etc/lighttpd/vhosts.d/*.conf"
+ ##
+ #######################################################################

Deleted: trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf.diff
===================================================================
--- trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf.diff	2010-11-27 15:12:35 UTC (rev 73868)
+++ trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf.diff	2010-11-27 16:08:28 UTC (rev 73869)
@@ -1,143 +0,0 @@
---- 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 a look at the
- ## mod_simple_vhost module.
--server.document-root        = "/srv/www/htdocs/"
-+server.document-root        = "__PREFIX/www/htdocs/"
- 
- ## where to send error-messages to
--server.errorlog             = "/var/log/lighttpd/error.log"
-+server.errorlog             = "__PREFIX/var/log/lighttpd/error.log"
- 
- # files to check for if .../ is requested
- index-file.names            = ( "index.php", "index.html",
-                                 "index.htm", "default.htm" )
- 
- ## set the event-handler (read the performance section in the manual)
--# server.event-handler = "freebsd-kqueue" # needed on OS X
-+server.event-handler = "freebsd-kqueue" # needed on OS X
- 
- # mimetype mapping
- mimetype.assign             = (
-@@ -115,7 +115,7 @@
- # server.tag                 = "lighttpd"
- 
- #### accesslog module
--accesslog.filename          = "/var/log/lighttpd/access.log"
-+accesslog.filename          = "__PREFIX/var/log/lighttpd/access.log"
- 
- ## deny access the file-extensions
- #
-@@ -147,7 +147,7 @@
- #server.error-handler-404   = "/error-handler.php"
- 
- ## to help the rc.scripts
--#server.pid-file            = "/var/run/lighttpd.pid"
-+server.pid-file            = "__PREFIX/var/run/lighttpd.pid"
- 
- 
- ###### virtual hosts
-@@ -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)
--#server.username            = "wwwrun"
-+server.username            = "www"
- 
- ## change uid to <uid> (default: don't care)
--#server.groupname           = "wwwrun"
-+server.groupname           = "www"
- 
- #### compress module
--#compress.cache-dir         = "/var/cache/lighttpd/compress/"
-+#compress.cache-dir         = "__PREFIX/var/cache/lighttpd/compress/"
- #compress.filetype          = ("text/plain", "text/html")
- 
- #### proxy module
-@@ -214,20 +214,20 @@
- #fastcgi.server             = ( ".php" =>
- #                               ( "localhost" =>
- #                                 (
--#                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
--#                                   "bin-path" => "/usr/local/bin/php-cgi"
-+#                                   "socket" => "__PREFIX/var/run/lighttpd/php-fastcgi.socket",
-+#                                   "bin-path" => "__PREFIX/bin/php-cgi"
- #                                 )
- #                               )
- #                            )
- 
- #### CGI module
--#cgi.assign                 = ( ".pl"  => "/usr/bin/perl",
--#                               ".cgi" => "/usr/bin/perl" )
-+#cgi.assign                 = ( ".pl"  => "__PREFIX/bin/perl",
-+#                               ".cgi" => "__PREFIX/bin/perl" )
- #
- 
- #### SSL engine
- #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
--#rrdtool.binary             = "/usr/bin/rrdtool"
--#rrdtool.db-name            = "/var/lib/lighttpd/lighttpd.rrd"
-+#rrdtool.binary             = "__PREFIX/bin/rrdtool"
-+#rrdtool.db-name            = "__PREFIX/var/lib/lighttpd/lighttpd.rrd"
- 
- #### setenv
- #setenv.add-request-header  = ( "TRAV_ENV" => "mysql://user@host/db" )
- #setenv.add-response-header = ( "X-Secret-Message" => "42" )
- 
- ## for mod_trigger_b4_dl
--# trigger-before-download.gdbm-filename = "/var/lib/lighttpd/trigger.db"
-+# trigger-before-download.gdbm-filename = "__PREFIX/var/lib/lighttpd/trigger.db"
- # 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/20101127/2a40583a/attachment-0001.html>


More information about the macports-changes mailing list