[Midnightbsd-cvs] mports [16908] trunk/www/lighttpd: lighttpd 1.4.35

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Sep 7 09:53:58 EDT 2014 

Revision: 16908
          http://svnweb.midnightbsd.org/mports/?rev=16908
Author:   laffer1
Date:     2014-09-07 09:53:58 -0400 (Sun, 07 Sep 2014)
Log Message:
-----------
lighttpd 1.4.35

Modified Paths:
--------------
    trunk/www/lighttpd/Makefile
    trunk/www/lighttpd/distinfo
    trunk/www/lighttpd/pkg-plist

Removed Paths:
-------------
    trunk/www/lighttpd/files/patch-src-mod_extforward.c

Modified: trunk/www/lighttpd/Makefile
===================================================================
--- trunk/www/lighttpd/Makefile	2014-09-07 13:50:23 UTC (rev 16907)
+++ trunk/www/lighttpd/Makefile	2014-09-07 13:53:58 UTC (rev 16908)
@@ -1,68 +1,67 @@
 # $MidnightBSD$
 
-PORTNAME=	lighttpd
-PORTVERSION=	1.4.33
-CATEGORIES=	www
-MASTER_SITES=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
+PORTNAME?=	lighttpd
+PORTVERSION=	1.4.35
+PORTREVISION=	0
+CATEGORIES?=	www
+MASTER_SITES?=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A secure, fast, compliant, and very flexible Web Server
 
+.if !defined(_BUILDING_LIGHTTPD_MODULE)
 LICENSE=	bsd3
+LICENSE_FILE=	${WRKSRC}/COPYING
+.endif
 
-LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	lthack
-USE_PKGCONFIG=	yes
-USE_AUTOTOOLS=	autoconf autoheader aclocal automake libtool
-ACLOCAL_ARGS=	-I m4
-AUTOMAKE_ARGS=	--add-missing
+USES=		gmake libtool pkgconfig tar:bzip2
 
-CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/lighttpd --enable-static
+USE_AUTOTOOLS=	autoconf autoheader aclocal automake
+AUTOMAKE_ARGS=	-a -c -f
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/lighttpd
+INSTALL_TARGET=	install-strip
 
-CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-
 .if !defined(_BUILDING_LIGHTTPD_MODULE)
 USE_RC_SUBR=	lighttpd
 
-MAN8=		lighttpd.8
+OPTIONS_DEFINE=	BZIP2 DOCS FAM GDBM IPV6 LIBEV LUA MEMCACHE MYSQL MYSQLAUTH \
+		NODELAY LDAP OPENSSL SPAWNFCGI VALGRIND WEBDAV
 
-OPTIONS=	BZIP2		"Enable Bzip2 support" on \
-		CML		"Enable Cache Meta Language support" off \
-		FAM		"Enable fam/gamin support" off \
-		GDBM		"Enable gdbm storage support" off \
-		IPV6		"Enable IPV6 support" on \
-		LIBEV		"Enable libev support" off \
-		MAGNET		"Enable magnet support" off \
-		MEMCACHE	"Enable memory caching support" off \
-		MYSQL		"Enable MYSQL support" off \
-		MYSQLAUTH	"Enable mysql auth (requires WITH_MYSQL)" off \
-		NODELAY		"Set TCP_NODELAY on listening sockets" off \
-		OPENLDAP	"Enable LDAP support" off \
-		OPENSSL		"Enable SSL support" on \
-		SPAWNFCGI	"Depend on spawn-fcgi utility" off \
-		WEBDAV		"Enable WebDAV support"	off
+OPTIONS_DEFAULT=	IPV6 OPENSSL
 
-.if !defined(NOPORTDOCS)
-DOCS=		AUTHORS COPYING INSTALL NEWS README
-PORTDOCS=	${DOCS}
-.endif
+BZIP2_DESC=	bzip2 support (mod_compress)
+GDBM_DESC=	gdbm storage (mod_trigger_b4_dl)
+LDAP_DESC=	LDAP authentication
+LUA_DESC=	lua support (mod_cml, mod_magnet)
+MEMCACHE_DESC=	memcached storage (mod_trigger_b4_dl)
+MYSQL_DESC=	MySQL support (mod_mysql_vhost)
+MYSQLAUTH_DESC=	MySQL authentication (requires WITH_MYSQL)
+NODELAY_DESC=	Set TCP_NODELAY on listening sockets
+SPAWNFCGI_DESC=	Depend on spawn-fcgi utility
+VALGRIND_DESC=	valgrind support
+WEBDAV_DESC=	WebDAV support
 
-CONF_FILES=	lighttpd.conf modules.conf
+FAM_USES=	fam
+FAM_CONFIGURE_ON=	--with-fam
+FAM_CONFIGURE_ENV=	FAM_CFLAGS="-I${LOCALBASE}/include" FAM_LIBS="-L${LOCALBASE}/lib"
 
-CONFD_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
+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
+
 LIGHTTPD_LOGROOT?=	/var/log/lighttpd
 LIGHTTPD_WEBROOT?=	${PREFIX}/www/data
 LIGHTTPD_USER?=		www
@@ -82,99 +81,91 @@
 # Default REQUIRE to rc.d script
 _REQUIRE=	DAEMON
 
-.if !defined(WITHOUT_OPENSSL)
-EXTENSIONS+=		openssl
-USE_OPENSSL_BASE=	yes
+.if ${PORT_OPTIONS:MDOCS}
+DOCS=		AUTHORS COPYING INSTALL NEWS README
+PORTDOCS=	${DOCS}
+.endif
+
+.if ${PORT_OPTIONS:MOPENSSL}
+USE_OPENSSL=		yes
 CONFIGURE_ARGS+=	--with-openssl \
 			--with-openssl-includes=${OPENSSLINC} \
 			--with-openssl-libs=${OPENSSLLIB}
 .endif
 
-.if defined(WITH_BZIP2)
+.if ${PORT_OPTIONS:MBZIP2}
 CONFIGURE_ARGS+=	--with-bzip2
-.else
-CONFIGURE_ARGS+=	--without-bzip2
 .endif
 
-.if defined(WITH_CML)
-USE_LUA=		yes
-CONFIGURE_ARGS+=	--with-lua
-CONFIGURE_ENV+=		LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua"
-.endif
-
-.if defined(WITH_FAM)
-USE_FAM=		yes
-CONFIGURE_ARGS+=	--with-fam
-CONFIGURE_ENV+=		FAM_CFLAGS="-I${LOCALBASE}/include" FAM_LIBS="-L${LOCALBASE}/lib"
-.endif
-
-.if defined(WITH_GDBM)
-LIB_DEPENDS+=		gdbm:${PORTSDIR}/databases/gdbm
+.if ${PORT_OPTIONS:MGDBM}
+LIB_DEPENDS+=		libgdbm.so:${PORTSDIR}/databases/gdbm
 CONFIGURE_ARGS+=	--with-gdbm
 .endif
 
-.if defined(WITHOUT_IPV6)
+.if empty(PORT_OPTIONS:MIPV6)
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if defined(WITH_LIBEV)
+.if ${PORT_OPTIONS:MLIBEV}
 CONFIGURE_ARGS+=	--with-libev=${LOCALBASE}
-LIB_DEPENDS+=		ev.3:${PORTSDIR}/devel/libev
-.else
-CONFIGURE_ARGS+=	--without-libev
+LIB_DEPENDS+=		libev.so:${PORTSDIR}/devel/libev
 .endif
 
-.if defined(WITH_MAGNET)
-USE_LUA=		5.1+
+.if ${PORT_OPTIONS:MLUA}
+USES+=			lua:51
 CONFIGURE_ARGS+=	--with-lua
-CONFIGURE_ENV+=		LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua"
+CONFIGURE_ENV+=		LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}"
 .endif
 
-.if defined(WITH_MEMCACHE)
-LIB_DEPENDS+=		memcache.4:${PORTSDIR}/databases/libmemcache
+.if ${PORT_OPTIONS:MMEMCACHE}
+LIB_DEPENDS+=		libmemcache.so:${PORTSDIR}/databases/libmemcache
 CONFIGURE_ARGS+=	--with-memcache
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql
 _REQUIRE+=		mysql
 .endif
 
-.if defined(WITH_MYSQLAUTH) && !defined(WITH_MYSQL)
-IGNORE=		WITH_MYSQLAUTH requires WITH_MYSQL
+.if ${PORT_OPTIONS:MMYSQLAUTH} && empty(PORT_OPTIONS:MMYSQL)
+IGNORE=		option WITH_MYSQLAUTH requires WITH_MYSQL
 .endif
 
-.if defined(WITH_MYSQLAUTH)
+.if ${PORT_OPTIONS:MMYSQLAUTH}
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-mysqlauth
 PORTDOCS+=		README.mysqlauth mysql_auth.sql
 .endif
 
-.if defined(WITH_NODELAY)
+.if ${PORT_OPTIONS:MNODELAY}
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-nodelay
 .endif
 
-.if defined(WITH_OPENLDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--with-ldap
 _REQUIRE+=		slapd
 .endif
 
-.if defined(WITH_SPAWNFCGI)
+.if ${PORT_OPTIONS:MSPAWNFCGI}
 RUN_DEPENDS+=		spawn-fcgi:${PORTSDIR}/www/spawn-fcgi
 .endif
 
-.if defined(WITH_WEBDAV)
+.if ${PORT_OPTIONS:MVALGRIND}
+BUILD_DEPENDS+=		valgrind:${PORTSDIR}/devel/valgrind
+RUN_DEPENDS+=		valgrind:${PORTSDIR}/devel/valgrind
+CONFIGURE_ARGS+=	--with-valgrind
+.endif
+
+.if ${PORT_OPTIONS:MWEBDAV}
 USE_GNOME+=		libxml2
-LIB_DEPENDS+=		uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \
-			sqlite3.8:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
+			libsqlite3.so:${PORTSDIR}/databases/sqlite3
 CONFIGURE_ARGS+=	--with-webdav-props --with-webdav-locks
 .endif
 
 SUB_LIST+=		REQUIRE="${_REQUIRE}"
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-std=gnu99||' \
 		${WRKSRC}/configure ${WRKSRC}/configure.ac
@@ -191,6 +182,9 @@
 		${WRKSRC}/doc/config/lighttpd.conf
 	@${REINPLACE_CMD} -e "s|/etc/lighttpd|${PREFIX}/etc/lighttpd|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
@@ -198,39 +192,38 @@
 		${WRKSRC}/doc/config/lighttpd.conf
 
 post-install:
-	@${MKDIR} ${PREFIX}/etc/lighttpd/conf.d ${PREFIX}/etc/lighttpd/vhosts.d
-.for FILE in ${CONF_FILES}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d ${STAGEDIR}${PREFIX}/etc/lighttpd/vhosts.d
+.for FILE in ${LIGHTTPD_CONF_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/doc/config/${FILE} \
-		${PREFIX}/etc/lighttpd/${FILE}.sample
-.if !exists(${PREFIX}/etc/lighttpd/${FILE})
-	@${INSTALL_DATA} ${WRKSRC}/doc/config/${FILE} \
-		${PREFIX}/etc/lighttpd/${FILE}
-.endif
+		${STAGEDIR}${PREFIX}/etc/lighttpd/${FILE}.sample
 .endfor
-.for FILE in ${CONFD_FILES}
+.for FILE in ${LIGHTTPD_CONF_D_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/doc/config/conf.d/${FILE} \
-		${PREFIX}/etc/lighttpd/conf.d/${FILE}.sample
-.if !exists(${PREFIX}/etc/lighttpd/conf.d/${FILE})
-	@${INSTALL_DATA} ${WRKSRC}/doc/config/conf.d/${FILE} \
-		${PREFIX}/etc/lighttpd/conf.d/${FILE}
-.endif
+		${STAGEDIR}${PREFIX}/etc/lighttpd/conf.d/${FILE}.sample
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/doc/config/vhosts.d/vhosts.template \
-		${PREFIX}/etc/lighttpd/vhosts.d/vhosts.template
-	@${MKDIR} -m 0700 ${LIGHTTPD_LOGROOT}
-	@${CHOWN} ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} ${LIGHTTPD_LOGROOT}
+		${STAGEDIR}${PREFIX}/etc/lighttpd/vhosts.d/vhosts.template
 
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 . for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}/${FILE}
+	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE}
 . endfor
 .endif
-.if defined(WITH_MYSQLAUTH)
+.if ${PORT_OPTIONS:MMYSQLAUTH}
 . for FILE in README.mysqlauth mysql_auth.sql
-	@${INSTALL_DATA} ${FILESDIR}/${FILE} ${DOCSDIR}/${FILE}
+	@${INSTALL_DATA} ${FILESDIR}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE}
 . endfor
 .endif
+	@${MKDIR} -m 0700 ${STAGEDIR}${LIGHTTPD_LOGROOT}
+
+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 <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/www/lighttpd/distinfo
===================================================================
--- trunk/www/lighttpd/distinfo	2014-09-07 13:50:23 UTC (rev 16907)
+++ trunk/www/lighttpd/distinfo	2014-09-07 13:53:58 UTC (rev 16908)
@@ -1,5 +1,5 @@
-SHA256 (lighttpd-1.4.33.tar.bz2) = 2ff2324658c0f90e7d39afd40f08f11ca230903b9019c31a2bbecd8f087f235e
-SIZE (lighttpd-1.4.33.tar.bz2) = 664850
+SHA256 (lighttpd-1.4.35.tar.bz2) = 4a71c1f6d8af41ed894b507720c4c17184dc320590013881d5170ca7f15c5bf7
+SIZE (lighttpd-1.4.35.tar.bz2) = 665955
 SHA256 (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch.gz) = d7c3704d5253c4f3c18459f89059063b311e50096cd2c38fc982cec683c32e61
 SIZE (lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch.gz) = 44695
 SHA256 (lighttpd-1.4.26_mod_geoip.patch.gz) = db43cc0ed7c808b5eed3185d97346e70dea0f1ef4fa9ed436d08e4faff7f97e7

Deleted: trunk/www/lighttpd/files/patch-src-mod_extforward.c
===================================================================
--- trunk/www/lighttpd/files/patch-src-mod_extforward.c	2014-09-07 13:50:23 UTC (rev 16907)
+++ trunk/www/lighttpd/files/patch-src-mod_extforward.c	2014-09-07 13:53:58 UTC (rev 16908)
@@ -1,10 +0,0 @@
---- src/mod_extforward.c.orig	2013-09-29 07:35:49.552153230 +0200
-+++ src/mod_extforward.c	2013-09-29 07:35:58.633202984 +0200
-@@ -439,7 +439,6 @@
- #ifdef HAVE_IPV6
- 		ipstr_to_sockaddr(srv, real_remote_addr, &sock);
- #else
--		UNUSED(addrs_left);
- 		sock.ipv4.sin_addr.s_addr = inet_addr(real_remote_addr);
- 		sock.plain.sa_family = (sock.ipv4.sin_addr.s_addr == 0xFFFFFFFF) ? AF_UNSPEC : AF_INET;
- #endif

Modified: trunk/www/lighttpd/pkg-plist
===================================================================
--- trunk/www/lighttpd/pkg-plist	2014-09-07 13:50:23 UTC (rev 16907)
+++ trunk/www/lighttpd/pkg-plist	2014-09-07 13:53:58 UTC (rev 16908)
@@ -1,175 +1,62 @@
- at unexec if cmp -s %D/etc/lighttpd/lighttpd.conf %D/etc/lighttpd/lighttpd.conf.sample; then rm -f %D/etc/lighttpd/lighttpd.conf; fi
-etc/lighttpd/lighttpd.conf.sample
- at exec [ -f %B/lighttpd.conf ] || cp %B/%f %B/lighttpd.conf
- at unexec if cmp -s %D/etc/lighttpd/modules.conf %D/etc/lighttpd/modules.conf.sample; then rm -f %D/etc/lighttpd/modules.conf; fi
-etc/lighttpd/modules.conf.sample
- at exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/access_log.conf %D/etc/lighttpd/conf.d/access_log.conf.sample; then rm -f %D/etc/lighttpd/conf.d/access_log.conf; fi
-etc/lighttpd/conf.d/access_log.conf.sample
- at exec [ -f %B/access_log.conf ] || cp %B/%f %B/access_log.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/auth.conf %D/etc/lighttpd/conf.d/auth.conf.sample; then rm -f %D/etc/lighttpd/conf.d/auth.conf; fi
-etc/lighttpd/conf.d/auth.conf.sample
- at exec [ -f %B/auth.conf ] || cp %B/%f %B/auth.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/cgi.conf %D/etc/lighttpd/conf.d/cgi.conf.sample; then rm -f %D/etc/lighttpd/conf.d/cgi.conf; fi
-etc/lighttpd/conf.d/cgi.conf.sample
- at exec [ -f %B/cgi.conf ] || cp %B/%f %B/cgi.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/cml.conf %D/etc/lighttpd/conf.d/cml.conf.sample; then rm -f %D/etc/lighttpd/conf.d/cml.conf; fi
-etc/lighttpd/conf.d/cml.conf.sample
- at exec [ -f %B/cml.conf ] || cp %B/%f %B/cml.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/compress.conf %D/etc/lighttpd/conf.d/compress.conf.sample; then rm -f %D/etc/lighttpd/conf.d/compress.conf; fi
-etc/lighttpd/conf.d/compress.conf.sample
- at exec [ -f %B/compress.conf ] || cp %B/%f %B/compress.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/debug.conf %D/etc/lighttpd/conf.d/debug.conf.sample; then rm -f %D/etc/lighttpd/conf.d/debug.conf; fi
-etc/lighttpd/conf.d/debug.conf.sample
- at exec [ -f %B/debug.conf ] || cp %B/%f %B/debug.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/dirlisting.conf %D/etc/lighttpd/conf.d/dirlisting.conf.sample; then rm -f %D/etc/lighttpd/conf.d/dirlisting.conf; fi
-etc/lighttpd/conf.d/dirlisting.conf.sample
- at exec [ -f %B/dirlisting.conf ] || cp %B/%f %B/dirlisting.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/evhost.conf %D/etc/lighttpd/conf.d/evhost.conf.sample; then rm -f %D/etc/lighttpd/conf.d/evhost.conf; fi
-etc/lighttpd/conf.d/evhost.conf.sample
- at exec [ -f %B/evhost.conf ] || cp %B/%f %B/evhost.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/expire.conf %D/etc/lighttpd/conf.d/expire.conf.sample; then rm -f %D/etc/lighttpd/conf.d/expire.conf; fi
-etc/lighttpd/conf.d/expire.conf.sample
- at exec [ -f %B/expire.conf ] || cp %B/%f %B/expire.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/fastcgi.conf %D/etc/lighttpd/conf.d/fastcgi.conf.sample; then rm -f %D/etc/lighttpd/conf.d/fastcgi.conf; fi
-etc/lighttpd/conf.d/fastcgi.conf.sample
- at exec [ -f %B/fastcgi.conf ] || cp %B/%f %B/fastcgi.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/magnet.conf %D/etc/lighttpd/conf.d/magnet.conf.sample; then rm -f %D/etc/lighttpd/conf.d/magnet.conf; fi
-etc/lighttpd/conf.d/magnet.conf.sample
- at exec [ -f %B/magnet.conf ] || cp %B/%f %B/magnet.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/mime.conf %D/etc/lighttpd/conf.d/mime.conf.sample; then rm -f %D/etc/lighttpd/conf.d/mime.conf; fi
-etc/lighttpd/conf.d/mime.conf.sample
- at exec [ -f %B/mime.conf ] || cp %B/%f %B/mime.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/mysql_vhost.conf %D/etc/lighttpd/conf.d/mysql_vhost.conf.sample; then rm -f %D/etc/lighttpd/conf.d/mysql_vhost.conf; fi
-etc/lighttpd/conf.d/mysql_vhost.conf.sample
- at exec [ -f %B/mysql_vhost.conf ] || cp %B/%f %B/mysql_vhost.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/proxy.conf %D/etc/lighttpd/conf.d/proxy.conf.sample; then rm -f %D/etc/lighttpd/conf.d/proxy.conf; fi
-etc/lighttpd/conf.d/proxy.conf.sample
- at exec [ -f %B/proxy.conf ] || cp %B/%f %B/proxy.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/rrdtool.conf %D/etc/lighttpd/conf.d/rrdtool.conf.sample; then rm -f %D/etc/lighttpd/conf.d/rrdtool.conf; fi
-etc/lighttpd/conf.d/rrdtool.conf.sample
- at exec [ -f %B/rrdtool.conf ] || cp %B/%f %B/rrdtool.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/scgi.conf %D/etc/lighttpd/conf.d/scgi.conf.sample; then rm -f %D/etc/lighttpd/conf.d/scgi.conf; fi
-etc/lighttpd/conf.d/scgi.conf.sample
- at exec [ -f %B/scgi.conf ] || cp %B/%f %B/scgi.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/secdownload.conf %D/etc/lighttpd/conf.d/secdownload.conf.sample; then rm -f %D/etc/lighttpd/conf.d/secdownload.conf; fi
-etc/lighttpd/conf.d/secdownload.conf.sample
- at exec [ -f %B/secdownload.conf ] || cp %B/%f %B/secdownload.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/simple_vhost.conf %D/etc/lighttpd/conf.d/simple_vhost.conf.sample; then rm -f %D/etc/lighttpd/conf.d/simple_vhost.conf; fi
-etc/lighttpd/conf.d/simple_vhost.conf.sample
- at exec [ -f %B/simple_vhost.conf ] || cp %B/%f %B/simple_vhost.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/ssi.conf %D/etc/lighttpd/conf.d/ssi.conf.sample; then rm -f %D/etc/lighttpd/conf.d/ssi.conf; fi
-etc/lighttpd/conf.d/ssi.conf.sample
- at exec [ -f %B/ssi.conf ] || cp %B/%f %B/ssi.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/status.conf %D/etc/lighttpd/conf.d/status.conf.sample; then rm -f %D/etc/lighttpd/conf.d/status.conf; fi
-etc/lighttpd/conf.d/status.conf.sample
- at exec [ -f %B/status.conf ] || cp %B/%f %B/status.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/trigger_b4_dl.conf %D/etc/lighttpd/conf.d/trigger_b4_dl.conf.sample; then rm -f %D/etc/lighttpd/conf.d/trigger_b4_dl.conf; fi
-etc/lighttpd/conf.d/trigger_b4_dl.conf.sample
- at exec [ -f %B/trigger_b4_dl.conf ] || cp %B/%f %B/trigger_b4_dl.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/userdir.conf %D/etc/lighttpd/conf.d/userdir.conf.sample; then rm -f %D/etc/lighttpd/conf.d/userdir.conf; fi
-etc/lighttpd/conf.d/userdir.conf.sample
- at exec [ -f %B/userdir.conf ] || cp %B/%f %B/userdir.conf
- at unexec if cmp -s %D/etc/lighttpd/conf.d/webdav.conf %D/etc/lighttpd/conf.d/webdav.conf.sample; then rm -f %D/etc/lighttpd/conf.d/webdav.conf; fi
-etc/lighttpd/conf.d/webdav.conf.sample
- at exec [ -f %B/webdav.conf ] || cp %B/%f %B/webdav.conf
+ at sample etc/lighttpd/lighttpd.conf.sample
+ at sample etc/lighttpd/modules.conf.sample
+ at sample etc/lighttpd/conf.d/access_log.conf.sample
+ at sample etc/lighttpd/conf.d/auth.conf.sample
+ at sample etc/lighttpd/conf.d/cml.conf.sample
+ at sample etc/lighttpd/conf.d/cgi.conf.sample
+ at sample etc/lighttpd/conf.d/compress.conf.sample
+ at sample etc/lighttpd/conf.d/debug.conf.sample
+ at sample etc/lighttpd/conf.d/dirlisting.conf.sample
+ at sample etc/lighttpd/conf.d/evhost.conf.sample
+ at sample etc/lighttpd/conf.d/expire.conf.sample
+ at sample etc/lighttpd/conf.d/fastcgi.conf.sample
+ at sample etc/lighttpd/conf.d/magnet.conf.sample
+ at sample etc/lighttpd/conf.d/mime.conf.sample
+ at sample etc/lighttpd/conf.d/mysql_vhost.conf.sample
+ at sample etc/lighttpd/conf.d/proxy.conf.sample
+ at sample etc/lighttpd/conf.d/rrdtool.conf.sample
+ at sample etc/lighttpd/conf.d/scgi.conf.sample
+ at sample etc/lighttpd/conf.d/secdownload.conf.sample
+ at sample etc/lighttpd/conf.d/simple_vhost.conf.sample
+ at sample etc/lighttpd/conf.d/ssi.conf.sample
+ at sample etc/lighttpd/conf.d/status.conf.sample
+ at sample etc/lighttpd/conf.d/trigger_b4_dl.conf.sample
+ at sample etc/lighttpd/conf.d/userdir.conf.sample
+ at sample etc/lighttpd/conf.d/webdav.conf.sample
 etc/lighttpd/vhosts.d/vhosts.template
-lib/lighttpd/mod_access.a
-lib/lighttpd/mod_access.la
 lib/lighttpd/mod_access.so
-lib/lighttpd/mod_accesslog.a
-lib/lighttpd/mod_accesslog.la
 lib/lighttpd/mod_accesslog.so
-lib/lighttpd/mod_alias.a
-lib/lighttpd/mod_alias.la
 lib/lighttpd/mod_alias.so
-lib/lighttpd/mod_auth.a
-lib/lighttpd/mod_auth.la
 lib/lighttpd/mod_auth.so
-lib/lighttpd/mod_cgi.a
-lib/lighttpd/mod_cgi.la
 lib/lighttpd/mod_cgi.so
-lib/lighttpd/mod_cml.a
-lib/lighttpd/mod_cml.la
 lib/lighttpd/mod_cml.so
-lib/lighttpd/mod_compress.a
-lib/lighttpd/mod_compress.la
 lib/lighttpd/mod_compress.so
-lib/lighttpd/mod_dirlisting.a
-lib/lighttpd/mod_dirlisting.la
 lib/lighttpd/mod_dirlisting.so
-lib/lighttpd/mod_evasive.a
-lib/lighttpd/mod_evasive.la
 lib/lighttpd/mod_evasive.so
-lib/lighttpd/mod_evhost.a
-lib/lighttpd/mod_evhost.la
 lib/lighttpd/mod_evhost.so
-lib/lighttpd/mod_expire.a
-lib/lighttpd/mod_expire.la
 lib/lighttpd/mod_expire.so
-lib/lighttpd/mod_extforward.a
-lib/lighttpd/mod_extforward.la
 lib/lighttpd/mod_extforward.so
-lib/lighttpd/mod_fastcgi.a
-lib/lighttpd/mod_fastcgi.la
 lib/lighttpd/mod_fastcgi.so
-lib/lighttpd/mod_flv_streaming.a
-lib/lighttpd/mod_flv_streaming.la
 lib/lighttpd/mod_flv_streaming.so
-lib/lighttpd/mod_indexfile.a
-lib/lighttpd/mod_indexfile.la
 lib/lighttpd/mod_indexfile.so
-lib/lighttpd/mod_magnet.a
-lib/lighttpd/mod_magnet.la
 lib/lighttpd/mod_magnet.so
-lib/lighttpd/mod_mysql_vhost.a
-lib/lighttpd/mod_mysql_vhost.la
 lib/lighttpd/mod_mysql_vhost.so
-lib/lighttpd/mod_proxy.a
-lib/lighttpd/mod_proxy.la
 lib/lighttpd/mod_proxy.so
-lib/lighttpd/mod_redirect.a
-lib/lighttpd/mod_redirect.la
 lib/lighttpd/mod_redirect.so
-lib/lighttpd/mod_rewrite.a
-lib/lighttpd/mod_rewrite.la
 lib/lighttpd/mod_rewrite.so
-lib/lighttpd/mod_rrdtool.a
-lib/lighttpd/mod_rrdtool.la
 lib/lighttpd/mod_rrdtool.so
-lib/lighttpd/mod_scgi.a
-lib/lighttpd/mod_scgi.la
 lib/lighttpd/mod_scgi.so
-lib/lighttpd/mod_secdownload.a
-lib/lighttpd/mod_secdownload.la
 lib/lighttpd/mod_secdownload.so
-lib/lighttpd/mod_setenv.a
-lib/lighttpd/mod_setenv.la
 lib/lighttpd/mod_setenv.so
-lib/lighttpd/mod_simple_vhost.a
-lib/lighttpd/mod_simple_vhost.la
 lib/lighttpd/mod_simple_vhost.so
-lib/lighttpd/mod_ssi.a
-lib/lighttpd/mod_ssi.la
 lib/lighttpd/mod_ssi.so
-lib/lighttpd/mod_staticfile.a
-lib/lighttpd/mod_staticfile.la
 lib/lighttpd/mod_staticfile.so
-lib/lighttpd/mod_status.a
-lib/lighttpd/mod_status.la
 lib/lighttpd/mod_status.so
-lib/lighttpd/mod_trigger_b4_dl.a
-lib/lighttpd/mod_trigger_b4_dl.la
 lib/lighttpd/mod_trigger_b4_dl.so
-lib/lighttpd/mod_userdir.a
-lib/lighttpd/mod_userdir.la
 lib/lighttpd/mod_userdir.so
-lib/lighttpd/mod_usertrack.a
-lib/lighttpd/mod_usertrack.la
 lib/lighttpd/mod_usertrack.so
-lib/lighttpd/mod_webdav.a
-lib/lighttpd/mod_webdav.la
 lib/lighttpd/mod_webdav.so
+man/man8/lighttpd.8.gz
 sbin/lighttpd
 sbin/lighttpd-angel
 @dirrm lib/lighttpd
@@ -179,4 +66,4 @@
 @cwd /
 @exec %%MKDIR%% -m 0700 %%LOGROOT%%
 @exec %%CHOWN%% %%USER%%:%%GROUP%% %%LOGROOT%%
- at dirrmtry %%LOGROOT%%
+ at unexec rmdir %%LOGROOT%% >/dev/null 2>&1 || :

More information about the Midnightbsd-cvs mailing list