Remove all USE_OPENSSL occurrences.

Sponsored by: Absolight
svn path=/head/; revision=436247
2017-03-15 14:45:30 +00:00 · 2017-03-15 14:45:30 +00:00 · a28f0f7f7f · 2021-03-31 03:12:20 +00:00
commit a28f0f7f7f
parent c285e43283
257 changed files with 272 additions and 477 deletions
--- a/archivers/py-attic/Makefile
+++ b/archivers/py-attic/Makefile
@ -17,9 +17,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python

-USES=		python:3.3+
+USES=		python:3.3+ ssl
 USE_PYTHON=	autoplist distutils
-USE_OPENSSL=	yes

 STRIP_FILES=	hashindex.so platform_freebsd.so chunker.so crypto.so
 PYDISTUTILS_BUILDPATH=${BUILD_WRKSRC}/build/lib.${OPSYS:tl}-${UNAMER}-${ARCH}-${PYTHON_VER}
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@ -16,8 +16,7 @@ BUILD_DEPENDS=	re>=0.4.14:audio/re \
 		rem>=0.4.7:audio/rem
 RUN_DEPENDS:=	${BUILD_DEPENDS}

-USES=		gmake pkgconfig
-USE_OPENSSL=	yes
+USES=		gmake pkgconfig ssl
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ilbc
 MAKE_ARGS=	MOD_AUTODETECT=""
 PLIST_FILES=	bin/baresip
--- a/audio/libshairport/Makefile
+++ b/audio/libshairport/Makefile
@ -13,9 +13,8 @@ COMMENT=	Airport Extreme Emulator

 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		autoreconf gmake libtool
+USES=		autoreconf gmake libtool ssl
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes

 CPPFLAGS+=	-isystem${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
--- a/audio/rem/Makefile
+++ b/audio/rem/Makefile
@ -14,9 +14,8 @@ LICENSE_FILE=	${WRKSRC}/docs/COPYING
 BUILD_DEPENDS=	${LOCALBASE}/share/re/re.mk:audio/re
 RUN_DEPENDS:=	${BUILD_DEPENDS}

-USES=		gmake
+USES=		gmake ssl
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes

 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
--- a/audio/shairport/Makefile
+++ b/audio/shairport/Makefile
@ -18,9 +18,8 @@ RUN_DEPENDS=	p5-MIME-Base64>=0:converters/p5-MIME-Base64 \
 		p5-HTTP-Message>=0:www/p5-HTTP-Message \
 		avahi-publish-service:net/avahi-app

-USES=		gmake perl5 pkgconfig
+USES=		gmake perl5 pkgconfig ssl
 USE_PERL5=	run
-USE_OPENSSL=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	miks
 GH_TAGNAME=	b1cb9ea
--- a/audio/umurmur/Makefile
+++ b/audio/umurmur/Makefile
@ -16,9 +16,8 @@ LIB_DEPENDS=	libconfig.so:devel/libconfig \

 USE_GITHUB=	yes

-USES=		autoreconf gmake libtool
+USES=		autoreconf gmake libtool ssl
 GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--with-ssl=openssl

 USE_RC_SUBR=	umurmur
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@ -10,9 +10,8 @@ COMMENT=	Tool for measuring webserver performance

 LICENSE=	GPLv2

-USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-USES=		autoreconf gmake libtool
+USES=		autoreconf gmake libtool ssl
 USE_GITHUB=	yes
 GH_TAGNAME=	dcfb746
 MAKE_ARGS=	LIBUTIL_OBJS=ssl_writev.o \
--- a/benchmarks/siege/Makefile
+++ b/benchmarks/siege/Makefile
@ -12,8 +12,7 @@ COMMENT=	HTTP regression testing and benchmarking utility

 LICENSE=	GPLv2

-USES=		autoreconf libtool perl5
-USE_OPENSSL=	yes
+USES=		autoreconf libtool perl5 ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PERL="${PERL}"
 CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE} --disable-shared \
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@ -19,7 +19,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-master=${DEFAULTHOST} --with-port=${DEFAULTPORT} \
 		--with-pam --with-libwrap --with-openssl

-USE_OPENSSL=	yes
+USES=		ssl
 USE_RC_SUBR=	conserver

 OPTIONS_DEFINE=	FREEIPMI GSSAPI GSSAPIONLY STRIPREALM UDS
--- a/databases/galera/Makefile
+++ b/databases/galera/Makefile
@ -18,12 +18,11 @@ BUILD_DEPENDS=	checkmk:devel/check \
 		${PYTHON_PKGNAMEPREFIX}cloud_sptheme>=0:textproc/py-cloud_sptheme
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs

-USES=		execinfo python:build scons shebangfix
+USES=		execinfo python:build scons shebangfix ssl

 USE_CXXSTD=	c++11
 USE_GCC=	yes
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes

 LDFLAGS+=	-lboost_program_options -lboost_system
 MAKE_ARGS+=	--config=force
--- a/databases/libdrizzle-redux/Makefile
+++ b/databases/libdrizzle-redux/Makefile
@ -16,9 +16,8 @@ COMMENT=	Client and protocol library for the Drizzle database
 LICENSE=	BSD2CLAUSE

 GNU_CONFIGURE=	yes
-USES=		gmake libtool
+USES=		gmake libtool ssl
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes

 CONFLICTS=	libdrizzle-[0-9]*

--- a/databases/mongodb/Makefile
+++ b/databases/mongodb/Makefile
@ -45,7 +45,7 @@ PORTSCOUT=	limitw:1,even
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MSSL}
-USE_OPENSSL=	yes
+USES+=		ssl
 MAKE_ARGS+=	--ssl
 .endif

--- a/databases/pgbouncer/Makefile
+++ b/databases/pgbouncer/Makefile
@ -24,8 +24,7 @@ GROUPS=		pgbouncer
 USE_RC_SUBR=	pgbouncer

 GNU_CONFIGURE=	yes
-USES=		gmake
-USE_OPENSSL=	yes
+USES=		gmake ssl

 CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} --enable-evdns
 CONFIGURE_ENV+=	PTHREAD_LIBS="-lpthread"
--- a/databases/pgpool-II/Makefile
+++ b/databases/pgpool-II/Makefile
@ -15,9 +15,8 @@ LICENSE=	MIT

 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gmake pgsql:9.2 libtool
+USES=		gmake pgsql:9.2 libtool ssl
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--with-openssl

 CONFLICTS=	pgpool-3.* pgpool-II-22-* pgpool-II-23-* pgpool-II-23-*
@ -28,15 +27,10 @@ PORTDOCS+=	TODO
 PORTDOCShtml=	pgpool-en.html pgpool-ja.html pgpool.css
 PORTDOCShtml+=	tutorial-en.html tutorial-ja.html

-OPTIONS_DEFINE+=	DOCS SSL
+OPTIONS_DEFINE+=	DOCS

 .include <bsd.port.options.mk>

-.if ${PORT_OPTIONS:MSSL}
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=--with-openssl
-.endif
-
 .if exists(${LOCALBASE}/include/postgresql/server/replication/walreceiver.h)
 FUNCTIONS=	pgpool-recovery pgpool-regclass pgpool-walrecrunning
 PLIST_SUB=	PGSQL9=""
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@ -27,9 +27,8 @@ BROKEN_sparc64=		Does not compile: error: DV_INT_TAG_WORD undeclared
 NOT_FOR_ARCHS=	arm armv6 i386 mips powerpc
 NOT_FOR_ARCHS_REASON=	can only be built on 64bit platforms

-USES=		execinfo gmake libtool readline uidfix
+USES=		execinfo gmake libtool readline uidfix ssl
 USE_AUTOTOOLS=	autoheader aclocal
-USE_OPENSSL=	yes

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-readline\
--- a/deskutils/growl-for-linux/Makefile
+++ b/deskutils/growl-for-linux/Makefile
@ -31,10 +31,9 @@ OPTIONS_DEFINE=	LIBNOTIFY

 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,^${PREFIX}/,,}

-USES=		autoreconf compiler:nestedfct libtool pkgconfig sqlite:3
+USES=		autoreconf compiler:nestedfct libtool pkgconfig sqlite:3 ssl
 USE_GITHUB=	yes
 USE_GNOME=	gtk20
-USE_OPENSSL=	yes

 post-patch:
 	@${REINPLACE_CMD} '/^gol_LDADD =/s/$$/ -lgmodule-2.0/' \
--- a/deskutils/qtm/Makefile
+++ b/deskutils/qtm/Makefile
@ -12,10 +12,9 @@ COMMENT=	Blog management application based on Qt 4
 LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/COPYING

-USES=		cmake tar:bzip2
+USES=		cmake tar:bzip2 ssl
 USE_QT4=	corelib dbus gui network xml \
 		moc_build qmake_build rcc_build uic_build
-USE_OPENSSL=	yes
 CMAKE_ARGS=	-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \
 		-DMANPAGE_DIRECTORY:STRING="${MANPREFIX}/man/man1" \
 		-DMARKDOWN_LOCATION:STRING="${LOCALBASE}/bin/markdown"
--- a/devel/dcmtk/Makefile
+++ b/devel/dcmtk/Makefile
@ -15,8 +15,7 @@ LIB_DEPENDS=	libtiff.so:graphics/tiff \

 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
-USES=		cmake:outsource jpeg
+USES=		cmake:outsource jpeg ssl
 CMAKE_ARGS+=	-DDCMTK_WITH_DOXYGEN:BOOL=OFF \
 		-DDCMTK_WITH_OPENSSL:BOOL=ON

--- a/devel/gdcm/Makefile
+++ b/devel/gdcm/Makefile
@ -48,8 +48,7 @@ GDCM_PATCH=	3
 VTK5_VERSION=	5.10
 VTK6_VERSION=	6.2

-USES=		alias cmake:outsource tar:bzip2
-USE_OPENSSL=	yes
+USES=		alias cmake:outsource tar:bzip2 ssl
 USE_LDCONFIG=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 CMAKE_ARGS=	-DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@ -17,10 +17,9 @@ USES=		tar:bzip2

 RUN_DEPENDS=	update-mime-database:misc/shared-mime-info

-USES+=		gettext gmake libtool:keepla pathfix pkgconfig
+USES+=		gettext gmake libtool:keepla pathfix pkgconfig ssl
 USE_GNOME=	gconf2 gnomemimedata intlhack referencehack
 INSTALL_TARGET=	install-strip
-USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-openssl \
--- a/devel/libepp-nicbr/Makefile
+++ b/devel/libepp-nicbr/Makefile
@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3

-USE_OPENSSL=	yes
+USES=		ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_cppunit_TestRunner_h=no
 CONFIGURE_ARGS=	--with-xerces-c=${LOCALBASE} \
--- a/devel/libewf/Makefile
+++ b/devel/libewf/Makefile
@ -16,9 +16,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid

-USES=		fuse gettext iconv libtool:keepla pathfix pkgconfig python:2
+USES=		fuse gettext iconv libtool:keepla pathfix pkgconfig python:2 ssl
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} --with-libuuid=${LOCALBASE} ${ICONV_CONFIGURE_ARG} --with-libsmdev=no
--- a/devel/libgit2/Makefile
+++ b/devel/libgit2/Makefile
@ -13,9 +13,8 @@ LICENSE=	GPLv2
 USE_GITHUB=	yes
 GH_ACCOUNT=	libgit2

-USES=		cmake pathfix pkgconfig python:build
+USES=		cmake pathfix pkgconfig python:build ssl
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes

 PLIST_SUB=	PORTVERSION=${PORTVERSION} SHLIB_VER=${PORTVERSION:R:E}

--- a/devel/libiqxmlrpc/Makefile
+++ b/devel/libiqxmlrpc/Makefile
@ -21,10 +21,9 @@ DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CMAKE_OFF=	-Dbuild_docs=off

 USE_GNOME=	libxml2
-USES=		cmake tar:bzip2
+USES=		cmake tar:bzip2 ssl
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes

 PORTDOCS=	*

--- a/devel/libmowgli2/Makefile
+++ b/devel/libmowgli2/Makefile
@ -14,9 +14,8 @@ GH_ACCOUNT=	atheme
 GH_PROJECT=	libmowgli-2

 GNU_CONFIGURE=	yes
-USES=		gmake pathfix
+USES=		gmake pathfix ssl
 PATHFIX_MAKEFILEIN=	Makefile
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes

 .include <bsd.port.mk>
--- a/devel/libsmraw/Makefile
+++ b/devel/libsmraw/Makefile
@ -14,8 +14,7 @@ LICENSE=	LGPL3+

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE}
-USES=		fuse gettext libtool pathfix pkgconfig python
-USE_OPENSSL=	yes
+USES=		fuse gettext libtool pathfix pkgconfig python ssl
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 LIBS+=		-L${OPENSSLLIB}
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@ -18,9 +18,8 @@ LICENSE_FILE_LGPL20=	${WRKSRC}/LICENSE-LGPL
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-optimize --with-ssl=${OPENSSLBASE}
 MAKE_ARGS=	INSTDIR=${STAGEDIR}${PREFIX} SHARED_INSTDIR=${STAGEDIR}${PREFIX}
-USES=		gmake ncurses readline
+USES=		gmake ncurses readline ssl
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}

 OPTIONS_DEFINE=	DEBUG DOCS EXAMPLES GTK1 TCL X11
--- a/devel/omniORB-4.1/Makefile
+++ b/devel/omniORB-4.1/Makefile
@ -18,8 +18,7 @@ CONFLICTS=	omniORB-4.2.*

 PLIST_SUB+=	SONUM=${PORTVERSION:C/.*\.//}
 GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes
-USES=		gmake pkgconfig python tar:bzip2
+USES=		gmake pkgconfig python tar:bzip2 ssl
 USE_LDCONFIG=	yes
 MAKEFILE=	GNUmakefile
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@ -14,8 +14,7 @@ LICENSE=	GPLv2
 CONFLICTS=	omniORB41-4.1.*
 PLIST_SUB+=	SONUM=1
 GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes
-USES=		gmake pkgconfig python tar:bzip2
+USES=		gmake pkgconfig python tar:bzip2 ssl
 USE_LDCONFIG=	yes
 MAKEFILE=	GNUmakefile
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
--- a/devel/pecl-event/Makefile
+++ b/devel/pecl-event/Makefile
@ -17,8 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 LIB_DEPENDS=	libevent.so:devel/libevent

-USES=		php:ext tar:tgz
-USE_OPENSSL=	yes
+USES=		php:ext tar:tgz ssl
 CONFIGURE_ARGS=	--with-openssl-dir=${OPENSSLBASE}
 USE_PHP=	sockets:build

--- a/devel/poco-ssl/Makefile
+++ b/devel/poco-ssl/Makefile
@ -18,11 +18,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 CONFLICTS=	poco-[0-9]*

-USES=		gmake tar:bzip2
+USES=		gmake tar:bzip2 ssl
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --config=FreeBSD
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes

 OPTIONS_DEFINE=	TEST SAMPLES MYSQL SQLITE ODBC
 OPTIONS_DEFAULT=MYSQL SQLITE
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@ -19,11 +19,10 @@ CONFLICTS=	ptlib-2.*

 WRKSRC=		${WRKDIR}/ptlib_v${PORTVERSION:S/./_/g}

-USES=		bison gmake
+USES=		bison gmake ssl
 USE_GCC=	any
 USE_AUTOTOOLS=	autoconf
 WANT_GNOME=	yes
-USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes

--- a/devel/py-omniorb-3/Makefile
+++ b/devel/py-omniorb-3/Makefile
@ -29,12 +29,11 @@ PLIST_SUB=	SONUM=${PORTVERSION:C/.*\.//}

 OMNIORB_WRKSRC!=	cd ${.CURDIR}/../omniORB-4.1 && ${MAKE} -V WRKSRC

-USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 MAKEFILE=	GNUmakefile
 USE_LDCONFIG=	yes
-USES=		gmake python tar:bzip2
+USES=		gmake python tar:bzip2 ssl

 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE} --with-omniorb=${LOCALBASE}
--- a/devel/py-omniorb/Makefile
+++ b/devel/py-omniorb/Makefile
@ -28,12 +28,11 @@ PLIST_SUB=	SONUM=2
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-2//}
 OMNIORB_WRKSRC!=	cd ${.CURDIR}/../omniORB && ${MAKE} -V WRKSRC

-USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 MAKEFILE=	GNUmakefile
 USE_LDCONFIG=	yes
-USES=		gmake python tar:bzip2
+USES=		gmake python tar:bzip2 ssl

 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE} --with-omniorb=${LOCALBASE}
--- a/devel/subcommander2/Makefile
+++ b/devel/subcommander2/Makefile
@ -20,11 +20,10 @@ CONFLICTS=	subcommander-1.*

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R:S,.b,b,}p${PORTVERSION:E}

-USES=		autoreconf gmake dos2unix
+USES=		autoreconf gmake dos2unix ssl
 DOS2UNIX_GLOB=	*.cpp *.h
 USE_QT4=	corelib gui network qt3support moc_build rcc_build uic_build
 QT_NONSTANDARD=	yes
-USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-boost=${LOCALBASE}/include \
 		--with-subversion=${LOCALBASE} --with-qt=${PREFIX} \
--- a/devel/tcltls/Makefile
+++ b/devel/tcltls/Makefile
@ -18,8 +18,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

 OPTIONS_DEFINE=	DOCS

-USES+=		tcl:tea
-USE_OPENSSL=	yes
+USES+=		tcl:tea ssl
 CONFIGURE_ARGS+=--with-ssl-dir=${OPENSSLBASE}

 WRKSRC=		${WRKDIR}/${TCL_PKG}
--- a/devel/uatraits/Makefile
+++ b/devel/uatraits/Makefile
@ -16,9 +16,8 @@ LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
 		libpcre.so:devel/pcre \
 		libxml2.so:textproc/libxml2

-USES=		autoreconf libtool pkgconfig python
+USES=		autoreconf libtool pkgconfig python ssl
 GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes
 USE_LDCONFIG=	yes

 CONFIGURE_ARGS=	--with-boost-prefix=${LOCALBASE} \
--- a/devel/ucommon/Makefile
+++ b/devel/ucommon/Makefile
@ -12,11 +12,10 @@ COMMENT=	Very lightweight C++ design pattern library
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER

-USES=		compiler:c++11-lib cmake:outsource pathfix pkgconfig
+USES=		compiler:c++11-lib cmake:outsource pathfix pkgconfig ssl
 CMAKE_ARGS=	-DBUILD_TESTING:BOOL=ON \
 		-DCMAKE_INSTALL_BINDIR:STRING=bin/${PORTNAME}
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
 TEST_TARGET=	test

 post-install:
--- a/devel/xmltooling/Makefile
+++ b/devel/xmltooling/Makefile
@ -19,9 +19,8 @@ BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-log4shib=${LOCALBASE} --with-openssl=${OPENSSLBASE} --with-curl=${LOCALBASE} --disable-doxygen-doc
-USES=		gmake libtool pkgconfig tar:bzip2
+USES=		gmake libtool pkgconfig tar:bzip2 ssl
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes

 PORTDOCS=	*

--- a/dns/bundy/Makefile
+++ b/dns/bundy/Makefile
@ -30,9 +30,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	bundy-dns
 GH_TAGNAME=	d310c5d

-USE_OPENSSL=	yes
-
-USES=	compiler:c++11-lang pathfix pkgconfig libtool python:3 autoreconf
+USES=	compiler:c++11-lang pathfix pkgconfig libtool python:3 autoreconf ssl

 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
--- a/dns/credns/Makefile
+++ b/dns/credns/Makefile
@ -33,7 +33,7 @@ PLIST_SUB=	CREDNSUSER=${USERS} \
 		CREDNSDBDIR=${CREDNSDBDIR} \
 		CREDNSRUNDIR=${CREDNSRUNDIR}

-USE_OPENSSL=	yes
+USES=		ssl

 PORTDOCS=	*

--- a/dns/mydns/Makefile
+++ b/dns/mydns/Makefile
@ -34,7 +34,7 @@ CONFIGURE_ARGS+=--enable-alias
 .endif

 .if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL=	yes
+USES+=		ssl
 CONFIGURE_ARGS+=--with-openssl \
 		--with-openssl-include=${OPENSSLINC} \
 		--with-openssl-lib=${OPENSSLLIB}
--- a/dns/samba-nsupdate/Makefile
+++ b/dns/samba-nsupdate/Makefile
@ -19,7 +19,7 @@ ISCVERSION=		9.8.6
 MAKE_JOBS_UNSAFE=	yes

 USE_AUTOTOOLS=		autoconf autoheader
-USE_OPENSSL=		yes
+USES=			ssl
 GNU_CONFIGURE=		yes

 CONFIGURE_ARGS+=	\
--- a/dns/validns/Makefile
+++ b/dns/validns/Makefile
@ -14,7 +14,7 @@ LICENSE=	BSD2CLAUSE

 LIB_DEPENDS=	libJudy.so:devel/judy

-USE_OPENSSL=	yes
+USES=		ssl

 ALL_TARGET=

--- a/finance/vanitygen/Makefile
+++ b/finance/vanitygen/Makefile
@ -17,8 +17,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	samr7
 GH_TAGNAME=	cd1a728

-USES=		gmake
-USE_OPENSSL=	yes
+USES=		gmake ssl
 ALL_TARGET=	most

 PLIST_FILES=	bin/keyconv bin/vanitygen
--- a/ftp/bsdftpd-ssl/Makefile
+++ b/ftp/bsdftpd-ssl/Makefile
@ -11,7 +11,7 @@ MASTER_SITES=	http://www.sourcefiles.org/System/Daemons/FTP/ \
 MAINTAINER=	skynick@mail.sc.ru
 COMMENT=	Secure FTP client/server with TLS/SSL support

-USE_OPENSSL=	yes
+USES=		ssl
 MAKE_ENV+=	OBJFORMAT=elf
 MAKE_JOBS_UNSAFE=	yes

--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@ -12,10 +12,9 @@ COMMENT=	Free multithreaded GTK-based FTP and SFTP client

 LICENSE=	GPLv2

-USES=		pathfix pkgconfig tar:bzip2
+USES=		pathfix pkgconfig tar:bzip2 ssl
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk20
-USE_OPENSSL=	yes

 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@ -13,8 +13,7 @@ COMMENT=	HTTP, FTP, and Gopher mirroring tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

-USES=		localbase tar:bzip2
-USE_OPENSSL=	yes
+USES=		localbase tar:bzip2 ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-locale-dir=${PREFIX}/share/locale \
 		--disable-debug --disable-gnome --disable-js \
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@ -53,7 +53,7 @@ USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes

 .if !defined(_BUILDING_PROFTPD_MODULE)
-USE_OPENSSL=	yes
+USES+=		ssl
 USE_RC_SUBR=	proftpd
 .endif

--- a/ftp/tnftp/Makefile
+++ b/ftp/tnftp/Makefile
@ -9,9 +9,8 @@ MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Enhanced ftp client from NetBSD

-USES=		ncurses
+USES=		ncurses ssl
 GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes

 PLIST_FILES=	bin/tnftp man/man1/tnftp.1.gz

--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@ -13,9 +13,8 @@ COMMENT=	Download manager
 LIB_DEPENDS=	libcurl.so:ftp/curl

 GNU_CONFIGURE=	yes
-USES=		dos2unix libtool pkgconfig
+USES=		dos2unix libtool pkgconfig ssl
 USE_GNOME=	gtk20
-USE_OPENSSL=	yes

 OPTIONS_DEFINE=	DOCS NLS
 NLS_USES=	gettext
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@ -53,7 +53,7 @@ PSL_LIB_DEPENDS=	libpsl.so:dns/libpsl
 CONFIGURE_ARGS+=--with-included-libunistring

 .if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL=	yes
+USES+=		ssl
 CONFIGURE_ARGS+=--with-ssl=openssl --with-libssl-prefix=${OPENSSLBASE}
 CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
--- a/ftp/yafc/Makefile
+++ b/ftp/yafc/Makefile
@ -15,8 +15,7 @@ LICENSE=	GPLv2+
 OPTIONS_DEFINE=	BASH EXAMPLES NLS SSH READLINE
 OPTIONS_DEFAULT=BASH SSH

-USES=		gmake tar:xz
-USE_OPENSSL=	yes
+USES=		gmake tar:xz ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_ipv6=yes
 CONFIGURE_ARGS=	--with-socks=no --with-socks5=no --with-krb4=no \
--- a/games/gtkevemon/Makefile
+++ b/games/gtkevemon/Makefile
@ -14,9 +14,8 @@ LIB_DEPENDS=	libgtkmm-3.0.so:x11-toolkits/gtkmm30 \
 USE_GITHUB=     yes
 GH_TAGNAME=     ac2ca34

-USES=		pkgconfig:both gmake
+USES=		pkgconfig:both gmake ssl
 USE_GNOME=	gtk30 libxml2
-USE_OPENSSL=	yes

 .include <bsd.port.pre.mk>

--- a/games/ldmud/Makefile
+++ b/games/ldmud/Makefile
@ -16,8 +16,7 @@ BUILD_DEPENDS=	help2man:misc/help2man
 LIB_DEPENDS=	libpcre.so:devel/pcre

 GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes
-USES=		iconv pkgconfig
+USES=		iconv pkgconfig ssl
 CONFIGURE_ARGS+=--libdir=${DATADIR} \
 		--bindir=${PREFIX}/sbin \
 		--enable-use-pcre \
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@ -49,7 +49,7 @@ GTK1_CONFIGURE_ON=	--with-gtk1
 .include <bsd.port.options.mk>

 .if ! ${PORT_OPTIONS:MGNUTLS}
-USE_OPENSSL=	yes
+USES+=	ssl
 .endif

 .if ${PORT_OPTIONS:MGTK1}
--- a/graphics/zathura-cb/Makefile
+++ b/graphics/zathura-cb/Makefile
@ -17,9 +17,8 @@ RUN_DEPENDS=	zathura:graphics/zathura

 PLIST_FILES=	lib/zathura/cb.so share/applications/zathura-cb.desktop

-USES=		compiler:c11 desktop-file-utils gmake pkgconfig libarchive
+USES=		compiler:c11 desktop-file-utils gmake pkgconfig libarchive ssl
 USE_GNOME=	glib20 gtk30
-USE_OPENSSL=	yes

 post-install:
 	${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/zathura/cb.so
--- a/graphics/zathura-ps/Makefile
+++ b/graphics/zathura-ps/Makefile
@ -16,9 +16,8 @@ LIB_DEPENDS=	libspectre.so:print/libspectre
 BUILD_DEPENDS=	zathura:graphics/zathura
 RUN_DEPENDS=	zathura:graphics/zathura

-USES=		compiler:c11 desktop-file-utils gmake pkgconfig
+USES=		compiler:c11 desktop-file-utils gmake pkgconfig ssl
 USE_GNOME=	glib20 gtk30
-USE_OPENSSL=	yes

 PLIST_FILES=	lib/zathura/ps.so share/applications/zathura-ps.desktop

--- a/irc/eggdrop-devel/Makefile
+++ b/irc/eggdrop-devel/Makefile
@ -14,8 +14,7 @@ COMMENT=	The most popular open source Internet Relay Chat bot

 LICENSE=	GPLv2

-USES=		tcl:85+
-USE_OPENSSL=	yes
+USES=		tcl:85+ ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_SHLIB_VER}.so \
 		--with-tclinc=${LOCALBASE}/include/tcl${TCL_VER}/tcl.h
--- a/irc/epic4/Makefile
+++ b/irc/epic4/Makefile
@ -21,9 +21,8 @@ LICENSE=	BSD3CLAUSE
 CONFLICTS=	epic5-0.[0-2]*

 GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-USES=		ncurses tar:bzip2
+USES=		ncurses tar:bzip2 ssl
 CFLAGS:=	${CFLAGS:C/-O2/-g -O/g}

 OPTIONS_DEFINE=	IPV6 TCL PERL SSL DOCS
--- a/irc/psybnc/Makefile
+++ b/irc/psybnc/Makefile
@ -15,8 +15,7 @@ LICENSE=	GPLv1+ # though COPYING is GPLv2

 BROKEN_powerpc64=	Does not build

-USE_OPENSSL=	yes
-USES=		dos2unix
+USES=		dos2unix ssl
 DOS2UNIX_GLOB=	*.c *.h
 WRKSRC=		${WRKDIR}/psybnc
 PSYBASE?=	${PREFIX}/psybnc
--- a/irc/xaric/Makefile
+++ b/irc/xaric/Makefile
@ -10,8 +10,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IRC Client similer to BitchX or ircII

 GNU_CONFIGURE=	yes
-USES=		gmake ncurses pathfix
-USE_OPENSSL=	yes
+USES=		gmake ncurses pathfix ssl

 post-patch:
 	@${REINPLACE_CMD} -e 's|-ggdb3||g' ${WRKSRC}/Makefile.in
--- a/lang/erlang-riak/Makefile
+++ b/lang/erlang-riak/Makefile
@ -14,10 +14,9 @@ WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}

 ERL_RELEASE=	R16B02-basho5

-USES=		gmake ncurses perl5
+USES=		gmake ncurses perl5 ssl
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes

 CONFIGURE_ARGS+=--with-ssl=/usr \
 		--disable-hipe \
--- a/lang/mosh/Makefile
+++ b/lang/mosh/Makefile
@ -23,8 +23,7 @@ LIB_DEPENDS=	libgmp.so:math/gmp \

 CONFLICTS_INSTALL=	mosh-1.[0-9].*

-USES=		gmake
-USE_OPENSSL=	yes
+USES=		gmake ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/lib

--- a/lang/php56/Makefile.ext
+++ b/lang/php56/Makefile.ext
@ -86,7 +86,7 @@ CONFIGURE_ARGS+=--enable-ftp \
 		--with-openssl-dir=${OPENSSLBASE}

 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
-USE_OPENSSL=	yes
+USES+=		ssl
 .endif

 .if ${PHP_MODNAME} == "gd"
@ -144,7 +144,7 @@ CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
 		--with-imap-ssl=${OPENSSLBASE}

 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
-USE_OPENSSL=	yes
+USES+=	ssl
 .endif

 .if ${PHP_MODNAME} == "interbase"
@ -218,7 +218,7 @@ CONFIGURE_ARGS+=--enable-odbc \
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}

 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
-USE_OPENSSL=	yes
+USES+=	ssl
 .endif

 .if ${PHP_MODNAME} == "opcache"
@ -344,7 +344,7 @@ CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"

 LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
-USE_OPENSSL=	yes
+USES+=	ssl
 .endif

 .if ${PHP_MODNAME} == "soap"
--- a/lang/php70/Makefile.ext
+++ b/lang/php70/Makefile.ext
@ -86,7 +86,7 @@ CONFIGURE_ARGS+=--enable-ftp \
 		--with-openssl-dir=${OPENSSLBASE}

 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
-USE_OPENSSL=	yes
+USES+=		ssl
 .endif

 .if ${PHP_MODNAME} == "gd"
@ -144,7 +144,7 @@ CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
 		--with-imap-ssl=${OPENSSLBASE}

 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
-USE_OPENSSL=	yes
+USES+=	ssl
 .endif

 .if ${PHP_MODNAME} == "interbase"
@ -210,7 +210,7 @@ CONFIGURE_ARGS+=--enable-odbc \
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}

 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
-USE_OPENSSL=	yes
+USES+=	ssl
 .endif

 .if ${PHP_MODNAME} == "opcache"
@ -336,7 +336,7 @@ CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"

 LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
-USE_OPENSSL=	yes
+USES+=	ssl
 .endif

 .if ${PHP_MODNAME} == "soap"
--- a/lang/php71/Makefile.ext
+++ b/lang/php71/Makefile.ext
@ -86,7 +86,7 @@ CONFIGURE_ARGS+=--enable-ftp \
 		--with-openssl-dir=${OPENSSLBASE}

 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
-USE_OPENSSL=	yes
+USES+=		ssl
 .endif

 .if ${PHP_MODNAME} == "gd"
@ -144,7 +144,7 @@ CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
 		--with-imap-ssl=${OPENSSLBASE}

 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
-USE_OPENSSL=	yes
+USES+=	ssl
 .endif

 .if ${PHP_MODNAME} == "interbase"
@ -210,7 +210,7 @@ CONFIGURE_ARGS+=--enable-odbc \
 CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}

 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
-USE_OPENSSL=	yes
+USES+=	ssl
 .endif

 .if ${PHP_MODNAME} == "opcache"
@ -336,7 +336,7 @@ CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"

 LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
-USE_OPENSSL=	yes
+USES+=	ssl
 .endif

 .if ${PHP_MODNAME} == "soap"
--- a/lang/qore/Makefile
+++ b/lang/qore/Makefile
@ -17,8 +17,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \

 BROKEN_powerpc64=	Does not build

-USES=	gmake iconv libtool:build pathfix autoreconf
-USE_OPENSSL=	yes
+USES=	gmake iconv libtool:build pathfix autoreconf ssl
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
--- a/lang/rubinius/Makefile
+++ b/lang/rubinius/Makefile
@ -48,9 +48,8 @@ LLVM38_DESC=	LLVM 3.8
 LLVM39_DESC=	LLVM 3.9
 LLVM40_DESC=	LLVM 4.0

-USES=		execinfo gmake perl5 readline tar:bzip2 libedit
+USES=		execinfo gmake perl5 readline tar:bzip2 libedit ssl
 USE_LOCALE=	en_US.UTF-8
-USE_OPENSSL=	yes
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=	yes
 USE_PERL5=	build
--- a/lang/ruby21/Makefile
+++ b/lang/ruby21/Makefile
@ -36,8 +36,7 @@ GNU_CONFIGURE=	yes
 # Keep this, else ruby will fail to load libraries dependent of libpthread.
 LIBS+=		-lpthread -L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
-USES=		autoreconf cpe execinfo tar:xz
+USES=		autoreconf cpe execinfo tar:xz ssl
 WRKSRC=		${RUBY_WRKSRC}

 RUBY_VER=		2.1
--- a/lang/urweb/Makefile
+++ b/lang/urweb/Makefile
@ -17,9 +17,8 @@ BUILD_DEPENDS=	mlton:lang/mlton
 CONFIGURE_ENV=	CCARGS="-I${LOCALBASE}/include"

 GNU_CONFIGURE=	yes
-USES=		gmake libtool tar:tgz
+USES=		gmake libtool tar:tgz ssl
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 CFLAGS+=	-pthread

@ -30,7 +29,6 @@ ELISP_DESC=	Install contributed Emacs Lisp

 .include <bsd.port.options.mk>

-USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}

 .if ${PORT_OPTIONS:MELISP}
--- 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
--- 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 \
--- 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}

--- 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

--- 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 \
--- 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 \
--- 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
--- 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
--- 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
--- 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
--- 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}
--- 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

--- 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

--- 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
--- 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:
--- 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

--- 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"
--- 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
--- 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)
--- 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

--- 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
--- 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}

--- 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:
--- 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}"
--- 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
--- 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}"

--- 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
--- 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
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@ -20,9 +20,8 @@ SLAVEDIRS=	misc/amanda-client

 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		charsetfix gmake libtool perl5 pkgconfig
+USES=		charsetfix gmake libtool perl5 pkgconfig ssl
 USE_GNOME=	glib20
-USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--without-amlibexecdir \
--- a/Show More
+++ b/Show More