4 files changed, 20 insertions, 36 deletions

diff --git a/devel/p5-PathTools/Makefile b/devel/p5-PathTools/Makefile
index ebf90522cbdf..83d64793e122 100644
--- a/devel/p5-PathTools/Makefile
+++ b/devel/p5-PathTools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	File-Spec
-PORTVERSION=	0.82
+PORTVERSION=	0.86
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	File
@@ -16,20 +16,16 @@ MAINTAINER=	dburr@FreeBSD.ORG
 COMMENT=	A Perl module for portably manipulating file specifications
 
 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
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} > 500600
-IGNORE=		This port is for perl 5.6.0 and under only.
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-PathTools/distinfo b/devel/p5-PathTools/distinfo
index 549bcdacad99..9027e8748dea 100644
--- a/devel/p5-PathTools/distinfo
+++ b/devel/p5-PathTools/distinfo
@@ -1 +1 @@
-MD5 (File-Spec-0.82.tar.gz) = df27080f675cdd6299c4f6b87ea859bd
+MD5 (File-Spec-0.86.tar.gz) = 281a4f82d39daba6374890d07c20bfa6
diff --git a/devel/p5-PathTools/files/patch-Makefile.PL b/devel/p5-PathTools/files/patch-Makefile.PL
deleted file mode 100644
index b692940511fb..000000000000
--- a/devel/p5-PathTools/files/patch-Makefile.PL
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.PL.orig	Sun Jun 25 19:02:43 2000
-+++ Makefile.PL	Thu Apr 25 15:20:32 2002
-@@ -7,7 +7,7 @@
-     'LIBS'          => [''],   # e.g., '-lm' 
-     'DEFINE'        => '',     # e.g., '-DHAVE_SOMETHING' 
-     'INC'           => '',     # e.g., '-I/usr/include/other' 
--    'INSTALLDIRS'   => 'perl', # 'perl' makes it replace std modules
-+#    'INSTALLDIRS'   => 'perl', # 'perl' makes it replace std modules
- #    'PM'	=> {'Spec.pm'	=> '$(INST_LIBDIR)/File/Spec.pm',
- #    			'OS2.pm'	=> '$(INST_LIBDIR)/File/Spec/OS2.pm',
- #    			'Win32.pm'	=> '$(INST_LIBDIR)/File/Spec/Win32.pm',
diff --git a/devel/p5-PathTools/pkg-plist b/devel/p5-PathTools/pkg-plist
index ca1e9c77b4fb..b17a359e3dbe 100644
--- a/devel/p5-PathTools/pkg-plist
+++ b/devel/p5-PathTools/pkg-plist
@@ -1,12 +1,14 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Spec/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/File/Spec/Functions.pm
-lib/perl5/site_perl/%%PERL_VER%%/File/Spec/Mac.pm
-lib/perl5/site_perl/%%PERL_VER%%/File/Spec/OS2.pm
-lib/perl5/site_perl/%%PERL_VER%%/File/Spec/Unix.pm
-lib/perl5/site_perl/%%PERL_VER%%/File/Spec/VMS.pm
-lib/perl5/site_perl/%%PERL_VER%%/File/Spec/Win32.pm
-lib/perl5/site_perl/%%PERL_VER%%/File/Spec.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Spec
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/File/Spec
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
+%%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