18 files changed, 38 insertions, 130 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index cb920a76ae51..0dd3ea7c90ad 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -335,10 +335,10 @@
     SUBDIR += p5-Pod-DocBook
     SUBDIR += p5-Pod-Escapes
     SUBDIR += p5-Pod-POM
+    SUBDIR += p5-Pod-Parser
     SUBDIR += p5-Pod-Simple
     SUBDIR += p5-Pod-Stripper
     SUBDIR += p5-Pod-Tree
-    SUBDIR += p5-PodParser
     SUBDIR += p5-RADIUS-UserFile
     SUBDIR += p5-RDF-Core
     SUBDIR += p5-RDF-Notation3
diff --git a/textproc/p5-Apache-XBEL/Makefile b/textproc/p5-Apache-XBEL/Makefile
index 13d14df4d79c..d4f3a7fd482b 100644
--- a/textproc/p5-Apache-XBEL/Makefile
+++ b/textproc/p5-Apache-XBEL/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Apache-XBEL
 PORTVERSION=	1.3
-# PORTREVISION=
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
@@ -19,7 +19,7 @@ COMMENT=	Apache mod_perl handler to render an XBEL file as an HTML tree
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Apache.pm:${PORTSDIR}/www/mod_perl \
 		${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
 		${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT \
-		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Memoize.pm:${PORTSDIR}/devel/p5-Memoize
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/textproc/p5-CSS-Tiny/Makefile b/textproc/p5-CSS-Tiny/Makefile
index 3de781f9deaf..742f5a9c385a 100644
--- a/textproc/p5-CSS-Tiny/Makefile
+++ b/textproc/p5-CSS-Tiny/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	CSS-Tiny
 PORTVERSION=	1.08
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CSS
@@ -15,6 +16,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hansjoerg.pehofer@uibk.ac.at
 COMMENT=	Read/Write .css files with as little code as possible
 
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_CONFIGURE=	yes
 MAN3=		CSS::Tiny.3
 
@@ -24,11 +28,6 @@ MAN3=		CSS::Tiny.3
 EXTRA_PATCHES=	${PATCHDIR}/500503-lib::CSS::Tiny.pm
 .endif
 
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
 post-patch:
 	@${RM} ${WRKSRC}/inc/Module/Install/AutoInstall.pm
 	@${PERL} -pi -e '$$_="" if /AutoInstall/' ${WRKSRC}/MANIFEST
diff --git a/textproc/p5-PerlPoint-Package/Makefile b/textproc/p5-PerlPoint-Package/Makefile
index 5eeec7e2ad50..1bbb985c0618 100644
--- a/textproc/p5-PerlPoint-Package/Makefile
+++ b/textproc/p5-PerlPoint-Package/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	PerlPoint-Package
 PORTVERSION=	0.39
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	PerlPoint
@@ -17,7 +17,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	PerlPoint is both a presentation and a documentation toolset
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
+		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	YES
@@ -43,14 +46,4 @@ post-install:
 	@cd ${WRKSRC}/demo; ${FIND} . | ${CPIO} -padm ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
-		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.if ${PERL_LEVEL} < 500600
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-Plucene/Makefile b/textproc/p5-Plucene/Makefile
index 59493d097dd0..98f791d24753 100644
--- a/textproc/p5-Plucene/Makefile
+++ b/textproc/p5-Plucene/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Plucene
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../by-authors/id/T/TM/TMTM
@@ -17,7 +18,7 @@ COMMENT=	Perl port of the Java Lucene search engine
 
 BUILD_DEPENDS=	${SITE_PERL}/Memoize.pm:${PORTSDIR}/devel/p5-Memoize \
 		${SITE_PERL}/Tie/Array/Sorted.pm:${PORTSDIR}/devel/p5-Tie-Array-Sorted \
-		${SITE_PERL}/File/Spec/Functions.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/Encode/compat.pm:${PORTSDIR}/devel/p5-Encode-compat \
 		${SITE_PERL}/File/Slurp.pm:${PORTSDIR}/devel/p5-File-Slurp \
 		${SITE_PERL}/Class/Virtual.pm:${PORTSDIR}/devel/p5-Class-Virtual \
@@ -104,7 +105,7 @@ MAN3=	Plucene.3 \
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=	"This port requires perl 5.6 or above."
+IGNORE=	This port requires perl 5.6 or above.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-Pod-Constants/Makefile b/textproc/p5-Pod-Constants/Makefile
index 795683ef71c2..ec206f798379 100644
--- a/textproc/p5-Pod-Constants/Makefile
+++ b/textproc/p5-Pod-Constants/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Pod-Constants
 PORTVERSION=	0.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/S/SA/SAMV
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Include constants from POD
 
-BUILD_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+BUILD_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/textproc/p5-Pod-DocBook/Makefile b/textproc/p5-Pod-DocBook/Makefile
index 17b07ca7e8b9..6ea03575f506 100644
--- a/textproc/p5-Pod-DocBook/Makefile
+++ b/textproc/p5-Pod-DocBook/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Pod-DocBook
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/N/NA/NANDU
@@ -16,7 +17,7 @@ MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Convert Pod data to DocBook SGML
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \
+		${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
 		${SITE_PERL}/Pod/ParseLink.pm:${PORTSDIR}/textproc/p5-podlators \
 		${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap
 RUN_DEPENDS=	${BUILD_DEPENDS}
@@ -29,7 +30,7 @@ MAN3=		Pod::DocBook.3
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
-IGNORE=	"Perl 5.6.1 or newer required. Install lang/perl5.8 or lang/perl5 and try again."
+IGNORE=	Perl 5.6.1 or newer required. Install lang/perl5.8 or lang/perl5 and try again.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-Pod-Parser/Makefile b/textproc/p5-Pod-Parser/Makefile
index f1d062ba1825..be4680bcaef4 100644
--- a/textproc/p5-Pod-Parser/Makefile
+++ b/textproc/p5-Pod-Parser/Makefile
@@ -5,9 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	PodParser
-PORTVERSION=	1.28
-PORTREVISION=	2
+PORTNAME=	Pod-Parser
+PORTVERSION=	1.31
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Pod
@@ -16,11 +15,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Modules to work with POD (Plain Old Documentation)
 
-BUILD_DEPENDS=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS="site"
 
 MAN1=		pod2usage.1 podchecker.1 podselect.1
 MAN3=		Pod::Checker.3 Pod::Find.3 Pod::InputObjects.3 \
diff --git a/textproc/p5-Pod-Parser/distinfo b/textproc/p5-Pod-Parser/distinfo
index 6eb9a734dd67..775d0195b462 100644
--- a/textproc/p5-Pod-Parser/distinfo
+++ b/textproc/p5-Pod-Parser/distinfo
@@ -1,2 +1,2 @@
-MD5 (PodParser-1.28.tar.gz) = 82b26c8cef5ef2bea0d7bf0294682382
-SIZE (PodParser-1.28.tar.gz) = 91327
+MD5 (Pod-Parser-1.31.tar.gz) = 9239f922617f805bc9da2f71d717061c
+SIZE (Pod-Parser-1.31.tar.gz) = 94086
diff --git a/textproc/p5-Pod-Parser/pkg-descr b/textproc/p5-Pod-Parser/pkg-descr
index 52476fcb8f2b..2242df2ea619 100644
--- a/textproc/p5-Pod-Parser/pkg-descr
+++ b/textproc/p5-Pod-Parser/pkg-descr
@@ -9,4 +9,4 @@ Set of modules:
 * Pod::ParseUtils - helpers for POD parsing and conversion
 * Pod::Find - find POD documents in directory trees
 
-WWW: http://search.cpan.org/dist/PodParser/
+WWW: http://search.cpan.org/dist/Pod-Parser/
diff --git a/textproc/p5-Pod-Stripper/Makefile b/textproc/p5-Pod-Stripper/Makefile
index cca5d55dc9ce..75ca01d894ae 100644
--- a/textproc/p5-Pod-Stripper/Makefile
+++ b/textproc/p5-Pod-Stripper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Pod-Stripper
 PORTVERSION=	0.22
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Pod
@@ -16,11 +16,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Strip all pod, and output what's left
 
-BUILD_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+BUILD_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS="site"
 
 MAN1=		podstrip.1
 MAN3=		Pod::Stripper.3
diff --git a/textproc/p5-PodParser/Makefile b/textproc/p5-PodParser/Makefile
deleted file mode 100644
index f1d062ba1825..000000000000
--- a/textproc/p5-PodParser/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# New ports collection makefile for:	Pod::Parser
-# Date created:		18 Dec 2001
-# Whom:			Sergey Skvortsov <skv@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	PodParser
-PORTVERSION=	1.28
-PORTREVISION=	2
-CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Pod
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	skv@FreeBSD.org
-COMMENT=	Modules to work with POD (Plain Old Documentation)
-
-BUILD_DEPENDS=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS="site"
-
-MAN1=		pod2usage.1 podchecker.1 podselect.1
-MAN3=		Pod::Checker.3 Pod::Find.3 Pod::InputObjects.3 \
-		Pod::ParseUtils.3 Pod::Parser.3 Pod::PlainText.3 Pod::Select.3 \
-		Pod::Usage.3
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-PLIST_SUB+=	PL_FILES=""
-.else
-.undef		MAN1
-PLIST_SUB+=	PL_FILES="@comment "
-.endif
-
-post-patch:
-.if ${PERL_LEVEL} >= 500600
-	@${REINPLACE_CMD} -e '/EXE_FILES/d' ${WRKSRC}/Makefile.PL
-.endif
-	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
-
-.include <bsd.port.post.mk>
diff --git a/textproc/p5-PodParser/distinfo b/textproc/p5-PodParser/distinfo
deleted file mode 100644
index 6eb9a734dd67..000000000000
--- a/textproc/p5-PodParser/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (PodParser-1.28.tar.gz) = 82b26c8cef5ef2bea0d7bf0294682382
-SIZE (PodParser-1.28.tar.gz) = 91327
diff --git a/textproc/p5-PodParser/pkg-descr b/textproc/p5-PodParser/pkg-descr
deleted file mode 100644
index 52476fcb8f2b..000000000000
--- a/textproc/p5-PodParser/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Set of modules:
-
-* Pod::Parser - base class for creating POD filters and translators
-* Pod::Select - extract selected sections of POD from input
-* Pod::Usage - print a usage message from embedded pod documentation
-* Pod::PlainText - convert POD data to formatted ASCII text
-* Pod::InputObjects - objects representing POD input paragraphs, commands, etc.
-* Pod::Checker - check pod documents for syntax errors
-* Pod::ParseUtils - helpers for POD parsing and conversion
-* Pod::Find - find POD documents in directory trees
-
-WWW: http://search.cpan.org/dist/PodParser/
diff --git a/textproc/p5-PodParser/pkg-plist b/textproc/p5-PodParser/pkg-plist
deleted file mode 100644
index 767ad94ec02d..000000000000
--- a/textproc/p5-PodParser/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-%%PL_FILES%%bin/pod2usage
-%%PL_FILES%%bin/podchecker
-%%PL_FILES%%bin/podselect
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Parser/.packlist
-%%SITE_PERL%%/Pod/Checker.pm
-%%SITE_PERL%%/Pod/Find.pm
-%%SITE_PERL%%/Pod/InputObjects.pm
-%%SITE_PERL%%/Pod/ParseUtils.pm
-%%SITE_PERL%%/Pod/Parser.pm
-%%SITE_PERL%%/Pod/PlainText.pm
-%%SITE_PERL%%/Pod/Select.pm
-%%SITE_PERL%%/Pod/Usage.pm
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Parser
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
diff --git a/textproc/p5-RDF-Notation3/Makefile b/textproc/p5-RDF-Notation3/Makefile
index 02e424d7791e..203b213aa0ff 100644
--- a/textproc/p5-RDF-Notation3/Makefile
+++ b/textproc/p5-RDF-Notation3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	RDF-Notation3
 PORTVERSION=	0.90
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	RDF
@@ -16,6 +17,7 @@ MAINTAINER=	skv@FreeBSD.org
 COMMENT=	RDF Notation3 parser
 
 BUILD_DEPENDS=	${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/RDF/Core.pm:${PORTSDIR}/textproc/p5-RDF-Core \
 		${SITE_PERL}/RDFStore.pm:${PORTSDIR}/textproc/p5-RDFStore
 RUN_DEPENDS=	${BUILD_DEPENDS}
@@ -30,14 +32,8 @@ MAN3=		RDF::Notation3.3 RDF::Notation3::PrefTriples.3 \
 		RDF::Notation3::Template::TXML.3 RDF::Notation3::Triples.3 \
 		RDF::Notation3::XML.3
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.pm" | \
 	${XARGS} ${PERL} -pi -e 's!^require 5.005_62;!!'
 
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-XML-Directory/Makefile b/textproc/p5-XML-Directory/Makefile
index b40b3feb2f6e..eb39f78d4779 100644
--- a/textproc/p5-XML-Directory/Makefile
+++ b/textproc/p5-XML-Directory/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	XML-Directory
 PORTVERSION=	1.00
+PORTREVISION=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	XML
@@ -16,6 +17,7 @@ MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Returns a content of directory as XML
 
 BUILD_DEPENDS=	${SITE_PERL}/RDF/Notation3.pm:${PORTSDIR}/textproc/p5-RDF-Notation3 \
+		${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
 		${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
@@ -24,10 +26,4 @@ PERL_CONFIGURE=	yes
 MAN3=		XML::Directory.3 XML::Directory::Apache.3 \
 		XML::Directory::SAX.3 XML::Directory::String.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-podlators/Makefile b/textproc/p5-podlators/Makefile
index a3f318f7cfa5..87a8b6763eb1 100644
--- a/textproc/p5-podlators/Makefile
+++ b/textproc/p5-podlators/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	podlators
 PORTVERSION=	1.27
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Pod
@@ -16,12 +16,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Modules to convert and parse POD (Plain Old Documentation)
 
-RUN_DEPENDS=	${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \
-		${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+		${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	INSTALLDIRS=site
 
 MAN1=		pod2man.1 pod2text.1
 MAN3=		Pod::Man.3 Pod::ParseLink.3 Pod::Text.3 Pod::Text::Color.3 \