From owner-svn-ports-head@freebsd.org Sat Jul 2 05:54:13 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DBFA3B8FD3A; Sat, 2 Jul 2016 05:54:13 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 927432A3D; Sat, 2 Jul 2016 05:54:13 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u625sCbB063517; Sat, 2 Jul 2016 05:54:12 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u625sC7T063516; Sat, 2 Jul 2016 05:54:12 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201607020554.u625sC7T063516@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sat, 2 Jul 2016 05:54:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417909 - head/www/thttpd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jul 2016 05:54:14 -0000 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 ' 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 - 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