svn commit: r419843 - in head: archivers/rpm4 audio/jack audio/moc chinese/libpinyin chinese/libtabe chinese/p5-Lingua-ZH-TaBE comms/trustedqsl comms/xastir databases/dbtool databases/evolution-dat...

Mon Aug 8 13:46:58 UTC 2016

Author: mat
Date: Mon Aug  8 13:46:50 2016
New Revision: 419843
URL: https://svnweb.freebsd.org/changeset/ports/419843

Log:
  USE_BDB cleanup.
  
  - USE_BDB=4x+ -> USES=bdb.
  - USE_BDB=yes -> USES=bdb.
  - USE_BDB=xx  -> USES=bdb:xx.
  
  Other modernisations when I see them.
  
  PR:		209183
  Sponsored by:	Absolight

Modified:
  head/archivers/rpm4/Makefile   (contents, props changed)
  head/audio/jack/Makefile   (contents, props changed)
  head/audio/moc/Makefile   (contents, props changed)
  head/chinese/libpinyin/Makefile   (contents, props changed)
  head/chinese/libtabe/Makefile   (contents, props changed)
  head/chinese/p5-Lingua-ZH-TaBE/Makefile   (contents, props changed)
  head/comms/trustedqsl/Makefile   (contents, props changed)
  head/comms/xastir/Makefile   (contents, props changed)
  head/databases/dbtool/Makefile   (contents, props changed)
  head/databases/evolution-data-server/Makefile   (contents, props changed)
  head/databases/fortytwo-bdb/Makefile   (contents, props changed)
  head/databases/libgda4/Makefile   (contents, props changed)
  head/databases/libgda5/Makefile   (contents, props changed)
  head/databases/memcacheq/Makefile   (contents, props changed)
  head/databases/p5-BDB/Makefile   (contents, props changed)
  head/databases/p5-BerkeleyDB/Makefile   (contents, props changed)
  head/databases/py-bsddb/Makefile   (contents, props changed)
  head/databases/rdfdb/Makefile   (contents, props changed)
  head/databases/ruby-bdb/Makefile   (contents, props changed)
  head/devel/ice/Makefile   (contents, props changed)
  head/devel/librcc/Makefile   (contents, props changed)
  head/devel/subversion/Makefile.common   (contents, props changed)
  head/devel/subversion18/Makefile.common   (contents, props changed)
  head/dns/dnshistory/Makefile   (contents, props changed)
  head/dns/fastresolve/Makefile   (contents, props changed)
  head/editors/nvi-devel/Makefile   (contents, props changed)
  head/editors/poedit/Makefile   (contents, props changed)
  head/graphics/fortytwo/Makefile   (contents, props changed)
  head/japanese/mutt-devel/Makefile   (contents, props changed)
  head/lang/gnu-cobol/Makefile   (contents, props changed)
  head/lang/php55/Makefile.ext   (contents, props changed)
  head/lang/php56/Makefile.ext   (contents, props changed)
  head/lang/php70/Makefile.ext   (contents, props changed)
  head/mail/avenger/Makefile   (contents, props changed)
  head/mail/bmf/Makefile   (contents, props changed)
  head/mail/bogofilter/Makefile   (contents, props changed)
  head/mail/dk-milter/Makefile   (contents, props changed)
  head/mail/dovecot/Makefile   (contents, props changed)
  head/mail/drac/Makefile   (contents, props changed)
  head/mail/evolution-ews/Makefile   (contents, props changed)
  head/mail/exim/Makefile   (contents, props changed)
  head/mail/greyfix/Makefile   (contents, props changed)
  head/mail/isync/Makefile   (contents, props changed)
  head/mail/meta1/Makefile   (contents, props changed)
  head/mail/opendkim/Makefile   (contents, props changed)
  head/mail/perdition/Makefile   (contents, props changed)
  head/mail/postfix-current/Makefile   (contents, props changed)
  head/mail/postfix/Makefile   (contents, props changed)
  head/mail/postfix211/Makefile   (contents, props changed)
  head/mail/prayer/Makefile   (contents, props changed)
  head/mail/sendmail/Makefile   (contents, props changed)
  head/mail/spamprobe/Makefile   (contents, props changed)
  head/mail/spmfilter/Makefile   (contents, props changed)
  head/mail/vacation/Makefile   (contents, props changed)
  head/misc/hotkeys/Makefile   (contents, props changed)
  head/net-im/jabberd/Makefile   (contents, props changed)
  head/net-p2p/bitcoin/Makefile   (contents, props changed)
  head/net-p2p/digitalcoin/Makefile   (contents, props changed)
  head/net-p2p/dogecoin/Makefile   (contents, props changed)
  head/net-p2p/jigdo/Makefile   (contents, props changed)
  head/net-p2p/litecoin/Makefile   (contents, props changed)
  head/net-p2p/namecoin/Makefile   (contents, props changed)
  head/net-p2p/twister/Makefile   (contents, props changed)
  head/net-p2p/zetacoin/Makefile   (contents, props changed)
  head/net/netatalk/Makefile   (contents, props changed)
  head/net/openldap24-server/Makefile   (contents, props changed)
  head/news/inn/Makefile   (contents, props changed)
  head/print/panda/Makefile   (contents, props changed)
  head/security/pks/Makefile   (contents, props changed)
  head/security/sks/Makefile   (contents, props changed)
  head/sysutils/apt/Makefile   (contents, props changed)
  head/sysutils/cfengine22/Makefile   (contents, props changed)
  head/sysutils/cfengine32/Makefile   (contents, props changed)
  head/textproc/p5-RDFStore/Makefile   (contents, props changed)
  head/textproc/redland/Makefile   (contents, props changed)
  head/www/c-icap/Makefile   (contents, props changed)
  head/www/crawl/Makefile   (contents, props changed)
  head/www/squidguard/Makefile   (contents, props changed)
  head/www/webalizer/Makefile   (contents, props changed)
  head/www/xshttpd-devel/Makefile   (contents, props changed)

Modified: head/archivers/rpm4/Makefile
==============================================================================

--- head/archivers/rpm4/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/archivers/rpm4/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -26,9 +26,8 @@ NLS_USES=	gettext
 NLS_LIBS=	-lintl
 PORTDOCS=	*
 
-USES=		alias gmake libarchive libtool lua:51 pathfix pkgconfig \
+USES=		alias bdb gmake libarchive libtool lua:51 pathfix pkgconfig \
 		shebangfix tar:bzip2
-USE_BDB=	46+
 INVALID_BDB_VER=51
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

Modified: head/audio/jack/Makefile
==============================================================================
--- head/audio/jack/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/audio/jack/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -21,8 +21,7 @@ LIB_DEPENDS=	libsndfile.so:audio/libsndf
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		gmake pathfix pkgconfig libtool
-USE_BDB=	48+
+USES=		gmake pathfix pkgconfig libtool bdb
 
 CONFIGURE_ARGS=	--disable-portaudio \
 		--with-default-tmpdir=/tmp

Modified: head/audio/moc/Makefile
==============================================================================
--- head/audio/moc/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/audio/moc/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -14,10 +14,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
-USES=		gmake libtool ncurses pkgconfig tar:bzip2
+USES=		bdb gmake libtool ncurses pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_BDB=	yes
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}

Modified: head/chinese/libpinyin/Makefile
==============================================================================
--- head/chinese/libpinyin/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/chinese/libpinyin/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -11,9 +11,8 @@ COMMENT=	Library to deal with pinyin
 
 LICENSE=	GPLv2
 
-USE_BDB=	yes
 USE_GNOME=	glib20
-USES=		gettext gmake libtool pathfix pkgconfig
+USES=		bdb gettext gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 

Modified: head/chinese/libtabe/Makefile
==============================================================================
--- head/chinese/libtabe/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/chinese/libtabe/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -14,10 +14,9 @@ COMMENT=	Unified library for Chinese tex
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake libtool
+USES=		bdb gmake libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_BDB=	yes
 OBSOLETE_BDB_VAR=	USE_DB2
 DATADIR=	${PREFIX}/share/tabe
 DOCSDIR=	${PREFIX}/share/doc/tabe

Modified: head/chinese/p5-Lingua-ZH-TaBE/Makefile
==============================================================================
--- head/chinese/p5-Lingua-ZH-TaBE/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/chinese/p5-Lingua-ZH-TaBE/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -13,10 +13,9 @@ COMMENT=	Chinese processing via libtabe
 
 LIB_DEPENDS=	libtabe.so:chinese/libtabe
 
-USES=		perl5
+USES=		bdb perl5
 USE_PERL5=	configure
 
-USE_BDB=	yes
 OBSOLETE_BDB_VAR=	WITH_DB
 
 CONFIGURE_ARGS=	DB="${BDB_LIB_NAME}"

Modified: head/comms/trustedqsl/Makefile
==============================================================================
--- head/comms/trustedqsl/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/comms/trustedqsl/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -18,15 +18,12 @@ LICENSE_PERMS=	dist-mirror pkg-mirror au
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2
 
-USE_BDB=	5+
-
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-USES=		cmake compiler:c++11-lib pkgconfig
+USES=		bdb:5+ cmake compiler:c++11-lib pkgconfig ssl
 CMAKE_ARGS=	-DBDB_PREFIX=${LOCALBASE}
 USE_WX=		2.8+
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
 
 OPTIONS_DEFINE=	GEN_CRQ LOAD_CERT STATION_LOC CONVERTER
 GEN_CRQ_DESC=	Build gen_crq

Modified: head/comms/xastir/Makefile
==============================================================================
--- head/comms/xastir/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/comms/xastir/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -67,7 +67,7 @@ RTREE_CONFIGURE_WITH=	rtree
 
 ERRORPOP_CONFIGURE_WITH=	errorpopups
 
-BDB_USE=		BDB=41+
+BDB_USES=		bdb
 BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} --with-bdb-libdir=${BDB_LIB_DIR}
 
 OPTCFLAGS_CFLAGS=	-O2 -pipe

Modified: head/databases/dbtool/Makefile
==============================================================================
--- head/databases/dbtool/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/databases/dbtool/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -31,7 +31,7 @@ OPTIONS_SINGLE_BACKEND=	BDB GDBM
 OPTIONS_DEFAULT=	GDBM
 
 BACKEND_DESC=		Database backend
-BDB_USE=		bdb=yes
+BDB_USES=		bdb
 BDB_CONFIGURE_ON=	--with-berkeley \
 			--with-bdb-include-dir=${BDB_INCLUDE_DIR} \
 			--with-bdb-lib-dir=${BDB_LIB_DIR}

Modified: head/databases/evolution-data-server/Makefile
==============================================================================
--- head/databases/evolution-data-server/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/databases/evolution-data-server/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -27,7 +27,7 @@ LIB_DEPENDS=	libsoup-gnome-2.4.so:devel/
 
 PORTSCOUT=	limitw:1,even
 
-USES=		bison gettext gmake gnome gperf libtool pathfix pkgconfig \
+USES=		bdb:5 bison gettext gmake gnome gperf libtool pathfix pkgconfig \
 		sqlite tar:xz
 # Unbreak mail/evolution with webkit-gtk3 on FreeBSD 8 and 9.  Normally
 # this change would be done there, but it is not a C++ application, so it
@@ -37,7 +37,6 @@ USES+=		compiler:c++11-lib
 USE_GNOME=	gtk30 intltool introspection:build libxml2
 USE_OPENLDAP=	yes
 GNU_CONFIGURE=	yes
-USE_BDB=	5
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--with-openldap=yes \

Modified: head/databases/fortytwo-bdb/Makefile
==============================================================================
--- head/databases/fortytwo-bdb/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/databases/fortytwo-bdb/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -14,13 +14,12 @@ COMMENT=	Interface to Berkeley DB for GN
 
 LICENSE=	LGPL21
 
-USES=		gnustep
+USES=		bdb gnustep
 USE_GNUSTEP=	back build
 
 LIB_DEPENDS=	libEncore.so:devel/fortytwo-encore
 DEFAULT_LIBVERSION=	0.1
 USE_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
-USE_BDB=	43+
 
 WRKSRC=		${WRKDIR}/BDB-${PORTVERSION}
 DOCSDIR=	${GNUSTEP_PREFIX}/Local/Library/Documentation/BDB

Modified: head/databases/libgda4/Makefile
==============================================================================
--- head/databases/libgda4/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/databases/libgda4/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -86,7 +86,7 @@ USE_GNOME+=	libgda4
 .endif
 
 .if ${LIBGDA4_SLAVE}=="bdb"
-USE_BDB=		yes
+USES+=			bdb
 CONFIGURE_ARGS+=	--with-bdb=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-bdb
@@ -100,7 +100,7 @@ CONFIGURE_ARGS+=	--without-ldap
 .endif
 
 .if ${LIBGDA4_SLAVE}=="mysql"
-USE_MYSQL=		yes
+USES+=			mysql
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-mysql

Modified: head/databases/libgda5/Makefile
==============================================================================
--- head/databases/libgda5/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/databases/libgda5/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+=--without-ui
 .endif
 
 .if ${LIBGDA5_SLAVE}==bdb
-USE_BDB=		5
+USES+=			bdb:5
 CONFIGURE_ARGS+=	--with-bdb=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-bdb
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+=	--without-ldap
 .endif
 
 .if ${LIBGDA5_SLAVE}==mysql
-USE_MYSQL=		yes
+USES+=			mysql
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-mysql

Modified: head/databases/memcacheq/Makefile
==============================================================================
--- head/databases/memcacheq/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/databases/memcacheq/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -19,8 +19,8 @@ USE_CSTD=	gnu89
 CFLAGS+=	-I"${BDB_INCLUDE_DIR}"
 LDFLAGS+=	-l"${BDB_LIB_NAME}" -L"${LOCALBASE}/lib"
 
+USES=		bdb:5
 USE_RC_SUBR=	memcacheq
-USE_BDB=	5
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} --with-bdb=${LOCALBASE} --enable-threads
 

Modified: head/databases/p5-BDB/Makefile
==============================================================================
--- head/databases/p5-BDB/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/databases/p5-BDB/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -21,9 +21,8 @@ PORTSCOUT=	skipv:1.801
 
 CFLAGS+=	-I${BDB_INCLUDE_DIR}
 LDFLAGS+=	-lpthread
-USE_BDB=	yes
 USE_PERL5=	configure
-USES=		perl5
+USES=		bdb perl5
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|' ${WRKSRC}/Makefile.PL

Modified: head/databases/p5-BerkeleyDB/Makefile
==============================================================================
--- head/databases/p5-BerkeleyDB/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/databases/p5-BerkeleyDB/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -17,8 +17,7 @@ LICENSE_COMB=	dual
 TEST_DEPENDS=	p5-MLDBM>=0:databases/p5-MLDBM \
 		p5-Test-Pod>=1:devel/p5-Test-Pod
 
-USES=		perl5 shebangfix
-USE_BDB=	yes
+USES=		bdb perl5 shebangfix
 USE_PERL5=	configure
 
 SHEBANG_FILES=	mkconsts.pl

Modified: head/databases/py-bsddb/Makefile
==============================================================================
--- head/databases/py-bsddb/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/databases/py-bsddb/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -16,9 +16,8 @@ LICENSE=	PSFL
 
 PORTSCOUT=	ignore:1
 
-USE_BDB=	43+
 USE_PYTHON=	distutils autoplist
-USES=		python tar:xz
+USES=		bdb python tar:xz
 
 DIST_SUBDIR=	python
 DISTINFO_FILE=	${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo

Modified: head/databases/rdfdb/Makefile
==============================================================================
--- head/databases/rdfdb/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/databases/rdfdb/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -11,14 +11,11 @@ DISTNAME=	rdfdb_src
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Lightweight RDF database
 
-USE_BDB=	40+
-INVALID_BDB_VER=2
-
 USERS=	rdfdb
 GROUPS=	rdfdb
 
 WRKSRC=		${WRKDIR}/rdfdb
-USES=		gmake
+USES=		bdb gmake
 MAKEFILE=	makefile
 ALL_TARGET=
 CFLAGS+=	-Wno-return-type

Modified: head/databases/ruby-bdb/Makefile
==============================================================================
--- head/databases/ruby-bdb/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/databases/ruby-bdb/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -17,8 +17,6 @@ COMMENT=	Ruby interface to Oracle Berkel
 
 LICENSE=	RUBY
 
-USE_BDB=	yes
-
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USE_RUBY=		yes
@@ -35,7 +33,7 @@ EXAMPLESDIR=	${RUBY_MODEXAMPLESDIR}
 PLIST_FILES=	%%RUBY_SITEARCHLIBDIR%%/bdb.so
 PORTDOCS=	*
 PORTEXAMPLES=	*
-USES=		shebangfix tar:bzip2
+USES=		bdb shebangfix tar:bzip2
 SHEBANG_FILES=	examples/record.rb \
 		examples/recno.rb \
 		examples/zeroc.rb \

Modified: head/devel/ice/Makefile
==============================================================================
--- head/devel/ice/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/devel/ice/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -17,7 +17,7 @@ SLAVE_PORT?=		no
 .if ${SLAVE_PORT} == "no"
 LIB_DEPENDS=		libexpat.so:textproc/expat2 \
 			libmcpp.so:devel/mcpp
-USE_OPENSSL=		yes
+USES+=			ssl
 .else
 LIB_VRS=		${PORTVERSION:R:S|.||g}
 LIB_DEPENDS+=		libIce.so.${LIB_VRS}:devel/ice
@@ -37,8 +37,8 @@ BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}
 
 WRKSRC=			${WRKDIR}/ice-${PORTVERSION}
 
-USE_BDB=		5
-INVALID_BDB_VER=	40 41 42 43 44 46 47 48 6
+USES+=			bdb:5
+INVALID_BDB_VER=	48 6
 USE_LDCONFIG=		yes
 BUILD_WRKSRC?=		${WRKSRC}/cpp
 INSTALL_WRKSRC?=	${WRKSRC}/cpp

Modified: head/devel/librcc/Makefile
==============================================================================
--- head/devel/librcc/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/devel/librcc/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -35,7 +35,7 @@ BDB_DESC=		Translation database support
 BDB_CONFIGURE_ENABLE=	bdb
 BDB_CPPFLAGS=		-I${BDB_INCLUDE_DIR}
 BDB_LDFLAGS=		-L${BDB_LIB_DIR}
-BDB_USE=		BDB=41+
+BDB_USES=		bdb
 
 TRANSLATE_DESC=			Online translation support
 TRANSLATE_CONFIGURE_ENABLE=	libtranslate

Modified: head/devel/subversion/Makefile.common
==============================================================================
--- head/devel/subversion/Makefile.common	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/devel/subversion/Makefile.common	Mon Aug  8 13:46:50 2016	(r419843)
@@ -37,7 +37,7 @@ OPTIONS_NAME=		devel_subversion
 OPTIONS_SUB=			yes
 
 BDB_CONFIGURE_OFF=		--without-berkeley-db
-BDB_USE=			BDB=42+
+BDB_USES=			bdb
 
 MAINTAINER_DEBUG_CONFIGURE_ON=	--enable-maintainer-mode --enable-debug
 

Modified: head/devel/subversion18/Makefile.common
==============================================================================
--- head/devel/subversion18/Makefile.common	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/devel/subversion18/Makefile.common	Mon Aug  8 13:46:50 2016	(r419843)
@@ -39,7 +39,7 @@ OPTIONS_NAME=		devel_subversion18
 OPTIONS_SUB=			yes
 
 BDB_CONFIGURE_OFF=		--without-berkeley-db
-BDB_USE=			BDB=42+
+BDB_USES=			bdb
 
 MAINTAINER_DEBUG_CFLAGS=	-g
 MAINTAINER_DEBUG_CONFIGURE_ON=	--enable-maintainer-mode --enable-debug

Modified: head/dns/dnshistory/Makefile
==============================================================================
--- head/dns/dnshistory/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/dns/dnshistory/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
-USE_BDB=	yes
+USES=		bdb
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz

Modified: head/dns/fastresolve/Makefile
==============================================================================
--- head/dns/fastresolve/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/dns/fastresolve/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -15,8 +15,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libadns.so:dns/adns
 RUN_DEPENDS=	p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
 
-USES=		perl5 tar:bzip2
-USE_BDB=	yes
+USES=		bdb perl5 tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PERL=${PERL} \
 		djm_cv_lib_db_Dbopen=yes

Modified: head/editors/nvi-devel/Makefile
==============================================================================
--- head/editors/nvi-devel/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/editors/nvi-devel/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -19,8 +19,7 @@ WIDECHAR_DESC=	Enable wide-character sup
 WRKSRC=			${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=		yes
 USE_LDCONFIG=		yes
-USES=			iconv libtool ncurses pkgconfig tar:bzip2
-USE_BDB=		42+
+USES=			bdb iconv libtool ncurses pkgconfig tar:bzip2
 CONFIGURE_ARGS+=	--with-db-prefix=${LOCALBASE} \
 			--program-prefix=n
 CONFIGURE_SCRIPT=	../dist/configure

Modified: head/editors/poedit/Makefile
==============================================================================
--- head/editors/poedit/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/editors/poedit/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -18,11 +18,10 @@ LIB_DEPENDS=	libgtkspell.so:textproc/gtk
 		libboost_thread.so:devel/boost-libs \
 		liblucene++.so:textproc/luceneplusplus
 
-USES=		compiler:c++11-lib desktop-file-utils gettext gmake pkgconfig
+USES=		bdb compiler:c++11-lib desktop-file-utils gettext gmake pkgconfig
 USE_WX=		3.0
 WX_CONF_ARGS=	absolute
 WX_UNICODE=	yes
-USE_BDB=	yes
 WITH_BDB_HIGHEST=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	WXRC="${WXRC_CMD}"

Modified: head/graphics/fortytwo/Makefile
==============================================================================
--- head/graphics/fortytwo/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/graphics/fortytwo/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -13,14 +13,13 @@ COMMENT=	Graph management system for GNU
 
 LICENSE=	LGPL21
 
-USES=		gnustep
+USES=		bdb gnustep
 USE_GNUSTEP=	back build
 
 LIB_DEPENDS=	libEncore.so:devel/fortytwo-encore \
 		libBDB.so:databases/fortytwo-bdb
 DEFAULT_LIBVERSION=	0.1
 USE_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
-USE_BDB=	43+
 
 WRKSRC=		${WRKDIR}/FT-${PORTVERSION}
 DOCSDIR=	${GNUSTEP_PREFIX}/Local/Library/Documentation/FT

Modified: head/japanese/mutt-devel/Makefile
==============================================================================
--- head/japanese/mutt-devel/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/japanese/mutt-devel/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -56,10 +56,9 @@ MANJADATE=	20050813
 
 FETCH_BEFORE_ARGS=	-A	# ha4.seikyou.ne.jp is running broken httpd
 
-USES=		gmake iconv ncurses shebangfix autoreconf fakeroot
+USES=		gmake iconv ncurses shebangfix autoreconf fakeroot ssl
 SHEBANG_FILES=	smime_keys.pl contrib/smime_keys_test.pl
 GNU_CONFIGURE=	yes
-USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/mutt-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib -ltinfow
 CONFIGURE_ENV=	CC="${CC} -D_DONT_USE_CTYPE_INLINE_ -D_XLOCALE_CTYPE_H ${DB_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/ncurses"
@@ -93,7 +92,7 @@ LIB_DEPENDS+=	libsasl2.so:security/cyrus
 PORT_OPTIONS+=	MAILDIR_HEADER_CACHE
 .endif
 .if ${PORT_OPTIONS:MIMAP_HEADER_CACHE}
-USE_BDB=	42+
+USES+=		bdb
 CONFIGURE_SED=	-e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /'
 .endif
 .if ${PORT_OPTIONS:MIDN}

Modified: head/lang/gnu-cobol/Makefile
==============================================================================
--- head/lang/gnu-cobol/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/lang/gnu-cobol/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -12,8 +12,7 @@ COMMENT=	Open-source COBOL compiler
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
-USE_BDB=	yes
-USES=		gmake libtool ncurses
+USES=		bdb gmake libtool ncurses
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 

Modified: head/lang/php55/Makefile.ext
==============================================================================
--- head/lang/php55/Makefile.ext	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/lang/php55/Makefile.ext	Mon Aug  8 13:46:50 2016	(r419843)
@@ -461,7 +461,7 @@ CONFIGURE_ARGS+=--without-cdb
 .	if ${PORT_OPTIONS:MDB4}
 CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
 
-USE_BDB=		40+
+USES+=			bdb
 WITH_BDB_HIGHEST=	yes
 .	endif
 .	if ${PORT_OPTIONS:MGDBM}

Modified: head/lang/php56/Makefile.ext
==============================================================================
--- head/lang/php56/Makefile.ext	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/lang/php56/Makefile.ext	Mon Aug  8 13:46:50 2016	(r419843)
@@ -464,7 +464,7 @@ CONFIGURE_ARGS+=--without-cdb
 .	if ${PORT_OPTIONS:MDB4}
 CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
 
-USE_BDB=		40+
+USES+=			bdb
 WITH_BDB_HIGHEST=	yes
 .	endif
 .	if ${PORT_OPTIONS:MGDBM}

Modified: head/lang/php70/Makefile.ext
==============================================================================
--- head/lang/php70/Makefile.ext	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/lang/php70/Makefile.ext	Mon Aug  8 13:46:50 2016	(r419843)
@@ -456,7 +456,7 @@ CONFIGURE_ARGS+=--without-cdb
 .	if ${PORT_OPTIONS:MDB4}
 CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
 
-USE_BDB=		40+
+USES+=			bdb
 WITH_BDB_HIGHEST=	yes
 .	endif
 .	if ${PORT_OPTIONS:MGDBM}

Modified: head/mail/avenger/Makefile
==============================================================================
--- head/mail/avenger/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/avenger/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -12,8 +12,7 @@ COMMENT=	Anti-spam SMTP server
 
 LICENSE=	GPLv2+ # though COPYING is GPLv3
 
-USE_BDB=	42+
-USE_OPENSSL=	yes
+USES=		bdb ssl
 GNU_CONFIGURE=	yes
 
 USERS=		${PORTNAME}

Modified: head/mail/bmf/Makefile
==============================================================================
--- head/mail/bmf/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/bmf/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -18,7 +18,7 @@ HAS_CONFIGURE=	yes
 OPTIONS_DEFINE=	BDB MYSQL DEBUG DOCS
 OPTIONS_DEFAULT=BDB
 
-BDB_USE=		BDB=40+
+BDB_USES=		bdb
 BDB_CONFIGURE_WITH=	libdb
 BDB_CFLAGS=		-I${BDB_INCLUDE_DIR}
 BDB_LDFLAGS=		-L${BDB_LIB_DIR}

Modified: head/mail/bogofilter/Makefile
==============================================================================
--- head/mail/bogofilter/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/bogofilter/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -14,8 +14,7 @@ LICENSE=	GPLv2
 
 .if !defined(MASTERDIR) || ${MASTERDIR} == ${.CURDIR}
 # building master port
-USE_BDB=	5+
-INVALID_BDB_VER=48
+USES+=		bdb:5+
 .endif
 
 OPTIONS_DEFINE=		GSL UNICODE DOCS

Modified: head/mail/dk-milter/Makefile
==============================================================================
--- head/mail/dk-milter/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/dk-milter/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -11,7 +11,7 @@ MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Domainkeys milter for Sendmail
 
 USE_RC_SUBR=	milter-dk
-USE_OPENSSL=	yes
+USES+=		ssl
 
 .if !defined(BUILDING_INDEX)
 IPCCHECK!=	ipcrm -q 0 2>&1 || true
@@ -46,8 +46,7 @@ OPTIONS_DEFINE=	DOCS
 IGNORE=		does not work with base bdb
 SITE_SUB+=	-e 's|%%BDB%%|dnl |g'
 . else
-USE_BDB=	41+
-INVALID_BDB_VER=	2 40
+USES+=		bdb
 SITE_SUB+=	-e 's|%%BDB%%||g' \
 		-e "s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g" \
 		-e "s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g" \

Modified: head/mail/dovecot/Makefile
==============================================================================
--- head/mail/dovecot/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/dovecot/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -28,9 +28,8 @@ CONFLICTS=	dovecot2-2.[0-9].*
 # consult the maintainer of those ports before updating this one.    #
 ######################################################################
 
-USES=		cpe iconv libtool:keepla
+USES=		cpe iconv libtool:keepla ssl
 USE_RC_SUBR=	dovecot
-USE_OPENSSL=	yes
 
 PORTSCOUT=	limit:^1\.2
 
@@ -65,7 +64,7 @@ VPOPMAIL_DESC=		VPopMail support
 OPTIONS_SUB=		yes
 BDB_CFLAGS=		-I${BDB_INCLUDE_DIR} -L${BDB_LIB_DIR}
 BDB_CONFIGURE_WITH=	db
-BDB_USE=		BDB=48+
+BDB_USES=		bdb
 DOCS_CONFIGURE_WITH=	docs
 GSSAPI_CONFIGURE_WITH=	gssapi
 GSSAPI_LDFLAGS=		-lgssapi_krb5

Modified: head/mail/drac/Makefile
==============================================================================
--- head/mail/drac/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/drac/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -35,7 +35,7 @@ DEFS=		-DWITH_TI_RPC -DFLOCK_LOCK -DGETH
 DEFS+=		-DTERM_KD
 RUN_DEPENDS+=	postfix:mail/postfix
 .if ${PORT_OPTIONS:MDB}
-USE_BDB=	41+
+USES+=		bdb
 .endif
 .elif ${PORT_OPTIONS:MEXIM}
 DEFS+=		-DTERM_KD -DREQ_HASH -DCIDR_KEY

Modified: head/mail/evolution-ews/Makefile
==============================================================================
--- head/mail/evolution-ews/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/evolution-ews/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -18,10 +18,9 @@ RUN_DEPENDS=	evolution>=3.0.0:mail/evolu
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake gnome libtool pathfix pkgconfig sqlite tar:xz
+USES=		bdb:5 gettext gmake gnome libtool pathfix pkgconfig sqlite tar:xz
 USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
-USE_BDB=	5
 USE_OPENLDAP=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/mail/exim/Makefile
==============================================================================
--- head/mail/exim/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/exim/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -41,7 +41,7 @@ MAKE_JOBS_UNSAFE=	yes
 OPTIONS_SUB=	yes
 
 AUTH_SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
-BDB_USE=	bdb=yes
+BDB_USES=	bdb
 DMARC_LIB_DEPENDS=	libopendmarc.so:mail/opendmarc
 EMBEDDED_PERL_USE=	perl5=run,build
 EXIMON_USE=	xorg=x11,xaw,xt
@@ -262,7 +262,7 @@ SEDLIST+=	-e 's,^\# (EXIM_MONITOR=),\1,'
 .if ${PORT_OPTIONS:MTLS}
 SEDLIST+=	-e 's,^\# (SUPPORT_TLS=),\1,'
 .if ! ${PORT_OPTIONS:MGNUTLS}
-USE_OPENSSL=	yes
+USES+=		ssl
 SEDLIST+=	-e 's,^\# (TLS_LIBS=.*-lssl[[:space:]]),\1,'
 .else
 SEDLIST+=	-e 's,^\# (USE_GNUTLS=),\1,'

Modified: head/mail/greyfix/Makefile
==============================================================================
--- head/mail/greyfix/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/greyfix/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -13,7 +13,7 @@ COMMENT=	Greylisting policy daemon for P
 
 SUB_FILES=	pkg-message
 
-USE_BDB=	5+
+USES=		bdb:5+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-berkeleydb-libdir=${BDB_LIB_DIR} \
 		--with-berkeleydb-includedir=${BDB_INCLUDE_DIR} \

Modified: head/mail/isync/Makefile
==============================================================================
--- head/mail/isync/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/isync/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -14,13 +14,11 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
-USES=		alias cpe
+USES=		alias bdb cpe ssl
 CPE_VENDOR=	oswald_buddenhagen
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sasl=${LOCALBASE} \
 		--with-ssl=${OPENSSLLIB:H}
-USE_OPENSSL=	yes
-USE_BDB=	46+
 
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
 LDFLAGS+=	-L${BDB_LIB_DIR}

Modified: head/mail/meta1/Makefile
==============================================================================
--- head/mail/meta1/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/meta1/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -71,8 +71,9 @@ MAKE_ENV+=	MTA_NETINET6=1
 .endif
 
 .if ${PORT_OPTIONS:MBDB}
+# Why keep the option if it can't work ?
 BROKEN=		port version of Berkeley DB is not compatible
-USE_BDB=	42+
+USES+=		bdb
 INVALID_BDB_VER=	46 47 48 5 6
 BERKELEYDB_SUFFIX=	-db${BDB_VER}
 CONFIGURE_ARGS+=	--disable-included-bdb
@@ -85,7 +86,7 @@ PLIST_SUB+=	WITH_BDBINT=""
 .endif
 
 .if ${PORT_OPTIONS:MPMILTER}
-USE_OPENSSL=	yes
+USES+=		ssl
 .else
 PMILTER_SUFFIX?=	-nopmilter
 .endif

Modified: head/mail/opendkim/Makefile
==============================================================================
--- head/mail/opendkim/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/opendkim/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -22,11 +22,10 @@ LICENSE_PERMS_SENDMAIL=	dist-mirror dist
 
 GNU_CONFIGURE=	yes
 NO_OPTIONS_SORT=yes
-USES=		libtool perl5 pkgconfig shebangfix
+USES=		libtool perl5 pkgconfig shebangfix ssl
 USE_PERL5=	run
 SHEBANG_FILES=	opendkim/opendkim-genkey* reputation/opendkim-* stats/opendkim-* \
 		reprrd/opendkim-reprrdimport*
-USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*
@@ -148,7 +147,7 @@ CONFIGURE_ARGS+=	--with-db-lib=c
 CONFIGURE_ARGS+=	--with-db-incdir=${BDB_INCLUDE_DIR} \
 			--with-db-libdir=${BDB_LIB_DIR}     \
 			--with-db-lib=${BDB_LIB_NAME}
-USE_BDB=		40+
+USES+=		bdb
 . endif
 .endif
 

Modified: head/mail/perdition/Makefile
==============================================================================
--- head/mail/perdition/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/perdition/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -42,7 +42,7 @@ POSIX_REGEX_DESC=	Native regex support
 
 .if ${PORT_OPTIONS:MOPENSSL}
 CONFIGURE_ARGS+=	--enable-ssl
-USE_OPENSSL=		yes
+USES+=			ssl
 .else
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
@@ -68,7 +68,7 @@ PLIST_SUB+=		DAEMONMAP="@comment "
 CPPFLAGS+=		-I${BDB_INCLUDE_DIR}
 CONFIGURE_ARGS+=	--enable-bdb
 PLIST_SUB+=		BDB=""
-USE_BDB=		yes
+USES+=			bdb
 .else
 CONFIGURE_ARGS+=	--disable-bdb
 PLIST_SUB+=		BDB="@comment "
@@ -92,7 +92,7 @@ PLIST_SUB+=		GDBM="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=		yes
+USES+=			mysql
 CONFIGURE_ARGS+=	--enable-mysql
 PLIST_SUB+=		MYSQL=""
 .else

Modified: head/mail/postfix-current/Makefile
==============================================================================
--- head/mail/postfix-current/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/postfix-current/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -46,7 +46,7 @@ OPTIONS_RADIO=		RG1
 OPTIONS_RADIO_RG1=	SASLKRB5 SASLKMIT
 OPTIONS_DEFAULT=	PCRE TLS
 
-BDB_USE=		BDB=yes
+BDB_USES=		bdb
 CDB_LIB_DEPENDS=	libcdb.so:databases/tinycdb
 LDAP_USE=		OPENLDAP=yes
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb

Modified: head/mail/postfix/Makefile
==============================================================================
--- head/mail/postfix/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/postfix/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -48,7 +48,7 @@ OPTIONS_RADIO=		RG1
 OPTIONS_RADIO_RG1=	SASLKRB5 SASLKMIT
 OPTIONS_DEFAULT=	PCRE TLS
 
-BDB_USE=		BDB=yes
+BDB_USES=		bdb
 CDB_LIB_DEPENDS=	libcdb.so:databases/tinycdb
 LDAP_USE=		OPENLDAP=yes
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb

Modified: head/mail/postfix211/Makefile
==============================================================================
--- head/mail/postfix211/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/postfix211/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -47,7 +47,7 @@ OPTIONS_RADIO=		RG1
 OPTIONS_RADIO_RG1=	SASLKRB5 SASLKMIT
 OPTIONS_DEFAULT=	PCRE TLS
 
-BDB_USE=		BDB=yes
+BDB_USES=		bdb
 CDB_LIB_DEPENDS=	libcdb.so:databases/tinycdb
 LDAP_USE=		OPENLDAP=yes
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb

Modified: head/mail/prayer/Makefile
==============================================================================
--- head/mail/prayer/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/prayer/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -33,9 +33,9 @@ SESSIONCACHE_DESC=	Activate Session Cach
 USERS=		_prayer
 GROUPS=		prayer
 
-SESSIONCACHE_USE=	BDB=5+
+SESSIONCACHE_USES=	bdb:5+
 LDAP_USE=		OPENLDAP=yes
-SSL_USE=		OPENSSL=yes
+SSL_USES=		ssl
 TIDY_LIB_DEPENDS=	libtidy.so:www/tidy-lib
 
 GID!=		id -g

Modified: head/mail/sendmail/Makefile
==============================================================================
--- head/mail/sendmail/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/sendmail/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -21,7 +21,7 @@ CONFLICTS?=	courier-0.* postfix-1.* post
 USERS=		smmsp
 GROUPS=		smmsp
 
-USES=		cpe uidfix
+USES=		bdb cpe uidfix
 MAKE_ARGS=	UBINOWN=${UID} UBINGRP=${GID} \
 		SBINOWN=${UID} SBINGRP=${GID} \
 		GBINOWN=${UID} GBINGRP=${GID} \
@@ -57,7 +57,6 @@ CYRUSLOOKUP_DESC=	Enable cyruslookup fea
 PICKY_HELO_CHECK_DESC=	Enable picky HELO check
 MILTER_DESC=		Enable milter support
 
-BDB_USE=	BDB=yes
 LDAP_USE=	OPENLDAP=yes
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASLAUTHD_RUN_DEPENDS=	${LOCALBASE}/sbin/saslauthd:security/cyrus-sasl2-saslauthd
@@ -120,7 +119,7 @@ SITE+=	${FILESDIR}/site.config.m4.ldap
 SITE+=	${FILESDIR}/site.config.m4.milter
 .endif
 .if ${PORT_OPTIONS:MTLS}
-USE_OPENSSL=	yes
+USES+=		ssl
 .endif
 
 SED_SCRIPT=	-e "s|\`-O\'|\`${CFLAGS}\'|" \

Modified: head/mail/spamprobe/Makefile
==============================================================================
--- head/mail/spamprobe/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/spamprobe/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -51,7 +51,7 @@ JPEG_USES=		jpeg
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBDB}
-USE_BDB=	40+
+USES+=		bdb
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
 LDFLAGS+=	-l${BDB_LIB_NAME}
 .endif

Modified: head/mail/spmfilter/Makefile
==============================================================================
--- head/mail/spmfilter/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/spmfilter/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -44,7 +44,7 @@ PLIST_SUB=	LIB_VERSION=${PORTVERSION} \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDB4}
-USE_BDB=	yes
+USES+=		bdb
 CMAKE_ARGS+=	-DDB4_INCLUDE_DIR="${BDB_INCLUDE_DIR}"
 .else
 CMAKE_ARGS+=	-DWITHOUT_DB4=TRUE
@@ -65,7 +65,7 @@ CMAKE_ARGS+=	-DWITHOUT_LDAP=TRUE
 
 .if ${PORT_OPTIONS:MMYSQL}
 LIB_DEPENDS+=	libzdb.so:databases/libzdb
-USE_MYSQL=	yes
+USES+=		mysql
 _REQUIRE+=	mysql
 .endif
 

Modified: head/mail/vacation/Makefile
==============================================================================
--- head/mail/vacation/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/mail/vacation/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -13,7 +13,7 @@ COMMENT=	Email autoresponder, similar to
 
 PORTSCOUT=	ignore:1
 
-USE_BDB=	yes
+USES=		bdb
 
 CFLAGS+=	-L${LOCALBASE}/lib
 

Modified: head/misc/hotkeys/Makefile
==============================================================================
--- head/misc/hotkeys/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/misc/hotkeys/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -23,8 +23,7 @@ CONFIGURE_ARGS=	--with-db3-inc=${BDB_INC
 
 USE_XORG=	x11 xft xkbfile xmu
 GNU_CONFIGURE=	yes
-USE_BDB=	yes
-USES=		gmake
+USES=		bdb gmake
 
 OPTIONS_DEFINE=	OSD
 OPTIONS_DEFAULT=	OSD

Modified: head/net-im/jabberd/Makefile
==============================================================================
--- head/net-im/jabberd/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/net-im/jabberd/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -24,9 +24,8 @@ OPTIONS_SUB=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		compiler:c11 iconv libtool perl5 tar:xz
+USES=		compiler:c11 iconv libtool perl5 ssl tar:xz
 USE_PERL5=	run
-USE_OPENSSL=	yes
 USE_RC_SUBR=	jabberd
 USE_LDCONFIG=	${PREFIX}/lib/jabberd
 CONFIGURE_ARGS=	--localstatedir=/var \
@@ -76,7 +75,7 @@ SQLITE_LIB_DEPENDS=	libsqlite3.so:databa
 MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_ENABLE=	mysql
 
-BDB_USE=		BDB=41+
+BDB_USES=		bdb
 BDB_CONFIGURE_ENABLE=	db
 BDB_CONFIGURE_ON=	--oldincludedir=/nonexistant
 

Modified: head/net-p2p/bitcoin/Makefile
==============================================================================
--- head/net-p2p/bitcoin/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/net-p2p/bitcoin/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -14,10 +14,9 @@ LICENSE=	MIT
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 		libevent.so:devel/libevent2
 
-USES=		autoreconf compiler:c++0x gmake libtool pkgconfig shebangfix
+USES=		autoreconf compiler:c++0x gmake libtool pkgconfig shebangfix ssl
 SHEBANG_FILES=	src/test/*.py
 USE_GITHUB=	yes
-USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 
 SLAVE_PORT?=	no
@@ -70,7 +69,7 @@ QRCODES_LIB_DEPENDS=	libqrencode.so:grap
 WALLET_CONFIGURE_ENABLE=	wallet
 WALLET_CXXFLAGS=		-I${BDB_INCLUDE_DIR}
 WALLET_LIBS=			-L${BDB_LIB_DIR}
-WALLET_USE=			BDB=48
+WALLET_USES=			bdb:48
 
 ZMQ_CONFIGURE_ENABLE=	zmq
 ZMQ_BUILD_DEPENDS=	libzmq4>0:net/libzmq4

Modified: head/net-p2p/digitalcoin/Makefile
==============================================================================
--- head/net-p2p/digitalcoin/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/net-p2p/digitalcoin/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -21,9 +21,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	baritus
 GH_TAGNAME=	96b098a
 
-USES=		desktop-file-utils gmake
-USE_OPENSSL=	yes
-USE_BDB=	48
+USES=		bdb:48 desktop-file-utils gmake ssl
 USE_QT4=	corelib gui qmake_build linguisttools_build uic_build \
 		moc_build rcc_build
 

Modified: head/net-p2p/dogecoin/Makefile
==============================================================================
--- head/net-p2p/dogecoin/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/net-p2p/dogecoin/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -24,14 +24,12 @@ QRCODES_DESC=	Build with QR code display
 
 USE_GITHUB=	yes
 
-USES=		gmake compiler:c++11-lib pkgconfig autoreconf
+USES=		bdb:5 gmake compiler:c++11-lib pkgconfig autoreconf ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-incompatible-bdb \
 		SSL_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" SSL_LIBS="-lssl" \
 		CRYPTO_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" CRYPTO_LIBS="-lcrypto"
 CONFIGURE_ENV+=	OBJC="${CC}" OBJCFLAGS="${CFLAGS}" OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}"
-USE_OPENSSL=	yes
-USE_BDB=	5
 
 CXXFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} \
 		-L${LOCALBASE}/lib -L${BDB_LIB_DIR}

Modified: head/net-p2p/jigdo/Makefile
==============================================================================
--- head/net-p2p/jigdo/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/net-p2p/jigdo/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -34,7 +34,7 @@ BDB_CONFIGURE_ON=	--with-libdb=-l${BDB_L
 BDB_CONFIGURE_OFF=	--without-libdb
 BDB_CPPFLAGS=		-I${BDB_INCLUDE_DIR}
 BDB_LIBS=		-L${BDB_LIB_DIR}
-BDB_USE=		BDB=48+
+BDB_USES=		bdb
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext

Modified: head/net-p2p/litecoin/Makefile
==============================================================================
--- head/net-p2p/litecoin/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/net-p2p/litecoin/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -16,10 +16,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 
-USES+=		autoreconf gmake libtool pkgconfig shebangfix
+USES+=		autoreconf gmake libtool pkgconfig shebangfix ssl
 SHEBANG_FILES=	src/test/*.py
 USE_GITHUB=	yes
-USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 
 SLAVE_PORT?=	no
@@ -71,7 +70,7 @@ QRCODES_LIB_DEPENDS=	libqrencode.so:grap
 WALLET_CONFIGURE_ENABLE=	wallet
 WALLET_CXXFLAGS=		-I${BDB_INCLUDE_DIR}
 WALLET_LIBS=			-L${BDB_LIB_DIR}
-WALLET_USE=			BDB=48
+WALLET_USES=			bdb:48
 
 GH_ACCOUNT=	litecoin-project
 

Modified: head/net-p2p/namecoin/Makefile
==============================================================================
--- head/net-p2p/namecoin/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/net-p2p/namecoin/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -24,10 +24,8 @@ QRCODES_DESC=	Build with QR code display
 
 USE_GITHUB=	yes
 
-USES=		gmake compiler:c++11-lib
+USES=		bdb:48 gmake compiler:c++11-lib ssl
 MAKE_JOBS_UNSAFE=yes
-USE_OPENSSL=	yes
-USE_BDB=	48
 
 CXXFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
 CXXFLAGS+=	-L${LOCALBASE}/lib -L${BDB_LIB_DIR}

Modified: head/net-p2p/twister/Makefile
==============================================================================
--- head/net-p2p/twister/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/net-p2p/twister/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -26,9 +26,7 @@ OPTIONS_DEFINE=	DOCS
 USE_GITHUB=	yes
 GH_ACCOUNT=	miguelfreitas
 
-USE_BDB=	48
-USE_OPENSSL=	yes
-USES=		autoreconf:build gmake iconv libtool
+USES=		bdb:48 autoreconf:build gmake iconv libtool ssl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=${WRKSRC}/libtorrent

Modified: head/net-p2p/zetacoin/Makefile
==============================================================================
--- head/net-p2p/zetacoin/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/net-p2p/zetacoin/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -13,7 +13,7 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 
-USES+=		autoreconf compiler:c++0x gmake libtool pkgconfig:build
+USES+=		autoreconf compiler:c++0x gmake libtool pkgconfig:build ssl
 
 BROKEN_armv6=	AtomicPointer not implemented
 
@@ -47,7 +47,7 @@ X11_USES=	desktop-file-utils
 WALLET_CONFIGURE_ENABLE=	wallet
 WALLET_CXXFLAGS=	-I${BDB_INCLUDE_DIR}
 WALLET_LIBS=		-L${BDB_LIB_DIR}
-WALLET_USE=	bdb=48
+WALLET_USES=	bdb:48
 
 QRCODES_IMPLIES=	X11
 QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
@@ -61,7 +61,6 @@ TEST_ALL_TARGET=	check
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
 				SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl"
-USE_OPENSSL=	yes
 
 QT_BINARY=		${PORTNAME}-qt
 CLI_BINARY=		${PORTNAME}-cli

Modified: head/net/netatalk/Makefile
==============================================================================
--- head/net/netatalk/Makefile	Mon Aug  8 13:20:10 2016	(r419842)
+++ head/net/netatalk/Makefile	Mon Aug  8 13:46:50 2016	(r419843)
@@ -13,8 +13,7 @@ COMMENT=	File server for Mac OS X
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
