8 files changed, 15 insertions, 9 deletions

diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index 3460aa2658f4..744487cf2d3e 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -11,9 +11,10 @@ DISTNAME=	${PORTNAME:U}_${PORTVERSION}_Install
 MAINTAINER=	rnejdl@ringofsaturn.com
 COMMENT=	Anti-Spam SMTP Proxy
 
+USES=		perl5
 USE_ZIP=	yes
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
+USE_PERL5=	run
 
 MAN8=		assp.8 assplog.8
 
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 32c5841a7b4e..9456a630ab88 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -22,8 +22,9 @@ UNICODE_DESC=		Normalize tokens to Unicode (UTF-8) (recommended)
 
 CONFLICTS_INSTALL?=	bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
 
+USES=		perl5
+USE_PERL5=	run
 USE_BZIP2=	yes
-USE_PERL5_RUN=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.options.mk>
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index 623c101050b6..d2a5e56f7c0f 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Receive, filter, read, compose, and send mail at the text console
 CONFLICTS=	elmo-[0-9]*
 
 GNU_CONFIGURE=	yes
-USES=		iconv
+USES=		iconv perl5
 USE_OPENSSL=	yes
-USE_PERL5_RUN=	yes
+USE_PERL5=	run
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/mail/p5-Sendmail-Milter/Makefile b/mail/p5-Sendmail-Milter/Makefile
index 15f2e3c15e0d..d51d727386a2 100644
--- a/mail/p5-Sendmail-Milter/Makefile
+++ b/mail/p5-Sendmail-Milter/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	marc@pilgerer.org
 COMMENT=	Module to write mail filters in Perl using sendmail's mail filter API
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Sendmail::Milter.3
 
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 4675c3485b4e..12de70c96379 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -28,8 +28,9 @@ CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-9].* postfix-base-2.[0-9].* \
 
 USERS=		postfix
 GROUPS=		mail maildrop postfix
+USES=		perl5
 USE_SUBMAKE=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 OPTIONS_DEFINE=	PCRE SASL2 TLS BDB MYSQL PGSQL SQLITE OPENLDAP LDAP_SASL \
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 13a485fc750d..b44126e55895 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -31,8 +31,9 @@ NO_LATEST_LINK=	yes
 
 USERS=		postfix
 GROUPS=		mail maildrop postfix
+USES=		perl5
+USE_PERL5=	build
 USE_SUBMAKE=	yes
-USE_PERL5_BUILD=yes
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 OPTIONS_DEFINE=	PCRE SASL2 TLS BDB MYSQL PGSQL SQLITE OPENLDAP \
diff --git a/mail/sqlgrey/Makefile b/mail/sqlgrey/Makefile
index e0e3d1cd7f7e..ee411f9874cc 100644
--- a/mail/sqlgrey/Makefile
+++ b/mail/sqlgrey/Makefile
@@ -13,7 +13,8 @@ RUN_DEPENDS=	p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
 		p5-IO-Multiplex>=0:${PORTSDIR}/devel/p5-IO-Multiplex \
 		p5-Pod-Parser>=0:${PORTSDIR}/textproc/p5-Pod-Parser
 
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 USE_RC_SUBR=	sqlgrey
 NO_BUILD=	yes
 
diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile
index cbb8a968f7d1..259e1a501a53 100644
--- a/mail/zmailer/Makefile
+++ b/mail/zmailer/Makefile
@@ -15,8 +15,8 @@ CONFLICTS=	courier-0.* postfix-1.* postfix-2.* sendmail-8.* sendmail-*-8.* smail
 OPTIONS_DEFINE=	SSL
 OPTIONS_DEFAULT=SSL
 
+USES=		perl5
 GNU_CONFIGURE=	yes
-USE_PERL5=	yes
 MAKE_JOBS_UNSAFE=
 
 .include <bsd.port.options.mk>