Index: head/www/lighttpd/Makefile =================================================================== --- head/www/lighttpd/Makefile (revision 454614) +++ head/www/lighttpd/Makefile (revision 454615) @@ -1,169 +1,179 @@ # Created by: k@123.org # $FreeBSD$ PORTNAME?= lighttpd PORTVERSION= 1.4.48 +PORTREVISION= 1 CATEGORIES?= www MASTER_SITES?= http://download.lighttpd.net/lighttpd/releases-1.4.x/ MAINTAINER= pkubaj@anongoth.pl COMMENT?= Secure, fast, compliant, and flexible Web Server .if !defined(_BUILDING_LIGHTTPD_MODULE) LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING .endif LIB_DEPENDS+= libpcre.so:devel/pcre GNU_CONFIGURE= yes USES= autoreconf gmake libtool localbase pkgconfig tar:xz USE_CSTD= gnu99 .if !defined(_BUILDING_LIGHTTPD_MODULE) USES+= cpe .endif CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/lighttpd INSTALL_TARGET= install-strip .if !defined(_BUILDING_LIGHTTPD_MODULE) PORTDOCS= AUTHORS COPYING INSTALL NEWS README USE_RC_SUBR= lighttpd REQUIRE= DAEMON OPTIONS_DEFINE= ATTR BZIP2 DOCS FAM GDBM GEOIP IPV6 KRB5 LIBEV LUA MEMCACHED \ MYSQL LDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV OPTIONS_DEFAULT= LUA OPENSSL OPTIONS_SUB= yes ATTR_DESC= extended attributes support BZIP2_DESC= bzip2 support (mod_compress) GDBM_DESC= gdbm storage (mod_trigger_b4_dl) KRB5_DESC= Kerberos authentication (mod_authn_gssapi) LDAP_DESC= LDAP authentication (mod_authn_ldap) LIBEV_DESC= Fast events support via libev (disables kqueue) LUA_DESC= lua support (mod_cml, mod_magnet) MEMCACHED_DESC= memcached storage (mod_trigger_b4_dl) MYSQL_DESC= MySQL support (mod_authn_mysql, mod_mysql_vhost) SPAWNFCGI_DESC= Depend on spawn-fcgi utility VALGRIND_DESC= valgrind support WEBDAV_DESC= WebDAV support ATTR_CONFIGURE_WITH= attr BZIP2_CONFIGURE_WITH= bzip2 FAM_USES= fam FAM_CONFIGURE_ON= --with-fam FAM_CONFIGURE_ENV= FAM_CFLAGS="-I${LOCALBASE}/include" FAM_LIBS="-L${LOCALBASE}/lib" GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= gdbm GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP GEOIP_CONFIGURE_WITH= geoip IPV6_CONFIGURE_OFF= --disable-ipv6 KRB5_CONFIGURE_WITH= krb5 KRB5_CPPFLAGS= ${GSSAPICPPFLAGS} KRB5_LDFLAGS= ${GSSAPILDFLAGS} KRB5_LIBS= ${GSSAPILIBS} KRB5_USES= gssapi:mit LDAP_CONFIGURE_WITH= ldap LDAP_USE= openldap=yes LDAP_VARS= REQUIRE+=slapd LIBEV_CONFIGURE_WITH= libev=${LOCALBASE} LIBEV_LIB_DEPENDS= libev.so:devel/libev LUA_USES= lua LUA_CONFIGURE_WITH= lua LUA_CONFIGURE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached MEMCACHED_CONFIGURE_WITH=memcached MYSQL_CONFIGURE_WITH= mysql MYSQL_USES= mysql MYSQL_VARS= REQUIRE+=mysql OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= openssl OPENSSL_CONFIGURE_ON= --with-openssl-includes=${OPENSSLINC} --with-openssl-libs=${OPENSSLLIB} SPAWNFCGI_RUN_DEPENDS= spawn-fcgi:www/spawn-fcgi VALGRIND_BUILD_DEPENDS= valgrind:devel/valgrind VALGRIND_RUN_DEPENDS= valgrind:devel/valgrind VALGRIND_CONFIGURE_WITH=valgrind WEBDAV_USE= GNOME=libxml2 WEBDAV_LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ libsqlite3.so:databases/sqlite3 WEBDAV_CONFIGURE_WITH= webdav-props webdav-locks LIGHTTPD_CONF_FILES= lighttpd.conf modules.conf LIGHTTPD_CONF_D_FILES= access_log.conf \ auth.conf cgi.conf cml.conf \ compress.conf debug.conf dirlisting.conf \ evhost.conf expire.conf fastcgi.conf \ magnet.conf mime.conf mysql_vhost.conf proxy.conf \ rrdtool.conf scgi.conf secdownload.conf \ simple_vhost.conf ssi.conf status.conf \ trigger_b4_dl.conf userdir.conf webdav.conf -LOGROOT= /var/log/lighttpd -PLIST_SUB= LOGROOT="${LOGROOT}" +USERS= ${WWWOWN} +GROUPS= ${WWWGRP} +CACHEDIR= /var/cache/${PORTNAME} +LOGDIR= /var/log/${PORTNAME} +HOMEDIR= /var/run/${PORTNAME} +PLIST_SUB+= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" +PLIST_SUB+= CACHEDIR="${CACHEDIR}" HOMEDIR="${HOMEDIR}" LOGDIR="${LOGDIR}" .endif # !defined(_BUILDING_LIGHTTPD_MODULE) .include .if !defined(_BUILDING_LIGHTTPD_MODULE) SUB_LIST= REQUIRE="${REQUIRE}" post-patch: @${REINPLACE_CMD} -e 's|-std=gnu99||' \ ${WRKSRC}/configure ${WRKSRC}/configure.ac @${REINPLACE_CMD} -E -e \ - 's|^(server.document-root.*=).*|\1 "${PREFIX}/www/data/"|' \ - -e "s|/etc/lighttpd|${PREFIX}/etc/lighttpd|g" \ + 's|^(server.document-root.*=).*|\1 "${PREFIX}/www" + "/data"|' \ + -e "s|/etc/lighttpd|${ETCDIR}|g" \ -e 's|^(server.event-handler.*=).*|\1 "freebsd-kqueue"|' \ -e 's|^(server.network-backend.*=).*|\1 "writev"|' \ - -e "s|^(server.username.*=).*|\1 \"${LIGHTTPD_USER}\"|" \ - -e "s|^(server.groupname.*=).*|\1 \"${LIGHTTPD_GROUP}\"|" \ - -e "s|^(var.log_root.*=).*|\1 \"${LIGHTTPD_LOGROOT}\"|" \ - -e "s|^(var.home_dir.*=).*|\1 \"/var/spool/lighttpd\"|" \ - -e "s|^(var.server_root.*=).*|\1 \"${LIGHTTPD_WEBROOT}\"|" \ + -e "s|^(server.username.*=).*|\1 \"${WWWOWN}\"|" \ + -e "s|^(server.groupname.*=).*|\1 \"${WWWGRP}\"|" \ + -e "s|^(var.log_root.*=).*|\1 \"${LOGDIR}\"|" \ + -e "s|^(var.server_root.*=).*|\1 \"${WWWDIR}\"|" \ + -e "s|^(var.home_dir.*=).*|\1 \"${HOMEDIR}\"|" \ + -e "s|^(var.cache_dir.*=).*|\1 \"${CACHEDIR}\"|" \ ${WRKSRC}/doc/config/lighttpd.conf - @${REINPLACE_CMD} -e "s|/etc/lighttpd|${PREFIX}/etc/lighttpd|g" \ + @${REINPLACE_CMD} -e "s|/etc/lighttpd|${ETCDIR}|g" \ ${WRKSRC}/doc/config/conf.d/auth.conf @${REINPLACE_CMD} -e "s|/usr/bin/python|${LOCALBASE}/bin/python|" \ ${WRKSRC}/doc/config/conf.d/cgi.conf \ ${WRKSRC}/tests/*.conf @${ECHO} >> ${WRKSRC}/doc/config/lighttpd.conf @${ECHO} "# IPv4 listening socket" >> \ ${WRKSRC}/doc/config/lighttpd.conf @${ECHO} "\$$SERVER[\"socket\"] == \"0.0.0.0:80\" { }" >> \ ${WRKSRC}/doc/config/lighttpd.conf post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d ${STAGEDIR}${PREFIX}/etc/lighttpd/vhosts.d + @${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d ${STAGEDIR}${ETCDIR}/vhosts.d .for FILE in ${LIGHTTPD_CONF_FILES} ${INSTALL_DATA} ${WRKSRC}/doc/config/${FILE} \ - ${STAGEDIR}${PREFIX}/etc/lighttpd/${FILE}.sample + ${STAGEDIR}${ETCDIR}/${FILE}.sample .endfor .for FILE in ${LIGHTTPD_CONF_D_FILES} ${INSTALL_DATA} ${WRKSRC}/doc/config/conf.d/${FILE} \ - ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/${FILE}.sample + ${STAGEDIR}${ETCDIR}/conf.d/${FILE}.sample .endfor ${INSTALL_DATA} ${WRKSRC}/doc/config/vhosts.d/vhosts.template \ - ${STAGEDIR}${PREFIX}/etc/lighttpd/vhosts.d/vhosts.template - @${MKDIR} -m 0700 ${STAGEDIR}${LOGROOT} + ${STAGEDIR}${ETCDIR}/vhosts.d/vhosts.template + @${MKDIR} ${STAGEDIR}${WWWDIR} + @${MKDIR} -m 0700 ${STAGEDIR}${CACHEDIR} + @${MKDIR} -m 0700 ${STAGEDIR}${HOMEDIR}/sockets + @${MKDIR} -m 0700 ${STAGEDIR}${LOGDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) test: build @cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} ${MAKE} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \ check-TESTS regression-test: test .endif # !defined(_BUILDING_LIGHTTPD_MODULE) .include Index: head/www/lighttpd/files/lighttpd.in =================================================================== --- head/www/lighttpd/files/lighttpd.in (revision 454614) +++ head/www/lighttpd/files/lighttpd.in (revision 454615) @@ -1,138 +1,138 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: lighttpd # REQUIRE: %%REQUIRE%% # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable lighttpd: # # lighttpd_enable (bool): Set it to "YES" to enable lighttpd # Default is "NO". # lighttpd_conf (path): Set full path to configuration file. -# Default is "%%PREFIX%%/etc/lighttpd/lighttpd.conf". +# Default is "%%ETCDIR%%/lighttpd.conf". # lighttpd_pidfile (path): Set full path to pid file. # Default is "/var/run/lighttpd.pid". # # Add the following lines to /etc/rc.conf for multiple instances: # (overrides lighttpd_conf and lighttpd_pidfile from above) # # lighttpd_instances (string): Instances of lighttpd # Default is "" (no instances). # lighttpd_${i}_conf (path): Set full path to instance configuration file. -# Default is "%%PREFIX%%/etc/lighttpd/${i}.conf". +# Default is "%%ETCDIR%%/${i}.conf". # lighttpd_${i}_pidfile (path): Set full path to instance pid file # Default is "/var/run/lighttpd_${i}.pid". # . /etc/rc.subr name="lighttpd" rcvar=lighttpd_enable load_rc_config $name : ${lighttpd_enable="NO"} : ${lighttpd_pidfile="/var/run/${name}.pid"} # Compatibility for old configuration file location deprecated_conf= if [ -z "${lighttpd_conf}" ]; then if [ -f "%%PREFIX%%/etc/lighttpd.conf" ]; then deprecated_conf=1 lighttpd_conf="%%PREFIX%%/etc/lighttpd.conf" else - lighttpd_conf="%%PREFIX%%/etc/lighttpd/lighttpd.conf" + lighttpd_conf="%%ETCDIR%%/lighttpd.conf" fi fi command=%%PREFIX%%/sbin/lighttpd stop_postcmd=stop_postcmd restart_precmd="lighttpd_checkconfig" graceful_precmd="lighttpd_checkconfig" graceful_cmd="lighttpd_graceful" gracefulstop_cmd="lighttpd_gracefulstop" configtest_cmd="lighttpd_checkconfig" extra_commands="reload graceful gracefulstop configtest" command_args="-f ${lighttpd_conf}" pidfile=${lighttpd_pidfile} required_files=${lighttpd_conf} lighttpd_check_deprecated() { if [ -n "${deprecated_conf}" ]; then echo "" echo "*** NOTICE: ***" echo "The default location of %%PREFIX%%/etc/lighttpd.conf is deprecated" - echo "Please consider moving to %%PREFIX%%/etc/lighttpd/lighttpd.conf" + echo "Please consider moving to %%ETCDIR%%/lighttpd.conf" echo "" fi } lighttpd_checkconfig() { echo "Performing sanity check on ${name} configuration:" - eval "${command} ${command_args} -t" + eval "${command} ${command_args} -tt" } lighttpd_gracefulstop() { echo "Stopping ${name} gracefully." sig_reload="INT" run_rc_command reload } lighttpd_graceful() { lighttpd_gracefulstop rm -f ${pidfile} run_rc_command start } lighttpd_run_instance() { _i="$1" _rcmd="$2" name=${_orig_name}_${_i} eval ${name}_enable=${lighttpd_enable} - eval lighttpd_conf=\"\${lighttpd_${_i}_conf:-"%%PREFIX%%/etc/lighttpd/${_i}.conf"}\" + eval lighttpd_conf=\"\${lighttpd_${_i}_conf:-"%%ETCDIR%%/${_i}.conf"}\" eval lighttpd_pidfile=\"\${lighttpd_${_i}_pidfile:-"/var/run/lighttpd_${_i}.pid"}\" command_args="-f ${lighttpd_conf}" pidfile=${lighttpd_pidfile} required_files=${lighttpd_conf} run_rc_command ${_rcmd} } stop_postcmd() { rm -f ${pidfile} } if [ -n "${lighttpd_instances}" ]; then _orig_name="${name}" _run_cmd="$1" if [ $# -gt 0 ]; then shift fi if [ -n "$*" ]; then _run_instances="$*" fi if [ -n "${_run_instances}" ]; then for _a in $_run_instances; do for _in in ${lighttpd_instances}; do if [ "$_a" = "$_in" ]; then _runlist="${_runlist} ${_a}" fi done done else _runlist="${lighttpd_instances}" fi for _in in ${_runlist}; do lighttpd_run_instance $_in $_run_cmd done else start_precmd="lighttpd_check_deprecated" run_rc_command "$1" fi Index: head/www/lighttpd/pkg-plist =================================================================== --- head/www/lighttpd/pkg-plist (revision 454614) +++ head/www/lighttpd/pkg-plist (revision 454615) @@ -1,75 +1,79 @@ -@sample etc/lighttpd/lighttpd.conf.sample -@sample etc/lighttpd/modules.conf.sample -@sample etc/lighttpd/conf.d/access_log.conf.sample -@sample etc/lighttpd/conf.d/auth.conf.sample -@sample etc/lighttpd/conf.d/cgi.conf.sample -@sample etc/lighttpd/conf.d/cml.conf.sample -@sample etc/lighttpd/conf.d/compress.conf.sample -@sample etc/lighttpd/conf.d/debug.conf.sample -@sample etc/lighttpd/conf.d/dirlisting.conf.sample -@sample etc/lighttpd/conf.d/evhost.conf.sample -@sample etc/lighttpd/conf.d/expire.conf.sample -@sample etc/lighttpd/conf.d/fastcgi.conf.sample -@sample etc/lighttpd/conf.d/magnet.conf.sample -@sample etc/lighttpd/conf.d/mime.conf.sample -@sample etc/lighttpd/conf.d/mysql_vhost.conf.sample -@sample etc/lighttpd/conf.d/proxy.conf.sample -@sample etc/lighttpd/conf.d/rrdtool.conf.sample -@sample etc/lighttpd/conf.d/scgi.conf.sample -@sample etc/lighttpd/conf.d/secdownload.conf.sample -@sample etc/lighttpd/conf.d/simple_vhost.conf.sample -@sample etc/lighttpd/conf.d/ssi.conf.sample -@sample etc/lighttpd/conf.d/status.conf.sample -@sample etc/lighttpd/conf.d/trigger_b4_dl.conf.sample -@sample etc/lighttpd/conf.d/userdir.conf.sample -@sample etc/lighttpd/conf.d/webdav.conf.sample -etc/lighttpd/vhosts.d/vhosts.template +@sample %%ETCDIR%%/lighttpd.conf.sample +@sample %%ETCDIR%%/modules.conf.sample +@sample %%ETCDIR%%/conf.d/access_log.conf.sample +@sample %%ETCDIR%%/conf.d/auth.conf.sample +@sample %%ETCDIR%%/conf.d/cgi.conf.sample +@sample %%ETCDIR%%/conf.d/cml.conf.sample +@sample %%ETCDIR%%/conf.d/compress.conf.sample +@sample %%ETCDIR%%/conf.d/debug.conf.sample +@sample %%ETCDIR%%/conf.d/dirlisting.conf.sample +@sample %%ETCDIR%%/conf.d/evhost.conf.sample +@sample %%ETCDIR%%/conf.d/expire.conf.sample +@sample %%ETCDIR%%/conf.d/fastcgi.conf.sample +@sample %%ETCDIR%%/conf.d/magnet.conf.sample +@sample %%ETCDIR%%/conf.d/mime.conf.sample +@sample %%ETCDIR%%/conf.d/mysql_vhost.conf.sample +@sample %%ETCDIR%%/conf.d/proxy.conf.sample +@sample %%ETCDIR%%/conf.d/rrdtool.conf.sample +@sample %%ETCDIR%%/conf.d/scgi.conf.sample +@sample %%ETCDIR%%/conf.d/secdownload.conf.sample +@sample %%ETCDIR%%/conf.d/simple_vhost.conf.sample +@sample %%ETCDIR%%/conf.d/ssi.conf.sample +@sample %%ETCDIR%%/conf.d/status.conf.sample +@sample %%ETCDIR%%/conf.d/trigger_b4_dl.conf.sample +@sample %%ETCDIR%%/conf.d/userdir.conf.sample +@sample %%ETCDIR%%/conf.d/webdav.conf.sample +%%ETCDIR%%/vhosts.d/vhosts.template lib/lighttpd/mod_access.so lib/lighttpd/mod_accesslog.so lib/lighttpd/mod_alias.so lib/lighttpd/mod_auth.so lib/lighttpd/mod_authn_file.so %%KRB5%%lib/lighttpd/mod_authn_gssapi.so %%LDAP%%lib/lighttpd/mod_authn_ldap.so %%MYSQL%%lib/lighttpd/mod_authn_mysql.so lib/lighttpd/mod_cgi.so %%LUA%%lib/lighttpd/mod_cml.so lib/lighttpd/mod_compress.so lib/lighttpd/mod_deflate.so lib/lighttpd/mod_dirlisting.so lib/lighttpd/mod_evasive.so lib/lighttpd/mod_evhost.so lib/lighttpd/mod_expire.so lib/lighttpd/mod_extforward.so lib/lighttpd/mod_fastcgi.so lib/lighttpd/mod_flv_streaming.so %%GEOIP%%lib/lighttpd/mod_geoip.so lib/lighttpd/mod_indexfile.so %%LUA%%lib/lighttpd/mod_magnet.so %%MYSQL%%lib/lighttpd/mod_mysql_vhost.so %%OPENSSL%%lib/lighttpd/mod_openssl.so lib/lighttpd/mod_proxy.so lib/lighttpd/mod_redirect.so lib/lighttpd/mod_rewrite.so lib/lighttpd/mod_rrdtool.so lib/lighttpd/mod_scgi.so lib/lighttpd/mod_secdownload.so lib/lighttpd/mod_setenv.so lib/lighttpd/mod_simple_vhost.so lib/lighttpd/mod_ssi.so lib/lighttpd/mod_staticfile.so lib/lighttpd/mod_status.so %%MEMCACHED%%lib/lighttpd/mod_trigger_b4_dl.so lib/lighttpd/mod_uploadprogress.so lib/lighttpd/mod_userdir.so lib/lighttpd/mod_usertrack.so lib/lighttpd/mod_vhostdb.so %%LDAP%%lib/lighttpd/mod_vhostdb_ldap.so %%MYSQL%%lib/lighttpd/mod_vhostdb_mysql.so lib/lighttpd/mod_webdav.so lib/lighttpd/mod_wstunnel.so man/man8/lighttpd.8.gz %%KRB5%%man/man8/lighttpd-angel.8.gz sbin/lighttpd sbin/lighttpd-angel -@dir(www,www,700) %%LOGROOT%% +@dir %%WWWDIR%% +@dir(%%WWWOWN%%,%%WWWGRP%%,700) %%CACHEDIR%% +@dir(%%WWWOWN%%,%%WWWGRP%%,700) %%HOMEDIR%%/sockets +@dir(%%WWWOWN%%,%%WWWGRP%%,700) %%HOMEDIR%% +@dir(%%WWWOWN%%,%%WWWGRP%%,700) %%LOGDIR%%