28 files changed, 28 insertions, 47 deletions

diff --git a/mail/akpop3d/Makefile b/mail/akpop3d/Makefile
index 3ebe011c6653..95c9fef7426c 100644
--- a/mail/akpop3d/Makefile
+++ b/mail/akpop3d/Makefile
@@ -15,7 +15,7 @@ USES=	tar:bzip2
 GNU_CONFIGURE=	yes
 
 .if defined(WITH_SSL)
-USE_OPENSSL=	YES
+USES+=		ssl
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 CPPFLAGS+=	-I${OPENSSLBASE}/include
 LDFLAGS+=	-L${OPENSSLBASE}/lib -lssl -lcrypto
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index dfe653485024..32de32011d53 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -23,10 +23,9 @@ RUN_DEPENDS=	gnome-keyring:security/gnome-keyring
 # Depends on gtkhtml4 (which is being abandonend). When our webkitgtk3
 # in ports gets updated to > 1.10.x, balsa should depend on it.
 USES=		desktop-file-utils gettext gmake iconv pathfix \
-		perl5 pkgconfig tar:bzip2
+		perl5 pkgconfig tar:bzip2 ssl
 USE_GNOME=	gnomeprefix gtkhtml4 intlhack libxslt
 INSTALLS_ICONS=	yes
-USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-threads \
 		--disable-more-warnings \
diff --git a/mail/batv-milter/Makefile b/mail/batv-milter/Makefile
index c29fa4bed55b..4b47d3bda8bd 100644
--- a/mail/batv-milter/Makefile
+++ b/mail/batv-milter/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Milter for BATV (Bounce Address Tag Validation)
 BUILD_DEPENDS+=	${LOCALBASE}/include/libmilter/mfapi.h:mail/libmilter
 .endif
 
-USES=		uidfix
+USES=		uidfix ssl
 USE_RC_SUBR=	milter-batv
-USE_OPENSSL=	TRUE
 
 MAKE_ARGS=	UBINOWN=${UID} UBINGRP=${GID}
 
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index abdb163adb10..8b608386c701 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -56,8 +56,7 @@ CALENDIR=	/var/spool/calendar
 MIMETYPES=	${LOCALBASE}/etc/mime.types
 WITH_TRANSPORT=	local esmtp dsn
 
-USES=		fam gettext gmake libtool perl5 pkgconfig tar:bzip2
-USE_OPENSSL=	yes
+USES=		fam gettext gmake libtool perl5 pkgconfig tar:bzip2 ssl
 USE_SUBMAKE=	yes
 USE_RC_SUBR=	courier
 
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 3e48cb08ffc9..97be8531be4d 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -21,8 +21,7 @@ CONFLICTS_INSTALL=	cyrus-imapd-2.[^3].* cyrus-imapd2[^3]-2.[^3].* \
 
 USE_RC_SUBR=	imapd
 
-USES=		cpe perl5
-USE_OPENSSL=	yes
+USES=		cpe perl5 ssl
 GNU_CONFIGURE=	yes
 CYRUS_PREFIX=	${PREFIX}/cyrus
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index ac0d82c855e6..046f16b3974d 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -22,8 +22,7 @@ CONFLICTS_INSTALL=	cyrus-imapd-2.[^4].* cyrus-imapd2[^4]-2.[^4].* \
 
 USE_RC_SUBR=	imapd
 
-USES=		cpe perl5
-USE_OPENSSL=	yes
+USES=		cpe perl5 ssl
 GNU_CONFIGURE=	yes
 CYRUS_PREFIX=	${PREFIX}/cyrus
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index 1b54e24de1c4..407b879f04ca 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -38,11 +38,10 @@ LDAP_USE=		OPENLDAP=yes
 INSTALL_TARGET=	install-strip
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pkgconfig
+USES=		gmake libtool pkgconfig ssl
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
 USE_GNOME=	glib20
-USE_OPENSSL=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/mail/dma/Makefile b/mail/dma/Makefile
index 07591710c106..b70393bfeb17 100644
--- a/mail/dma/Makefile
+++ b/mail/dma/Makefile
@@ -13,8 +13,7 @@ COMMENT=	DragonFly Mail Agent, a small MTA for local/outbound mail
 
 LICENSE=	BSD3CLAUSE
 
-USE_OPENSSL=	yes
-USES=		uidfix
+USES=		uidfix ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	corecode
diff --git a/mail/enma/Makefile b/mail/enma/Makefile
index 8049ae18e646..359bcdc2220d 100644
--- a/mail/enma/Makefile
+++ b/mail/enma/Makefile
@@ -20,10 +20,9 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ssl-incdir=${OPENSSLINC} \
 		--with-ssl-libdir=${OPENSSLLIB}
 
-USES=		gmake libtool perl5
+USES=		gmake libtool perl5 ssl
 USE_RC_SUBR=	milter-enma
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
 USE_PERL5=	build
 LDFLAGS+=	-lssl
 MANLANG=	"" ja_JP.UTF-8
diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile
index aec60ad21563..2320d03e89fb 100644
--- a/mail/esmtp/Makefile
+++ b/mail/esmtp/Makefile
@@ -14,8 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libesmtp.so:mail/libesmtp
 
-USES=		tar:bzip2 bison
-USE_OPENSSL=	yes
+USES=		tar:bzip2 bison ssl
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	README
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 36efd8996a47..72d88b603c41 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -19,14 +19,13 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
-USES=		cpe gmake shebangfix tar:xz
+USES=		cpe gmake shebangfix tar:xz ssl
 SHEBANG_FILES=	fetchmailconf.py
 
 USE_RC_SUBR=	fetchmail
 SUB_FILES=	pkg-message
 
 GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-SDPS \
 		--without-hesiod --enable-fallback=no \
 		--with-ssl=${OPENSSLBASE}
diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile
index 85d25d5de9ab..c5dc17afede1 100644
--- a/mail/filtermail/Makefile
+++ b/mail/filtermail/Makefile
@@ -23,8 +23,7 @@ EXTRACT_AFTER_ARGS=	| ${SED} 's/[mM][aA][iI][lL][fF][iI][lL][tT][eE][rR]/filterm
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		bison gmake
-USE_OPENSSL=	yes
+USES=		bison gmake ssl
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/mail/gbuffy/Makefile b/mail/gbuffy/Makefile
index 59e713566241..525da3b2d0cd 100644
--- a/mail/gbuffy/Makefile
+++ b/mail/gbuffy/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libPropList.so:devel/libPropList \
 GNU_CONFIGURE=	yes
 LIBS+=		-L${LOCALBASE}/lib
 USE_GNOME=	gtk12
-USE_OPENSSL=	yes
+USES=		ssl
 
 PLIST_FILES=	bin/gbuffy
 
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 96a2141f89f8..208c753b61c8 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -51,7 +51,7 @@ MAKE_ARGS+=	WITH_DRAC=yes
 .if ! ${PORT_OPTIONS:MSSL}
 MAKE_ARGS+=	SSLTYPE=none SSLDIR=${OPENSSLBASE}
 .else
-USE_OPENSSL=	yes
+USES+=		ssl
 .if ${PORT_OPTIONS:MSSL_AND_PLAINTEXT}
 MAKE_ARGS+=	SSLTYPE=unix
 .else
diff --git a/mail/libdkim/Makefile b/mail/libdkim/Makefile
index db897a6f6eb6..00f6d5af3a92 100644
--- a/mail/libdkim/Makefile
+++ b/mail/libdkim/Makefile
@@ -11,13 +11,11 @@ COMMENT=	DKIM (DomainKeys Identified Mail) library
 
 LICENSE=	APACHE20
 
-USES=		uidfix zip
+USES=		uidfix zip ssl
 USE_LDCONFIG=	YES
 SHLIB_MAJOR=	1
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-USE_OPENSSL=	YES
-
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
 post-patch:
diff --git a/mail/libdomainkeys/Makefile b/mail/libdomainkeys/Makefile
index 3b4d61fb7153..93357e5cc929 100644
--- a/mail/libdomainkeys/Makefile
+++ b/mail/libdomainkeys/Makefile
@@ -9,14 +9,12 @@ MASTER_SITES=	SF/domainkeys/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DomainKeys library
 
-USES=		uidfix
+USES=		uidfix ssl
 USE_LDCONFIG=	yes
 SHLIB_MAJOR=	3
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 MAKE_ENV=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-USE_OPENSSL=	yes
-
 post-patch:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile
 
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 842950aa6376..68bd9a02976b 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -39,7 +39,7 @@ NLS_USES=		gettext
 
 GNUTLS_CONFIGURE_ON=	--with-ssl=gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
-OPENSSL_VARS=		USE_OPENSSL=yes
+OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ON=	--with-ssl=openssl
 OPENSSL_CONFIGURE_ENV=	libssl_CFLAGS="-I${OPENSSLINC}" \
 			libssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 72271c7f3fd0..58a74ae7b666 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -43,7 +43,7 @@ MUTT_XFACE_DESC=	Adds mutt X-Face support
 MUTT_FLOCK_DESC=	Use flock() for file locks
 MUTT_ICONV_DESC=	Enable mutt's iconv character conversion feature
 
-USE_OPENSSL=	yes
+USES+=	ssl
 
 .if defined (MUTT_LITE)
 PKGNAMESUFFIX=	14-lite
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 3b509d738c18..239c856f3025 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -61,7 +61,7 @@ OPTIONS_DEFAULT=	SMTP FLOCK
 
 .if ${PORT_OPTIONS:MTLS}
 CONFIGURE_ARGS+=	--with-tls
-USE_OPENSSL=	yes
+USES+=			ssl
 .endif
 
 .if defined(WITH_DEBUG)
diff --git a/mail/panda-cclient/Makefile b/mail/panda-cclient/Makefile
index 8af8d8a30223..1e5b14d7aeb1 100644
--- a/mail/panda-cclient/Makefile
+++ b/mail/panda-cclient/Makefile
@@ -29,7 +29,7 @@ MAKE_JOBS_UNSAFE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
-USE_OPENSSL=	yes
+USES+=		ssl
 PKGMESSAGE=	pkg-message-ssl
 .endif
 
diff --git a/mail/panda-imap/Makefile b/mail/panda-imap/Makefile
index 5226c883ffc1..f6431c12b1a8 100644
--- a/mail/panda-imap/Makefile
+++ b/mail/panda-imap/Makefile
@@ -48,7 +48,7 @@ MAKE_ARGS+=	WITH_DRAC=yes
 .if ! ${PORT_OPTIONS:MSSL}
 MAKE_ARGS+=	SSLTYPE=none SSLDIR=${OPENSSLBASE}
 .else
-USE_OPENSSL=	yes
+USES+=		ssl
 .if ${PORT_OPTIONS:MSSL_AND_PLAINTEXT}
 MAKE_ARGS+=	SSLTYPE=unix
 .else
diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index 9ba7616e24a8..1050f9e8baba 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -15,8 +15,7 @@ LICENSE=	LGPL21
 # The use of libiconv shouldn't be necessary, but a build dependency installs
 # it and we end up picking up the header.
 MAKE_ARGS+=	LIBRARIES_DEPEND_UPON='${ICONV_LIB} -lssl'
-USES=		gnustep iconv
-USE_OPENSSL=	yes
+USES=		gnustep iconv ssl
 USE_GNUSTEP=	back build
 USE_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
diff --git a/mail/pop3proxy/Makefile b/mail/pop3proxy/Makefile
index 97f87184dd63..1c85694f3c1d 100644
--- a/mail/pop3proxy/Makefile
+++ b/mail/pop3proxy/Makefile
@@ -12,8 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	POP3 Proxy Server derived from UP IMAP Proxy
 
 GNU_CONFIGURE=	yes
-USES=		autoreconf
-USE_OPENSSL=	yes
+USES=		autoreconf ssl
 USE_RC_SUBR=	pop3proxyd
 
 post-patch:
diff --git a/mail/popular/Makefile b/mail/popular/Makefile
index b0869b299d47..b9c8fa1e9eda 100644
--- a/mail/popular/Makefile
+++ b/mail/popular/Makefile
@@ -14,9 +14,8 @@ BUILD_DEPENDS=	p5-XML-DOM>=0:textproc/p5-XML-DOM
 
 CONFLICTS=	pserv-[0-9]* synce-librapi2-[0-9]*
 
-USES=		libtool perl5 gmake tar:bzip2
+USES=		libtool perl5 gmake tar:bzip2 ssl
 GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes
 PDM_MODULES=	any master
 CONFIGURE_ARGS=	--without-bdb --disable-docbook --with-confdir=${PREFIX}/etc/popular \
 		--enable-ssl --with-pdm="${PDM_MODULES}"
diff --git a/mail/qmail-tls/Makefile b/mail/qmail-tls/Makefile
index bd5318c03541..bf2df38a3be2 100644
--- a/mail/qmail-tls/Makefile
+++ b/mail/qmail-tls/Makefile
@@ -15,7 +15,7 @@ SLAVE_TLS=	yes
 
 TLS_PATCH_DATE=	20160918
 
-USE_OPENSSL=	yes
+USES=		ssl
 
 # Local overrides
 MASTERDIR=	${.CURDIR}/../qmail
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index bec3d94fb76a..557734ed0604 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR=	qmail
 CONFLICTS?=	qmail-ldap-[0-9]* *qmail-mysql-[0-9]* qmail-spamcontrol-[0-9]* *qmail-tls-[0-9]*
 CONFLICTS+=	qmail-vida-[0-9]*
 
-USES=		qmail:vars fakeroot
+USES+=		qmail:vars fakeroot
 PREFIX?=	${QMAIL_PREFIX}
 PLIST_SUB+=	QMAIL_PREFIX="${PREFIX}"
 
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index ca21753f12af..0a3672d65aaf 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Traps spammers with a very slow smtp-login and return 4xx error
 LICENSE=	BSD2CLAUSE
 
 USE_RC_SUBR?=	obspamd obspamlogd
-USE_OPENSSL=	yes
+USES=		ssl
 
 USERS=		_spamd
 GROUPS=		_spamd
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 826eb8c05517..ada48a0d188d 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -11,9 +11,8 @@ DISTFILES=	${PORTNAME}_${PORTVERSION}.orig${EXTRACT_SUFX}
 MAINTAINER=	aragon@phat.za.net
 COMMENT=	Extremely simple MTA to get mail off the system to a mail hub
 
-USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-USES=		gmake tar:bzip2
+USES=		gmake tar:bzip2 ssl
 GROUPS=		ssmtp
 
 SUB_FILES+=	pkg-message