- Revert ports/165605 as requested by portmgr@

Note: devel/p5-B-Size and devel/p5-Devel-Arena
where intentionally not restored.

PR:             ports/165605
Approved by:    portmgr (bapt)
Feature safe:   yes (I sure hope so)

9 files changed, 72 insertions, 6 deletions

diff --git a/archivers/p5-Archive-Any/Makefile b/archivers/p5-Archive-Any/Makefile
index 41a94ddb5878..86bf6b563c13 100644
--- a/archivers/p5-Archive-Any/Makefile
+++ b/archivers/p5-Archive-Any/Makefile
@@ -29,4 +29,10 @@ PERL_MODBUILD=	yes
 MAN3=		Archive::Any.3 Archive::Any::Plugin.3 \
 		Archive::Any::Plugin::Tar.3 Archive::Any::Plugin::Zip.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500903
+RUN_DEPENDS+=	p5-Archive-Tar>=0.22:${PORTSDIR}/archivers/p5-Archive-Tar
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/archivers/p5-Archive-Extract-Libarchive/Makefile b/archivers/p5-Archive-Extract-Libarchive/Makefile
index 82de05168837..3634043c4e9d 100644
--- a/archivers/p5-Archive-Extract-Libarchive/Makefile
+++ b/archivers/p5-Archive-Extract-Libarchive/Makefile
@@ -25,4 +25,10 @@ PERL_MODBUILD=	yes
 
 MAN3=		Archive::Extract::Libarchive.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501000
+BUILD_DEPENDS+=	p5-ExtUtils-CBuilder>=0:${PORTSDIR}/devel/p5-ExtUtils-CBuilder
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/archivers/p5-Archive-Extract/Makefile b/archivers/p5-Archive-Extract/Makefile
index ab95dd95b512..a5604718241e 100644
--- a/archivers/p5-Archive-Extract/Makefile
+++ b/archivers/p5-Archive-Extract/Makefile
@@ -21,6 +21,15 @@ MAN3=		Archive::Extract.3
 
 .include <bsd.port.pre.mk>
 
+.if ${PERL_LEVEL} < 501000
+BUILD_DEPENDS+=	p5-Locale-Maketext-Simple>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Simple \
+		p5-Module-Load-Conditional>=0.04:${PORTSDIR}/devel/p5-Module-Load-Conditional \
+		p5-Params-Check>=0.07:${PORTSDIR}/devel/p5-Params-Check
+RUN_DEPENDS+=	p5-Locale-Maketext-Simple>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Simple \
+		p5-Module-Load-Conditional>=0.04:${PORTSDIR}/devel/p5-Module-Load-Conditional \
+		p5-Params-Check>=0.07:${PORTSDIR}/devel/p5-Params-Check
+.endif
+
 .if ${PERL_LEVEL} < 501400
 BUILD_DEPENDS+=	p5-IPC-Cmd>=0.64:${PORTSDIR}/devel/p5-IPC-Cmd
 RUN_DEPENDS+=	p5-IPC-Cmd>=0.64:${PORTSDIR}/devel/p5-IPC-Cmd
diff --git a/archivers/p5-Archive-Peek/Makefile b/archivers/p5-Archive-Peek/Makefile
index 9f6d95a32394..37155c8a171e 100644
--- a/archivers/p5-Archive-Peek/Makefile
+++ b/archivers/p5-Archive-Peek/Makefile
@@ -26,4 +26,7 @@ PERL_CONFIGURE=	yes
 
 MAN3=		Archive::Peek.3
 
+regression-test: build
+	cd ${WRKSRC}/ && ${MAKE} test
+
 .include <bsd.port.mk>
diff --git a/archivers/p5-Archive-Tar/Makefile b/archivers/p5-Archive-Tar/Makefile
index c0d7ee9632af..373086e8439b 100644
--- a/archivers/p5-Archive-Tar/Makefile
+++ b/archivers/p5-Archive-Tar/Makefile
@@ -23,12 +23,32 @@ MAN3=		Archive::Tar.3 Archive::Tar::File.3
 
 OPTIONS=	TEXT_DIFF "Text::Diff support for ptardiff" off
 
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_TEXT_DIFF)
 RUN_DEPENDS+=	${SITE_PERL}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff
 .endif
 
+.if ${PERL_LEVEL} < 500904
+RUN_DEPENDS+=	p5-Package-Constants>=0:${PORTSDIR}/devel/p5-Package-Constants
+.endif
+
+.if ${PERL_LEVEL} < 500903
+RUN_DEPENDS+=	p5-IO-Zlib>=1.01:${PORTSDIR}/archivers/p5-IO-Zlib \
+		p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+.endif
+
+.if ${PERL_LEVEL} >= 501000
+PLIST_SUB+=	EXE_FILES="@comment "
+.else
+PLIST_SUB+=	EXE_FILES=""
+MAN1=		ptardiff.1 ptar.1
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's/5.009/5.666/' ${WRKSRC}/Makefile.PL
+.if ${PERL_LEVEL} >= 501000
 	@${REINPLACE_CMD} -e '/EXE_FILES/d' ${WRKSRC}/Makefile.PL
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/archivers/p5-Archive-Tar/pkg-plist b/archivers/p5-Archive-Tar/pkg-plist
index 595b64154f2e..bc81f665980b 100644
--- a/archivers/p5-Archive-Tar/pkg-plist
+++ b/archivers/p5-Archive-Tar/pkg-plist
@@ -1,3 +1,5 @@
+%%EXE_FILES%%bin/ptar
+%%EXE_FILES%%bin/ptardiff
 %%SITE_PERL%%/Archive/Tar.pm
 %%SITE_PERL%%/Archive/Tar/Constant.pm
 %%SITE_PERL%%/Archive/Tar/File.pm
diff --git a/archivers/p5-Archive-Zip/Makefile b/archivers/p5-Archive-Zip/Makefile
index f583ab0b0d9b..a6cfae1851c4 100644
--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@@ -19,4 +19,11 @@ PERL_CONFIGURE=	yes
 
 MAN3=		Archive::Zip.3 Archive::Zip::Tree.3 Archive::Zip::FAQ.3 Archive::Zip::MemberRead.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500903
+BUILD_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/archivers/p5-IO-Zlib/Makefile b/archivers/p5-IO-Zlib/Makefile
index d88511a79c46..325e758da29e 100644
--- a/archivers/p5-IO-Zlib/Makefile
+++ b/archivers/p5-IO-Zlib/Makefile
@@ -19,4 +19,11 @@ COMMENT=	IO:: style interface to Compress::Zlib
 PERL_CONFIGURE=	yes
 MAN3=		IO::Zlib.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500903
+BUILD_DEPENDS=	p5-IO-Compress>=2:${PORTSDIR}/archivers/p5-IO-Compress
+RUN_DEPENDS=	p5-IO-Compress>=2:${PORTSDIR}/archivers/p5-IO-Compress
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/archivers/p5-POE-Filter-Zlib/Makefile b/archivers/p5-POE-Filter-Zlib/Makefile
index 7d1ab9375fab..13549533a9ea 100644
--- a/archivers/p5-POE-Filter-Zlib/Makefile
+++ b/archivers/p5-POE-Filter-Zlib/Makefile
@@ -24,4 +24,10 @@ PERL_CONFIGURE=	yes
 MAN3=		POE::Filter::Zlib.3 \
     		POE::Filter::Zlib::Stream.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500903
+RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+.endif
+
+.include <bsd.port.post.mk>