3 files changed, 56 insertions, 35 deletions

diff --git a/www/p5-WWW-Link/Makefile b/www/p5-WWW-Link/Makefile
index 2667904dc44d..c9fe481584c3 100644
--- a/www/p5-WWW-Link/Makefile
+++ b/www/p5-WWW-Link/Makefile
@@ -6,20 +6,29 @@
 #
 
 PORTNAME=	WWW-Link
-PORTVERSION=	0.030
+PORTVERSION=	0.036
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	../by-authors/id/M/MI/MIKEDLR
+MASTER_SITE_SUBDIR=	WWW
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	svenasse@polaris.ca
 COMMENT=	Maintain information about the state of links
 
+BUILD_DEPENDS=	${SITE_PERL}/HTTP/Response.pm:${PORTSDIR}/www/p5-libwww \
+		${SITE_PERL}/HTML/Stream.pm:${PORTSDIR}/www/p5-HTML-Stream \
+		${SITE_PERL}/CGI/Form.pm:${PORTSDIR}/www/p5-CGI-modules \
+		${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet \
+		${SITE_PERL}/MLDBM.pm:${PORTSDIR}/databases/p5-MLDBM \
+		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_CONFIGURE=	yes
 
 MAN3=	WWW::Link.3 \
 	WWW::Link::Change.3 \
 	WWW::Link::Merge.3 \
+	WWW::Link::Redirect.3 \
 	WWW::Link::Repair.3 \
 	WWW::Link::Repair::ResourceMapper.3 \
 	WWW::Link::Repair::Substitutor.3 \
@@ -29,6 +38,7 @@ MAN3=	WWW::Link.3 \
 	WWW::Link::Reporter::LongList.3 \
 	WWW::Link::Reporter::RepairForm.3 \
 	WWW::Link::Reporter::Text.3 \
+	WWW::Link::Reporter::URI.3 \
 	WWW::Link::Selector.3 \
 	WWW::Link::Test.3 \
 	WWW::Link::Test::Validate.3 \
@@ -37,6 +47,15 @@ MAN3=	WWW::Link.3 \
 	WWW::Link::Tester::Base.3 \
 	WWW::Link::Tester::Complex.3 \
 	WWW::Link::Tester::Simple.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500601
+post-patch:
+	${PERL} -pi.bak \
+		-e 's/^\s*our\s+\(?\s*([\$$\@]\w+)\s*\)?/use vars qw($$1);$$1/;' \
+		-e '$$_="" if /use warnings/;' \
+		$$(${FIND} ${WRKSRC}/lib -name '*.pm')
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/www/p5-WWW-Link/distinfo b/www/p5-WWW-Link/distinfo
index c12b34701025..f5dbf08995fe 100644
--- a/www/p5-WWW-Link/distinfo
+++ b/www/p5-WWW-Link/distinfo
@@ -1 +1 @@
-MD5 (WWW-Link-0.030.tar.gz) = 8f9c258cf97e159d36d852ddefc1aa63
+MD5 (WWW-Link-0.036.tar.gz) = 668af5e35f5a7f5c5d66767bd17a743a
diff --git a/www/p5-WWW-Link/pkg-plist b/www/p5-WWW-Link/pkg-plist
index 5e3df428ada4..f41f7305cfa2 100644
--- a/www/p5-WWW-Link/pkg-plist
+++ b/www/p5-WWW-Link/pkg-plist
@@ -1,30 +1,32 @@
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Change.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Merge.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Repair.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Repair/ResourceMapper.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Repair/Substitutor.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Reporter.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Reporter/Compile.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Reporter/HTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Reporter/LongList.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Reporter/RepairForm.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Reporter/Text.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Reporter/junk
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Selector.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Test.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Test/Validate.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Tester.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Tester/Adaptive.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Tester/Base.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Tester/Complex.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Tester/Complex.pm.extra
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Tester/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW-Link/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW-Link
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Tester
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Test
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Reporter
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Link/Repair
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Link
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/WWW 2>/dev/null || true
+%%SITE_PERL%%/WWW/Link.pm
+%%SITE_PERL%%/WWW/Link/Change.pm
+%%SITE_PERL%%/WWW/Link/Merge.pm
+%%SITE_PERL%%/WWW/Link/Redirect.pm
+%%SITE_PERL%%/WWW/Link/Repair.pm
+%%SITE_PERL%%/WWW/Link/Repair/ResourceMapper.pm
+%%SITE_PERL%%/WWW/Link/Repair/Substitutor.pm
+%%SITE_PERL%%/WWW/Link/Reporter.pm
+%%SITE_PERL%%/WWW/Link/Reporter/Compile.pm
+%%SITE_PERL%%/WWW/Link/Reporter/HTML.pm
+%%SITE_PERL%%/WWW/Link/Reporter/LongList.pm
+%%SITE_PERL%%/WWW/Link/Reporter/RepairForm.pm
+%%SITE_PERL%%/WWW/Link/Reporter/Text.pm
+%%SITE_PERL%%/WWW/Link/Reporter/URI.pm
+%%SITE_PERL%%/WWW/Link/Reporter/junk
+%%SITE_PERL%%/WWW/Link/Selector.pm
+%%SITE_PERL%%/WWW/Link/Test.pm
+%%SITE_PERL%%/WWW/Link/Test/Validate.pm
+%%SITE_PERL%%/WWW/Link/Tester.pm
+%%SITE_PERL%%/WWW/Link/Tester/Adaptive.pm
+%%SITE_PERL%%/WWW/Link/Tester/Base.pm
+%%SITE_PERL%%/WWW/Link/Tester/Complex.pm
+%%SITE_PERL%%/WWW/Link/Tester/Complex.pm.extra
+%%SITE_PERL%%/WWW/Link/Tester/Simple.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW-Link/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW-Link
+@dirrm %%SITE_PERL%%/WWW/Link/Tester
+@dirrm %%SITE_PERL%%/WWW/Link/Test
+@dirrm %%SITE_PERL%%/WWW/Link/Reporter
+@dirrm %%SITE_PERL%%/WWW/Link/Repair
+@dirrm %%SITE_PERL%%/WWW/Link
+@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true