aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorskv <skv@FreeBSD.org>2005-06-12 00:13:12 +0800
committerskv <skv@FreeBSD.org>2005-06-12 00:13:12 +0800
commitbd66c37b2ebc3af08e4801d5ee95d052d7106537 (patch)
tree5d1cee6ab34a9bc371efc1528a966de11e512cf8 /devel
parentfa6b19a74d8cf69c7178487be2538d36f7b0d459 (diff)
downloadfreebsd-ports-gnome-bd66c37b2ebc3af08e4801d5ee95d052d7106537.tar.gz
freebsd-ports-gnome-bd66c37b2ebc3af08e4801d5ee95d052d7106537.tar.zst
freebsd-ports-gnome-bd66c37b2ebc3af08e4801d5ee95d052d7106537.zip
* reflect renaming on CPAN File-Spec to PathTools
+ add devel/p5-PathTools, remove devel/p5-File-Spec + update dependencies for all affected ports (make them unconditional), bump PORTREVISION for these ports module was renamed * reflect renaming on CPAN PodParser to Pod-Parser + add textproc/p5-Pod-Parser, remove textproc/p5-PodParser + update dependencies for all affected ports (make them unconditional), bump PORTREVISION for these ports * for all changed ports make dependencies on File::Temp, Digest::MD5, Storable unconditional * remove 'CONFIGURE_ARGS= INSTALLDIRS=site' from Makefile's (this variable is forced by bsd.port.mk now) * update Class-Autouse to 1.17 * update POE-API-Hooks to 1.05 * make portlint happy (clean IGNORE, convert spaces to tabs and so on)
Diffstat (limited to 'devel')
-rw-r--r--devel/Makefile2
-rw-r--r--devel/bugzilla/Makefile3
-rw-r--r--devel/bugzilla2/Makefile3
-rw-r--r--devel/bugzilla3/Makefile3
-rw-r--r--devel/cvsmonitor/Makefile4
-rw-r--r--devel/p5-App-Info/Makefile12
-rw-r--r--devel/p5-AppConfig-Std/Makefile3
-rw-r--r--devel/p5-Array-Window/Makefile12
-rw-r--r--devel/p5-AtExit/Makefile1
-rw-r--r--devel/p5-Cache-Cache/Makefile19
-rw-r--r--devel/p5-Class-Autouse/Makefile4
-rw-r--r--devel/p5-Class-Autouse/distinfo4
-rw-r--r--devel/p5-Class-Fields/Makefile1
-rw-r--r--devel/p5-Class-Inspector/Makefile3
-rw-r--r--devel/p5-Config-Auto/Makefile6
-rw-r--r--devel/p5-Config-General/Makefile7
-rw-r--r--devel/p5-DateTime-Format-Builder/Makefile10
-rw-r--r--devel/p5-DateTime-Format-HTTP/Makefile5
-rw-r--r--devel/p5-Devel-Cycle/Makefile2
-rw-r--r--devel/p5-Devel-DProfPP/Makefile2
-rw-r--r--devel/p5-Devel-LeakTrace/Makefile2
-rw-r--r--devel/p5-Devel-PPPort/Makefile1
-rw-r--r--devel/p5-Devel-Pointer/Makefile2
-rw-r--r--devel/p5-Devel-Profiler/Makefile2
-rw-r--r--devel/p5-Devel-SmallProf/Makefile2
-rw-r--r--devel/p5-Devel-ptkdb/Makefile1
-rw-r--r--devel/p5-ExtUtils-CBuilder/Makefile13
-rw-r--r--devel/p5-ExtUtils-Constant/Makefile3
-rw-r--r--devel/p5-ExtUtils-Depends/Makefile2
-rw-r--r--devel/p5-ExtUtils-MakeMaker/Makefile1
-rw-r--r--devel/p5-ExtUtils-ParseXS/Makefile1
-rw-r--r--devel/p5-ExtUtils-XSBuilder/Makefile1
-rw-r--r--devel/p5-File-Find-Rule/Makefile7
-rw-r--r--devel/p5-File-NCopy/Makefile13
-rw-r--r--devel/p5-File-Spec/Makefile31
-rw-r--r--devel/p5-File-Spec/distinfo2
-rw-r--r--devel/p5-File-Spec/pkg-descr7
-rw-r--r--devel/p5-File-Spec/pkg-plist14
-rw-r--r--devel/p5-File-Temp/Makefile5
-rw-r--r--devel/p5-Locale-Maketext-Lexicon/Makefile3
-rw-r--r--devel/p5-Locale-Maketext/Makefile1
-rw-r--r--devel/p5-Locale-libintl/Makefile13
-rw-r--r--devel/p5-Log-Log4perl/Makefile12
-rw-r--r--devel/p5-Module-Build/Makefile7
-rw-r--r--devel/p5-Module-Info/Makefile14
-rw-r--r--devel/p5-Module-Load-Conditional/Makefile13
-rw-r--r--devel/p5-Module-Pluggable/Makefile3
-rw-r--r--devel/p5-Module-Release/Makefile3
-rw-r--r--devel/p5-NEXT/Makefile1
-rw-r--r--devel/p5-PCSC-Card/Makefile1
-rw-r--r--devel/p5-POE-API-Hooks/Makefile4
-rw-r--r--devel/p5-POE-API-Hooks/distinfo4
-rw-r--r--devel/p5-POE-API-Peek/Makefile2
-rw-r--r--devel/p5-POE-Component-DebugShell/Makefile2
-rw-r--r--devel/p5-POE-Devel-Profiler/Makefile2
-rw-r--r--devel/p5-POE/Makefile3
-rw-r--r--devel/p5-Path-Class/Makefile8
-rw-r--r--devel/p5-PathTools/Makefile20
-rw-r--r--devel/p5-PathTools/distinfo4
-rw-r--r--devel/p5-PathTools/pkg-descr2
-rw-r--r--devel/p5-PathTools/pkg-plist30
-rw-r--r--devel/p5-Pod-Coverage/Makefile3
-rw-r--r--devel/p5-Storable/Makefile1
-rw-r--r--devel/p5-Test-Harness/Makefile3
-rw-r--r--devel/p5-Test-Inline/Makefile19
-rw-r--r--devel/p5-Test-Reporter/Makefile19
-rw-r--r--devel/p5-Test-Tester/Makefile1
-rw-r--r--devel/p5-Time-HiRes/Makefile1
-rw-r--r--devel/p5-Time-Local/Makefile1
-rw-r--r--devel/p5-VCS/Makefile10
-rw-r--r--devel/p5-Want/Makefile2
-rw-r--r--devel/p5-base/Makefile1
-rw-r--r--devel/p5-release/Makefile3
73 files changed, 152 insertions, 280 deletions
diff --git a/devel/Makefile b/devel/Makefile
index 16587676d324..694a8c0293fb 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -879,7 +879,6 @@
SUBDIR += p5-File-ReadBackwards
SUBDIR += p5-File-Remove
SUBDIR += p5-File-Slurp
- SUBDIR += p5-File-Spec
SUBDIR += p5-File-Sync
SUBDIR += p5-File-Tail
SUBDIR += p5-File-Temp
@@ -1012,6 +1011,7 @@
SUBDIR += p5-Parse-Yapp
SUBDIR += p5-ParseLex
SUBDIR += p5-PatchReader
+ SUBDIR += p5-PathTools
SUBDIR += p5-Path-Class
SUBDIR += p5-Penguin
SUBDIR += p5-Penguin-Easy
diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index 46a6c7b83e2c..43af4d847b71 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= bugzilla
PORTVERSION?= 2.18.1
+PORTREVISION?= 1
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= webtools webtools/archived
@@ -28,7 +29,7 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DB
${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap \
${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \
- ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+ ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
${SITE_PERL}/PatchReader.pm:${PORTSDIR}/devel/p5-PatchReader
CONFLICTS?= ja-bugzilla-2.*
diff --git a/devel/bugzilla2/Makefile b/devel/bugzilla2/Makefile
index 46a6c7b83e2c..43af4d847b71 100644
--- a/devel/bugzilla2/Makefile
+++ b/devel/bugzilla2/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= bugzilla
PORTVERSION?= 2.18.1
+PORTREVISION?= 1
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= webtools webtools/archived
@@ -28,7 +29,7 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DB
${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap \
${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \
- ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+ ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
${SITE_PERL}/PatchReader.pm:${PORTSDIR}/devel/p5-PatchReader
CONFLICTS?= ja-bugzilla-2.*
diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile
index 46a6c7b83e2c..43af4d847b71 100644
--- a/devel/bugzilla3/Makefile
+++ b/devel/bugzilla3/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= bugzilla
PORTVERSION?= 2.18.1
+PORTREVISION?= 1
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= webtools webtools/archived
@@ -28,7 +29,7 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DB
${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
${SITE_PERL}/Text/Wrap.pm:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap \
${SITE_PERL}/${PERL_ARCH}/Data/Dumper.pm:${PORTSDIR}/devel/p5-Data-Dumper \
- ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+ ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
${SITE_PERL}/PatchReader.pm:${PORTSDIR}/devel/p5-PatchReader
CONFLICTS?= ja-bugzilla-2.*
diff --git a/devel/cvsmonitor/Makefile b/devel/cvsmonitor/Makefile
index bce6de76c757..8cad572e4112 100644
--- a/devel/cvsmonitor/Makefile
+++ b/devel/cvsmonitor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cvsmonitor
PORTVERSION= 0.6.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +17,7 @@ MAINTAINER= skv@FreeBSD.org
COMMENT= Monitor activity on a CVS Repository
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
- ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+ ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
${SITE_PERL}/Time/Duration.pm:${PORTSDIR}/devel/p5-Time-Duration \
${SITE_PERL}/Class/Autouse.pm:${PORTSDIR}/devel/p5-Class-Autouse \
${SITE_PERL}/Class/Default.pm:${PORTSDIR}/devel/p5-Class-Default \
diff --git a/devel/p5-App-Info/Makefile b/devel/p5-App-Info/Makefile
index b1411116d104..929bcb52ffab 100644
--- a/devel/p5-App-Info/Makefile
+++ b/devel/p5-App-Info/Makefile
@@ -7,6 +7,7 @@
PORTNAME= App-Info
PORTVERSION= 0.25
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= App
@@ -15,7 +16,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= Interface for providing metadata about installed software packages
-BUILD_DEPENDS= ${SITE_PERL}/Test/Simple.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+ ${SITE_PERL}/Test/Simple.pm:${PORTSDIR}/devel/p5-Test-Simple
PERL_MODBUILD= YES
@@ -26,10 +28,4 @@ MAN3= App::Info::HTTPD.3 App::Info::Lib::Iconv.3 \
App::Info::Util.3 App::Info::Handler.3 App::Info.3 \
App::Info::Handler::Prompt.3 App::Info::Handler::Carp.3
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500600
-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/devel/p5-AppConfig-Std/Makefile b/devel/p5-AppConfig-Std/Makefile
index b0da6e8c7523..72e9798f64e7 100644
--- a/devel/p5-AppConfig-Std/Makefile
+++ b/devel/p5-AppConfig-Std/Makefile
@@ -7,6 +7,7 @@
PORTNAME= AppConfig-Std
PORTVERSION= 1.07
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= AppConfig
@@ -16,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A subclass of AppConfig that provides standard options
BUILD_DEPENDS= ${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
- ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+ ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
diff --git a/devel/p5-Array-Window/Makefile b/devel/p5-Array-Window/Makefile
index 66f46ccaa354..6cc3d68de9f8 100644
--- a/devel/p5-Array-Window/Makefile
+++ b/devel/p5-Array-Window/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Array-Window
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Array
@@ -15,17 +16,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Calculate windows/subsets/pages of arrays
-BUILD_DEPENDS= ${SITE_PERL}/Class/Inspector.pm:${PORTSDIR}/devel/p5-Class-Inspector
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+ ${SITE_PERL}/Class/Inspector.pm:${PORTSDIR}/devel/p5-Class-Inspector
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
MAN3= Array::Window.3
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500800
-RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-AtExit/Makefile b/devel/p5-AtExit/Makefile
index 7c93b0bb5ac8..6280f29b1a1a 100644
--- a/devel/p5-AtExit/Makefile
+++ b/devel/p5-AtExit/Makefile
@@ -16,7 +16,6 @@ MAINTAINER= skv@FreeBSD.org
COMMENT= AtExit - Perform exit processing for a program or object
PERL_CONFIGURE= yes
-CONFIGURE_ARGS= INSTALLDIRS=site
MAN3= AtExit.3
diff --git a/devel/p5-Cache-Cache/Makefile b/devel/p5-Cache-Cache/Makefile
index c505b0440880..abcc12934b7d 100644
--- a/devel/p5-Cache-Cache/Makefile
+++ b/devel/p5-Cache-Cache/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Cache-Cache
PORTVERSION= 1.04
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Cache
@@ -16,6 +17,9 @@ MAINTAINER= perl@FreeBSD.org
COMMENT= Cache::Cache -- Perl Cache interface
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/IPC/ShareLite.pm:${PORTSDIR}/devel/p5-IPC-ShareLite \
+ ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+ ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+ ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error \
${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
RUN_DEPENDS= ${BUILD_DEPENDS}
@@ -43,17 +47,4 @@ MAN3= Cache::BaseCache.3 \
Cache::SizeAwareMemoryCache.3 \
Cache::SizeAwareSharedMemoryCache.3
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
- ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
-RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
- ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
-.endif
-.if ${PERL_LEVEL} <= 500600
-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
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Class-Autouse/Makefile b/devel/p5-Class-Autouse/Makefile
index 60169d9171d5..cdac581e0af7 100644
--- a/devel/p5-Class-Autouse/Makefile
+++ b/devel/p5-Class-Autouse/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= Class-Autouse
-PORTVERSION= 1.16
+PORTVERSION= 1.17
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Class
@@ -16,7 +16,7 @@ MAINTAINER= skv@FreeBSD.org
COMMENT= Defer loading of one or more classes
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/List/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils \
- ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+ ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
${SITE_PERL}/prefork.pm:${PORTSDIR}/devel/p5-prefork
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-Class-Autouse/distinfo b/devel/p5-Class-Autouse/distinfo
index d79be49a09ab..b44637cfbfe8 100644
--- a/devel/p5-Class-Autouse/distinfo
+++ b/devel/p5-Class-Autouse/distinfo
@@ -1,2 +1,2 @@
-MD5 (Class-Autouse-1.16.tar.gz) = 7258938f734b3a308b7b6bd389ae61f8
-SIZE (Class-Autouse-1.16.tar.gz) = 27144
+MD5 (Class-Autouse-1.17.tar.gz) = 075c0d92df6ccc8628fd46ad46923fad
+SIZE (Class-Autouse-1.17.tar.gz) = 32625
diff --git a/devel/p5-Class-Fields/Makefile b/devel/p5-Class-Fields/Makefile
index 427f092b95b2..6be14f8eab5b 100644
--- a/devel/p5-Class-Fields/Makefile
+++ b/devel/p5-Class-Fields/Makefile
@@ -20,7 +20,6 @@ BUILD_DEPENDS= ${SITE_PERL}/Carp/Assert.pm:${PORTSDIR}/devel/p5-Carp-Assert \
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-CONFIGURE_ARGS= INSTALLDIRS='site'
MAN3= Class::Fields.3 Class::Fields::Attribs.3 \
Class::Fields::Fuxor.3 Class::Fields::Inherit.3 private.3 \
diff --git a/devel/p5-Class-Inspector/Makefile b/devel/p5-Class-Inspector/Makefile
index 83fc75555ce7..9050f9c551cb 100644
--- a/devel/p5-Class-Inspector/Makefile
+++ b/devel/p5-Class-Inspector/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Class-Inspector
PORTVERSION= 1.08
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Class
@@ -15,7 +16,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Provides information about classes
-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
diff --git a/devel/p5-Config-Auto/Makefile b/devel/p5-Config-Auto/Makefile
index da8396feca49..6effdb005b7a 100644
--- a/devel/p5-Config-Auto/Makefile
+++ b/devel/p5-Config-Auto/Makefile
@@ -6,6 +6,7 @@
PORTNAME= Config-Auto
PORTVERSION= 0.12
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Config
@@ -14,7 +15,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
COMMENT= Magical config file parser
-BUILD_DEPENDS= ${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+ ${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles
RUN_DEPENDS= ${BUILD_DEPENDS}
OPTIONS= XMLSIMPLE "Support for XML config files" off
@@ -31,8 +33,6 @@ PERL_CONFIGURE= yes
MAN3= Config::Auto.3
.if ${PERL_LEVEL} < 500600
-BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-
post-patch:
@${PERL} -pi -e 's/^our (\$$\w+)/use vars qw($$1); $$1/;' \
-e '$$_ = "" if (/5.006/);' \
diff --git a/devel/p5-Config-General/Makefile b/devel/p5-Config-General/Makefile
index e655738a3136..9753d443f10b 100644
--- a/devel/p5-Config-General/Makefile
+++ b/devel/p5-Config-General/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Config-General
PORTVERSION= 2.28
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Config
@@ -15,6 +16,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl5 module for handling Apache-style configuration files
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS= ${BUILD_DEPENDS}
+
PERL_CONFIGURE= YES
MAN3= Config::General::Extended.3 Config::General::Interpolated.3 \
@@ -23,9 +27,6 @@ MAN3= Config::General::Extended.3 Config::General::Interpolated.3 \
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} <= 500600
-BUILD_DEPENDS= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
post-patch:
@${REINPLACE_CMD} -e 's|::Heavy||' ${WRKSRC}/General.pm
.endif
diff --git a/devel/p5-DateTime-Format-Builder/Makefile b/devel/p5-DateTime-Format-Builder/Makefile
index 7fd2706fdeea..88c94290d8d7 100644
--- a/devel/p5-DateTime-Format-Builder/Makefile
+++ b/devel/p5-DateTime-Format-Builder/Makefile
@@ -7,6 +7,7 @@
PORTNAME= DateTime-Format-Builder
PORTVERSION= 0.78.06
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DateTime
@@ -18,6 +19,7 @@ COMMENT= Create DateTime parser classes and objects
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate \
+ ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
${SITE_PERL}/DateTime/Format/Strptime.pm:${PORTSDIR}/devel/p5-DateTime-Format-Strptime
@@ -43,10 +45,4 @@ post-install:
@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
.endif
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500600
-RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-DateTime-Format-HTTP/Makefile b/devel/p5-DateTime-Format-HTTP/Makefile
index 0fe946321a6a..674022908ad7 100644
--- a/devel/p5-DateTime-Format-HTTP/Makefile
+++ b/devel/p5-DateTime-Format-HTTP/Makefile
@@ -7,6 +7,7 @@
PORTNAME= DateTime-Format-HTTP
PORTVERSION= 0.36
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DateTime
@@ -18,6 +19,7 @@ COMMENT= HTTP date conversion routines
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DateTime.pm:${PORTSDIR}/devel/p5-DateTime \
+ ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
${SITE_PERL}/HTTP/Date.pm:${PORTSDIR}/www/p5-libwww
PERL_MODBUILD= yes
@@ -26,9 +28,6 @@ MAN3= DateTime::Format::HTTP.3
.include <bsd.port.pre.mk>
-.if ${PERL_LEVEL} <= 500600
-RUN_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
.if ${PERL_LEVEL} < 500600
post-patch:
@${PERL} -pi -e '$$_ = "" if /use warnings/;' \
diff --git a/devel/p5-Devel-Cycle/Makefile b/devel/p5-Devel-Cycle/Makefile
index f63f7e63ee85..da75e5970a59 100644
--- a/devel/p5-Devel-Cycle/Makefile
+++ b/devel/p5-Devel-Cycle/Makefile
@@ -25,7 +25,7 @@ MAN3= Devel::Cycle.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500601
-IGNORE= "Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE= Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-DProfPP/Makefile b/devel/p5-Devel-DProfPP/Makefile
index 7f054dab9ba9..fdf5226ce2bf 100644
--- a/devel/p5-Devel-DProfPP/Makefile
+++ b/devel/p5-Devel-DProfPP/Makefile
@@ -22,7 +22,7 @@ MAN3= Devel::DProfPP.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500600
-IGNORE= "Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE= Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-LeakTrace/Makefile b/devel/p5-Devel-LeakTrace/Makefile
index eefc9ec49754..9962785fc00c 100644
--- a/devel/p5-Devel-LeakTrace/Makefile
+++ b/devel/p5-Devel-LeakTrace/Makefile
@@ -23,7 +23,7 @@ MAN3= Devel::LeakTrace.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500600
-IGNORE= "Perl 5.6 or newer required. Install lang/perl5.8 and try again."
+IGNORE= Perl 5.6 or newer required. Install lang/perl5.8 and try again.
.endif
.if ${PERL_LEVEL} < 500702
diff --git a/devel/p5-Devel-PPPort/Makefile b/devel/p5-Devel-PPPort/Makefile
index d7dd7720c294..86111d559b97 100644
--- a/devel/p5-Devel-PPPort/Makefile
+++ b/devel/p5-Devel-PPPort/Makefile
@@ -17,7 +17,6 @@ MAINTAINER= mat@FreeBSD.org
COMMENT= Perl/Pollution/Portability
PERL_CONFIGURE= yes
-CONFIGURE_ARGS= INSTALLDIRS=site
MAN3= Devel::PPPort.3
diff --git a/devel/p5-Devel-Pointer/Makefile b/devel/p5-Devel-Pointer/Makefile
index 29660ae81880..bf4fcf7c5c3d 100644
--- a/devel/p5-Devel-Pointer/Makefile
+++ b/devel/p5-Devel-Pointer/Makefile
@@ -22,7 +22,7 @@ MAN3= Devel::Pointer.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500600
-IGNORE= "Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE= Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-Profiler/Makefile b/devel/p5-Devel-Profiler/Makefile
index 24e6d26c77cd..040863f8bde2 100644
--- a/devel/p5-Devel-Profiler/Makefile
+++ b/devel/p5-Devel-Profiler/Makefile
@@ -26,7 +26,7 @@ MAN3= Devel::Profiler.3 Devel::Profiler::Apache.3 \
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500600
-IGNORE= "Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE= Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-SmallProf/Makefile b/devel/p5-Devel-SmallProf/Makefile
index 630657d9a863..20bacb8ddbe8 100644
--- a/devel/p5-Devel-SmallProf/Makefile
+++ b/devel/p5-Devel-SmallProf/Makefile
@@ -26,7 +26,7 @@ MAN3= Devel::SmallProf.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500600
-IGNORE= "Perl 5.6 or newer required. Install lang/perl5.6 and try again."
+IGNORE= Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again.
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-ptkdb/Makefile b/devel/p5-Devel-ptkdb/Makefile
index 74c66b95ef25..45d8ec526ab1 100644
--- a/devel/p5-Devel-ptkdb/Makefile
+++ b/devel/p5-Devel-ptkdb/Makefile
@@ -18,7 +18,6 @@ COMMENT= Tk debugger for Perl
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
PERL_CONFIGURE= yes
-CONFIGURE_ARGS= INSTALLDIRS='site'
MAN3= Devel::ptkdb.3
diff --git a/devel/p5-ExtUtils-CBuilder/Makefile b/devel/p5-ExtUtils-CBuilder/Makefile
index 049eb62bdc23..3871a9dec4a5 100644
--- a/devel/p5-ExtUtils-CBuilder/Makefile
+++ b/devel/p5-ExtUtils-CBuilder/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ExtUtils-CBuilder
PORTVERSION= 0.11
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ExtUtils
@@ -15,6 +16,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mat@FreeBSD.org
COMMENT= Compile and link C code for Perl modules
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS= ${BUILD_DEPENDS}
+
PERL_CONFIGURE= yes
MAN3= ExtUtils::CBuilder.3 ExtUtils::CBuilder::Platform::Windows.3
@@ -28,11 +32,4 @@ post-install:
@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
.endif
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500600
-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
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-ExtUtils-Constant/Makefile b/devel/p5-ExtUtils-Constant/Makefile
index 3985219990b8..bb92af781395 100644
--- a/devel/p5-ExtUtils-Constant/Makefile
+++ b/devel/p5-ExtUtils-Constant/Makefile
@@ -21,7 +21,6 @@ MAN3= ExtUtils::Constant.3 ExtUtils::Constant::Base.3 \
ExtUtils::Constant::Utils.3 ExtUtils::Constant::XS.3
post-patch:
- @${PERL} -pi -e 's!^(\s+INSTALLDIRS\s+=>\s+).*$$!$$1"site",!' \
- ${WRKSRC}/Makefile.PL
+ @${REINPLACE_CMD} -e '/INSTALLDIRS/d' ${WRKSRC}/Makefile.PL
.include <bsd.port.mk>
diff --git a/devel/p5-ExtUtils-Depends/Makefile b/devel/p5-ExtUtils-Depends/Makefile
index 49c12802c729..ccbc45d89703 100644
--- a/devel/p5-ExtUtils-Depends/Makefile
+++ b/devel/p5-ExtUtils-Depends/Makefile
@@ -22,7 +22,7 @@ MAN3= ExtUtils::Depends.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500600
-IGNORE= "Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE= Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile
index ec88729f0c42..30c9c6399aef 100644
--- a/devel/p5-ExtUtils-MakeMaker/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile
@@ -17,7 +17,6 @@ MAINTAINER= perl@FreeBSD.org
COMMENT= Designed to write a Makefile for an extension module
PERL_CONFIGURE= YES
-CONFIGURE_ARGS= INSTALLDIRS=site
MAN1= instmodsh.1
MAN3= ExtUtils::Installed.3 ExtUtils::MM_OS2.3 ExtUtils::MakeMaker.3 \
diff --git a/devel/p5-ExtUtils-ParseXS/Makefile b/devel/p5-ExtUtils-ParseXS/Makefile
index 5c892eb6c190..b76a01b04455 100644
--- a/devel/p5-ExtUtils-ParseXS/Makefile
+++ b/devel/p5-ExtUtils-ParseXS/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS= ${SITE_PERL}/ExtUtils/CBuilder.pm:${PORTSDIR}/devel/p5-ExtUtils-C
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-CONFIGURE_ARGS= INSTALLDIRS=site
MAN3= ExtUtils::ParseXS.3
diff --git a/devel/p5-ExtUtils-XSBuilder/Makefile b/devel/p5-ExtUtils-XSBuilder/Makefile
index 7d608203e1d7..1b8fb555d930 100644
--- a/devel/p5-ExtUtils-XSBuilder/Makefile
+++ b/devel/p5-ExtUtils-XSBuilder/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= ${SITE_PERL}/Tie/IxHash.pm:${PORTSDIR}/devel/p5-Tie-IxHash
BUILD_DEPENDS= ${RUN_DEPENDS}
PERL_CONFIGURE= yes
-CONFIGURE_ARGS= INSTALLDIRS=site
MAN3= ExtUtils::XSBuilder.3 ExtUtils::XSBuilder::PODTemplate.3 \
ExtUtils::xsbuilder.osc2002.3
diff --git a/devel/p5-File-Find-Rule/Makefile b/devel/p5-File-Find-Rule/Makefile
index 5ff768c90392..3419e25ec347 100644
--- a/devel/p5-File-Find-Rule/Makefile
+++ b/devel/p5-File-Find-Rule/Makefile
@@ -7,6 +7,7 @@
PORTNAME= File-Find-Rule
PORTVERSION= 0.28
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= File
@@ -16,6 +17,7 @@ MAINTAINER= skv@FreeBSD.org
COMMENT= Alternative interface to File::Find
BUILD_DEPENDS= ${SITE_PERL}/Number/Compare.pm:${PORTSDIR}/math/p5-Number-Compare \
+ ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
${SITE_PERL}/Text/Glob.pm:${PORTSDIR}/textproc/p5-Text-Glob
RUN_DEPENDS= ${BUILD_DEPENDS}
@@ -27,11 +29,6 @@ MAN3= File::Find::Rule.3 File::Find::Rule::Extending.3 \
.include <bsd.port.pre.mk>
-.if ${PERL_LEVEL} <= 500600
-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
-
.if ${PERL_LEVEL} < 500702
BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
.endif
diff --git a/devel/p5-File-NCopy/Makefile b/devel/p5-File-NCopy/Makefile
index 5785d6e6cd29..85e02c0bb985 100644
--- a/devel/p5-File-NCopy/Makefile
+++ b/devel/p5-File-NCopy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= File-NCopy
PORTVERSION= 0.34
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ../../authors/id/M/MZ/MZSANFORD
@@ -15,15 +16,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Copy file(s) to directories/file
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS= ${BUILD_DEPENDS}
+
PERL_CONFIGURE= yes
MAN3= File::NCopy.3
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS= ${BUILD_DEPENDS}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-File-Spec/Makefile b/devel/p5-File-Spec/Makefile
deleted file mode 100644
index 310e58e5793e..000000000000
--- a/devel/p5-File-Spec/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for: p5-File-Spec
-# Date created: November 22, 2000
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
-#
-# $FreeBSD$
-#
-
-PORTNAME= File-Spec
-PORTVERSION= 0.90
-CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= File
-PKGNAMEPREFIX= p5-
-
-MAINTAINER= perl@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
-
-.include <bsd.port.mk>
diff --git a/devel/p5-File-Spec/distinfo b/devel/p5-File-Spec/distinfo
deleted file mode 100644
index 8f8e7e29e368..000000000000
--- a/devel/p5-File-Spec/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (File-Spec-0.90.tar.gz) = 7b8d2c4db438ded45f78f79ee7562909
-SIZE (File-Spec-0.90.tar.gz) = 33064
diff --git a/devel/p5-File-Spec/pkg-descr b/devel/p5-File-Spec/pkg-descr
deleted file mode 100644
index 3dd8fae8a883..000000000000
--- a/devel/p5-File-Spec/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This module is designed to support operations commonly performed on file
-specifications (usually called "file names", but not to be confused with
-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/
diff --git a/devel/p5-File-Spec/pkg-plist b/devel/p5-File-Spec/pkg-plist
deleted file mode 100644
index b17a359e3dbe..000000000000
--- a/devel/p5-File-Spec/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-%%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
diff --git a/devel/p5-File-Temp/Makefile b/devel/p5-File-Temp/Makefile
index 924b3846e14b..5a715677d525 100644
--- a/devel/p5-File-Temp/Makefile
+++ b/devel/p5-File-Temp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= File-Temp
PORTVERSION= 0.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= File
@@ -16,12 +16,11 @@ PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
COMMENT= Perl5 module to generate temporary files or directories safely
-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 \
${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-CONFIGURE_ARGS= INSTALLDIRS=site
MAN3= File::Temp.3
diff --git a/devel/p5-Locale-Maketext-Lexicon/Makefile b/devel/p5-Locale-Maketext-Lexicon/Makefile
index 5cd45d95a7c6..c448bac94ed1 100644
--- a/devel/p5-Locale-Maketext-Lexicon/Makefile
+++ b/devel/p5-Locale-Maketext-Lexicon/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Locale-Maketext-Lexicon
PORTVERSION= 0.49
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Locale
@@ -16,7 +17,7 @@ MAINTAINER= mat@FreeBSD.org
COMMENT= Use other catalog formats in Locale::Maketext
BUILD_DEPENDS= ${SITE_PERL}/Regexp/Common.pm:${PORTSDIR}/textproc/p5-Regexp-Common \
- ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \
+ ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-Locale-Maketext/Makefile b/devel/p5-Locale-Maketext/Makefile
index 8a941e8f1c02..edcc1ff7889b 100644
--- a/devel/p5-Locale-Maketext/Makefile
+++ b/devel/p5-Locale-Maketext/Makefile
@@ -19,7 +19,6 @@ BUILD_DEPENDS= ${SITE_PERL}/I18N/LangTags.pm:${PORTSDIR}/misc/p5-I18N-LangTags
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= YES
-CONFIGURE_ARGS= INSTALLDIRS=site
MAN3= Locale::Maketext.3 Locale::Maketext::TPJ13.3
diff --git a/devel/p5-Locale-libintl/Makefile b/devel/p5-Locale-libintl/Makefile
index e2eba4ecf6be..e375a0b5ea7d 100644
--- a/devel/p5-Locale-libintl/Makefile
+++ b/devel/p5-Locale-libintl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Locale-libintl
PORTVERSION= 1.11
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Locale
@@ -16,6 +17,9 @@ DISTNAME= libintl-perl-${PORTVERSION}
MAINTAINER= erwin@FreeBSD.org
COMMENT= Internationalization library for Perl
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS= ${BUILD_DEPENDS}
+
PERL_CONFIGURE= yes
USE_GETTEXT= yes
@@ -166,11 +170,4 @@ MAN3= Locale::RecodeData::IBM862.3 \
Locale::RecodeData::IBM290.3 \
Locale::RecodeData::IBM903.3 \
-.include <bsd.port.pre.mk>
-
-.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
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Log-Log4perl/Makefile b/devel/p5-Log-Log4perl/Makefile
index 899364ff3fa0..7a30e5839f89 100644
--- a/devel/p5-Log-Log4perl/Makefile
+++ b/devel/p5-Log-Log4perl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Log-Log4perl
PORTVERSION= 0.52
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Log
@@ -15,7 +16,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
COMMENT= Log4j implementation for Perl
-BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
+ ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -64,10 +66,4 @@ MAN3= Log::Log4perl.3 \
Log::Log4perl::NDC.3 \
Log::Log4perl::Util.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/devel/p5-Module-Build/Makefile b/devel/p5-Module-Build/Makefile
index 8102f0dfd170..1bf1c3a6b953 100644
--- a/devel/p5-Module-Build/Makefile
+++ b/devel/p5-Module-Build/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Module-Build
PORTVERSION= 0.26.10
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Module/KWILLIAMS
@@ -16,7 +17,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
MAINTAINER= mat@FreeBSD.org
COMMENT= Build and install Perl modules
-BUILD_DEPENDS= ${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+ ${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \
${SITE_PERL}/ExtUtils/CBuilder.pm:${PORTSDIR}/devel/p5-ExtUtils-CBuilder
RUN_DEPENDS= ${BUILD_DEPENDS}
@@ -60,9 +62,6 @@ post-install:
.if ${PERL_LEVEL} > 500600
BUILD_DEPENDS+= ${SITE_PERL}/ExtUtils/ParseXS.pm:${PORTSDIR}/devel/p5-ExtUtils-ParseXS
.endif
-.if ${PERL_LEVEL} < 500600
-BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
.if ${PERL_LEVEL} < 500805
BUILD_DEPENDS+= ${SITE_PERL}/Pod/Man.pm:${PORTSDIR}/textproc/p5-podlators
.endif
diff --git a/devel/p5-Module-Info/Makefile b/devel/p5-Module-Info/Makefile
index 435d375bf4ba..03f3b5aada89 100644
--- a/devel/p5-Module-Info/Makefile
+++ b/devel/p5-Module-Info/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Module-Info
PORTVERSION= 0.26
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Module
@@ -15,15 +16,12 @@ PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
COMMENT= Provides information about Perl modules
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS= ${BUILD_DEPENDS}
+
PERL_CONFIGURE= yes
+
MAN1= module_info.1 pfunc.1
MAN3= B::Utils.3 Module::Info.3
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500600
-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
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Module-Load-Conditional/Makefile b/devel/p5-Module-Load-Conditional/Makefile
index 5b53a4eb2093..0d36112f735a 100644
--- a/devel/p5-Module-Load-Conditional/Makefile
+++ b/devel/p5-Module-Load-Conditional/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Module-Load-Conditional
PORTVERSION= 0.08
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Module
@@ -17,7 +18,8 @@ COMMENT= Looking up Perl modules information/loading at runtime
BUILD_DEPENDS= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
${RUN_DEPENDS}
-RUN_DEPENDS= ${SITE_PERL}/Module/Load.pm:${PORTSDIR}/devel/p5-Module-Load \
+RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+ ${SITE_PERL}/Module/Load.pm:${PORTSDIR}/devel/p5-Module-Load \
${SITE_PERL}/Locale/Maketext/Simple.pm:${PORTSDIR}/devel/p5-Locale-Maketext-Simple \
${SITE_PERL}/Params/Check.pm:${PORTSDIR}/devel/p5-Params-Check
@@ -34,11 +36,4 @@ post-install:
@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
.endif
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500600
-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
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Module-Pluggable/Makefile b/devel/p5-Module-Pluggable/Makefile
index f6a21322f00e..14d0cf689ad7 100644
--- a/devel/p5-Module-Pluggable/Makefile
+++ b/devel/p5-Module-Pluggable/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Module-Pluggable
PORTVERSION= 2.8
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Module
@@ -15,7 +16,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
COMMENT= Automatically give your module the ability to have plugins
-BUILD_DEPENDS= ${SITE_PERL}/File/Spec/Functions.pm:${PORTSDIR}/devel/p5-File-Spec
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_MODBUILD= yes
diff --git a/devel/p5-Module-Release/Makefile b/devel/p5-Module-Release/Makefile
index 76a6052f334c..d486243b16b2 100644
--- a/devel/p5-Module-Release/Makefile
+++ b/devel/p5-Module-Release/Makefile
@@ -7,6 +7,7 @@
PORTNAME= release
PORTVERSION= 0.99
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ../../authors/id/B/BD/BDFOY
@@ -15,7 +16,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Upload files to CPAN and SourceForge
-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 \
${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
${SITE_PERL}/Test/Pod.pm:${PORTSDIR}/devel/p5-Test-Pod \
${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
diff --git a/devel/p5-NEXT/Makefile b/devel/p5-NEXT/Makefile
index 58747cedfa8d..8f0846b144ea 100644
--- a/devel/p5-NEXT/Makefile
+++ b/devel/p5-NEXT/Makefile
@@ -16,7 +16,6 @@ MAINTAINER= mat@FreeBSD.org
COMMENT= Provide a pseudo-class NEXT (et al) that allows method redispatch
PERL_CONFIGURE= yes
-CONFIGURE_ARGS= INSTALLDIRS=site
MAN3= NEXT.3
diff --git a/devel/p5-PCSC-Card/Makefile b/devel/p5-PCSC-Card/Makefile
index 796f63eb04d2..c60a220d1afc 100644
--- a/devel/p5-PCSC-Card/Makefile
+++ b/devel/p5-PCSC-Card/Makefile
@@ -26,7 +26,6 @@ IGNORE= Requires perl-5.6.0 or better to build correctly
.endif
PERL_CONFIGURE= yes
-CONFIGURE_ARGS= INSTALLDIRS=site
MAKE_ENV= "LOCALBASE=$(LOCALBASE)"
MAN3= Chipcard::PCSC::Card.3 Chipcard::PCSC.3
diff --git a/devel/p5-POE-API-Hooks/Makefile b/devel/p5-POE-API-Hooks/Makefile
index 118cff152b73..c31672e6e985 100644
--- a/devel/p5-POE-API-Hooks/Makefile
+++ b/devel/p5-POE-API-Hooks/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= POE-API-Hooks
-PORTVERSION= 1.0443
+PORTVERSION= 1.05
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ../../authors/id/S/SU/SUNGO
@@ -26,7 +26,7 @@ MAN3= POE::API::Hooks.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500601
-IGNORE= "Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE= Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-POE-API-Hooks/distinfo b/devel/p5-POE-API-Hooks/distinfo
index 7c5d28e523c2..80525c78fb36 100644
--- a/devel/p5-POE-API-Hooks/distinfo
+++ b/devel/p5-POE-API-Hooks/distinfo
@@ -1,2 +1,2 @@
-MD5 (POE-API-Hooks-1.0443.tar.gz) = f25e086c70aa14dc3523822cdea6041d
-SIZE (POE-API-Hooks-1.0443.tar.gz) = 4773
+MD5 (POE-API-Hooks-1.05.tar.gz) = b48a6ddf120639af44dad25ce0a76ea2
+SIZE (POE-API-Hooks-1.05.tar.gz) = 5013
diff --git a/devel/p5-POE-API-Peek/Makefile b/devel/p5-POE-API-Peek/Makefile
index 4b7d1d964aaf..6352797c83a4 100644
--- a/devel/p5-POE-API-Peek/Makefile
+++ b/devel/p5-POE-API-Peek/Makefile
@@ -26,7 +26,7 @@ MAN3= POE::API::Peek.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500601
-IGNORE= "Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE= Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-POE-Component-DebugShell/Makefile b/devel/p5-POE-Component-DebugShell/Makefile
index aa88849dfb5f..97ec213242fd 100644
--- a/devel/p5-POE-Component-DebugShell/Makefile
+++ b/devel/p5-POE-Component-DebugShell/Makefile
@@ -30,7 +30,7 @@ post-patch:
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500601
-IGNORE= "Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE= Perl 5.6.1 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-POE-Devel-Profiler/Makefile b/devel/p5-POE-Devel-Profiler/Makefile
index ae70eb4fd512..85909cf4f51d 100644
--- a/devel/p5-POE-Devel-Profiler/Makefile
+++ b/devel/p5-POE-Devel-Profiler/Makefile
@@ -26,7 +26,7 @@ MAN3= POE::Devel::Profiler.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500600
-IGNORE= "Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again"
+IGNORE= Perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again.
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-POE/Makefile b/devel/p5-POE/Makefile
index 3ee3a919c9cf..6e4e1d244730 100644
--- a/devel/p5-POE/Makefile
+++ b/devel/p5-POE/Makefile
@@ -7,6 +7,7 @@
PORTNAME= POE
PORTVERSION= 0.3101
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= POE
@@ -17,7 +18,7 @@ MAINTAINER= skv@FreeBSD.org
COMMENT= Multitasking and networking framework for perl
BUILD_DEPENDS= \
- ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+ ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
${SITE_PERL}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event \
diff --git a/devel/p5-Path-Class/Makefile b/devel/p5-Path-Class/Makefile
index cecbc12eb5cd..2cf9fc279633 100644
--- a/devel/p5-Path-Class/Makefile
+++ b/devel/p5-Path-Class/Makefile
@@ -15,6 +15,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Cross-platform path specification manipulation
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools
+RUN_DEPENDS= ${BUILD_DEPENDS}
+
PERL_MODBUILD= yes
MAN3= Path::Class.3 \
@@ -33,10 +36,7 @@ post-install:
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500600
-EXTRA_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO \
- ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-BUILD_DEPENDS= ${EXTRA_DEPENDS}
-RUN_DEPENDS= ${EXTRA_DEPENDS}
+BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO
.endif
.include <bsd.port.post.mk>
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
diff --git a/devel/p5-Pod-Coverage/Makefile b/devel/p5-Pod-Coverage/Makefile
index c4d6cc454253..c9b322840aa9 100644
--- a/devel/p5-Pod-Coverage/Makefile
+++ b/devel/p5-Pod-Coverage/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Pod-Coverage
PORTVERSION= 0.17
+PORTREVISION= 1
CATEGORIES= devel textproc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Pod
@@ -16,7 +17,7 @@ MAINTAINER= mat@FreeBSD.org
COMMENT= Checks if the documentation of a module is comprehensive
BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser \
+RUN_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump
PERL_MODBUILD= yes
diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index 94e1e2f714a3..50c009663f5e 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -16,7 +16,6 @@ MAINTAINER= tobez@FreeBSD.org
COMMENT= Persistency for perl data structures
PERL_CONFIGURE= yes
-CONFIGURE_ARGS= INSTALLDIRS=site
MAN3= Storable.3
diff --git a/devel/p5-Test-Harness/Makefile b/devel/p5-Test-Harness/Makefile
index 6f0356652fd1..adc80e79f7b9 100644
--- a/devel/p5-Test-Harness/Makefile
+++ b/devel/p5-Test-Harness/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Test-Harness
PORTVERSION= 2.42
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Test
@@ -25,7 +26,7 @@ MAN3= Test::Harness.3 Test::Harness::Assert.3 \
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+= ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+BUILD_DEPENDS+= ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser
RUN_DEPENDS+= ${BUILD_DEPENDS}
.endif
diff --git a/devel/p5-Test-Inline/Makefile b/devel/p5-Test-Inline/Makefile
index d8b4705f03cc..8ad846643df9 100644
--- a/devel/p5-Test-Inline/Makefile
+++ b/devel/p5-Test-Inline/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Test-Inline
PORTVERSION= 0.16
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Test
@@ -15,7 +16,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= erwin@FreeBSD.org
COMMENT= Test::Inline - Inlining your tests next to the code being tested
-BUILD_DEPENDS= ${SITE_PERL}/Test/Harness.pm:${PORTSDIR}/devel/p5-Test-Harness
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+ ${SITE_PERL}/Test/Harness.pm:${PORTSDIR}/devel/p5-Test-Harness \
+ ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -23,16 +26,4 @@ PERL_CONFIGURE= yes
MAN1= pod2test.1
MAN3= Pod::Tests.3 Pod::Tests::Tutorial.3 Test::Inline.3 Test::Inline::Tutorial.3
-.include <bsd.port.pre.mk>
-
-.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
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Test-Reporter/Makefile b/devel/p5-Test-Reporter/Makefile
index 3a999a462456..447f76a62d1f 100644
--- a/devel/p5-Test-Reporter/Makefile
+++ b/devel/p5-Test-Reporter/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Test-Reporter
PORTVERSION= 1.27
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Test
@@ -15,7 +16,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= lth@FreeBSD.org
COMMENT= Sends test results to cpan-testers@perl.org
-BUILD_DEPENDS= ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+ ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
+ ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
@@ -26,16 +29,4 @@ MAN3= Test::Reporter.3 \
Test::Reporter::Mail::Util.3 \
Test::Reporter::Time::Zone.3
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-.if ${PERL_LEVEL} <= 500503
-EXTRA_PATCHES= ${FILESDIR}/500503-Test::Reporter.pm
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/p5-Test-Tester/Makefile b/devel/p5-Test-Tester/Makefile
index 3f9c3194d34d..a7e72eb2f633 100644
--- a/devel/p5-Test-Tester/Makefile
+++ b/devel/p5-Test-Tester/Makefile
@@ -17,7 +17,6 @@ MAINTAINER= mat@FreeBSD.org
COMMENT= Helps to test various Test::Builder derivatives
PERL_CONFIGURE= yes
-CONFIGURE_ARGS= INSTALLDIRS=site
INSTALL_TARGET= pure_install
MAN3= Test::Tester.3 Test::Tester::Capture.3 \
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index 4cb8c04ac0f6..686f5742bc9a 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -17,7 +17,6 @@ MAINTAINER= tobez@FreeBSD.org
COMMENT= A perl5 module implementing High resolution time, sleep, and alarm
PERL_CONFIGURE= yes
-CONFIGURE_ARGS= INSTALLDIRS=site
MAN3= Time::HiRes.3
diff --git a/devel/p5-Time-Local/Makefile b/devel/p5-Time-Local/Makefile
index a1c696a6bcdb..27e431b1d4ea 100644
--- a/devel/p5-Time-Local/Makefile
+++ b/devel/p5-Time-Local/Makefile
@@ -16,7 +16,6 @@ MAINTAINER= mat@FreeBSD.org
COMMENT= Efficiently compute time from local and GMT time
PERL_CONFIGURE= yes
-CONFIGURE_ARGS= INSTALLDIRS='site'
MAN3= Time::Local.3
diff --git a/devel/p5-VCS/Makefile b/devel/p5-VCS/Makefile
index 37b7d0d200a0..04406064b1b4 100644
--- a/devel/p5-VCS/Makefile
+++ b/devel/p5-VCS/Makefile
@@ -7,6 +7,7 @@
PORTNAME= VCS
PORTVERSION= 0.14
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= VCS
@@ -16,6 +17,7 @@ MAINTAINER= perl@FreeBSD.org
COMMENT= Library for generic Version Control System access in Perl
BUILD_DEPENDS= ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
+ ${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
${SITE_PERL}/Sort/Versions.pm:${PORTSDIR}/devel/p5-Sort-Versions
RUN_DEPENDS= ${BUILD_DEPENDS}
@@ -25,10 +27,4 @@ MAN1= diff-hist.1
MAN3= VCS.3 VCS::Cvs.3 VCS::Dir.3 VCS::File.3 \
VCS::Rcs.3 VCS::Version.3 VCS_dev.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/devel/p5-Want/Makefile b/devel/p5-Want/Makefile
index 37bd0e0f5aad..2bd7c4d9ab93 100644
--- a/devel/p5-Want/Makefile
+++ b/devel/p5-Want/Makefile
@@ -22,7 +22,7 @@ MAN3= Want.3
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500600
-IGNORE= "Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again."
+IGNORE= Perl 5.6 or newer required. Install lang/perl5 or lang/perl5.8 and try again.
.endif
.include <bsd.port.post.mk>
diff --git a/devel/p5-base/Makefile b/devel/p5-base/Makefile
index 236b4b8977b0..97df9c049de6 100644
--- a/devel/p5-base/Makefile
+++ b/devel/p5-base/Makefile
@@ -16,7 +16,6 @@ MAINTAINER= skv@FreeBSD.org
COMMENT= Set of modules to operate with inheritance and class fields at runtime
PERL_CONFIGURE= yes
-CONFIGURE_ARGS= INSTALLDIRS='site'
MAN3= base.3 fields.3
diff --git a/devel/p5-release/Makefile b/devel/p5-release/Makefile
index 76a6052f334c..d486243b16b2 100644
--- a/devel/p5-release/Makefile
+++ b/devel/p5-release/Makefile
@@ -7,6 +7,7 @@
PORTNAME= release
PORTVERSION= 0.99
+PORTREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ../../authors/id/B/BD/BDFOY
@@ -15,7 +16,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
COMMENT= Upload files to CPAN and SourceForge
-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 \
${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
${SITE_PERL}/Test/Pod.pm:${PORTSDIR}/devel/p5-Test-Pod \
${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \