- Remove SITE_PERL from *_DEPENDS

6 files changed, 20 insertions, 18 deletions

diff --git a/graphics/p5-Image-Caa/Makefile b/graphics/p5-Image-Caa/Makefile
index dd36b43..e27c096 100644
--- a/graphics/p5-Image-Caa/Makefile
+++ b/graphics/p5-Image-Caa/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Colored ASCII Art
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses
+RUN_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/graphics/p5-Image-Compare/Makefile b/graphics/p5-Image-Compare/Makefile
index 4d6e74c..5b84e6f 100644
--- a/graphics/p5-Image-Compare/Makefile
+++ b/graphics/p5-Image-Compare/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Compare two images in a variety of ways
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Imager.pm:${PORTSDIR}/graphics/p5-Imager \
-		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/Regexp/Common.pm:${PORTSDIR}/textproc/p5-Regexp-Common
+RUN_DEPENDS=	p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
diff --git a/shells/zoidberg/Makefile b/shells/zoidberg/Makefile
index 96b7f63..8171f63 100644
--- a/shells/zoidberg/Makefile
+++ b/shells/zoidberg/Makefile
@@ -17,12 +17,12 @@ DISTNAME=	Zoidberg-${PORTVERSION}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A modular PERL shell
 
-BUILD_DEPENDS=	${SITE_PERL}/Exporter/Tidy.pm:${PORTSDIR}/devel/p5-Exporter-Tidy \
-		${SITE_PERL}/Term/ReadLine/Zoid.pm:${PORTSDIR}/devel/p5-Term-ReadLine-Zoid \
-		${SITE_PERL}/Env/PS1.pm:${PORTSDIR}/devel/p5-Env-PS1
-RUN_DEPENDS=	${SITE_PERL}/Exporter/Tidy.pm:${PORTSDIR}/devel/p5-Exporter-Tidy \
-		${SITE_PERL}/Term/ReadLine/Zoid.pm:${PORTSDIR}/devel/p5-Term-ReadLine-Zoid \
-		${SITE_PERL}/Env/PS1.pm:${PORTSDIR}/devel/p5-Env-PS1
+BUILD_DEPENDS=	p5-Exporter-Tidy>=0:${PORTSDIR}/devel/p5-Exporter-Tidy \
+		p5-Term-ReadLine-Zoid>=0:${PORTSDIR}/devel/p5-Term-ReadLine-Zoid \
+		p5-Env-PS1>=0:${PORTSDIR}/devel/p5-Env-PS1
+RUN_DEPENDS=	p5-Exporter-Tidy>=0:${PORTSDIR}/devel/p5-Exporter-Tidy \
+		p5-Term-ReadLine-Zoid>=0:${PORTSDIR}/devel/p5-Term-ReadLine-Zoid \
+		p5-Env-PS1>=0:${PORTSDIR}/devel/p5-Env-PS1
 
 PERL_MODBUILD=	yes
 CONFIGURE_ARGS=	install_path=share="${DATADIR}" \
diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile
index d637053..eb42b4a 100644
--- a/www/p5-Apache-Clean2/Makefile
+++ b/www/p5-Apache-Clean2/Makefile
@@ -17,12 +17,13 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}_7
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A mod_perl interface into HTML::Clean
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 \
+BUILD_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
 		p5-HTML-Clean>=0.8:${PORTSDIR}/www/p5-HTML-Clean
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}2
 
 PERL_CONFIGURE=	yes
+USE_APACHE=	20+
 
 MAN3=		Apache::Clean.3
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/www/p5-Apache-DBI/Makefile b/www/p5-Apache-DBI/Makefile
index 02c2338..8bd6a17 100644
--- a/www/p5-Apache-DBI/Makefile
+++ b/www/p5-Apache-DBI/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBI persistent connection, authentication and authorization
 
 BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2
+		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	p5-Apache-DBI-mp[12]*
diff --git a/www/p5-Apache-MP3/Makefile b/www/p5-Apache-MP3/Makefile
index 3e2b785..bf165d7 100644
--- a/www/p5-Apache-MP3/Makefile
+++ b/www/p5-Apache-MP3/Makefile
@@ -15,14 +15,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	MP3 browsing and streaming under mod_perl and Apache
 
-BUILD_DEPENDS=	${SITE_PERL}/Audio/Wav.pm:${PORTSDIR}/audio/p5-Audio-Wav \
-		${SITE_PERL}/CGI/Session.pm:${PORTSDIR}/www/p5-CGI-Session \
-		${SITE_PERL}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info \
-		${SITE_PERL}/${PERL_ARCH}/Ogg/Vorbis/Header.pm:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header \
-		${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2
+BUILD_DEPENDS=	p5-Audio-Wav>=0:${PORTSDIR}/audio/p5-Audio-Wav \
+		p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
+		p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info \
+		p5-Ogg-Vorbis-Header>=0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header \
+		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	YES
+PERL_CONFIGURE=	yes
+USE_APACHE=	20+
 
 MAN3=		Apache::MP3.3 \
 		Apache::MP3::L10N.3 \