After devel/p5-File-Temp has gained an IGNORE for PERL_LEVEL > 500800, all

these ports were broken because they always depended on it. I've rearranged all
the dependencies to fit the new scheme.

9 files changed, 46 insertions, 20 deletions

diff --git a/devel/cvsmonitor/Makefile b/devel/cvsmonitor/Makefile
index 9c2bf62d0088..7fd8156decbc 100644
--- a/devel/cvsmonitor/Makefile
+++ b/devel/cvsmonitor/Makefile
@@ -27,7 +27,6 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storab
 		${SITE_PERL}/Validate/Net.pm:${PORTSDIR}/net/p5-Validate-Net \
 		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
 		${SITE_PERL}/Chart/Math/Axis.pm:${PORTSDIR}/math/p5-Chart-Math-Axis \
-		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
 		${SITE_PERL}/File/Flat.pm:${PORTSDIR}/devel/p5-File-Flat \
 		${SITE_PERL}/File/Find/Rule.pm:${PORTSDIR}/devel/p5-File-Find-Rule \
 		${SITE_PERL}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time-modules \
@@ -84,4 +83,10 @@ do-install:
 .endfor
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500800
+BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-Data-TemporaryBag/Makefile b/devel/p5-Data-TemporaryBag/Makefile
index a9034d92e302..d089ce9d89aa 100644
--- a/devel/p5-Data-TemporaryBag/Makefile
+++ b/devel/p5-Data-TemporaryBag/Makefile
@@ -15,17 +15,18 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Handle long size data using temporary file
 
-BUILD_DEPENDS=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
 PERL_CONFIGURE=	yes
 
 MAN3=		Data::TemporaryBag.3
 
 .include <bsd.port.pre.mk>
 
+.if ${PERL_LEVEL} < 500800
+BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 .if ${PERL_LEVEL} < 500600
 EXTRA_PATCHES=	${PATCHDIR}/500503-TemporaryBag.pm
 .endif
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-File-Flat/Makefile b/devel/p5-File-Flat/Makefile
index 95097369d108..e771df782223 100644
--- a/devel/p5-File-Flat/Makefile
+++ b/devel/p5-File-Flat/Makefile
@@ -15,8 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Implements a flat filesystem
 
-BUILD_DEPENDS=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
-		${SITE_PERL}/Class/Autouse.pm:${PORTSDIR}/devel/p5-Class-Autouse \
+BUILD_DEPENDS=	${SITE_PERL}/Class/Autouse.pm:${PORTSDIR}/devel/p5-Class-Autouse \
 		${SITE_PERL}/Class/Inspector.pm:${PORTSDIR}/devel/p5-Class-Inspector \
 		${SITE_PERL}/File/Remove.pm:${PORTSDIR}/devel/p5-File-Remove \
 		${SITE_PERL}/File/Slurp.pm:${PORTSDIR}/devel/p5-File-Slurp \
@@ -27,4 +26,10 @@ PERL_CONFIGURE=	yes
 
 MAN3=		File::Flat.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500800
+BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-File-Modified/Makefile b/devel/p5-File-Modified/Makefile
index 2283ce7385ee..57a05de1fd23 100644
--- a/devel/p5-File-Modified/Makefile
+++ b/devel/p5-File-Modified/Makefile
@@ -14,8 +14,7 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for checking intelligently if files have changed
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 \
-		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
@@ -24,6 +23,10 @@ MAN3=		File::Modified.3
 
 .include <bsd.port.pre.mk>
 
+.if ${PERL_LEVEL} < 500800
+BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+.endif
+
 post-patch:
 	${PERL} -pi -e 's/\r\n/\n/;' -e 's/^use warnings;//' ${WRKSRC}/Modified.pm
 
diff --git a/devel/p5-Log-Dispatch-Config/Makefile b/devel/p5-Log-Dispatch-Config/Makefile
index 18357f2a7a03..13f7a2b51cea 100644
--- a/devel/p5-Log-Dispatch-Config/Makefile
+++ b/devel/p5-Log-Dispatch-Config/Makefile
@@ -22,7 +22,6 @@ PM_DEPENDS=	${SITE_PERL}/Log/Dispatch.pm:${PORTSDIR}/devel/p5-Log-Dispatch
 PM_DEPENDS+=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 PM_DEPENDS+=	${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig
 PM_DEPENDS+=	${SITE_PERL}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy
-PM_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 PERL_CONFIGURE=	yes
 
@@ -30,4 +29,10 @@ PERL_CONFIGURE=	yes
 #		Log::Dispatch::Configurator.3 \
 #		Log::Dispatch::Configurator::AppConfig.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500800
+PM_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-PAR/Makefile b/devel/p5-PAR/Makefile
index a4c9d77ee6df..56f69f798aea 100644
--- a/devel/p5-PAR/Makefile
+++ b/devel/p5-PAR/Makefile
@@ -18,7 +18,6 @@ COMMENT=	Perl Archive Toolkit
 
 BUILD_DEPENDS=	${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
-		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
 		${SITE_PERL}/Module/ScanDeps/DataFeed.pm:${PORTSDIR}/devel/p5-Module-ScanDeps \
 		${SITE_PERL}/Module/Signature.pm:${PORTSDIR}/security/p5-Module-Signature \
 		${SITE_PERL}/PAR/Dist.pm:${PORTSDIR}/devel/p5-PAR-Dist \
@@ -36,7 +35,10 @@ MAN3=		App::Packer::PAR.3 PAR.3 \
 
 .include <bsd.port.pre.mk>
 
-pre-everything::
+.if ${PERL_LEVEL} < 500800
+BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+.endif
+
 .if ${PERL_LEVEL} < 500601
 IGNORE=		p5-PAR only supports the ports versions of Perl.
 IGNORE+=If you have installed a Perl port, and are getting this message,
diff --git a/devel/p5-PatchReader/Makefile b/devel/p5-PatchReader/Makefile
index c22a8318c766..d897b56a6f39 100644
--- a/devel/p5-PatchReader/Makefile
+++ b/devel/p5-PatchReader/Makefile
@@ -21,9 +21,9 @@ MAN3=		PatchReader.3
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500600
-BUILD_DEPENDS=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-RUN_DEPENDS=	${BUILD_DEPENDS}
+.if ${PERL_LEVEL} < 500800
+BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Reporter/Makefile b/devel/p5-Test-Reporter/Makefile
index 022fe8979128..c033fd943f0d 100644
--- a/devel/p5-Test-Reporter/Makefile
+++ b/devel/p5-Test-Reporter/Makefile
@@ -25,9 +25,12 @@ MAN3=		Test::Reporter.3
 
 .include <bsd.port.pre.mk>
 
+.if ${PERL_LEVEL} < 500800
+BUILD_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+.include <bsd.port.post.mk>
 .if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
-		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+.endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-VCP/Makefile b/devel/p5-VCP/Makefile
index f0ab2e03e6d1..c5ec080a12ef 100644
--- a/devel/p5-VCP/Makefile
+++ b/devel/p5-VCP/Makefile
@@ -21,7 +21,6 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-X
 		${SITE_PERL}/IPC/Run3.pm:${PORTSDIR}/devel/p5-IPC-Run3 \
 		${SITE_PERL}/Pod/Links.pm:${PORTSDIR}/www/p5-PodToHTML \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
 		${SITE_PERL}/Regexp/Shellish.pm:${PORTSDIR}/devel/p5-Regexp-Shellish \
 		${SITE_PERL}/BFD.pm:${PORTSDIR}/devel/p5-BFD \
 		${SITE_PERL}/Text/Table.pm:${PORTSDIR}/textproc/p5-Text-Table \
@@ -104,8 +103,11 @@ MAN3=		RevML::Doctype.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} < 500600
 BROKEN=		"Does not compile with perl ${PERL_VERSION}"
 .endif
+.endif
 
 .include <bsd.port.post.mk>