3 files changed, 70 insertions, 12 deletions

diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile
index 053962680174..f1f8b22f2b24 100644
--- a/ftp/vsftpd/Makefile
+++ b/ftp/vsftpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vsftpd
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.3
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://vsftpd.beasts.org/users/cevans/
 
@@ -14,38 +14,54 @@ MAINTAINER=	dinoex@FreeBSD.org
 
 USE_PERL5=	yes
 ALL_TARGET=	vsftpd
-
 MAN5=		vsftpd.conf.5
-
 MAN8=		vsftpd.8
+DOCFILES=	AUDIT BENCHMARKS BUGS COPYING Changelog FAQ INSTALL LICENSE \
+		README README.security REWARD SIZE SPEED TODO TUNING
 
 .include <bsd.port.pre.mk>
 
-post-patch:
+do-configure:
 	@${MV} ${WRKSRC}/defs.h ${WRKSRC}/defs.h.sed
 	${SED} -e "s=/etc/vsftpd.conf=${PREFIX}/etc/vsftpd.conf=" \
 		${WRKSRC}/defs.h.sed > ${WRKSRC}/defs.h
 	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.sed
 	${SED} -e "s/^CFLAGS	=/CFLAGS	+=/" \
 		${WRKSRC}/Makefile.sed > ${WRKSRC}/Makefile
-	@${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \
+	@${MV} ${WRKSRC}/builddefs.h ${WRKSRC}/builddefs.h.sed
+	${SED} -e "s/#undef VSF_BUILD_TCPWRAPPERS/#define VSF_BUILD_TCPWRAPPERS 1/" \
+		${WRKSRC}/builddefs.h.sed > ${WRKSRC}/builddefs.h
+	${SED} -e "s/^CFLAGS	=/CFLAGS	+=/" \
+		${WRKSRC}/Makefile.sed > ${WRKSRC}/Makefile
+	${ECHO_CMD} "secure_chroot_dir=${PREFIX}/share/vsftpd/empty" >> \
 		${WRKSRC}/vsftpd.conf
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${PREFIX}/libexec/
-	@${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/vsftpd.conf.dist
-	@${INSTALL} -d ${PREFIX}/share/vsftpd/empty
+	${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${PREFIX}/libexec/
+	${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/vsftpd.conf.dist
+	${INSTALL} -d ${PREFIX}/share/vsftpd/empty
 	@if [ ! -e ${PREFIX}/etc/vsftpd.conf ]; then \
 		${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${PREFIX}/etc/ ; \
 	fi
-	@${MKDIR} ${PREFIX}/share/vsftpd/empty
+	${MKDIR} ${PREFIX}/share/vsftpd/empty
 	@for i in ${MAN8} ; do \
 		${INSTALL_MAN} -m 644 ${WRKSRC}/$${i} ${MANPREFIX}/man/man8/ ; \
 		done
 	@for i in ${MAN5} ; do \
 		${INSTALL_MAN} -m 644 ${WRKSRC}/$${i} ${MANPREFIX}/man/man5/ ; \
 		done
-	@${PERL5} ${PKGINSTALL}
-	@${MKDIR} /var/ftp
+	${PERL5} ${PKGINSTALL}
+	${MKDIR} /var/ftp
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in ${DOCFILES}
+	${INSTALL_DATA} -m 644 ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.for i in EXAMPLE SECURITY
+	${MKDIR} ${DOCSDIR}/${i}
+	${CP} -p -R -L ${WRKSRC}/${i}/./ ${DOCSDIR}/${i}/
+	${CHMOD} -R -L a+rX,go-w ${DOCSDIR}/${i}/
+.endfor
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/ftp/vsftpd/distinfo b/ftp/vsftpd/distinfo
index 85e2885250e7..1d586a1395d2 100644
--- a/ftp/vsftpd/distinfo
+++ b/ftp/vsftpd/distinfo
@@ -1 +1 @@
-MD5 (vsftpd-1.1.2.tar.gz) = cd52f4bdc4db706432cb9c92b83c6824
+MD5 (vsftpd-1.1.3.tar.gz) = 3f5f59be09a6f89e516a75ad0d1e3802
diff --git a/ftp/vsftpd/pkg-plist b/ftp/vsftpd/pkg-plist
index 6dde76ce1fd8..30a859fd2577 100644
--- a/ftp/vsftpd/pkg-plist
+++ b/ftp/vsftpd/pkg-plist
@@ -7,3 +7,45 @@ etc/vsftpd.conf.dist
 @unexec rmdir /var/ftp 2>/dev/null || true
 @dirrm share/vsftpd/empty
 @dirrm share/vsftpd
+%%PORTDOCS%%share/doc/vsftpd/AUDIT
+%%PORTDOCS%%share/doc/vsftpd/BENCHMARKS
+%%PORTDOCS%%share/doc/vsftpd/BUGS
+%%PORTDOCS%%share/doc/vsftpd/COPYING
+%%PORTDOCS%%share/doc/vsftpd/Changelog
+%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/INTERNET_SITE/README
+%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.conf
+%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.xinetd
+%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD/README
+%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf
+%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/PER_IP_CONFIG/README
+%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/PER_IP_CONFIG/hosts.allow
+%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/README
+%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/VIRTUAL_HOSTS/README
+%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/README
+%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/logins.txt
+%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/vsftpd.conf
+%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS/vsftpd.pam
+%%PORTDOCS%%share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS_2/README
+%%PORTDOCS%%share/doc/vsftpd/FAQ
+%%PORTDOCS%%share/doc/vsftpd/INSTALL
+%%PORTDOCS%%share/doc/vsftpd/LICENSE
+%%PORTDOCS%%share/doc/vsftpd/README
+%%PORTDOCS%%share/doc/vsftpd/README.security
+%%PORTDOCS%%share/doc/vsftpd/REWARD
+%%PORTDOCS%%share/doc/vsftpd/SECURITY/DESIGN
+%%PORTDOCS%%share/doc/vsftpd/SECURITY/IMPLEMENTATION
+%%PORTDOCS%%share/doc/vsftpd/SECURITY/OVERVIEW
+%%PORTDOCS%%share/doc/vsftpd/SECURITY/TRUST
+%%PORTDOCS%%share/doc/vsftpd/SIZE
+%%PORTDOCS%%share/doc/vsftpd/SPEED
+%%PORTDOCS%%share/doc/vsftpd/TODO
+%%PORTDOCS%%share/doc/vsftpd/TUNING
+%%PORTDOCS%%@dirrm share/doc/vsftpd/EXAMPLE/INTERNET_SITE
+%%PORTDOCS%%@dirrm share/doc/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD
+%%PORTDOCS%%@dirrm share/doc/vsftpd/EXAMPLE/PER_IP_CONFIG
+%%PORTDOCS%%@dirrm share/doc/vsftpd/EXAMPLE/VIRTUAL_HOSTS
+%%PORTDOCS%%@dirrm share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS
+%%PORTDOCS%%@dirrm share/doc/vsftpd/EXAMPLE/VIRTUAL_USERS_2
+%%PORTDOCS%%@dirrm share/doc/vsftpd/EXAMPLE
+%%PORTDOCS%%@dirrm share/doc/vsftpd/SECURITY
+%%PORTDOCS%%@dirrm share/doc/vsftpd