svn commit: r400047 - head/ftp/vsftpd

[Dmitry Marakasov]

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 <bsd.port.mk>

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
- at exec mkdir -p %D/share/vsftpd/empty
- at dirrm share/vsftpd/empty
- at dirrm share/vsftpd
+ at 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%%