- make the p5-IO dependency conditional on the Perl version

- don't change the in-place pkg-message; generate a temporary one
  in ${WRKDIR}
- fix install of scripts to ${PREFIX}/sbin
- use EXAMPLSDIR and DOCSDIR
- fix pkg-plist rmdir ... 2>/dev/null's to always return true
- bump PORTREVISION

PR:		59083
Submitted by:	Lars Thegler <lars@thegler.dk>

2 files changed, 30 insertions, 26 deletions

diff --git a/ftp/p5-Net-FTPServer/Makefile b/ftp/p5-Net-FTPServer/Makefile
index ce8d19350ab4..5ec146b2d410 100644
--- a/ftp/p5-Net-FTPServer/Makefile
+++ b/ftp/p5-Net-FTPServer/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	Net-FTPServer
 PORTVERSION=	1.118
+PORTREVISION=	1
 CATEGORIES=	ftp perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
@@ -20,7 +21,6 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Authen/PAM.pm:${PORTSDIR}/security/p5-A
 		${SITE_PERL}/${PERL_ARCH}/BSD/Resource.pm:${PORTSDIR}/devel/p5-BSD-Resource \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${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}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
@@ -30,6 +30,8 @@ USE_REINPLACE=	yes
 MAKE_ENV+=	NOCONF=1
 PERL_CONFIGURE=	yes
 
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 MAN3=	Net::FTPServer.3 \
 	Net::FTPServer::DBeg1::DirHandle.3 \
 	Net::FTPServer::DBeg1::FileHandle.3 \
@@ -48,25 +50,25 @@ MAN3=	Net::FTPServer.3 \
 	Net::FTPServer::RO::FileHandle.3 \
 	Net::FTPServer::RO::Server.3
 
+DOCS=	FAQ README TODO doc/*
+
 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," \
+		-e "s,$$.PREFIX./sbin,${PREFIX}/sbin," \
+		-e "s,$$.SITEPREFIX./sbin,${PREFIX}/sbin," \
 		${WRKSRC}/Makefile.PL
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/examples/Net-FTPServer
-	${INSTALL_DATA} ${WRKSRC}/ftpd.conf \
-		${PREFIX}/share/examples/Net-FTPServer
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/ftpd.conf ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in FAQ README TODO doc/*
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
-	@${PERL} -pi -e 's,PREFIX,${PREFIX},g' ${PKGMESSAGE}
+	@${PERL} -p -e 's,PREFIX,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
@@ -74,6 +76,8 @@ post-install:
 .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
diff --git a/ftp/p5-Net-FTPServer/pkg-plist b/ftp/p5-Net-FTPServer/pkg-plist
index 28945eef2b5a..8ba0440868cb 100644
--- a/ftp/p5-Net-FTPServer/pkg-plist
+++ b/ftp/p5-Net-FTPServer/pkg-plist
@@ -20,26 +20,26 @@ 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
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/archives.txt
+%%PORTDOCS%%%%DOCSDIR%%/eg1-psql63.sql
+%%PORTDOCS%%%%DOCSDIR%%/eg1.sql
+%%PORTDOCS%%%%DOCSDIR%%/modules.txt
+%%PORTDOCS%%%%DOCSDIR%%/press1.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfcs.txt
+%%PORTDOCS%%%%DOCSDIR%%/roadmap-1.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/safesignals.txt
+%%PORTDOCS%%%%DOCSDIR%%/sharedstate.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/ftpd.conf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTPServer
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
 @dirrm %%SITE_PERL%%/Net/FTPServer/RO
 @dirrm %%SITE_PERL%%/Net/FTPServer/InMem
 @dirrm %%SITE_PERL%%/Net/FTPServer/Full
 @dirrm %%SITE_PERL%%/Net/FTPServer/DBeg1
 @dirrm %%SITE_PERL%%/Net/FTPServer
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true