4 files changed, 21 insertions, 6 deletions

diff --git a/ftp/p5-Net-FTPServer/Makefile b/ftp/p5-Net-FTPServer/Makefile
index 33aaf7c495d8..913bcbbc4d1b 100644
--- a/ftp/p5-Net-FTPServer/Makefile
+++ b/ftp/p5-Net-FTPServer/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	Net-FTPServer
-PORTVERSION=	1.102
+PORTVERSION=	1.111
 CATEGORIES=	ftp perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
@@ -22,9 +22,12 @@ 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}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO \
 		${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy \
-		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip
+		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
+		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_REINPLACE=	yes
+MAKE_ENV+=	NOCONF=1
 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 PERL_CONFIGURE=	yes
 
@@ -47,8 +50,15 @@ MAN3=	Net::FTPServer.3 \
 	Net::FTPServer::RO::FileHandle.3 \
 	Net::FTPServer::RO::Server.3
 
+post-patch:
+	@${REINPLACE_CMD} -e "s/root,root/root,wheel/" \
+		-e "s,/usr/sbin,${PREFIX}/sbin," \
+		${WRKSRC}/Net-FTPServer.spec.PL
+	@${REINPLACE_CMD} -e "s/-g root/-g wheel/" \
+		-e "s,/usr/sbin,${PREFIX}/sbin," \
+		${WRKSRC}/Makefile.PL
+
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/ftpd ${PREFIX}/sbin/perlftpd
 	@${MKDIR} ${PREFIX}/share/examples/Net-FTPServer
 	${INSTALL_DATA} ${WRKSRC}/ftpd.conf \
 		${PREFIX}/share/examples/Net-FTPServer
diff --git a/ftp/p5-Net-FTPServer/distinfo b/ftp/p5-Net-FTPServer/distinfo
index d5566c4a4be1..438a0e753d3f 100644
--- a/ftp/p5-Net-FTPServer/distinfo
+++ b/ftp/p5-Net-FTPServer/distinfo
@@ -1 +1 @@
-MD5 (Net-FTPServer-1.102.tar.gz) = f9ab4b2d00ed351726db0d29ebd04978
+MD5 (Net-FTPServer-1.111.tar.gz) = 41072ccfd200382469168aa70c55cb49
diff --git a/ftp/p5-Net-FTPServer/pkg-message b/ftp/p5-Net-FTPServer/pkg-message
index c653630d1793..3618f61ede06 100644
--- a/ftp/p5-Net-FTPServer/pkg-message
+++ b/ftp/p5-Net-FTPServer/pkg-message
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------
 You have installed p5-Net-FTPServer, a full-featured ftp daemon written in
 Perl.  For more information, please type `perldoc Net::FTPServer'.  The
-ftpd is installed as PREFIX/sbin/perlftpd, with an example config
+ftpd is installed as PREFIX/sbin/ftpd.pl, with an example config
 file in PREFIX/share/examples/Net-FTPServer.
 --------------------------------------------------------------------------
diff --git a/ftp/p5-Net-FTPServer/pkg-plist b/ftp/p5-Net-FTPServer/pkg-plist
index 5d338cf55898..48504f78b2ca 100644
--- a/ftp/p5-Net-FTPServer/pkg-plist
+++ b/ftp/p5-Net-FTPServer/pkg-plist
@@ -18,17 +18,22 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Net/FTPServer/RO/Server.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/FTPServer/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/FTPServer/FTPServer.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/FTPServer/FTPServer.so
-sbin/perlftpd
+sbin/dbeg1-ftpd.pl
+sbin/ftpd.pl
+sbin/inmem-ftpd.pl
+sbin/ro-ftpd.pl
 %%PORTDOCS%%share/doc/Net-FTPServer/FAQ
 %%PORTDOCS%%share/doc/Net-FTPServer/README
 %%PORTDOCS%%share/doc/Net-FTPServer/TODO
 %%PORTDOCS%%share/doc/Net-FTPServer/archives.txt
 %%PORTDOCS%%share/doc/Net-FTPServer/eg1-psql63.sql
 %%PORTDOCS%%share/doc/Net-FTPServer/eg1.sql
+%%PORTDOCS%%share/doc/Net-FTPServer/modules.txt
 %%PORTDOCS%%share/doc/Net-FTPServer/press1.0.txt
 %%PORTDOCS%%share/doc/Net-FTPServer/rfcs.txt
 %%PORTDOCS%%share/doc/Net-FTPServer/roadmap-1.2.txt
 %%PORTDOCS%%share/doc/Net-FTPServer/safesignals.txt
+%%PORTDOCS%%share/doc/Net-FTPServer/sharedstate.txt
 share/examples/Net-FTPServer/ftpd.conf
 @dirrm share/examples/Net-FTPServer
 %%PORTDOCS%%@dirrm share/doc/Net-FTPServer