- Remove SITE_PERL from *_DEPENDS

Approved by: portmgr@ (bapt@)

21 files changed, 61 insertions, 61 deletions

diff --git a/comms/p5-Device-Gsm/Makefile b/comms/p5-Device-Gsm/Makefile
index eb095b20a3cc..14daf2df739d 100644
--- a/comms/p5-Device-Gsm/Makefile
+++ b/comms/p5-Device-Gsm/Makefile
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	Perl interface to GSM phones/modems on serial ports
 
-BUILD_DEPENDS=	${SITE_PERL}/Device/Modem.pm:${PORTSDIR}/comms/p5-Device-Modem
-RUN_DEPENDS=	${SITE_PERL}/Device/Modem.pm:${PORTSDIR}/comms/p5-Device-Modem
+BUILD_DEPENDS=	p5-Device-Modem>=0:${PORTSDIR}/comms/p5-Device-Modem
+RUN_DEPENDS=	p5-Device-Modem>=0:${PORTSDIR}/comms/p5-Device-Modem
 
 PERL_CONFIGURE=	yes
 
diff --git a/comms/yfklog/Makefile b/comms/yfklog/Makefile
index b009bccb9baa..714968cfeb13 100644
--- a/comms/yfklog/Makefile
+++ b/comms/yfklog/Makefile
@@ -19,11 +19,11 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Amateur Radio curses based logging program
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses \
-		${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite \
-		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
-		${SITE_PERL}/${PERL_ARCH}/Hamlib.pm:${PORTSDIR}/comms/hamlib \
-		${SITE_PERL}/Net/FTP/File.pm:${PORTSDIR}/net/p5-Net-FTP-File
+RUN_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses \
+		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
+		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+		hamlib>=0:${PORTSDIR}/comms/hamlib \
+		p5-Net-FTP-File>=0:${PORTSDIR}/net/p5-Net-FTP-File
 
 USE_PERL5=	yes
 NO_BUILD=	yes
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 7cbdc739af11..2db5b021c5f5 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -175,9 +175,9 @@ post-patch:
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	41
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41
+RUN_DEPENDS=	p5-DBD-mysql41>=0:${PORTSDIR}/databases/p5-DBD-mysql41
 .if ${PERL_LEVEL} <= 500800
-RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+=	p5-File-Temp>=0:${PORTSDIR}/devel/p5-File-Temp
 .endif
 
 LATEST_LINK=	mysql41-scripts
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 5b007aec7a01..2a71e09fac0f 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -215,9 +215,9 @@ post-patch:
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	50
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50
+RUN_DEPENDS=	p5-DBD-mysql50>=0:${PORTSDIR}/databases/p5-DBD-mysql50
 .if ${PERL_LEVEL} <= 500800
-RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+=	p5-File-Temp>=0:${PORTSDIR}/devel/p5-File-Temp
 .endif
 
 LATEST_LINK=	mysql50-scripts
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index e6dae56a314b..c85f0a96f0a1 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -198,9 +198,9 @@ post-install:
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	51
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql51
+RUN_DEPENDS=	p5-DBD-mysql51>=0:${PORTSDIR}/databases/p5-DBD-mysql51
 .if ${PERL_LEVEL} <= 500800
-RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
+RUN_DEPENDS+=	p5-File-Temp>=0:${PORTSDIR}/devel/p5-File-Temp
 .endif
 
 LATEST_LINK=	mysql51-scripts
diff --git a/devel/p5-File-DesktopEntry/Makefile b/devel/p5-File-DesktopEntry/Makefile
index 295d79a78533..2f5768d470c7 100644
--- a/devel/p5-File-DesktopEntry/Makefile
+++ b/devel/p5-File-DesktopEntry/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Object to handle desktop files
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/File/Spec.pm:${PORTSDIR}/devel/p5-PathTools \
+BUILD_DEPENDS=	p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools \
 		p5-File-BaseDir>=0.03:${PORTSDIR}/devel/p5-File-BaseDir
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/devel/p5-Gtk2-Spell/Makefile b/devel/p5-Gtk2-Spell/Makefile
index a31a301bc00d..71e6faa1617e 100644
--- a/devel/p5-Gtk2-Spell/Makefile
+++ b/devel/p5-Gtk2-Spell/Makefile
@@ -15,9 +15,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Perl interface to the Gtk2Spell library
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Cairo.pm:${PORTSDIR}/graphics/p5-Cairo \
-		${SITE_PERL}/ExtUtils/Depends.pm:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		${SITE_PERL}/ExtUtils/PkgConfig.pm:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
+BUILD_DEPENDS=	p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo \
+		p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
 		p5-Glib2>=1.001:${PORTSDIR}/devel/p5-Glib2 \
 		p5-Gtk2>=1.001:${PORTSDIR}/x11-toolkits/p5-Gtk2
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
diff --git a/mail/gotmail/Makefile b/mail/gotmail/Makefile
index 1853b35bfd37..42f58f2cd495 100644
--- a/mail/gotmail/Makefile
+++ b/mail/gotmail/Makefile
@@ -15,8 +15,8 @@ MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A script to fetch mail from a Hotmail or MSN mailbox
 
 RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/Net/libnet.cfg:${PORTSDIR}/net/p5-Net
+		p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-Net>=0:${PORTSDIR}/net/p5-Net
 
 MAN1=		${PORTNAME}.1
 USE_PERL5=	yes
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 1b05d4299905..286f20e54fab 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	anders@FreeBSD.org
 COMMENT=	A mailing list manager
 
 .if defined(WITH_SHA1_COOKIES)
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
 .endif
 
 USE_PERL5=	yes
@@ -35,7 +35,7 @@ DOCSDIR=	${PREFIX}/${PORTNAME}/doc
 
 .if !defined(WITH_SHA1_COOKIES)
 . if ${PERL_LEVEL} < 500703
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+RUN_DEPENDS+=	p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5
 . endif
 .endif
 
diff --git a/mail/pronto/Makefile b/mail/pronto/Makefile
index 51d9abfc2637..f7b5e2caf775 100644
--- a/mail/pronto/Makefile
+++ b/mail/pronto/Makefile
@@ -14,19 +14,19 @@ MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A Mail Client for Gnome/Gtk written in Perl
 
 BUILD_DEPENDS=\
-		${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \
-		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
-		${SITE_PERL}/DBD/CSV.pm:${PORTSDIR}/databases/p5-DBD-CSV \
-		${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
-		${SITE_PERL}/SQL/Statement.pm:${PORTSDIR}/databases/p5-SQL-Statement \
-		${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-		${SITE_PERL}/MIME/Types.pm:${PORTSDIR}/mail/p5-MIME-Types \
-		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-		${SITE_PERL}/Lingua/Ispell.pm:${PORTSDIR}/textproc/p5-Lingua-Ispell
+		p5-Gtk>=0:${PORTSDIR}/x11-toolkits/p5-Gtk \
+		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+		p5-DBD-CSV>=0:${PORTSDIR}/databases/p5-DBD-CSV \
+		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
+		p5-SQL-Statement>=0:${PORTSDIR}/databases/p5-SQL-Statement \
+		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
+		p5-MIME-Types>=0:${PORTSDIR}/mail/p5-MIME-Types \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-Lingua-Ispell>=0:${PORTSDIR}/textproc/p5-Lingua-Ispell
 
 .if defined(WITH_MYSQL)
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql
+BUILD_DEPENDS+=	p5-Mysql>=0:${PORTSDIR}/databases/p5-Mysql
 .endif
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
diff --git a/mail/tlb/Makefile b/mail/tlb/Makefile
index d6b4bcec7116..db5fd4417451 100644
--- a/mail/tlb/Makefile
+++ b/mail/tlb/Makefile
@@ -16,9 +16,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	The List Batcher, a general purpose mail list delivery engine
 
-RUN_DEPENDS=	${SITE_PERL}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-		${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
-		${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS=	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
+		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
+		p5-Net>=0:${PORTSDIR}/net/p5-Net
 
 NO_BUILD=	yes
 USE_PERL5=	yes
diff --git a/net-mgmt/ocsinventory-agent/Makefile b/net-mgmt/ocsinventory-agent/Makefile
index ccc24d80ed2e..0f2ac7e61b89 100644
--- a/net-mgmt/ocsinventory-agent/Makefile
+++ b/net-mgmt/ocsinventory-agent/Makefile
@@ -18,10 +18,10 @@ COMMENT=	Keep track of the computers configuration and software
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
-		${SITE_PERL}/Net/IP.pm:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		${SITE_PERL}/Proc/Daemon.pm:${PORTSDIR}/devel/p5-Proc-Daemon
+RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
+		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
+		p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon
 BUILD_DEPENDS=	dmidecode:${PORTSDIR}/sysutils/dmidecode \
 		lspci:${PORTSDIR}/sysutils/pciutils
 
diff --git a/net-mgmt/ocsinventory-ng/Makefile b/net-mgmt/ocsinventory-ng/Makefile
index 5f72162e1c64..a2dd48c84df4 100644
--- a/net-mgmt/ocsinventory-ng/Makefile
+++ b/net-mgmt/ocsinventory-ng/Makefile
@@ -15,14 +15,14 @@ COMMENT=	Open Computer and Software Inventory Next Generation
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
-		${SITE_PERL}/${PERL_ARCH}/Compress/Raw/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Raw-Zlib \
-		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
-		${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
-		${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI \
-		${SITE_PERL}/Net/IP.pm:${PORTSDIR}/net-mgmt/p5-Net-IP \
-		${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
-		${SITE_PERL}/XML/Entities.pm:${PORTSDIR}/textproc/p5-XML-Entities
+RUN_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
+		p5-Compress-Raw-Zlib>=0:${PORTSDIR}/archivers/p5-Compress-Raw-Zlib \
+		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
+		p5-Apache-DBI>=0:${PORTSDIR}/www/p5-Apache-DBI \
+		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
+		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
+		p5-XML-Entities>=0:${PORTSDIR}/textproc/p5-XML-Entities
 
 USE_APACHE=	20+
 USE_MYSQL=	41+
diff --git a/net/p5-BBS-Client/Makefile b/net/p5-BBS-Client/Makefile
index 1dbd20244ce2..427f77ffd6f5 100644
--- a/net/p5-BBS-Client/Makefile
+++ b/net/p5-BBS-Client/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	yzlin@FreeBSD.org
 COMMENT=	A Client Module For BBS Systems
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet
+BUILD_DEPENDS=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/net/p5-Filesys-SmbClient/Makefile b/net/p5-Filesys-SmbClient/Makefile
index 596e0a631654..fb4056a3ee90 100644
--- a/net/p5-Filesys-SmbClient/Makefile
+++ b/net/p5-Filesys-SmbClient/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	anders@FreeBSD.org
 COMMENT=	Interface for access Samba filesystem with libsmclient.so
 
 LIB_DEPENDS=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
-BUILD_DEPENDS=	${SITE_PERL}/Test/Simple.pm:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
 
 PERL_CONFIGURE=	yes
 
diff --git a/net/x2goclient-cli/Makefile b/net/x2goclient-cli/Makefile
index fc342caac57d..26621bcbac88 100644
--- a/net/x2goclient-cli/Makefile
+++ b/net/x2goclient-cli/Makefile
@@ -14,8 +14,8 @@ DISTNAME=	${PORTNAME}_${DISTVERSION}
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	The x2go perl client
 
-RUN_DEPENDS=	${SITE_PERL}/Proc/Simple.pm:${PORTSDIR}/devel/p5-Proc-Simple \
-		${SITE_PERL}/Term/ReadPassword.pm:${PORTSDIR}/devel/p5-Term-ReadPassword \
+RUN_DEPENDS=	p5-Proc-Simple>=0:${PORTSDIR}/devel/p5-Proc-Simple \
+		p5-Term-ReadPassword>=0:${PORTSDIR}/devel/p5-Term-ReadPassword \
 		nxproxy:${PORTSDIR}/net/nxproxy
 
 LICENSE=	GPLv2
diff --git a/security/pcsc-tools/Makefile b/security/pcsc-tools/Makefile
index de7f70e0cf62..4922b0ef0513 100644
--- a/security/pcsc-tools/Makefile
+++ b/security/pcsc-tools/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Tools to test a PCSC driver, card or reader
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	pcsclite.1:${PORTSDIR}/devel/pcsc-lite
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Chipcard/PCSC.pm:${PORTSDIR}/devel/p5-PCSC-Card
+RUN_DEPENDS=	p5-PCSC-Card>=0:${PORTSDIR}/devel/p5-PCSC-Card
 
 USE_GMAKE=	yes
 
diff --git a/security/sshblock/Makefile b/security/sshblock/Makefile
index dd00c0d42d93..aeafa7a6343f 100644
--- a/security/sshblock/Makefile
+++ b/security/sshblock/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.pl
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	Block abusive SSH login attempts
 
-RUN_DEPENDS=	${SITE_PERL}/File/Tail.pm:${PORTSDIR}/devel/p5-File-Tail
+RUN_DEPENDS=	p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/sysutils/lmon/Makefile b/sysutils/lmon/Makefile
index 2e16f290da3e..73fe10b78af2 100644
--- a/sysutils/lmon/Makefile
+++ b/sysutils/lmon/Makefile
@@ -14,9 +14,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	Near-realtime log monitoring tool, sends alerts on hits and misses
 
-RUN_DEPENDS=	${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles \
-		${SITE_PERL}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail \
-		${SITE_PERL}/File/Tail.pm:${PORTSDIR}/devel/p5-File-Tail
+RUN_DEPENDS=	p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
+		p5-Mail-Sendmail>=0:${PORTSDIR}/mail/p5-Mail-Sendmail \
+		p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
 
 NO_BUILD=	yes
 USE_PERL5=	yes
diff --git a/sysutils/monkeytail/Makefile b/sysutils/monkeytail/Makefile
index 3cc587cbcf1d..50afac19ee07 100644
--- a/sysutils/monkeytail/Makefile
+++ b/sysutils/monkeytail/Makefile
@@ -15,8 +15,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	yzlin@FreeBSD.org
 COMMENT=	A multi-file tail on both local and remote hosts
 
-RUN_DEPENDS=	${SITE_PERL}/Config/General.pm:${PORTSDIR}/devel/p5-Config-General \
-		${SITE_PERL}/Getopt/Declare.pm:${PORTSDIR}/devel/p5-Getopt-Declare
+RUN_DEPENDS=	p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
+		p5-Getopt-Declare>=0:${PORTSDIR}/devel/p5-Getopt-Declare
 
 USE_PERL5_RUN=	yes
 
diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index 3391c7163eb8..c92299fddefc 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -28,9 +28,9 @@ PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 .if defined (WITH_MODPERL2)
 PKGNAMEPREFIX+=	p5-
 
-P5_APREQ_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2 \
-		${SITE_PERL}/ExtUtils/XSBuilder:${PORTSDIR}/devel/p5-ExtUtils-XSBuilder \
-		${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
+P5_APREQ_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
+		p5-ExtUtils-XSBuilder>=0:${PORTSDIR}/devel/p5-ExtUtils-XSBuilder \
+		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
 BUILD_DEPENDS+=	${P5_APREQ_DEPENDS}
 RUN_DEPENDS+=	${P5_APREQ_DEPENDS}