- relocate Test::* to BUILD_DEPENDS only for non-Test::* modules

- add optional Text::Diff support for ptardiff
- unbreak on old perl
- bump PORTREVISION
- assign to perl@

1 files changed, 24 insertions, 4 deletions

diff --git a/archivers/p5-Archive-Tar/Makefile b/archivers/p5-Archive-Tar/Makefile
index f22986466e30..7edd5a319c90 100644
--- a/archivers/p5-Archive-Tar/Makefile
+++ b/archivers/p5-Archive-Tar/Makefile
@@ -7,23 +7,43 @@
 
 PORTNAME=	Archive-Tar
 PORTVERSION=	1.26
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	archivers perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Archive
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for creation and manipulation of tar files
 
 RUN_DEPENDS=	${SITE_PERL}/IO/Zlib.pm:${PORTSDIR}/archivers/p5-IO-Zlib \
 		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
-		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
 		${SITE_PERL}/IO/String.pm:${PORTSDIR}/devel/p5-IO-String
 BUILD_DEPENDS=	${RUN_DEPENDS}
+BUILD_DEPENDS+=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 
 PERL_CONFIGURE=	YES
 
 MAN3=		Archive::Tar.3 Archive::Tar::File.3
 
-.include <bsd.port.mk>
+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} < 500600
+
+post-patch:
+	${PERL} -pi -e "s/'>',/'>'./" ${WRKSRC}/lib/Archive/Tar.pm
+	${PERL} -pi -e 's/seek \$$handle, 0, 0/\$$handle->setpos\(0\)/' ${WRKSRC}/lib/Archive/Tar.pm
+	${PERL} -pi -e 's/my \$$fh;/my \$$fh = IO::File->new;/' ${WRKSRC}/t/02_methods.t
+
+post-configure:
+	${PERL} -pi -e 's/-I\S+PERL\S+ //g if m{PERL_DL_NONLAZY}' ${WRKSRC}/Makefile
+
+.endif
+
+.include <bsd.port.post.mk>