7 files changed, 32 insertions, 36 deletions

diff --git a/devel/p5-Test-File-Contents/Makefile b/devel/p5-Test-File-Contents/Makefile
index b286cd8cd431..5b3ed4daced1 100644
--- a/devel/p5-Test-File-Contents/Makefile
+++ b/devel/p5-Test-File-Contents/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@rbt.ca
 COMMENT=	Test routines for examining the contents of files
 
-PERL_BUILD_DEPENDS=	Test-More:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 
 PERL_MODBUILD=	yes
 
diff --git a/misc/tinderbox/Makefile b/misc/tinderbox/Makefile
index 8d2ab3aa7f15..615b8ae8b344 100644
--- a/misc/tinderbox/Makefile
+++ b/misc/tinderbox/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES=	http://tinderbox.marcuscom.com/
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Port build tinderbox system
 
-PERL_RUN_DEPENDS=	Digest-MD5:${PORTSDIR}/security/p5-Digest-MD5 \
-			Net-SMTP:${PORTSDIR}/net/p5-Net
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB \
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
+		${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB \
 		cvsup:${PORTSDIR}/net/cvsup-without-gui
 
 OPTIONS=	PGSQL "With pgsql" On \
@@ -37,13 +37,13 @@ USE_PHP=	session
 .if defined(WITH_PGSQL)
 USE_PGSQL=	yes
 USE_PHP+=	pgsql
-PERL_RUN_DEPENDS+=	DBD-Pg:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
 .if defined(WITH_MYSQL)
 USE_PHP+=	mysql
 USE_MYSQL=	yes
-PERL_RUN_DEPENDS+=	DBD-mysql:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
 .endif
 
 .include "${PORTSDIR}/Mk/bsd.php.mk"
diff --git a/ports-mgmt/newportsversioncheck/Makefile b/ports-mgmt/newportsversioncheck/Makefile
index 271e9bfeab2a..ee30daf4c613 100644
--- a/ports-mgmt/newportsversioncheck/Makefile
+++ b/ports-mgmt/newportsversioncheck/Makefile
@@ -14,10 +14,9 @@ MASTER_SITES=	http://www.mavetju.org/download/
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Ports new version checker
 
-PERL_RUN_DEPENDS=	\
-		DBD-SQLite:${PORTSDIR}/databases/p5-DBD-SQLite \
-		MIME-Lite:${PORTSDIR}/mail/p5-MIME-Lite \
-		LWP:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite \
+		${SITE_PERL}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite \
+		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
 
 USE_PERL_RUN=	yes
 USE_SQLITE=	yes
diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index 8d2ab3aa7f15..615b8ae8b344 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES=	http://tinderbox.marcuscom.com/
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Port build tinderbox system
 
-PERL_RUN_DEPENDS=	Digest-MD5:${PORTSDIR}/security/p5-Digest-MD5 \
-			Net-SMTP:${PORTSDIR}/net/p5-Net
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB \
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
+		${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB \
 		cvsup:${PORTSDIR}/net/cvsup-without-gui
 
 OPTIONS=	PGSQL "With pgsql" On \
@@ -37,13 +37,13 @@ USE_PHP=	session
 .if defined(WITH_PGSQL)
 USE_PGSQL=	yes
 USE_PHP+=	pgsql
-PERL_RUN_DEPENDS+=	DBD-Pg:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
 .if defined(WITH_MYSQL)
 USE_PHP+=	mysql
 USE_MYSQL=	yes
-PERL_RUN_DEPENDS+=	DBD-mysql:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
 .endif
 
 .include "${PORTSDIR}/Mk/bsd.php.mk"
diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile
index 8d2ab3aa7f15..615b8ae8b344 100644
--- a/ports-mgmt/tinderbox/Makefile
+++ b/ports-mgmt/tinderbox/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES=	http://tinderbox.marcuscom.com/
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Port build tinderbox system
 
-PERL_RUN_DEPENDS=	Digest-MD5:${PORTSDIR}/security/p5-Digest-MD5 \
-			Net-SMTP:${PORTSDIR}/net/p5-Net
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB \
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
+		${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB \
 		cvsup:${PORTSDIR}/net/cvsup-without-gui
 
 OPTIONS=	PGSQL "With pgsql" On \
@@ -37,13 +37,13 @@ USE_PHP=	session
 .if defined(WITH_PGSQL)
 USE_PGSQL=	yes
 USE_PHP+=	pgsql
-PERL_RUN_DEPENDS+=	DBD-Pg:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
 .if defined(WITH_MYSQL)
 USE_PHP+=	mysql
 USE_MYSQL=	yes
-PERL_RUN_DEPENDS+=	DBD-mysql:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
 .endif
 
 .include "${PORTSDIR}/Mk/bsd.php.mk"
diff --git a/sysutils/lire/Makefile b/sysutils/lire/Makefile
index 3583b2605da5..4f93e4bfc437 100644
--- a/sysutils/lire/Makefile
+++ b/sysutils/lire/Makefile
@@ -21,16 +21,15 @@ MAINTAINER=	edwin@mavetju.org
 COMMENT=	Logfile analyse toolkit for multiple applications
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-PERL_BUILD_DEPENDS= \
-		Digest-MD5:${PORTSDIR}/security/p5-Digest-MD5 \
-		MIME-Tools:${PORTSDIR}/mail/p5-MIME-Tools \
-		Time-Timezone:${PORTSDIR}/devel/p5-Time-modules \
-		DBD-SQLite2:${PORTSDIR}/databases/p5-DBD-SQLite2 \
-		XML-Parser:${PORTSDIR}/textproc/p5-XML-Parser \
-		Curses:${PORTSDIR}/devel/p5-Curses \
-		Curses-UI:${PORTSDIR}/devel/p5-Curses-UI \
-		Locale-TextDomain:${PORTSDIR}/devel/p5-Locale-libintl
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
+		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
+		${SITE_PERL}/Time/Timezone.pm:${PORTSDIR}/devel/p5-Time-modules \
+		${SITE_PERL}/${PERL_ARCH}/DBD/SQLite2.pm:${PORTSDIR}/databases/p5-DBD-SQLite2 \
+		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+		${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses \
+		${SITE_PERL}/Curses/UI.pm:${PORTSDIR}/devel/p5-Curses-UI \
+		${SITE_PERL}/Locale/TextDomain.pm:${PORTSDIR}/devel/p5-Locale-libintl
 
 OPTIONS=	CHARTS "Have Charts output format" On \
 		HTML "Have HTML or DocBook output format" On \
@@ -259,7 +258,7 @@ IGNORE=		sysutils/lire requires are least Perl 5.6.1, while Perl 5.8.2 is recomm
 .ifdef(WITH_CHARTS)
 RUN_DEPENDS+=	ploticus:${PORTSDIR}/math/ploticus-nox11 \
 		dia:${PORTSDIR}/graphics/dia
-PERL_BUILD_DEPENDS+=	GD-Graph:${PORTSDIR}/graphics/p5-GD-Graph
+BUILD_DEPENDS+=	${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph
 .endif
 .ifdef(WITH_HTML)
 RUN_DEPENDS+=	lynx:${PORTSDIR}/www/lynx
@@ -277,7 +276,6 @@ BUILD_DEPENDS+=	${SITE_PERL}/Spreadsheet/WriteExcel.pm:${PORTSDIR}/textproc/p5-S
 .endif
 
 RUN_DEPENDS+=	${BUILD_DEPENDS}
-PERL_RUN_DEPENDS+=	${PERL_BUILD_DEPENDS}
 
 post-install:
 	@${CAT} pkg-message
diff --git a/sysutils/newportsversioncheck/Makefile b/sysutils/newportsversioncheck/Makefile
index 271e9bfeab2a..ee30daf4c613 100644
--- a/sysutils/newportsversioncheck/Makefile
+++ b/sysutils/newportsversioncheck/Makefile
@@ -14,10 +14,9 @@ MASTER_SITES=	http://www.mavetju.org/download/
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Ports new version checker
 
-PERL_RUN_DEPENDS=	\
-		DBD-SQLite:${PORTSDIR}/databases/p5-DBD-SQLite \
-		MIME-Lite:${PORTSDIR}/mail/p5-MIME-Lite \
-		LWP:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite \
+		${SITE_PERL}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite \
+		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
 
 USE_PERL_RUN=	yes
 USE_SQLITE=	yes