--- a/components/lighttpd/lighttpd.p5m Fri Jan 23 17:31:40 2015 -0800
+++ b/components/lighttpd/lighttpd.p5m Tue Feb 03 19:24:25 2015 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,88 +27,79 @@
add pkg.linted.userland.action001.2 true>
set name=pkg.fmri \
value=pkg:/web/server/lighttpd-14@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary \
- value="The Lighttpd Web Server"
+set name=pkg.summary value="The Lighttpd Web Server"
set name=com.oracle.info.description value="the Lightppd web server"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url \
- value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
- value=LSARC/2008/191
-set name=org.opensolaris.consolidation \
- value=$(CONSOLIDATION)
-
-license lighttpd.license license='Lighttpd license'
-
-dir path=var/lighttpd/1.4/docroot
-dir path=var/lighttpd/1.4/errors
-dir path=var/lighttpd/1.4/logs group=webservd owner=webservd mode=700
-dir path=var/lighttpd/1.4/vhosts
-dir path=var/lighttpd/1.4/sockets
-file doc/config/conf.d/access_log.conf path=etc/lighttpd/1.4/conf.d/access_log.conf \
+set name=org.opensolaris.arc-caseid value=LSARC/2008/191
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file doc/config/conf.d/access_log.conf \
+ path=etc/lighttpd/1.4/conf.d/access_log.conf mode=0644 preserve=renamenew
+file doc/config/conf.d/auth.conf path=etc/lighttpd/1.4/conf.d/auth.conf \
mode=0644 preserve=renamenew
-file doc/config/conf.d/compress.conf path=etc/lighttpd/1.4/conf.d/compress.conf \
- mode=0644 preserve=renamenew
-file doc/config/conf.d/trigger_b4_dl.conf path=etc/lighttpd/1.4/conf.d/trigger_b4_dl.conf \
- mode=0644 preserve=renamenew
-file doc/config/conf.d/webdav.conf path=etc/lighttpd/1.4/conf.d/webdav.conf \
- mode=0644 preserve=renamenew
-file doc/config/conf.d/ssi.conf path=etc/lighttpd/1.4/conf.d/ssi.conf \
+file doc/config/conf.d/cgi.conf path=etc/lighttpd/1.4/conf.d/cgi.conf \
mode=0644 preserve=renamenew
file doc/config/conf.d/cml.conf path=etc/lighttpd/1.4/conf.d/cml.conf \
mode=0644 preserve=renamenew
+file doc/config/conf.d/compress.conf \
+ path=etc/lighttpd/1.4/conf.d/compress.conf mode=0644 preserve=renamenew
+file doc/config/conf.d/debug.conf path=etc/lighttpd/1.4/conf.d/debug.conf \
+ mode=0644 preserve=renamenew
+file doc/config/conf.d/dirlisting.conf \
+ path=etc/lighttpd/1.4/conf.d/dirlisting.conf mode=0644 preserve=renamenew
+file doc/config/conf.d/evhost.conf path=etc/lighttpd/1.4/conf.d/evhost.conf \
+ mode=0644 preserve=renamenew
+file doc/config/conf.d/expire.conf path=etc/lighttpd/1.4/conf.d/expire.conf \
+ mode=0644 preserve=renamenew
+file doc/config/conf.d/fastcgi.conf path=etc/lighttpd/1.4/conf.d/fastcgi.conf \
+ mode=0644 preserve=renamenew
+file Solaris/fcgi-php.conf path=etc/lighttpd/1.4/conf.d/fcgi-php.conf \
+ mode=0644 \
+ original_name=SUNWlighttpd14:etc/lighttpd/1.4/conf.d/fcgi-php.conf \
+ preserve=renamenew
+file doc/config/conf.d/magnet.conf path=etc/lighttpd/1.4/conf.d/magnet.conf \
+ mode=0644 preserve=renamenew
file doc/config/conf.d/mime.conf path=etc/lighttpd/1.4/conf.d/mime.conf \
mode=0644 preserve=renamenew
-file doc/config/conf.d/auth.conf path=etc/lighttpd/1.4/conf.d/auth.conf \
- mode=0644 preserve=renamenew
-file doc/config/conf.d/status.conf path=etc/lighttpd/1.4/conf.d/status.conf \
- mode=0644 preserve=renamenew
-file doc/config/conf.d/simple_vhost.conf path=etc/lighttpd/1.4/conf.d/simple_vhost.conf \
- mode=0644 preserve=renamenew
+file doc/config/conf.d/mysql_vhost.conf \
+ path=etc/lighttpd/1.4/conf.d/mysql_vhost.conf mode=0644 preserve=renamenew
file doc/config/conf.d/proxy.conf path=etc/lighttpd/1.4/conf.d/proxy.conf \
mode=0644 preserve=renamenew
file doc/config/conf.d/rrdtool.conf path=etc/lighttpd/1.4/conf.d/rrdtool.conf \
mode=0644 preserve=renamenew
-file doc/config/conf.d/evhost.conf path=etc/lighttpd/1.4/conf.d/evhost.conf \
- mode=0644 preserve=renamenew
-file doc/config/conf.d/magnet.conf path=etc/lighttpd/1.4/conf.d/magnet.conf \
- mode=0644 preserve=renamenew
-file doc/config/conf.d/expire.conf path=etc/lighttpd/1.4/conf.d/expire.conf \
- mode=0644 preserve=renamenew
-file doc/config/conf.d/debug.conf path=etc/lighttpd/1.4/conf.d/debug.conf \
- mode=0644 preserve=renamenew
file doc/config/conf.d/scgi.conf path=etc/lighttpd/1.4/conf.d/scgi.conf \
mode=0644 preserve=renamenew
-file doc/config/conf.d/mysql_vhost.conf path=etc/lighttpd/1.4/conf.d/mysql_vhost.conf \
+file doc/config/conf.d/secdownload.conf \
+ path=etc/lighttpd/1.4/conf.d/secdownload.conf mode=0644 preserve=renamenew
+file doc/config/conf.d/simple_vhost.conf \
+ path=etc/lighttpd/1.4/conf.d/simple_vhost.conf mode=0644 preserve=renamenew
+file doc/config/conf.d/ssi.conf path=etc/lighttpd/1.4/conf.d/ssi.conf \
mode=0644 preserve=renamenew
-file doc/config/conf.d/fastcgi.conf path=etc/lighttpd/1.4/conf.d/fastcgi.conf \
+file Solaris/ssl.conf path=etc/lighttpd/1.4/conf.d/ssl.conf mode=0644 \
+ original_name=SUNWlighttpd14:etc/lighttpd/1.4/conf.d/ssl.conf \
+ preserve=renamenew
+file doc/config/conf.d/status.conf path=etc/lighttpd/1.4/conf.d/status.conf \
mode=0644 preserve=renamenew
+file doc/config/conf.d/trigger_b4_dl.conf \
+ path=etc/lighttpd/1.4/conf.d/trigger_b4_dl.conf mode=0644 \
+ preserve=renamenew
file doc/config/conf.d/userdir.conf path=etc/lighttpd/1.4/conf.d/userdir.conf \
mode=0644 preserve=renamenew
-file doc/config/conf.d/secdownload.conf path=etc/lighttpd/1.4/conf.d/secdownload.conf \
- mode=0644 preserve=renamenew
-file doc/config/conf.d/dirlisting.conf path=etc/lighttpd/1.4/conf.d/dirlisting.conf \
- mode=0644 preserve=renamenew
-file doc/config/conf.d/cgi.conf path=etc/lighttpd/1.4/conf.d/cgi.conf \
+file doc/config/conf.d/webdav.conf path=etc/lighttpd/1.4/conf.d/webdav.conf \
mode=0644 preserve=renamenew
-
-file Solaris/fcgi-php.conf path=etc/lighttpd/1.4/conf.d/fcgi-php.conf \
- mode=0644 preserve=renamenew \
- original_name=SUNWlighttpd14:etc/lighttpd/1.4/conf.d/fcgi-php.conf
-file Solaris/ssl.conf path=etc/lighttpd/1.4/conf.d/ssl.conf \
- mode=0644 preserve=renamenew \
- original_name=SUNWlighttpd14:etc/lighttpd/1.4/conf.d/ssl.conf
-file doc/config/lighttpd.conf path=etc/lighttpd/1.4/lighttpd.conf \
- mode=0644 preserve=renamenew \
- original_name=SUNWlighttpd14:etc/lighttpd/1.4/lighttpd.conf
-file doc/config/modules.conf path=etc/lighttpd/1.4/modules.conf \
- mode=0644 preserve=renamenew
+file doc/config/lighttpd.conf path=etc/lighttpd/1.4/lighttpd.conf mode=0644 \
+ original_name=SUNWlighttpd14:etc/lighttpd/1.4/lighttpd.conf \
+ preserve=renamenew
+file doc/config/modules.conf path=etc/lighttpd/1.4/modules.conf mode=0644 \
+ preserve=renamenew
file Solaris/auth_attr path=etc/security/auth_attr.d/lighttpd
file Solaris/prof_attr path=etc/security/prof_attr.d/lighttpd
-file Solaris/http-lighttpd14.xml path=lib/svc/manifest/network/http-lighttpd14.xml
+file Solaris/http-lighttpd14.xml \
+ path=lib/svc/manifest/network/http-lighttpd14.xml
+link path=usr/lighttpd/1.4/bin/spawn-fcgi target=../../../bin/spawn-fcgi
file path=usr/lighttpd/1.4/lib/mod_access.so
file path=usr/lighttpd/1.4/lib/mod_accesslog.so
file path=usr/lighttpd/1.4/lib/mod_alias.so
@@ -141,11 +132,18 @@
file path=usr/lighttpd/1.4/lib/mod_userdir.so
file path=usr/lighttpd/1.4/lib/mod_usertrack.so
file path=usr/lighttpd/1.4/lib/mod_webdav.so
+link path=usr/lighttpd/1.4/man/man1/spawn-fcgi.1 \
+ target=../../../../share/man/man1/spawn-fcgi.1
file path=usr/lighttpd/1.4/man/man8/lighttpd.8
file path=usr/lighttpd/1.4/sbin/lighttpd
file path=usr/lighttpd/1.4/sbin/lighttpd-angel
file Solaris/lighttpd.1m.sunman path=usr/share/man/man1m/lighttpd.1m
-link path=usr/lighttpd/1.4/man/man1/spawn-fcgi.1 target=../../../../share/man/man1/spawn-fcgi.1
-link path=usr/lighttpd/1.4/bin/spawn-fcgi target=../../../bin/spawn-fcgi
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/spawn-fcgi type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/share/man/man1/spawn-fcgi.1 type=require
+dir path=var/lighttpd/1.4/docroot
+dir path=var/lighttpd/1.4/errors
+dir path=var/lighttpd/1.4/logs owner=webservd group=webservd mode=700
+dir path=var/lighttpd/1.4/sockets
+dir path=var/lighttpd/1.4/vhosts
+license lighttpd.license license="Lighttpd license"
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/spawn-fcgi
+depend type=require fmri=__TBD \
+ pkg.debug.depend.file=usr/share/man/man1/spawn-fcgi.1