- Update to version 1.0.0

PR:		59761
Submitted by:	maintainer

7 files changed, 46 insertions, 49 deletions

diff --git a/ftp/bsdftpd-ssl/Makefile b/ftp/bsdftpd-ssl/Makefile
index e5f09dac6a0d..2f1584de5667 100644
--- a/ftp/bsdftpd-ssl/Makefile
+++ b/ftp/bsdftpd-ssl/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	bsdftpd-ssl
-PORTVERSION=	0.6.3
+PORTVERSION=	1.0.0
 CATEGORIES=	ftp
-MASTER_SITES=	http://bsdftpd-ssl.sc.ru/files/bsdftpd-ssl/archive/0.6/src/
-DISTNAME=	bsdftpd-6.0-ssl-${PORTVERSION}
+MASTER_SITES=	http://bsdftpd-ssl.sc.ru/files/bsdftpd-ssl/archive/1.0/src/
+DISTNAME=	bsdftpd-ssl-${PORTVERSION}
 
 MAINTAINER=	skynick@mail.sc.ru
 
 # Client only part
 .if defined(CLIENT_ONLY)
 PKGNAMESUFFIX=	-client
-COMMENT=	FTP command-line client utility with TLS/SSL support
+COMMENT=	FTP command-line client utility with the TLS/SSL support
 DESCR=		${FILESDIR}/pkg-descr.client
 PLIST=		${FILESDIR}/pkg-plist.client
 .endif
@@ -24,7 +24,8 @@ PLIST=		${FILESDIR}/pkg-plist.client
 MAN1=	ftps.1
 # Server part
 .if !defined(CLIENT_ONLY)
-COMMENT=	FTP server with TLS/SSL support
+COMMENT=	Secure FTP server with the TLS/SSL support
+MAN5=	ftpchroot.5
 MAN8=	ftpd.8
 MLINKS=	ftpd.8 ftpd-ssl.8
 PKGMESSAGE=	${FILESDIR}/pkg-message.server
@@ -63,6 +64,7 @@ do-install:
 # Server part
 .if !defined(CLIENT_ONLY)
 	${INSTALL_PROGRAM} ${WRKSRC}/ftpd/ftpd ${PREFIX}/libexec/ftpd
+	${INSTALL_MAN} ${WRKSRC}/ftpd/ftpchroot.5.gz ${MANDIR}5/ftpchroot.5.gz
 	${INSTALL_MAN} ${WRKSRC}/ftpd/ftpd.8.gz ${MANDIR}8/ftpd.8.gz
 .endif
 
@@ -87,7 +89,7 @@ post-install:
 	${MKDIR} ${DOCDIR}/cert
 	${INSTALL_SCRIPT} -p ${WRKSRC}/cert/cert-nopass.sh ${DOCDIR}/cert/cert-nopass.sh
 	${INSTALL_SCRIPT} -p ${WRKSRC}/cert/cert-pass.sh ${DOCDIR}/cert/cert-pass.sh
-	${INSTALL_SCRIPT} -p ${WRKSRC}/cert/dummy.sh ${DOCDIR}/cert/dummy.sh
+	${INSTALL_SCRIPT} -p ${WRKSRC}/cert/cert-dummy.sh ${DOCDIR}/cert/cert-dummy.sh
 	${INSTALL_SCRIPT} -p ${WRKSRC}/cert/xCA.sh ${DOCDIR}/cert/xCA.sh
 .endif
 .if !defined(CLIENT_ONLY)
diff --git a/ftp/bsdftpd-ssl/distinfo b/ftp/bsdftpd-ssl/distinfo
index 59e5c4d741de..2c61dbc6a1b7 100644
--- a/ftp/bsdftpd-ssl/distinfo
+++ b/ftp/bsdftpd-ssl/distinfo
@@ -1 +1 @@
-MD5 (bsdftpd-6.0-ssl-0.6.3.tar.gz) = 77d35b30da7127e1a8bb1fa93febebbd
+MD5 (bsdftpd-ssl-1.0.0.tar.gz) = 745befccb117d08aa0e37ea592dfb48c
diff --git a/ftp/bsdftpd-ssl/files/patch-ftpd::popen.c b/ftp/bsdftpd-ssl/files/patch-ftpd::popen.c
deleted file mode 100644
index b6493810654b..000000000000
--- a/ftp/bsdftpd-ssl/files/patch-ftpd::popen.c
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN ftpd/popen.c.ORI ftpd/popen.c
---- ftpd/popen.c.ORI	Mon Dec 17 12:21:41 2001
-+++ ftpd/popen.c	Fri Oct 17 02:27:29 2003
-@@ -64,7 +64,7 @@
- #include "pathnames.h"
- #include <syslog.h>
- #include <time.h>
--#include <varargs.h>
-+#include <stdarg.h>
- #endif
- 
- #define	MAXUSRARGS	100
diff --git a/ftp/bsdftpd-ssl/files/pkg-descr.client b/ftp/bsdftpd-ssl/files/pkg-descr.client
index 8932014f5cea..a8d8154b0f89 100644
--- a/ftp/bsdftpd-ssl/files/pkg-descr.client
+++ b/ftp/bsdftpd-ssl/files/pkg-descr.client
@@ -1,7 +1,10 @@
-BSDftpd-ssl is a TLS/SSL-enhanced FTP server. This package contains
-command-line FTP client utility (ftps). The TLS/SSL enhancement allows RFC2228
-"FTP Security Extensions"-compliant TLS/SSL support for both control and data
-connections; with standard FTP servers this software operates as the standard
-FTP client.
+This is an implementation of the command-line FTP client that supports industry
+standard TLS/SSL encryption and authentication for whole FTP sessions and data
+transfers. It is compatible with the original FTP protocol, which is described
+in RFC 959, and the TLS/SSL enhancement allows RFC 2228-compliant TLS/SSL
+protection for both control and data channels.
+
+This package contains the FTP client utility, an essential documentation, and
+also script programs for a basic X.509 certificate management.
 
 WWW: http://bsdftpd-ssl.sc.ru
diff --git a/ftp/bsdftpd-ssl/files/pkg-plist.client b/ftp/bsdftpd-ssl/files/pkg-plist.client
index 9c3b94b79af6..9bafbef7f1fd 100644
--- a/ftp/bsdftpd-ssl/files/pkg-plist.client
+++ b/ftp/bsdftpd-ssl/files/pkg-plist.client
@@ -5,7 +5,7 @@ bin/ftps
 %%PORTDOCS%%share/doc/bsdftpd-ssl-client/ChangeLog
 %%PORTDOCS%%share/doc/bsdftpd-ssl-client/cert/cert-nopass.sh
 %%PORTDOCS%%share/doc/bsdftpd-ssl-client/cert/cert-pass.sh
-%%PORTDOCS%%share/doc/bsdftpd-ssl-client/cert/dummy.sh
+%%PORTDOCS%%share/doc/bsdftpd-ssl-client/cert/cert-dummy.sh
 %%PORTDOCS%%share/doc/bsdftpd-ssl-client/cert/xCA.sh
 %%PORTDOCS%%share/doc/bsdftpd-ssl-client/docs/README
 %%PORTDOCS%%share/doc/bsdftpd-ssl-client/docs/cert-basics.txt
diff --git a/ftp/bsdftpd-ssl/pkg-descr b/ftp/bsdftpd-ssl/pkg-descr
index 3bd1cd598f19..10c7e110d0f6 100644
--- a/ftp/bsdftpd-ssl/pkg-descr
+++ b/ftp/bsdftpd-ssl/pkg-descr
@@ -1,7 +1,11 @@
-BSDftpd-ssl is a TLS/SSL-enhanced FTP server. The TLS/SSL enhancement allows
-RFC2228 "FTP Security Extensions"-compliant TLS/SSL support for both control
-and data connections. This package contains FTP server (ftpd) and command-line
-FTP client utility (ftps). Server and client are fully compatible with standard
-FTP protocol.
+BSDftpd-ssl is the secure FTP server that supports industry standard TLS/SSL
+encryption and authentication for whole FTP sessions and data transfers. This
+implementation is compatible with the original FTP protocol, which is described
+in RFC 959, and the TLS/SSL enhancement allows RFC 2228-compliant TLS/SSL
+protection for both control and data channels.
+
+This package contains the secure FTP server, the command-line TLS/SSL-aware FTP
+client utility, an essential documentation, and also script programs for a
+basic X.509 certificate management.
 
 WWW: http://bsdftpd-ssl.sc.ru
diff --git a/ftp/bsdftpd-ssl/pkg-plist b/ftp/bsdftpd-ssl/pkg-plist
index 267d218f2f2d..cb904d959428 100644
--- a/ftp/bsdftpd-ssl/pkg-plist
+++ b/ftp/bsdftpd-ssl/pkg-plist
@@ -1,21 +1,21 @@
 bin/ftps
 libexec/ftpd
-%%PORTDOCS%%share/doc/bsdftpd-ssl/COPYRIGHT
-%%PORTDOCS%%share/doc/bsdftpd-ssl/README
-%%PORTDOCS%%share/doc/bsdftpd-ssl/INSTALL
-%%PORTDOCS%%share/doc/bsdftpd-ssl/ChangeLog
-%%PORTDOCS%%share/doc/bsdftpd-ssl/cert/cert-nopass.sh
-%%PORTDOCS%%share/doc/bsdftpd-ssl/cert/cert-pass.sh
-%%PORTDOCS%%share/doc/bsdftpd-ssl/cert/dummy.sh
-%%PORTDOCS%%share/doc/bsdftpd-ssl/cert/xCA.sh
-%%PORTDOCS%%share/doc/bsdftpd-ssl/docs/README
-%%PORTDOCS%%share/doc/bsdftpd-ssl/docs/cert-basics.txt
-%%PORTDOCS%%share/doc/bsdftpd-ssl/docs/cert-howto.txt
-%%PORTDOCS%%share/doc/bsdftpd-ssl/docs/ciphers.txt
-%%PORTDOCS%%share/doc/bsdftpd-ssl/docs/licenses
-%%PORTDOCS%%share/doc/bsdftpd-ssl/docs/standards.txt
-%%PORTDOCS%%share/doc/bsdftpd-ssl/docs/verify.txt
-%%PORTDOCS%%share/doc/bsdftpd-ssl/docs/x509_auth.txt
-%%PORTDOCS%%@dirrm share/doc/bsdftpd-ssl/cert
-%%PORTDOCS%%@dirrm share/doc/bsdftpd-ssl/docs
-%%PORTDOCS%%@dirrm share/doc/bsdftpd-ssl
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/cert/cert-nopass.sh
+%%PORTDOCS%%%%DOCSDIR%%/cert/cert-pass.sh
+%%PORTDOCS%%%%DOCSDIR%%/cert/cert-dummy.sh
+%%PORTDOCS%%%%DOCSDIR%%/cert/xCA.sh
+%%PORTDOCS%%%%DOCSDIR%%/docs/README
+%%PORTDOCS%%%%DOCSDIR%%/docs/cert-basics.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/cert-howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/ciphers.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/licenses
+%%PORTDOCS%%%%DOCSDIR%%/docs/standards.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/verify.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/x509_auth.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/cert
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%