3 files changed, 18 insertions, 16 deletions

diff --git a/ftp/p5-Net-FTPServer/Makefile b/ftp/p5-Net-FTPServer/Makefile
index 5ec146b2d410..23985f4c67c4 100644
--- a/ftp/p5-Net-FTPServer/Makefile
+++ b/ftp/p5-Net-FTPServer/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	Net-FTPServer
-PORTVERSION=	1.118
-PORTREVISION=	1
+PORTVERSION=	1.119
 CATEGORIES=	ftp perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
@@ -23,7 +22,8 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Authen/PAM.pm:${PORTSDIR}/security/p5-A
 		${SITE_PERL}/${PERL_ARCH}/File/Sync.pm:${PORTSDIR}/devel/p5-File-Sync \
 		${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
+		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_REINPLACE=	yes
@@ -46,12 +46,21 @@ MAN3=	Net::FTPServer.3 \
 	Net::FTPServer::InMem::DirHandle.3 \
 	Net::FTPServer::InMem::FileHandle.3 \
 	Net::FTPServer::InMem::Server.3 \
+	Net::FTPServer::Proxy::DirHandle.3 \
+	Net::FTPServer::Proxy::FileHandle.3 \
+	Net::FTPServer::Proxy::Server.3 \
 	Net::FTPServer::RO::DirHandle.3 \
 	Net::FTPServer::RO::FileHandle.3 \
 	Net::FTPServer::RO::Server.3
 
 DOCS=	FAQ README TODO doc/*
 
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500601
+IGNORE=         Port requires perl 5.6.1 or later. Install lang/perl5 then try again
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s/root,root/root,wheel/" \
 		-e "s,/usr/sbin,${PREFIX}/sbin," \
@@ -71,16 +80,4 @@ post-install:
 	@${PERL} -p -e 's,PREFIX,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO
-.else
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/ftp/p5-Net-FTPServer/distinfo b/ftp/p5-Net-FTPServer/distinfo
index 2d3e55627a77..fdb2c7b11721 100644
--- a/ftp/p5-Net-FTPServer/distinfo
+++ b/ftp/p5-Net-FTPServer/distinfo
@@ -1 +1 @@
-MD5 (Net-FTPServer-1.118.tar.gz) = 2783c530f3ad73d48732ee77e73c8c56
+MD5 (Net-FTPServer-1.119.tar.gz) = 8e1779270e4f8e00a0f88e1b830bcd29
diff --git a/ftp/p5-Net-FTPServer/pkg-plist b/ftp/p5-Net-FTPServer/pkg-plist
index 8ba0440868cb..a9e20ada170c 100644
--- a/ftp/p5-Net-FTPServer/pkg-plist
+++ b/ftp/p5-Net-FTPServer/pkg-plist
@@ -12,6 +12,9 @@
 %%SITE_PERL%%/Net/FTPServer/InMem/DirHandle.pm
 %%SITE_PERL%%/Net/FTPServer/InMem/FileHandle.pm
 %%SITE_PERL%%/Net/FTPServer/InMem/Server.pm
+%%SITE_PERL%%/Net/FTPServer/Proxy/DirHandle.pm
+%%SITE_PERL%%/Net/FTPServer/Proxy/FileHandle.pm   
+%%SITE_PERL%%/Net/FTPServer/Proxy/Server.pm
 %%SITE_PERL%%/Net/FTPServer/RO/DirHandle.pm
 %%SITE_PERL%%/Net/FTPServer/RO/FileHandle.pm
 %%SITE_PERL%%/Net/FTPServer/RO/Server.pm
@@ -19,6 +22,7 @@
 sbin/dbeg1-ftpd.pl
 sbin/ftpd.pl
 sbin/inmem-ftpd.pl
+sbin/proxy-ftpd.pl
 sbin/ro-ftpd.pl
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -38,6 +42,7 @@ sbin/ro-ftpd.pl
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTPServer
 @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
 @dirrm %%SITE_PERL%%/Net/FTPServer/RO
+@dirrm %%SITE_PERL%%/Net/FTPServer/Proxy
 @dirrm %%SITE_PERL%%/Net/FTPServer/InMem
 @dirrm %%SITE_PERL%%/Net/FTPServer/Full
 @dirrm %%SITE_PERL%%/Net/FTPServer/DBeg1