10 files changed, 10 insertions, 15 deletions

diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index 752c89a10a13..948fb92fdf78 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	${PORTNAME:U}_${PORTVERSION}_Install
 MAINTAINER=	rnejdl@ringofsaturn.com
 COMMENT=	Anti-Spam SMTP Proxy
 
-USES=		perl5
-USE_ZIP=	yes
+USES=		perl5 zip
 NO_BUILD=	yes
 USE_PERL5=	run
 
diff --git a/mail/ftrack/Makefile b/mail/ftrack/Makefile
index 8d987686e076..e7d055e7ddf6 100644
--- a/mail/ftrack/Makefile
+++ b/mail/ftrack/Makefile
@@ -17,12 +17,10 @@ BROKEN=		Does not compile
 
 LIB_DEPENDS=	smapi.2:${PORTSDIR}/news/husky-smapi
 
-USE_ZIP=	yes
-USE_GMAKE=	yes
+USES=		perl5 gmake zip:infozip
 ALL_TARGET=	ftrack
 MAKEFILE=	${WRKSRC}/MakeFiles/FreeBSD/Makefile
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
-USES=		perl5
 
 PORTDOCS=	ftrack.faq readme report.err
 
diff --git a/mail/libdkim/Makefile b/mail/libdkim/Makefile
index b7e456563000..004466a9623d 100644
--- a/mail/libdkim/Makefile
+++ b/mail/libdkim/Makefile
@@ -11,7 +11,7 @@ COMMENT=	DKIM (DomainKeys Identified Mail) library
 
 LICENSE=	APACHE20
 
-USE_ZIP=	YES
+USES=		zip
 USE_LDCONFIG=	YES
 SHLIB_MAJOR=	1
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
diff --git a/mail/p5-SES/Makefile b/mail/p5-SES/Makefile
index a5d804d1d330..90897ecdbee3 100644
--- a/mail/p5-SES/Makefile
+++ b/mail/p5-SES/Makefile
@@ -20,10 +20,9 @@ RUN_DEPENDS=	p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
 		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
 		p5-libwww>=6:${PORTSDIR}/www/p5-libwww
 
-USES=		perl5 shebangfix
+USES=		perl5 shebangfix zip
 NO_BUILD=	yes
 USE_PERL5=	run
-USE_ZIP=	yes
 
 WRKSRC=		${WRKDIR}/bin
 
diff --git a/mail/popfile/Makefile b/mail/popfile/Makefile
index f5a8e72e56be..3db3338f7fe0 100644
--- a/mail/popfile/Makefile
+++ b/mail/popfile/Makefile
@@ -33,8 +33,7 @@ MECABU_DESC=	\
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-USES=		perl5
-USE_ZIP=	yes
+USES=		perl5 zip
 USE_PERL5=	run
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
diff --git a/mail/py-Products.MailHost/Makefile b/mail/py-Products.MailHost/Makefile
index 8a7dba1f583b..5751cc68750b 100644
--- a/mail/py-Products.MailHost/Makefile
+++ b/mail/py-Products.MailHost/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Zope.sendmail integration for Zope 2
 
 LICENSE=	ZPL21
 
+USEs=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/mail/py-Products.SecureMailHost/Makefile b/mail/py-Products.SecureMailHost/Makefile
index a40491bc6fdf..0ae61ea5a059 100644
--- a/mail/py-Products.SecureMailHost/Makefile
+++ b/mail/py-Products.SecureMailHost/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Reimplementation of the standard Zope2 MailHost
 
 LICENSE=	ZPL21
 
+USZS=		zip
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
-USE_ZIP=		yes
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-mobilecube/Makefile b/mail/roundcube-mobilecube/Makefile
index 19a64d797b89..a4565f6aae39 100644
--- a/mail/roundcube-mobilecube/Makefile
+++ b/mail/roundcube-mobilecube/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	roundcube>=0.3:${PORTSDIR}/mail/roundcube
 THEME_VERSION?=	3.1.0
 THEME_BUILD?=	030110A
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/MobileCubeBeta\#${THEME_BUILD}
diff --git a/mail/thunderbird-dictionaries/Makefile b/mail/thunderbird-dictionaries/Makefile
index 10ac82fa6355..a8ab1bd00253 100644
--- a/mail/thunderbird-dictionaries/Makefile
+++ b/mail/thunderbird-dictionaries/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Dictionaries for Mozilla Thunderbird
 
 RUN_DEPENDS=	thunderbird>=6.0:${PORTSDIR}/mail/thunderbird
 
-USE_ZIP=	yes
+USES=		zip
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/dictionaries
 
diff --git a/mail/uebimiau/Makefile b/mail/uebimiau/Makefile
index b16964244c22..9b5b7a3d7bf5 100644
--- a/mail/uebimiau/Makefile
+++ b/mail/uebimiau/Makefile
@@ -12,7 +12,7 @@ COMMENT=	UebiMiau is a simple yet efficient WebMail written in PHP
 
 WRKSRC=		${WRKDIR}/webmail
 
-USE_ZIP=	yes
+USES=		zip
 USE_PHP=	pcre
 WANT_PHP_MOD=	yes
 NO_BUILD=	yes