4 files changed, 27 insertions, 29 deletions

diff --git a/devel/p5-PathTools/Makefile b/devel/p5-PathTools/Makefile
index 310e58e5793e..052ca3a34253 100644
--- a/devel/p5-PathTools/Makefile
+++ b/devel/p5-PathTools/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	File-Spec
-PORTVERSION=	0.90
+PORTNAME=	PathTools
+PORTVERSION=	3.08
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	File
@@ -15,17 +15,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A Perl module for portably manipulating file specifications
 
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS+=	INSTALLDIRS='site'
 
-MAN3=		File::Spec.3 \
-		File::Spec::Cygwin.3 \
-		File::Spec::Epoc.3 \
-		File::Spec::Functions.3 \
-		File::Spec::Mac.3 \
-		File::Spec::OS2.3 \
-		File::Spec::Unix.3 \
-		File::Spec::VMS.3 \
-		File::Spec::Win32.3
+MAN3=		Cwd.3 File::Spec.3 File::Spec::Cygwin.3 File::Spec::Epoc.3 \
+		File::Spec::Functions.3 File::Spec::Mac.3 File::Spec::OS2.3 \
+		File::Spec::Unix.3 File::Spec::VMS.3 File::Spec::Win32.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-PathTools/distinfo b/devel/p5-PathTools/distinfo
index 8f8e7e29e368..ed569267fffb 100644
--- a/devel/p5-PathTools/distinfo
+++ b/devel/p5-PathTools/distinfo
@@ -1,2 +1,2 @@
-MD5 (File-Spec-0.90.tar.gz) = 7b8d2c4db438ded45f78f79ee7562909
-SIZE (File-Spec-0.90.tar.gz) = 33064
+MD5 (PathTools-3.08.tar.gz) = 6648d4f94a656b16f4f7393da082ceaa
+SIZE (PathTools-3.08.tar.gz) = 110666
diff --git a/devel/p5-PathTools/pkg-descr b/devel/p5-PathTools/pkg-descr
index 3dd8fae8a883..539a02f00b86 100644
--- a/devel/p5-PathTools/pkg-descr
+++ b/devel/p5-PathTools/pkg-descr
@@ -4,4 +4,4 @@ the contents of a file, or Perl's file handles), such as concatenating
 several directory and file names into a single path, or determining
 whether a path is rooted.
 
-WWW: http://search.cpan.org/dist/File-Spec/
+WWW: http://search.cpan.org/dist/PathTools/
diff --git a/devel/p5-PathTools/pkg-plist b/devel/p5-PathTools/pkg-plist
index b17a359e3dbe..fd64d5b4b89b 100644
--- a/devel/p5-PathTools/pkg-plist
+++ b/devel/p5-PathTools/pkg-plist
@@ -1,14 +1,16 @@
-%%SITE_PERL%%/File/Spec.pm
-%%SITE_PERL%%/File/Spec/Cygwin.pm
-%%SITE_PERL%%/File/Spec/Epoc.pm
-%%SITE_PERL%%/File/Spec/Functions.pm
-%%SITE_PERL%%/File/Spec/Mac.pm
-%%SITE_PERL%%/File/Spec/OS2.pm
-%%SITE_PERL%%/File/Spec/Unix.pm
-%%SITE_PERL%%/File/Spec/VMS.pm
-%%SITE_PERL%%/File/Spec/Win32.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Spec/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Spec
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@dirrm %%SITE_PERL%%/File/Spec
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Cwd.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Cygwin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Epoc.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Functions.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Mac.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/OS2.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Unix.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/VMS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/Spec/Win32.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/Cwd.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/Cwd.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/File/Spec
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/File 2>/dev/null || true