74 files changed, 148 insertions, 148 deletions

diff --git a/mail/p5-Dancer-Plugin-Email/Makefile b/mail/p5-Dancer-Plugin-Email/Makefile
index c3ecaba259ad..45b8518d9891 100644
--- a/mail/p5-Dancer-Plugin-Email/Makefile
+++ b/mail/p5-Dancer-Plugin-Email/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Simple email handling for Dancer applications
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dancer>=0:www/p5-Dancer \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Dancer>=0:www/p5-Dancer \
 		p5-Email-Date-Format>=0:mail/p5-Email-Date-Format \
 		p5-Email-Sender>=0:mail/p5-Email-Sender \
 		p5-File-Type>=0:devel/p5-File-Type \
 		p5-MIME-Tools>=0:mail/p5-MIME-Tools
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/mail/p5-Dancer2-Plugin-Email/Makefile b/mail/p5-Dancer2-Plugin-Email/Makefile
index 1ad9aae2632c..e8147ac79af7 100644
--- a/mail/p5-Dancer2-Plugin-Email/Makefile
+++ b/mail/p5-Dancer2-Plugin-Email/Makefile
@@ -13,14 +13,14 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Dancer2>=0.200000:www/p5-Dancer2 \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Dancer2>=0.200000:www/p5-Dancer2 \
 		p5-Email-Date-Format>=0:mail/p5-Email-Date-Format \
 		p5-Email-Sender>=0:mail/p5-Email-Sender \
 		p5-File-Type>=0:devel/p5-File-Type \
 		p5-IO-Socket-SSL>=2.000:security/p5-IO-Socket-SSL \
 		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
 		p5-Module-Runtime>=0:devel/p5-Module-Runtime
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
 		p5-Plack>=1.0029:www/p5-Plack
 
diff --git a/mail/p5-Email-Address-List/Makefile b/mail/p5-Email-Address-List/Makefile
index 15b89907f001..d9cfcb2ad61d 100644
--- a/mail/p5-Email-Address-List/Makefile
+++ b/mail/p5-Email-Address-List/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	RFC-close address list parsing
 
-BUILD_DEPENDS=	p5-Email-Address>0:mail/p5-Email-Address
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-Address>0:mail/p5-Email-Address
 
 NO_ARCH=	yes
 
diff --git a/mail/p5-Email-Date/Makefile b/mail/p5-Email-Date/Makefile
index 676c9282f223..331dcf28b975 100644
--- a/mail/p5-Email-Date/Makefile
+++ b/mail/p5-Email-Date/Makefile
@@ -14,11 +14,11 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Email-Abstract>=2.10:mail/p5-Email-Abstract \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-Abstract>=2.10:mail/p5-Email-Abstract \
 		p5-Email-Date-Format>=1:mail/p5-Email-Date-Format \
 		p5-Email-Simple>=1.9:mail/p5-Email-Simple \
 		p5-TimeDate>=1.16:devel/p5-TimeDate
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Email-Delete/Makefile b/mail/p5-Email-Delete/Makefile
index 195bcbf96d3a..0cfbef78151f 100644
--- a/mail/p5-Email-Delete/Makefile
+++ b/mail/p5-Email-Delete/Makefile
@@ -14,11 +14,11 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Email-Folder>=0:mail/p5-Email-Folder \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-Folder>=0:mail/p5-Email-Folder \
 		p5-Email-FolderType>=0:mail/p5-Email-FolderType \
 		p5-Email-LocalDelivery>=0:mail/p5-Email-LocalDelivery \
 		p5-Email-Simple>=0:mail/p5-Email-Simple
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Email-Filter/Makefile b/mail/p5-Email-Filter/Makefile
index 4f37c1bb5ca6..4155d206623f 100644
--- a/mail/p5-Email-Filter/Makefile
+++ b/mail/p5-Email-Filter/Makefile
@@ -14,11 +14,11 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Class-Trigger>=0:devel/p5-Class-Trigger \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Class-Trigger>=0:devel/p5-Class-Trigger \
 		p5-Email-LocalDelivery>=0:mail/p5-Email-LocalDelivery \
 		p5-Email-Simple>=0:mail/p5-Email-Simple \
 		p5-IPC-Run>=0:devel/p5-IPC-Run
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Email-Find/Makefile b/mail/p5-Email-Find/Makefile
index 5dd2b8c0b324..dbd3a30d56f6 100644
--- a/mail/p5-Email-Find/Makefile
+++ b/mail/p5-Email-Find/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Find RFC 822 email addresses in plain text
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Email-Valid>=0:mail/p5-Email-Valid
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-Valid>=0:mail/p5-Email-Valid
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Email-Folder-IMAP/Makefile b/mail/p5-Email-Folder-IMAP/Makefile
index d970335f45b7..91628dabdb99 100644
--- a/mail/p5-Email-Folder-IMAP/Makefile
+++ b/mail/p5-Email-Folder-IMAP/Makefile
@@ -14,12 +14,12 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Email-Folder>=0:mail/p5-Email-Folder \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-Folder>=0:mail/p5-Email-Folder \
 		p5-Email-FolderType-Net>=0:mail/p5-Email-FolderType-Net \
 		p5-Net-IMAP-Simple>=0.95:mail/p5-Net-IMAP-Simple \
 		p5-URI>=0:net/p5-URI \
 		p5-URI-imap>=0:mail/p5-URI-imap
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Email-Folder-IMAPS/Makefile b/mail/p5-Email-Folder-IMAPS/Makefile
index 2a41fa07629d..4580253df868 100644
--- a/mail/p5-Email-Folder-IMAPS/Makefile
+++ b/mail/p5-Email-Folder-IMAPS/Makefile
@@ -14,11 +14,11 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Email-Folder-IMAP>=1.102:mail/p5-Email-Folder-IMAP \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-Folder-IMAP>=1.102:mail/p5-Email-Folder-IMAP \
 		p5-Net-IMAP-Simple-SSL>=1.3:mail/p5-Net-IMAP-Simple-SSL \
 		p5-URI-imap>=0:mail/p5-URI-imap \
 		p5-URI-imaps>=0:mail/p5-URI-imaps
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Email-Folder-POP3/Makefile b/mail/p5-Email-Folder-POP3/Makefile
index 8291bbc3b0dc..1f6ee5d2d101 100644
--- a/mail/p5-Email-Folder-POP3/Makefile
+++ b/mail/p5-Email-Folder-POP3/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Email-Folder>=0:mail/p5-Email-Folder \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-Folder>=0:mail/p5-Email-Folder \
 		p5-Email-FolderType-Net>=0:mail/p5-Email-FolderType-Net \
 		p5-URI>=0:net/p5-URI
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Email-Folder/Makefile b/mail/p5-Email-Folder/Makefile
index bee1297ee64e..db6955d156e5 100644
--- a/mail/p5-Email-Folder/Makefile
+++ b/mail/p5-Email-Folder/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Email-FolderType>=0.600:mail/p5-Email-FolderType \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-FolderType>=0.600:mail/p5-Email-FolderType \
 		p5-Email-Simple>=0:mail/p5-Email-Simple
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Email-FolderType-Net/Makefile b/mail/p5-Email-FolderType-Net/Makefile
index 21e962b78688..071c421df41a 100644
--- a/mail/p5-Email-FolderType-Net/Makefile
+++ b/mail/p5-Email-FolderType-Net/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Email-FolderType>=0.800:mail/p5-Email-FolderType \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-FolderType>=0.800:mail/p5-Email-FolderType \
 		p5-URI>=1.35:net/p5-URI
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Email-FolderType/Makefile b/mail/p5-Email-FolderType/Makefile
index 28fb776b06c7..a843c6b531d5 100644
--- a/mail/p5-Email-FolderType/Makefile
+++ b/mail/p5-Email-FolderType/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Module-Pluggable>0:devel/p5-Module-Pluggable
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Module-Pluggable>0:devel/p5-Module-Pluggable
 TEST_DEPENDS=	p5-Capture-Tiny>0:devel/p5-Capture-Tiny
 
 NO_ARCH=	yes
diff --git a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
index 97f7c4d6264c..e0b0f73c60e7 100644
--- a/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
+++ b/mail/p5-Email-LocalDelivery-Ezmlm/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Deliver mail into ezmlm archives
 
-BUILD_DEPENDS=	p5-Email-LocalDelivery>=0:mail/p5-Email-LocalDelivery \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-LocalDelivery>=0:mail/p5-Email-LocalDelivery \
 		p5-Email-FolderType>=0:mail/p5-Email-FolderType
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Email-MIME-Attachment-Stripper/Makefile b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
index d7adaafed80f..1954049a253f 100644
--- a/mail/p5-Email-MIME-Attachment-Stripper/Makefile
+++ b/mail/p5-Email-MIME-Attachment-Stripper/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Email-MIME>=1.861:mail/p5-Email-MIME \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-MIME>=1.861:mail/p5-Email-MIME \
 		p5-Email-MIME-ContentType>=1.016:mail/p5-Email-MIME-ContentType
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Email-MIME-CreateHTML/Makefile b/mail/p5-Email-MIME-CreateHTML/Makefile
index 2cd585768fe3..49960aec1193 100644
--- a/mail/p5-Email-MIME-CreateHTML/Makefile
+++ b/mail/p5-Email-MIME-CreateHTML/Makefile
@@ -13,7 +13,8 @@ COMMENT=	Multipart HTML Email builder
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-Data-Serializer>=0:devel/p5-Data-Serializer \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Data-Serializer>=0:devel/p5-Data-Serializer \
 		p5-Email-MIME>=0:mail/p5-Email-MIME \
 		p5-File-Policy>=0:devel/p5-File-Policy \
 		p5-HTML-Tagset>=0:www/p5-HTML-Tagset \
@@ -22,7 +23,6 @@ BUILD_DEPENDS=	p5-Data-Serializer>=0:devel/p5-Data-Serializer \
 		p5-MIME-Types>=2.17:mail/p5-MIME-Types \
 		p5-URI>=0:net/p5-URI \
 		p5-libwww>=0:www/p5-libwww
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Email-Address>=0:mail/p5-Email-Address \
 		p5-Email-Send>=0:mail/p5-Email-Send \
 		p5-File-Slurp>=0:devel/p5-File-Slurp \
diff --git a/mail/p5-Email-MIME/Makefile b/mail/p5-Email-MIME/Makefile
index 8b14d8da66e3..dc67e6922c12 100644
--- a/mail/p5-Email-MIME/Makefile
+++ b/mail/p5-Email-MIME/Makefile
@@ -13,14 +13,14 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Email-Address-XS>=0:mail/p5-Email-Address-XS \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-Address-XS>=0:mail/p5-Email-Address-XS \
 		p5-Email-MIME-ContentType>=1.022:mail/p5-Email-MIME-ContentType \
 		p5-Email-MIME-Encodings>=1.314:mail/p5-Email-MIME-Encodings \
 		p5-Email-MessageID>=0:mail/p5-Email-MessageID \
 		p5-Email-Simple>=2.212:mail/p5-Email-Simple \
 		p5-MIME-Types>=1.13:mail/p5-MIME-Types \
 		p5-Module-Runtime>=0:devel/p5-Module-Runtime
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Email-Reply/Makefile b/mail/p5-Email-Reply/Makefile
index 3f456717ad70..d7e782606249 100644
--- a/mail/p5-Email-Reply/Makefile
+++ b/mail/p5-Email-Reply/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Email::Reply - Reply to a Message
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Email-Abstract>=2.01:mail/p5-Email-Abstract \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-Abstract>=2.01:mail/p5-Email-Abstract \
 		p5-Email-Address>=1.800:mail/p5-Email-Address \
 		p5-Email-MIME>=1.82:mail/p5-Email-MIME
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
 
 USES=		perl5
diff --git a/mail/p5-Email-Send/Makefile b/mail/p5-Email-Send/Makefile
index f9e9505c0944..e68c9077995d 100644
--- a/mail/p5-Email-Send/Makefile
+++ b/mail/p5-Email-Send/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Email::Send - Simply Sending Email
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.19:devel/p5-Class-Accessor \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Class-Accessor>=0.19:devel/p5-Class-Accessor \
 		p5-Email-Address>=1.800:mail/p5-Email-Address \
 		p5-Email-Simple>=1.92:mail/p5-Email-Simple \
 		p5-Return-Value>=1.28:devel/p5-Return-Value \
 		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Email-Sender/Makefile b/mail/p5-Email-Sender/Makefile
index 01438b124c17..c15c007e6caf 100644
--- a/mail/p5-Email-Sender/Makefile
+++ b/mail/p5-Email-Sender/Makefile
@@ -14,7 +14,8 @@ COMMENT=	Library for sending email
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Email-Abstract>=3.006:mail/p5-Email-Abstract \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-Abstract>=3.006:mail/p5-Email-Abstract \
 		p5-Email-Address>=0:mail/p5-Email-Address \
 		p5-Email-Simple>=1.998:mail/p5-Email-Simple \
 		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
@@ -24,7 +25,6 @@ BUILD_DEPENDS=	p5-Email-Abstract>=3.006:mail/p5-Email-Abstract \
 		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
 		p5-Throwable>=0.200003:devel/p5-Throwable \
 		p5-Try-Tiny>=0:lang/p5-Try-Tiny
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Capture-Tiny>=0.08:devel/p5-Capture-Tiny
 
 NO_ARCH=	yes
diff --git a/mail/p5-Email-Simple-FromHandle/Makefile b/mail/p5-Email-Simple-FromHandle/Makefile
index addf7f404dc5..e647b0703633 100644
--- a/mail/p5-Email-Simple-FromHandle/Makefile
+++ b/mail/p5-Email-Simple-FromHandle/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl library for making email objects from a filehandle
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Email-Simple>=0:mail/p5-Email-Simple \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-Simple>=0:mail/p5-Email-Simple \
 		p5-IO-String>=0:devel/p5-IO-String
 
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Email-Simple/Makefile b/mail/p5-Email-Simple/Makefile
index 25cc72b6ad91..0e097b5022bb 100644
--- a/mail/p5-Email-Simple/Makefile
+++ b/mail/p5-Email-Simple/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Email-Date-Format>=0:mail/p5-Email-Date-Format
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-Date-Format>=0:mail/p5-Email-Date-Format
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Email-Stuffer/Makefile b/mail/p5-Email-Stuffer/Makefile
index c6d5713ee980..bd489e6e8adb 100644
--- a/mail/p5-Email-Stuffer/Makefile
+++ b/mail/p5-Email-Stuffer/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	More casual approach to creating and sending Email
 
-BUILD_DEPENDS=	p5-Params-Util>=0.23:devel/p5-Params-Util \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Params-Util>=0.23:devel/p5-Params-Util \
 		p5-File-Type>=0.22:devel/p5-File-Type \
 		p5-Email-MIME>=1.901:mail/p5-Email-MIME \
 		p5-Email-Sender>=0:mail/p5-Email-Sender
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Email-Valid-Loose/Makefile b/mail/p5-Email-Valid-Loose/Makefile
index 3cec5a6fd2eb..a1ef40e5720f 100644
--- a/mail/p5-Email-Valid-Loose/Makefile
+++ b/mail/p5-Email-Valid-Loose/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Variation of Email::Valid which allows dot before at mark
 
-BUILD_DEPENDS=	p5-Email-Valid>=0:mail/p5-Email-Valid
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-Valid>=0:mail/p5-Email-Valid
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-GMail-IMAPD/Makefile b/mail/p5-GMail-IMAPD/Makefile
index 7a5eca1c737d..59092413ee65 100644
--- a/mail/p5-GMail-IMAPD/Makefile
+++ b/mail/p5-GMail-IMAPD/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mashtizadeh@gmail.com
 COMMENT=	Perl IMAP4 gateway to Google's webmail service
 
-BUILD_DEPENDS=	p5-Mail-Webmail-Gmail>=0:mail/p5-Mail-Webmail-Gmail
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Mail-Webmail-Gmail>=0:mail/p5-Mail-Webmail-Gmail
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-LMAP-CID2SPF/Makefile b/mail/p5-LMAP-CID2SPF/Makefile
index bbba42e14b39..0cb7b6ce0487 100644
--- a/mail/p5-LMAP-CID2SPF/Makefile
+++ b/mail/p5-LMAP-CID2SPF/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Module to convert between Microsoft's Caller-ID and SPF		#'
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USES=		perl5 shebangfix
 USE_PERL5=	configure
diff --git a/mail/p5-MIME-EncWords/Makefile b/mail/p5-MIME-EncWords/Makefile
index c735c588d4ce..902503a86df8 100644
--- a/mail/p5-MIME-EncWords/Makefile
+++ b/mail/p5-MIME-EncWords/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Deal with RFC 2047 encoded words (improved)
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MIME-Charset>=1.010.1:mail/p5-MIME-Charset
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-MIME-Charset>=1.010.1:mail/p5-MIME-Charset
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-MIME-Lite/Makefile b/mail/p5-MIME-Lite/Makefile
index 92c34a5e4350..989ed1234a31 100644
--- a/mail/p5-MIME-Lite/Makefile
+++ b/mail/p5-MIME-Lite/Makefile
@@ -15,10 +15,10 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Email-Date-Format>=1.000:mail/p5-Email-Date-Format \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Email-Date-Format>=1.000:mail/p5-Email-Date-Format \
 		p5-MIME-Types>=1.28:mail/p5-MIME-Types \
 		p5-Mail-Tools>=1.62:mail/p5-Mail-Tools
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-MIME-Tools/Makefile b/mail/p5-MIME-Tools/Makefile
index 418b2604f443..a776ce2ae9d7 100644
--- a/mail/p5-MIME-Tools/Makefile
+++ b/mail/p5-MIME-Tools/Makefile
@@ -16,9 +16,9 @@ COMMENT=	Set of perl5 modules for MIME
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Convert-BinHex>=0:converters/p5-Convert-BinHex \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Convert-BinHex>=0:converters/p5-Convert-BinHex \
 		p5-Mail-Tools>=1.05:mail/p5-Mail-Tools
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 NO_ARCH=	yes
diff --git a/mail/p5-Mail-Address-MobileJp/Makefile b/mail/p5-Mail-Address-MobileJp/Makefile
index b5fd33598b54..5c7c6ec3485d 100644
--- a/mail/p5-Mail-Address-MobileJp/Makefile
+++ b/mail/p5-Mail-Address-MobileJp/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Utility to detect an e-mail is mobile one or not
 
-BUILD_DEPENDS=	p5-Mail-Tools>=0:mail/p5-Mail-Tools
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Mail-Tools>=0:mail/p5-Mail-Tools
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-Audit/Makefile b/mail/p5-Mail-Audit/Makefile
index 0fd4d7880278..21d7f0fc3e0a 100644
--- a/mail/p5-Mail-Audit/Makefile
+++ b/mail/p5-Mail-Audit/Makefile
@@ -14,11 +14,11 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-File-HomeDir>=0.61:devel/p5-File-HomeDir \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-File-HomeDir>=0.61:devel/p5-File-HomeDir \
 		p5-File-Tempdir>=0:devel/p5-File-Tempdir \
 		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
 		p5-Mail-Tools>=0:mail/p5-Mail-Tools
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Mail-POP3Client>=0:mail/p5-Mail-POP3Client \
 		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 
diff --git a/mail/p5-Mail-Box-IMAP4-SSL/Makefile b/mail/p5-Mail-Box-IMAP4-SSL/Makefile
index 51edae964689..56a42f8f6278 100644
--- a/mail/p5-Mail-Box-IMAP4-SSL/Makefile
+++ b/mail/p5-Mail-Box-IMAP4-SSL/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Missing part of Mail::Box::IMAP4
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Mail-Box>=0:mail/p5-Mail-Box \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Mail-Box>=0:mail/p5-Mail-Box \
 		p5-superclass>=0.003:devel/p5-superclass \
 		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Probe-Perl>=0:sysutils/p5-Probe-Perl \
 		p5-Proc-Background>=1.08:devel/p5-Proc-Background
 
diff --git a/mail/p5-Mail-Box-Parser-C/Makefile b/mail/p5-Mail-Box-Parser-C/Makefile
index 3c3e2554aee4..db5679cbf7a9 100644
--- a/mail/p5-Mail-Box-Parser-C/Makefile
+++ b/mail/p5-Mail-Box-Parser-C/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Parsing folders for Mail::Box with C routines
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mail-Box>=0:mail/p5-Mail-Box
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Mail-Box>=0:mail/p5-Mail-Box
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-CheckUser/Makefile b/mail/p5-Mail-CheckUser/Makefile
index a2ab14902ccf..8b88e4ffa0f0 100644
--- a/mail/p5-Mail-CheckUser/Makefile
+++ b/mail/p5-Mail-CheckUser/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bra@fsn.hu
 COMMENT=	Perl module to check email addresses for validity
 
-BUILD_DEPENDS=  p5-Net-DNS>=0:dns/p5-Net-DNS
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=  p5-Net-DNS>=0:dns/p5-Net-DNS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-ClamAV/Makefile b/mail/p5-Mail-ClamAV/Makefile
index 5f16a854168c..947c2a629b0a 100644
--- a/mail/p5-Mail-ClamAV/Makefile
+++ b/mail/p5-Mail-ClamAV/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl extension for the clamav virus scanner
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0:devel/p5-Inline \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Inline>=0:devel/p5-Inline \
 		p5-Inline-C>=0:devel/p5-Inline-C \
 		clamscan:security/clamav
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		perl5
diff --git a/mail/p5-Mail-DKIM/Makefile b/mail/p5-Mail-DKIM/Makefile
index 4fc1575d2680..bbcce9c9ee43 100644
--- a/mail/p5-Mail-DKIM/Makefile
+++ b/mail/p5-Mail-DKIM/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Perl5 module to process and/or create DKIM email
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
 		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
 		p5-Net-DNS>=0:dns/p5-Net-DNS \
 		p5-Net-DNS-Resolver-Mock>=0:dns/p5-Net-DNS-Resolver-Mock
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-RequiresInternet>=0:devel/p5-Test-RequiresInternet \
 		p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
 
diff --git a/mail/p5-Mail-DMARC/Makefile b/mail/p5-Mail-DMARC/Makefile
index 1d495c00d37e..a1da37486121 100644
--- a/mail/p5-Mail-DMARC/Makefile
+++ b/mail/p5-Mail-DMARC/Makefile
@@ -12,7 +12,8 @@ COMMENT=	Perl5 module to process and/or create DKIM email
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
 		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
 		p5-Config-Tiny>=0:devel/p5-Config-Tiny \
 		p5-File-ShareDir-Install>=0:devel/p5-File-ShareDir-Install \
@@ -38,7 +39,6 @@ BUILD_DEPENDS=	p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
 		p5-Net-DNS>=0:dns/p5-Net-DNS \
 		p5-Net-IDN-Encode>=0:textproc/p5-Net-IDN-Encode
 
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile b/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
index 59c67f03e029..996ebcee2b93 100644
--- a/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
+++ b/mail/p5-Mail-DeliveryStatus-BounceParser/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-MIME-Tools>=5.418:mail/p5-MIME-Tools \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-MIME-Tools>=5.418:mail/p5-MIME-Tools \
 		p5-Mail-Tools>=2.04:mail/p5-Mail-Tools
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile
index ab42aa652ece..433765cb006d 100644
--- a/mail/p5-Mail-Ezmlm/Makefile
+++ b/mail/p5-Mail-Ezmlm/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Perl module to allow object methods for ezmlm-idx mailing lists
 LICENSE=	BSD3CLAUSE GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${EZMLM_DIR}/bin/ezmlm-idx:mail/ezmlm-idx \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	${EZMLM_DIR}/bin/ezmlm-idx:mail/ezmlm-idx \
 		p5-Crypt-GPG>=0:security/p5-Crypt-GPG
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Mail-Field-Received/Makefile b/mail/p5-Mail-Field-Received/Makefile
index 0c1d42f9f136..6309749b4ab7 100644
--- a/mail/p5-Mail-Field-Received/Makefile
+++ b/mail/p5-Mail-Field-Received/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl5 modules for parsing of `Received' headers in e-mails
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mail-Tools>0:mail/p5-Mail-Tools
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Mail-Tools>0:mail/p5-Mail-Tools
 
 TEST_DEPENDS=	p5-Test-Differences>0:devel/p5-Test-Differences
 
diff --git a/mail/p5-Mail-FilterXML/Makefile b/mail/p5-Mail-FilterXML/Makefile
index 7006a66a0ce3..8a4c161a3c8d 100644
--- a/mail/p5-Mail-FilterXML/Makefile
+++ b/mail/p5-Mail-FilterXML/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module that allows writing mail filter rules in XML
 
-BUILD_DEPENDS=	p5-Mail-Audit>=0:mail/p5-Mail-Audit \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Mail-Audit>=0:mail/p5-Mail-Audit \
 		p5-XML-Parser>=0:textproc/p5-XML-Parser
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	mailfilter.pl
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index 9476ae4f67da..41069661f1b6 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -12,11 +12,11 @@ DISTNAME=	MailFolder-${PORTVERSION}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for a folder-independant interface to email folders
 
-BUILD_DEPENDS=	p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Mail-Tools>=0:mail/p5-Mail-Tools \
 		p5-TimeDate>=0:devel/p5-TimeDate \
 		p5-File-Sync>=0:devel/p5-File-Sync \
 		p5-MIME-Tools>=0:mail/p5-MIME-Tools
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-Freshmeat/Makefile b/mail/p5-Mail-Freshmeat/Makefile
index 69acdf7c7c2e..7f77c0392044 100644
--- a/mail/p5-Mail-Freshmeat/Makefile
+++ b/mail/p5-Mail-Freshmeat/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Perl module to parse daily newsletters from freshmeat.net
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mail-Tools>=0:mail/p5-Mail-Tools
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Mail-Tools>=0:mail/p5-Mail-Tools
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-GnuPG/Makefile b/mail/p5-Mail-GnuPG/Makefile
index 9339a12880a8..406a7b397db4 100644
--- a/mail/p5-Mail-GnuPG/Makefile
+++ b/mail/p5-Mail-GnuPG/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 interface to process and/or create PGP email
 
-BUILD_DEPENDS=	p5-GnuPG-Interface>=0:security/p5-GnuPG-Interface \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-GnuPG-Interface>=0:security/p5-GnuPG-Interface \
 		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
 		p5-Mail-Tools>=0:mail/p5-Mail-Tools
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Mail-IMAPTalk/Makefile b/mail/p5-Mail-IMAPTalk/Makefile
index 303169199d41..cf7f5dd65daf 100644
--- a/mail/p5-Mail-IMAPTalk/Makefile
+++ b/mail/p5-Mail-IMAPTalk/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
 		p5-Encode-IMAPUTF7>=0:converters/p5-Encode-IMAPUTF7
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Mail-MailStats/Makefile b/mail/p5-Mail-MailStats/Makefile
index f6a6aad6529c..59c2d5949acc 100644
--- a/mail/p5-Mail-MailStats/Makefile
+++ b/mail/p5-Mail-MailStats/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to detect newer messages in procmail-generated mailboxes
 
-BUILD_DEPENDS=	p5-AppConfig>=0:devel/p5-AppConfig
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-AppConfig>=0:devel/p5-AppConfig
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-MboxParser/Makefile b/mail/p5-Mail-MboxParser/Makefile
index e506cdaab221..4b30ee594451 100644
--- a/mail/p5-Mail-MboxParser/Makefile
+++ b/mail/p5-Mail-MboxParser/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Module for working with UNIX-flavoured mailboxes
 
-BUILD_DEPENDS=	p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-MIME-Tools>=0:mail/p5-MIME-Tools \
 		p5-Mail-Mbox-MessageParser>=0:mail/p5-Mail-Mbox-MessageParser
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-OpenRelay-Simple/Makefile b/mail/p5-Mail-OpenRelay-Simple/Makefile
index 2fe0165d0788..50fb1cdb640b 100644
--- a/mail/p5-Mail-OpenRelay-Simple/Makefile
+++ b/mail/p5-Mail-OpenRelay-Simple/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Check if a mail server runs as an open relay
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.25:devel/p5-Class-Accessor \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Class-Accessor>=0.25:devel/p5-Class-Accessor \
 		p5-Net-Telnet>=3.03:net/p5-Net-Telnet
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-RBL/Makefile b/mail/p5-Mail-RBL/Makefile
index 2a7cab301bee..71b4eb6013fc 100644
--- a/mail/p5-Mail-RBL/Makefile
+++ b/mail/p5-Mail-RBL/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to access RBL-style host verification services
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
 		p5-NetAddr-IP>0:net-mgmt/p5-NetAddr-IP
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-SPF/Makefile b/mail/p5-Mail-SPF/Makefile
index 091cc8b8dc26..723fa9a6260a 100644
--- a/mail/p5-Mail-SPF/Makefile
+++ b/mail/p5-Mail-SPF/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Object-oriented implementation of Sender Policy Framework
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Error>=0:lang/p5-Error \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Error>=0:lang/p5-Error \
 		p5-Net-DNS>=0.62:dns/p5-Net-DNS \
 		p5-Net-DNS-Resolver-Programmable>=0.003:dns/p5-Net-DNS-Resolver-Programmable \
 		p5-NetAddr-IP>=4:net-mgmt/p5-NetAddr-IP \
 		p5-URI>=1.13:net/p5-URI
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 CONFIGURE_ARGS=	--install_path sbin=${PREFIX}/sbin
diff --git a/mail/p5-Mail-SRS/Makefile b/mail/p5-Mail-SRS/Makefile
index 3e8c76a36e97..5ac78d9ad55b 100644
--- a/mail/p5-Mail-SRS/Makefile
+++ b/mail/p5-Mail-SRS/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Sender Rewriting Scheme
 
-BUILD_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
 		p5-MLDBM>=0:databases/p5-MLDBM
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index 333cae930131..aeb2badc99a4 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pure Perl implementation of mail spooling, unspooling, and sending
 
-BUILD_DEPENDS=	p5-File-NFSLock>=0:devel/p5-File-NFSLock \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-File-NFSLock>=0:devel/p5-File-NFSLock \
 		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
 		p5-Net-DNS>=0:dns/p5-Net-DNS
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-Transport-Dbx/Makefile b/mail/p5-Mail-Transport-Dbx/Makefile
index f5d3b21b6b0c..b7f9941ecac2 100644
--- a/mail/p5-Mail-Transport-Dbx/Makefile
+++ b/mail/p5-Mail-Transport-Dbx/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mail::Transport::Dbx - Parse Outlook Express mailboxes
 
-#BUILD_DEPENDS=	p5-ExtUtils-Constant>0:devel/p5-ExtUtils-Constant
-#RUN_DEPENDS:=	${BUILD_DEPENDS}
+#BUILD_DEPENDS=	${RUN_DEPENDS}
+#RUN_DEPENDS=	p5-ExtUtils-Constant>0:devel/p5-ExtUtils-Constant
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-Verify/Makefile b/mail/p5-Mail-Verify/Makefile
index e49cf3d5c174..bc76f6bba00f 100644
--- a/mail/p5-Mail-Verify/Makefile
+++ b/mail/p5-Mail-Verify/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to verify email addresses
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Mail-Webmail-Gmail/Makefile b/mail/p5-Mail-Webmail-Gmail/Makefile
index b1600dab9160..2956355e647d 100644
--- a/mail/p5-Mail-Webmail-Gmail/Makefile
+++ b/mail/p5-Mail-Webmail-Gmail/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to Google webmail service
 
-BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
 		p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Net-IMAP-Client/Makefile b/mail/p5-Net-IMAP-Client/Makefile
index 9c1395fa0ec5..5c082668f2d1 100644
--- a/mail/p5-Net-IMAP-Client/Makefile
+++ b/mail/p5-Net-IMAP-Client/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Not so simple IMAP client library
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
 		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Net-IMAP-Server/Makefile b/mail/p5-Net-IMAP-Server/Makefile
index 4bd243c5a3b9..ccee5cf12cb0 100644
--- a/mail/p5-Net-IMAP-Server/Makefile
+++ b/mail/p5-Net-IMAP-Server/Makefile
@@ -13,7 +13,8 @@ COMMENT=	Single-threaded multiplexing IMAP server implementation
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>0:devel/p5-AnyEvent \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-AnyEvent>0:devel/p5-AnyEvent \
 		p5-Class-Accessor>0:devel/p5-Class-Accessor \
 		p5-Coro>0:devel/p5-Coro \
 		p5-DateTime>0:devel/p5-DateTime \
@@ -27,7 +28,6 @@ BUILD_DEPENDS=	p5-AnyEvent>0:devel/p5-AnyEvent \
 		p5-Net-Server-Coro>=0.6:net/p5-Net-Server-Coro \
 		p5-Regexp-Common>0:textproc/p5-Regexp-Common \
 		p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL
 
 NO_ARCH=	yes
diff --git a/mail/p5-Net-IMAP-Simple-SSL/Makefile b/mail/p5-Net-IMAP-Simple-SSL/Makefile
index 283b5b7947e3..b8c5f13e96d4 100644
--- a/mail/p5-Net-IMAP-Simple-SSL/Makefile
+++ b/mail/p5-Net-IMAP-Simple-SSL/Makefile
@@ -14,9 +14,9 @@ COMMENT=	SSL support for Net::IMAP::Simple
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
 		p5-Net-IMAP-Simple>=0:mail/p5-Net-IMAP-Simple
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Net-IMAP-Simple/Makefile b/mail/p5-Net-IMAP-Simple/Makefile
index 906f3348179f..c3b98a6b0676 100644
--- a/mail/p5-Net-IMAP-Simple/Makefile
+++ b/mail/p5-Net-IMAP-Simple/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl extension for simple IMAP account handling
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL \
 		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
 		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:1.20271
 
diff --git a/mail/p5-Net-ManageSieve/Makefile b/mail/p5-Net-ManageSieve/Makefile
index 813c9fc3f49b..a03b7089bafd 100644
--- a/mail/p5-Net-ManageSieve/Makefile
+++ b/mail/p5-Net-ManageSieve/Makefile
@@ -13,8 +13,8 @@ COMMENT=	ManageSieve Protocol Client
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-Net-SMTP-Server/Makefile b/mail/p5-Net-SMTP-Server/Makefile
index 3f30adc03faf..c438a4304481 100644
--- a/mail/p5-Net-SMTP-Server/Makefile
+++ b/mail/p5-Net-SMTP-Server/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Native Perl SMTP Server
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Net-SMTP-TLS/Makefile b/mail/p5-Net-SMTP-TLS/Makefile
index bd253c4431e4..4d1184ebdea8 100644
--- a/mail/p5-Net-SMTP-TLS/Makefile
+++ b/mail/p5-Net-SMTP-TLS/Makefile
@@ -14,10 +14,10 @@ COMMENT=	SMTP client supporting TLS and AUTH
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
 		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
 		p5-Net-SSLeay>=0:security/p5-Net-SSLeay
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/mail/p5-POE-Component-Client-POP3/Makefile b/mail/p5-POE-Component-Client-POP3/Makefile
index 4d55e1422962..acd6fc4e0d64 100644
--- a/mail/p5-POE-Component-Client-POP3/Makefile
+++ b/mail/p5-POE-Component-Client-POP3/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Implement a POP3 client POE component
 
-BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-POE>=0:devel/p5-POE
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	samples/test.perl samples/term.perl
diff --git a/mail/p5-POE-Component-Client-SMTP/Makefile b/mail/p5-POE-Component-Client-SMTP/Makefile
index 535fd4373d29..fb47230618ac 100644
--- a/mail/p5-POE-Component-Client-SMTP/Makefile
+++ b/mail/p5-POE-Component-Client-SMTP/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	SMTP client POE component
 
-BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-POE>=0:devel/p5-POE \
 		p5-POE-Filter-Transparent-SMTP>=0:mail/p5-POE-Filter-Transparent-SMTP
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/mail/p5-POE-Component-SMTP/Makefile b/mail/p5-POE-Component-SMTP/Makefile
index 58269ec531c8..893cceceefe4 100644
--- a/mail/p5-POE-Component-SMTP/Makefile
+++ b/mail/p5-POE-Component-SMTP/Makefile
@@ -14,10 +14,10 @@ COMMENT=	SMTP Protocol Implementation
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-POE>=0:devel/p5-POE \
 		p5-POE-Session-MultiDispatch>=0:devel/p5-POE-Session-MultiDispatch \
 		p5-Mail-Tools>=0:mail/p5-Mail-Tools
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-POE-Filter-Transparent-SMTP/Makefile b/mail/p5-POE-Filter-Transparent-SMTP/Makefile
index 096599e1596c..2635640d3da8 100644
--- a/mail/p5-POE-Filter-Transparent-SMTP/Makefile
+++ b/mail/p5-POE-Filter-Transparent-SMTP/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0+$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	SMTP transparency POE filter
 
-BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-POE>=0:devel/p5-POE
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Parse-Syslog-Mail/Makefile b/mail/p5-Parse-Syslog-Mail/Makefile
index 5d233ac4428b..d0fcee05d45d 100644
--- a/mail/p5-Parse-Syslog-Mail/Makefile
+++ b/mail/p5-Parse-Syslog-Mail/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse log messages generated by various MTAs
 
-BUILD_DEPENDS=	p5-Parse-Syslog>=0:textproc/p5-Parse-Syslog
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Parse-Syslog>=0:textproc/p5-Parse-Syslog
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Sendmail-AccessDB/Makefile b/mail/p5-Sendmail-AccessDB/Makefile
index ac3294a84fcc..62d7c2f59ddc 100644
--- a/mail/p5-Sendmail-AccessDB/Makefile
+++ b/mail/p5-Sendmail-AccessDB/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Perl5 interface to the Sendmail access.db list
 
-BUILD_DEPENDS=	p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-Test-Email/Makefile b/mail/p5-Test-Email/Makefile
index b57b3a8d7446..8f46b3e3ccb3 100644
--- a/mail/p5-Test-Email/Makefile
+++ b/mail/p5-Test-Email/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Test Email Contents
 
-BUILD_DEPENDS=	p5-Mail-POP3Client>=2:mail/p5-Mail-POP3Client \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Mail-POP3Client>=2:mail/p5-Mail-POP3Client \
 		p5-Mail-Sendmail>=0.79:mail/p5-Mail-Sendmail \
 		p5-MIME-Tools>=5.4:mail/p5-MIME-Tools \
 		p5-Test-Simple>=0.7:devel/p5-Test-Simple
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 
diff --git a/mail/p5-URI-imap/Makefile b/mail/p5-URI-imap/Makefile
index 9ee2c7293769..fde8634904e3 100644
--- a/mail/p5-URI-imap/Makefile
+++ b/mail/p5-URI-imap/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	URI::imap - Support IMAP URI
 
-BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-URI-imaps/Makefile b/mail/p5-URI-imaps/Makefile
index 554fc442db63..e61089bd3edf 100644
--- a/mail/p5-URI-imaps/Makefile
+++ b/mail/p5-URI-imaps/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Support IMAPS URI
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-URI>=0:net/p5-URI
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/mail/p5-WWW-GMail/Makefile b/mail/p5-WWW-GMail/Makefile
index 8945a88eb141..cdb51886c28c 100644
--- a/mail/p5-WWW-GMail/Makefile
+++ b/mail/p5-WWW-GMail/Makefile
@@ -15,9 +15,9 @@ COMMENT=	This module simplifies access to gmail
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
 		p5-URI>=0:net/p5-URI
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-WWW-Hotmail/Makefile b/mail/p5-WWW-Hotmail/Makefile
index fd8f6b50c72c..9f186e3dc05a 100644
--- a/mail/p5-WWW-Hotmail/Makefile
+++ b/mail/p5-WWW-Hotmail/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	This module simplifies access to hotmail
 
-BUILD_DEPENDS=	p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
 		p5-Mail-Audit>=0:mail/p5-Mail-Audit
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/mail/p5-qpsmtpd/Makefile b/mail/p5-qpsmtpd/Makefile
index c50346a003a0..f01382697302 100644
--- a/mail/p5-qpsmtpd/Makefile
+++ b/mail/p5-qpsmtpd/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	noc-ports@biglist.com
 COMMENT=	Flexible SMTP daemon written in Perl and featuring a plugin API
 
-BUILD_DEPENDS=	spamd:mail/spamassassin \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	spamd:mail/spamassassin \
 		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
 		p5-Net-DNS>=0.39:dns/p5-Net-DNS \
 		p5-Net-IP>=0:net-mgmt/p5-Net-IP
-RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	MODPERL DOCS EXAMPLES
 OPTIONS_DEFAULT=MODPERL