diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-10-23 18:18:25 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-10-23 18:18:25 +0000 |
| commit | a6ad5ac1e52d95ffdd22e886b468cd39957c1154 (patch) | |
| tree | 08cb02d820a9187dac7e16eec670d74b30379fab /ftp | |
| parent | 8e02189b35163ecaf01f798ef54b948d5bba54bc (diff) | |
| download | ports-a6ad5ac1e52d95ffdd22e886b468cd39957c1154.tar.gz ports-a6ad5ac1e52d95ffdd22e886b468cd39957c1154.zip | |
- Switch to options helpers
- Drop @dirrm* from plist
Approved by: portmgr blanket
Notes
Notes:
svn path=/head/; revision=400047
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/vsftpd/Makefile | 4 | ||||
| -rw-r--r-- | ftp/vsftpd/pkg-plist | 13 |
2 files changed, 3 insertions, 14 deletions
diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile index b0886d3c1e56..b81d8002c4a5 100644 --- a/ftp/vsftpd/Makefile +++ b/ftp/vsftpd/Makefile @@ -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> diff --git a/ftp/vsftpd/pkg-plist b/ftp/vsftpd/pkg-plist index 5348ea17555e..82dba6d326c2 100644 --- a/ftp/vsftpd/pkg-plist +++ b/ftp/vsftpd/pkg-plist @@ -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%% |