[55776] trunk/dports/www/lighttpd

snc at macports.org snc at macports.org
Tue Aug 18 11:03:56 PDT 2009


Revision: 55776
          http://trac.macports.org/changeset/55776
Author:   snc at macports.org
Date:     2009-08-18 11:03:55 -0700 (Tue, 18 Aug 2009)
Log Message:
-----------
ensure default configuration\s

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

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

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

Modified: trunk/dports/www/lighttpd/Portfile
===================================================================
--- trunk/dports/www/lighttpd/Portfile	2009-08-18 18:01:06 UTC (rev 55775)
+++ trunk/dports/www/lighttpd/Portfile	2009-08-18 18:03:55 UTC (rev 55776)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem 1.0
@@ -17,10 +18,10 @@
                   rmd160  0762e55c52cbc8e5c20faecc45817db5885462d4
 depends_lib       port:pcre \
                   port:zlib
-patchfiles        patch-doc-lighttpd.conf
+patchfiles        patch-doc-lighttpd.conf.diff
 
 post-patch {
-	reinplace "s|__PREFIX|${prefix}|g" "${worksrcpath}/doc/lighttpd.conf"
+    reinplace "s|__PREFIX|${prefix}|g" "${worksrcpath}/doc/lighttpd.conf"
 }
 
 configure.args    --mandir=${prefix}/share/man
@@ -36,6 +37,11 @@
 startupitem.start   "${prefix}/sbin/lighttpd -f ${lighttpd_config}"
 startupitem.stop    "kill \$(cat \$PIDFILE)"
 
+destroot.keepdirs   ${destroot}${prefix}/var/log/lighttpd \
+                    ${destroot}${prefix}/www/htdocs \
+                    ${destroot}${prefix}/var/run/lighttpd \
+                    ${destroot}${prefix}/var/lib/lighttpd \
+                    ${destroot}${prefix}/var/cache/lighttpd/compress
 post-destroot {
    file mkdir "${destroot}${prefix}/etc/${name}/"
    xinstall -m 644 -v "${worksrcpath}/doc/lighttpd.conf" \

Deleted: trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf
===================================================================
--- trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf	2009-08-18 18:01:06 UTC (rev 55775)
+++ trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf	2009-08-18 18:03:55 UTC (rev 55776)
@@ -1,40 +0,0 @@
---- doc/lighttpd.conf	2007-08-14 21:05:57.000000000 +0200
-+++ doc/lighttpd.conf	2007-09-17 11:25:25.000000000 +0200
-@@ -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
-@@ -213,14 +213,14 @@
- #                               ( "localhost" =>
- #                                 (
- #                                   "socket" => "/var/run/lighttpd/php-fastcgi.socket",
--#                                   "bin-path" => "/usr/local/bin/php-cgi"
-+#                                   "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
-@@ -281,8 +281,8 @@
- #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" )

Copied: trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf.diff (from rev 55718, trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf)
===================================================================
--- trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf.diff	                        (rev 0)
+++ trunk/dports/www/lighttpd/files/patch-doc-lighttpd.conf.diff	2009-08-18 18:03:55 UTC (rev 55776)
@@ -0,0 +1,97 @@
+--- 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 @@
+ 
+ ## a static document-root, for virtual-hosting take look at the
+ ## server.virtual-* options
+-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             = (
+@@ -116,7 +116,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
+ #
+@@ -148,7 +148,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
+@@ -189,13 +189,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
+@@ -215,15 +215,15 @@
+ #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
+@@ -284,15 +284,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/"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090818/09b4e629/attachment.html>


More information about the macports-changes mailing list