From owner-svn-ports-all@freebsd.org Sun Nov 4 18:17:44 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C6FF10E127F; Sun, 4 Nov 2018 18:17:44 +0000 (UTC) (envelope-from leres@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8AC147DAE3; Sun, 4 Nov 2018 18:17:43 +0000 (UTC) (envelope-from leres@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6D44B474C; Sun, 4 Nov 2018 18:17:43 +0000 (UTC) (envelope-from leres@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA4IHhYU073598; Sun, 4 Nov 2018 18:17:43 GMT (envelope-from leres@FreeBSD.org) Received: (from leres@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA4IHhq7073596; Sun, 4 Nov 2018 18:17:43 GMT (envelope-from leres@FreeBSD.org) Message-Id: <201811041817.wA4IHhq7073596@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: leres set sender to leres@FreeBSD.org using -f From: Craig Leres Date: Sun, 4 Nov 2018 18:17:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484119 - head/www/mini_httpd X-SVN-Group: ports-head X-SVN-Commit-Author: leres X-SVN-Commit-Paths: head/www/mini_httpd X-SVN-Commit-Revision: 484119 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8AC147DAE3 X-Spamd-Result: default: False [-0.05 / 200.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(0.06)[0.060,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2018 18:17:44 -0000 Author: leres Date: Sun Nov 4 18:17:42 2018 New Revision: 484119 URL: https://svnweb.freebsd.org/changeset/ports/484119 Log: After consulting with upstream it turns out 500.mini_httpd-rotate is supposed to be an example so add an EXAMPLES option and install (or not) appropriately. PR: 232926 Reported by: Oleg Strizhak Approved by: ler (mentor, implicit) Modified: head/www/mini_httpd/Makefile head/www/mini_httpd/pkg-plist Modified: head/www/mini_httpd/Makefile ============================================================================== --- head/www/mini_httpd/Makefile Sun Nov 4 18:15:36 2018 (r484118) +++ head/www/mini_httpd/Makefile Sun Nov 4 18:17:42 2018 (r484119) @@ -3,7 +3,7 @@ PORTNAME= mini_httpd PORTVERSION= 1.30 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www ipv6 MASTER_SITES= https://www.acme.com/software/mini_httpd/ @@ -16,6 +16,8 @@ USES= cpe ssl CPE_VENDOR= acme +OPTIONS_DEFINE+= EXAMPLES + post-patch: @${REINPLACE_CMD} -e 's/htpasswd/${PORTNAME}-htpasswd/' \ ${WRKSRC}/htpasswd.1 @@ -23,13 +25,9 @@ post-patch: ${WRKSRC}/${PORTNAME}.8 do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily - @${MKDIR} ${STAGEDIR}${PREFIX}/www/chroot/logs ${INSTALL_PROGRAM} ${WRKSRC}/mini_httpd ${STAGEDIR}${PREFIX}/sbin ${INSTALL_PROGRAM} ${WRKSRC}/htpasswd \ ${STAGEDIR}${PREFIX}/sbin/${PORTNAME}-htpasswd - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/500.mini_httpd-rotate \ - ${STAGEDIR}${PREFIX}/etc/periodic/daily ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd_wrapper \ ${STAGEDIR}${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd.sh \ @@ -40,5 +38,8 @@ do-install: ${STAGEDIR}${MANPREFIX}/man/man8 ${INSTALL_DATA} ${WRKSRC}/mini_httpd.cnf \ ${STAGEDIR}${PREFIX}/etc/mini_httpd.cnf.sample + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/500.mini_httpd-rotate \ + ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/www/mini_httpd/pkg-plist ============================================================================== --- head/www/mini_httpd/pkg-plist Sun Nov 4 18:15:36 2018 (r484118) +++ head/www/mini_httpd/pkg-plist Sun Nov 4 18:17:42 2018 (r484119) @@ -1,9 +1,9 @@ @sample etc/mini_httpd.cnf.sample -etc/periodic/daily/500.mini_httpd-rotate etc/rc.d/mini_httpd man/man1/mini_httpd-htpasswd.1.gz man/man8/mini_httpd.8.gz sbin/mini_httpd sbin/mini_httpd-htpasswd sbin/mini_httpd_wrapper -@dir www/chroot/logs +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/500.mini_httpd-rotate +%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%