From owner-svn-ports-all@freebsd.org Fri Oct 23 18:18:27 2015 Return-Path: Delivered-To: svn-ports-all@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 7528CA1DDC4; Fri, 23 Oct 2015 18:18:27 +0000 (UTC) (envelope-from amdmi3@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 1CD4920B; Fri, 23 Oct 2015 18:18:27 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9NIIQ1j065996; Fri, 23 Oct 2015 18:18:26 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9NIIQcA065994; Fri, 23 Oct 2015 18:18:26 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510231818.t9NIIQcA065994@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 23 Oct 2015 18:18:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400047 - head/ftp/vsftpd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 23 Oct 2015 18:18:27 -0000 Author: amdmi3 Date: Fri Oct 23 18:18:25 2015 New Revision: 400047 URL: https://svnweb.freebsd.org/changeset/ports/400047 Log: - Switch to options helpers - Drop @dirrm* from plist Approved by: portmgr blanket Modified: head/ftp/vsftpd/Makefile head/ftp/vsftpd/pkg-plist Modified: head/ftp/vsftpd/Makefile ============================================================================== --- head/ftp/vsftpd/Makefile Fri Oct 23 18:12:26 2015 (r400046) +++ head/ftp/vsftpd/Makefile Fri Oct 23 18:18:25 2015 (r400047) @@ -92,7 +92,8 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/vsftpd.conf.5 ${STAGEDIR}${PREFIX}/man/man5/ ${INSTALL_MAN} ${WRKSRC}/vsftpd.8 ${STAGEDIR}${PREFIX}/man/man8/ ${MKDIR} ${STAGEDIR}/var/ftp ${STAGEDIR}${PREFIX}/share/vsftpd/empty -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ .for i in EXAMPLE SECURITY @@ -100,6 +101,5 @@ do-install: ${CP} -p -R -L ${WRKSRC}/${i}/./ ${STAGEDIR}${DOCSDIR}/${i}/ ${CHMOD} -R -L a+rX,go-w ${STAGEDIR}${DOCSDIR}/${i}/ .endfor -.endif .include Modified: head/ftp/vsftpd/pkg-plist ============================================================================== --- head/ftp/vsftpd/pkg-plist Fri Oct 23 18:12:26 2015 (r400046) +++ head/ftp/vsftpd/pkg-plist Fri Oct 23 18:18:25 2015 (r400047) @@ -8,9 +8,7 @@ etc/vsftpd.conf.dist @exec if [ ! -f %B/vsftpd.conf ]; then cp %B/vsftpd.conf.dist %B/vsftpd.conf; fi @unexec rmdir /var/ftp 2>/dev/null || true @exec if [ ! -d /var/ftp ]; then mkdir /var/ftp ; fi -@exec mkdir -p %D/share/vsftpd/empty -@dirrm share/vsftpd/empty -@dirrm share/vsftpd +@dir %%DATADIR%%/empty %%PORTDOCS%%%%DOCSDIR%%/AUDIT %%PORTDOCS%%%%DOCSDIR%%/BENCHMARKS %%PORTDOCS%%%%DOCSDIR%%/BUGS @@ -45,12 +43,3 @@ etc/vsftpd.conf.dist %%PORTDOCS%%%%DOCSDIR%%/SPEED %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/TUNING -%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/INTERNET_SITE -%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/INTERNET_SITE_NOINETD -%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/PER_IP_CONFIG -%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/VIRTUAL_HOSTS -%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS -%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE/VIRTUAL_USERS_2 -%%PORTDOCS%%@dirrm %%DOCSDIR%%/EXAMPLE -%%PORTDOCS%%@dirrm %%DOCSDIR%%/SECURITY -%%PORTDOCS%%@dirrm %%DOCSDIR%%