Date: Sat, 2 Jul 2016 05:54:12 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417909 - head/www/thttpd Message-ID: <201607020554.u625sC7T063516@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Jul 2 05:54:12 2016 New Revision: 417909 URL: https://svnweb.freebsd.org/changeset/ports/417909 Log: - Make thttpd's collecting of internal stats and printing them to system log every hour optional, because apparently some users do not want it - Convert to option helper targets (post-patch-FOO-off) while here, which allows us to remove `.include <bsd.port.options.mk>' PR: 200884 Modified: head/www/thttpd/Makefile Modified: head/www/thttpd/Makefile ============================================================================== --- head/www/thttpd/Makefile Sat Jul 2 05:20:15 2016 (r417908) +++ head/www/thttpd/Makefile Sat Jul 2 05:54:12 2016 (r417909) @@ -19,20 +19,19 @@ SUB_FILES= pkg-message thttpd.conf.sampl SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} CPE_VENDOR= acme -OPTIONS_DEFINE= SENDFILE IPREAL INDEXES HTACCESS -OPTIONS_DEFAULT= SENDFILE IPREAL +OPTIONS_DEFINE= SENDFILE IPREAL INDEXES HTACCESS STATS +OPTIONS_DEFAULT= SENDFILE IPREAL STATS SENDFILE_DESC= Use sendfile(2) to serve files IPREAL_DESC= Respect (pass on) "X-Forwarded-For" header INDEXES_DESC= Generate index pages for directories HTACCESS_DESC= IP-based authorization (.htaccess) support +STATS_DESC= Collect internal stats and print to system log SENDFILE_EXTRA_PATCHES= ${FILESDIR}/extra-patch-config.h IPREAL_EXTRA_PATCHES= ${FILESDIR}/extra-patch-ip_real HTACCESS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-htaccess -.include <bsd.port.options.mk> - post-patch: # To avoid conflict with other ports that also install htpasswd(1) .for f in extras/htpasswd.1 extras/htpasswd.c thttpd.8 @@ -40,10 +39,14 @@ post-patch: .endfor @${REINPLACE_CMD} -e 's|/var/www|${WWWDIR}|' \ ${WRKSRC}/extras/makeweb.1 -.if ! ${PORT_OPTIONS:MINDEXES} + +post-patch-INDEXES-off: @${REINPLACE_CMD} -e '/GENERATE_INDEXES/s|.*|/* & */|' \ ${WRKSRC}/config.h -.endif + +post-patch-STATS-off: + @${REINPLACE_CMD} -e '/STATS_TIME/s|.*|/* & */|' \ + ${WRKSRC}/config.h post-install: ${INSTALL_DATA} ${WRKDIR}/thttpd.conf.sample ${STAGEDIR}${PREFIX}/etc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607020554.u625sC7T063516>