4 files changed, 18 insertions, 15 deletions

diff --git a/ftp/p5-POE-Component-Client-FTP/Makefile b/ftp/p5-POE-Component-Client-FTP/Makefile
index 583bf9b68232..70ed4390cb34 100644
--- a/ftp/p5-POE-Component-Client-FTP/Makefile
+++ b/ftp/p5-POE-Component-Client-FTP/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	POE-Component-Client-FTP
-PORTVERSION=	0.05
+PORTVERSION=	0.07
 CATEGORIES=	ftp perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	POE
@@ -15,15 +15,17 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Implements an FTP client POE Component
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	${SITE_PERL}/POE.pm:${PORTSDIR}/devel/p5-POE
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
 PERL_CONFIGURE=	yes
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		POE::Component::Client::FTP.3
 
+post-patch:
+	@${PERL} -pi -e '$$_="" if /^use warnings/; s/\x0d(?=\x0a)//;' \
+		${WRKSRC}/FTP.pm
+
 post-install:
 .ifndef(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
diff --git a/ftp/p5-POE-Component-Client-FTP/distinfo b/ftp/p5-POE-Component-Client-FTP/distinfo
index 64d5c8ac7e3f..31e2bfc27151 100644
--- a/ftp/p5-POE-Component-Client-FTP/distinfo
+++ b/ftp/p5-POE-Component-Client-FTP/distinfo
@@ -1 +1 @@
-MD5 (POE-Component-Client-FTP-0.05.tar.gz) = 4ad9dc1e0d3b6aa502d08ee3d83dbb0e
+MD5 (POE-Component-Client-FTP-0.07.tar.gz) = 788fd8cbb4ea84c2e17116893cedc944
diff --git a/ftp/p5-POE-Component-Client-FTP/pkg-descr b/ftp/p5-POE-Component-Client-FTP/pkg-descr
index 0b51bcfea746..bac8669c25a1 100644
--- a/ftp/p5-POE-Component-Client-FTP/pkg-descr
+++ b/ftp/p5-POE-Component-Client-FTP/pkg-descr
@@ -1,7 +1,7 @@
 POE::Component::Client::FTP is a POE component for interacting with a
 FTP server.
 
-WWW: http://search.cpan.org/search?dist=POE-Component-Client-FTP
+WWW: http://search.cpan.org/dist/POE-Component-Client-FTP/
 
 -- Sergey Skvortsov
 skv@FreeBSD.org
diff --git a/ftp/p5-POE-Component-Client-FTP/pkg-plist b/ftp/p5-POE-Component-Client-FTP/pkg-plist
index bf75ff605ca6..8e75c937e0bb 100644
--- a/ftp/p5-POE-Component-Client-FTP/pkg-plist
+++ b/ftp/p5-POE-Component-Client-FTP/pkg-plist
@@ -1,12 +1,13 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/Client/FTP/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Client/FTP.pm
+%%SITE_PERL%%/POE/Component/Client/FTP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/FTP/.packlist
 %%PORTDOCS%%%%EXAMPLESDIR%%/dotfer.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/list.pl
 %%PORTDOCS%%%%EXAMPLESDIR%%/sync.pl
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/Client/FTP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/POE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/FTP
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true