Remove USE_SQLITE from bsd.databases.mk, replaced by USES=sqlite.

While there replace USE_SQLITE=x by USES=sqlite:x.

PR:		208971
Submitted by:	mat
Exp-run by:	antoine
With hat:	portmgr
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D5951

84 files changed, 93 insertions, 150 deletions

diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk
index 234c1ecfe8c7..2309e5bc1fea 100644
--- a/Mk/bsd.database.mk
+++ b/Mk/bsd.database.mk
@@ -76,12 +76,6 @@ Database_Include_MAINTAINER=	ports@FreeBSD.org
 # BDB_VER
 #			- Detected Berkeley DB version.
 ##
-# USE_SQLITE		- Add dependency on SQLite library.  Valid values are:
-#			  3 and 2.  If version is not specified directly then
-#			  SQLite-3 is used (if USE_SQLITE= yes).
-# SQLITE_VER
-#			- Detected SQLite version.
-##
 # USE_FIREBIRD		- Add dependency on Firebird library.  Valid values are:
 #			  2 and 1.  If no version is given by the maintainer (if
 #			  USE_FIREBIRD= yes) and the user did not define
@@ -381,28 +375,6 @@ IGNORE=	${_IGNORE_MSG}
 
 .endif # USE_BDB
 
-# Handling SQLite dependency
-.if defined(USE_SQLITE)
-
-.if ${USE_SQLITE:tl} == "yes"
-_SQLITE_VER=	3
-.else
-_SQLITE_VER=	 ${USE_SQLITE}
-.endif
-
-# USE_SQLITE is specified incorrectly, so mark this as IGNORE
-.if ${_SQLITE_VER} == "3"
-LIB_DEPENDS+=	libsqlite3.so:databases/sqlite${_SQLITE_VER}
-SQLITE_VER=	${_SQLITE_VER}
-.elif ${_SQLITE_VER} == "2"
-LIB_DEPENDS+=	libsqlite.so:databases/sqlite${_SQLITE_VER}
-SQLITE_VER=	${_SQLITE_VER}
-.else
-IGNORE=		cannot install: unknown SQLite version: ${_SQLITE_VER}
-.endif
-
-.endif # defined(USE_SQLITE)
-
 .if defined(USE_FIREBIRD)
 
 .if defined(WITH_FIREBIRD_VER)
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index e804fb4042c9..469427c9966e 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1864,7 +1864,7 @@ _FORCE_POST_PATTERNS=	rmdir kldxref mkfontscale mkfontdir fc-cache \
 .endif
 
 .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \
-	defined(USE_BDB)  || defined(USE_SQLITE) || defined(USE_FIREBIRD)
+	defined(USE_BDB)  || defined(USE_FIREBIRD)
 .include "${PORTSDIR}/Mk/bsd.database.mk"
 .endif
 
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index 929650cb2adf..ef122ba08355 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -168,8 +168,8 @@ SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
 		INSTALLS_SHLIB USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \
 		PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \
 		USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \
-		UNIQUENAME LATEST_LINK
-SANITY_DEPRECATED=	PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY USE_SQLITE \
+		UNIQUENAME LATEST_LINK USE_SQLITE
+SANITY_DEPRECATED=	PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY \
 			USE_FIREBIRD
 SANITY_NOTNEEDED=	WX_UNICODE
 
diff --git a/Tools/scripts/portsvar.sh b/Tools/scripts/portsvar.sh
index 365389e36f9c..db8f05868171 100755
--- a/Tools/scripts/portsvar.sh
+++ b/Tools/scripts/portsvar.sh
@@ -58,7 +58,7 @@ do
         apache) setvar="$setvar USE_APACHE=yes";;
         autotools) setvar="$setvar USE_AUTOTOOLS=yes";;
         database) setvar="$setvar USE_MYSQL=yes USE_PGSQL=yes"
-                  setvar="$setvar USE_BDB=yes USE_SQLITE=yes";;
+                  setvar="$setvar USE_BDB=yes";;
         emacs) setvar="$setvar EMACS_PORT_NAME=yes";;
         gcc) setvar="$setvar USE_GCC=yes";;
         gnome) setvar="$setvar USE_GNOME=yes";;
diff --git a/astro/foxtrotgps/Makefile b/astro/foxtrotgps/Makefile
index 8a418826d9b9..6208f07d5acb 100644
--- a/astro/foxtrotgps/Makefile
+++ b/astro/foxtrotgps/Makefile
@@ -20,14 +20,13 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	DATADIRNAME=share
 CONFIGURE_ARGS=	--disable-schemas-install
-USES=		gettext gmake pkgconfig shebangfix
+USES=		gettext gmake pkgconfig shebangfix sqlite:3
 SHEBANG_FILES=	contrib/convert2gpx \
 		contrib/convert2osm \
 		contrib/georss2foxtrotgps-poi\
 		contrib/gpx2osm
 
 USE_GNOME=	gtk20 gconf2 libxml2 intltool libglade2
-USE_SQLITE=	3
 INSTALLS_ICONS=	yes
 
 GCONF_SCHEMAS=	apps_foxtrotgps.schemas
diff --git a/audio/harp/Makefile b/audio/harp/Makefile
index 997f870fff30..f6733e56129d 100644
--- a/audio/harp/Makefile
+++ b/audio/harp/Makefile
@@ -12,9 +12,7 @@ LICENSE=	GPLv3
 USE_GITHUB=	yes
 GH_ACCOUNT=	heckendorfc
 
-USES=		cmake
-
-USE_SQLITE=	yes
+USES=		cmake sqlite
 
 USE_LDCONFIG=	yes
 
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 835553c2723f..4834887beef3 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -16,13 +16,12 @@ LIB_DEPENDS=	libplist.so:devel/libplist \
 		libtag.so:audio/taglib \
 		libsgutils2.so:sysutils/sg3_utils
 
-USES=		gettext gmake libtool localbase pathfix pkgconfig tar:bzip2
+USES=		gettext gmake libtool localbase pathfix pkgconfig sqlite:3 tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules --disable-udev --without-hal \
 		--with-html-dir="${DOCSDIR:H}"
 USE_CSTD=	gnu89
 USE_GNOME=	gdkpixbuf2 gtk20 intltool
-USE_SQLITE=	3
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile
index b434d1d71ace..0dd2c4c479ab 100644
--- a/audio/linuxsampler/Makefile
+++ b/audio/linuxsampler/Makefile
@@ -22,9 +22,8 @@ OPTIONS_DEFAULT=	JACK
 DSSI_DESC=	Enable DSSI support
 LV2CORE_DESC=	Enable LV2 support
 
-USES=		tar:bzip2 libtool gmake pathfix pkgconfig
+USES=		tar:bzip2 libtool gmake pathfix pkgconfig sqlite:3
 GNU_CONFIGURE=	yes
-USE_SQLITE=	3
 CONFIGURE_ENV=	HAVE_UNIX98=1
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
diff --git a/audio/lollypop/Makefile b/audio/lollypop/Makefile
index d81a21637106..978a29bb3a48 100644
--- a/audio/lollypop/Makefile
+++ b/audio/lollypop/Makefile
@@ -18,10 +18,9 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:databases/py-sqlite3 \
 LIB_DEPENDS=	libnotify.so:devel/libnotify \
 	libtotem-plparser.so:multimedia/totem-pl-parser
 
-USES=	shebangfix python:3 pkgconfig gettext gmake tar:xz
+USES=	shebangfix python:3 pkgconfig gettext gmake sqlite tar:xz
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk30 py3gobject3 introspection:build intltool intlhack
-USE_SQLITE=	yes
 USE_GSTREAMER1=	yes mad ogg flac opus libav faad good speex
 USE_PYTHON=	py3kplist
 INSTALLS_ICONS=	yes
diff --git a/audio/osd-lyrics/Makefile b/audio/osd-lyrics/Makefile
index f70ad67792f1..5e777e503bb4 100644
--- a/audio/osd-lyrics/Makefile
+++ b/audio/osd-lyrics/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS=	libnotify.so:devel/libnotify \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libcurl.so:ftp/curl
 
-USES=		desktop-file-utils gettext gmake iconv localbase pkgconfig
+USES=		desktop-file-utils gettext gmake iconv localbase pkgconfig sqlite
 USE_GNOME=	gtk20 intltool
-USE_SQLITE=	yes
 GNU_CONFIGURE=	yes
 # Cannot enable -Werror yet: Clang does not like the code `printf(_("..."))',
 # see this bug for details: http://llvm.org/bugs/show_bug.cgi?id=3814
diff --git a/audio/pragha/Makefile b/audio/pragha/Makefile
index 70aa43c231e3..ae87c49c270b 100644
--- a/audio/pragha/Makefile
+++ b/audio/pragha/Makefile
@@ -19,10 +19,9 @@ LIB_DEPENDS=	libtag.so:audio/taglib \
 	libtotem-plparser.so:multimedia/totem-pl-parser
 
 USES=	compiler:c11 desktop-file-utils gettext-tools gmake libtool \
-	pkgconfig tar:bz2
+	pkgconfig sqlite tar:bz2
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk30 intltool intlhack
-USE_SQLITE=	yes
 USE_GSTREAMER1=	yes faad flac libav mad ogg speex
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile
index 728da486e5fb..33e4566156e1 100644
--- a/chinese/libchewing/Makefile
+++ b/chinese/libchewing/Makefile
@@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo
 
-USES=		cmake libtool pathfix pkgconfig tar:bzip2
-USE_SQLITE=	yes
+USES=		cmake libtool pathfix pkgconfig sqlite tar:bzip2
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	chewing
diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index c303f612a304..664cbb1e0ba3 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -41,7 +41,7 @@ PGSQL_DESC=	Install PostgreSQL Qt plugin
 PGSQL_USE=	QT4=sql-pgsql_run
 
 SQLITE_DESC=	Enable SQLite backend
-SQLITE_USE=	SQLITE=3
+SQLITE_USES=	sqlite:3
 SQLITE_CMAKE_OFF=	-DAKONADI_BUILD_QSQLITE=off
 
 OPTIONS_DEFAULT=	MYSQL
diff --git a/databases/cppdb/Makefile b/databases/cppdb/Makefile
index 9e8319e81061..3bbadd28b23f 100644
--- a/databases/cppdb/Makefile
+++ b/databases/cppdb/Makefile
@@ -91,7 +91,7 @@ PLIST_SUB+=	PGSQL=""
 CMAKE_ARGS+=	-DDISABLE_SQLITE:BOOL=ON
 PLIST_SUB+=	SQLITE3="@comment "
 .else
-USE_SQLITE=	3
+USES+=		sqlite:3
 CMAKE_ARGS+=	-DDISABLE_SQLITE:BOOL=OFF
 .if ${PORT_OPTIONS:MSQLITE3_INTERNAL}
 CMAKE_ARGS+=	-DSQLITE_BACKEND_INTERNAL:BOOL=ON
diff --git a/databases/fpc-sqlite/Makefile b/databases/fpc-sqlite/Makefile
index 3a4a8f43cf7a..6bbfc19fae02 100644
--- a/databases/fpc-sqlite/Makefile
+++ b/databases/fpc-sqlite/Makefile
@@ -16,6 +16,6 @@ EXTRACTUNITDIR=	${WRKUNITDIR}
 OPTIONS_DEFINE=	SQLITE
 OPTIONS_DEFAULT=	SQLITE
 
-SQLITE_USE=	SQLITE=yes
+SQLITE_USES=	sqlite
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index b5bb6e81d000..39af5395d632 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -111,7 +111,7 @@ ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CONFIGURE_ON=	--with-odbc
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-postgres
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite
 
 .include <bsd.port.options.mk>
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index 9e19a8329a7a..aebe6c5f284f 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -50,7 +50,7 @@ CONFIGURE_ARGS+=	--without-mysql
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=	yes
+USES+=		sqlite
 .else
 CONFIGURE_ARGS+=	--without-sqlite
 .endif
diff --git a/databases/luadbi/Makefile b/databases/luadbi/Makefile
index e6ff4522f8b5..deff14ea3554 100644
--- a/databases/luadbi/Makefile
+++ b/databases/luadbi/Makefile
@@ -35,7 +35,7 @@ MYSQL_CFLAGS=		-I ${LOCALBASE}/include/mysql
 MYSQL_ALL_TARGET=	mysql
 MYSQL_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbdmysql.so
 
-SQLITE3_USE=		SQLITE=3
+SQLITE3_USES=		sqlite:3
 SQLITE3_ALL_TARGET=	sqlite3
 SQLITE3_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbdsqlite3.so
 
diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile
index f7a0a0041d10..fa0f147ca1af 100644
--- a/databases/opendbx/Makefile
+++ b/databases/opendbx/Makefile
@@ -38,7 +38,7 @@ PGSQL_USES=	pgsql
 
 SQLITE_LIB_DEPENDS=	libsqlite.so:databases/sqlite2
 
-SQLITE3_USE=	SQLITE=3
+SQLITE3_USES=	sqlite:3
 
 MSSQL_LIB_DEPENDS=	libsybdb.so:databases/freetds
 
diff --git a/databases/p5-DBIx-Class-Schema-Loader/Makefile b/databases/p5-DBIx-Class-Schema-Loader/Makefile
index 1e91c33d0297..5bdeac7e19ea 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Loader/Makefile
@@ -51,7 +51,7 @@ MYSQL_USE=		MYSQL=yes
 ORACLE_BUILD_DEPENDS=	p5-DBD-Oracle>=0.19:databases/p5-DBD-Oracle
 ORACLE_RUN_DEPENDS=	p5-DBD-Oracle>=0.19:databases/p5-DBD-Oracle
 PGSQL_USES=		pgsql
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/proftpd-mod_sql_sqlite/Makefile b/databases/proftpd-mod_sql_sqlite/Makefile
index 94d50d485d2c..a050bfb3d6a2 100644
--- a/databases/proftpd-mod_sql_sqlite/Makefile
+++ b/databases/proftpd-mod_sql_sqlite/Makefile
@@ -15,7 +15,7 @@ DESCR=		${.CURDIR}/pkg-descr
 
 MASTERDIR=	${.CURDIR}/../../ftp/proftpd
 
-USE_SQLITE=	yes
+USES=		sqlite
 
 INCLUDEDIRS=	${LOCALBASE}/include
 LIBDIRS=	${LOCALBASE}/lib
diff --git a/databases/qt5-sqldrivers-sqlite2/Makefile b/databases/qt5-sqldrivers-sqlite2/Makefile
index 09812cbcbed1..5a4de2e81df6 100644
--- a/databases/qt5-sqldrivers-sqlite2/Makefile
+++ b/databases/qt5-sqldrivers-sqlite2/Makefile
@@ -3,6 +3,6 @@
 DB=		SQLite2
 DB_DESC=	SQLite 2
 
-USE_SQLITE=	2
+USES=		sqlite:2
 
 .include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers"
diff --git a/databases/qt5-sqldrivers-sqlite3/Makefile b/databases/qt5-sqldrivers-sqlite3/Makefile
index 3af4eb38e930..6a8554bce8f4 100644
--- a/databases/qt5-sqldrivers-sqlite3/Makefile
+++ b/databases/qt5-sqldrivers-sqlite3/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	sqlite3
 DB=		SQLite
 DB_DESC=	SQLite 3
 
-USE_SQLITE=	3
+USES=		sqlite:3
 CONFIGURE_ARGS=	-system-sqlite
 
 .include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers"
diff --git a/databases/soci/Makefile b/databases/soci/Makefile
index 29e1b7b5af77..82155ae179d8 100644
--- a/databases/soci/Makefile
+++ b/databases/soci/Makefile
@@ -33,7 +33,7 @@ PGSQL_USES=	pgsql
 PGSQL_CMAKE_ON=	-DWITH_POSTGRESQL:BOOL=ON
 PGSQL_CMAKE_OFF=	-DWITH_POSTGRESQL:BOOL=OFF
 
-SQLITE_USE=	SQLITE=yes
+SQLITE_USES=	sqlite
 SQLITE_CMAKE_ON=	-DWITH_SQLITE3:BOOL=ON
 SQLITE_CMAKE_OFF=	-DWITH_SQLITE3:BOOL=OFF
 
diff --git a/databases/spatialite-tools/Makefile b/databases/spatialite-tools/Makefile
index 4c4aa41bd137..c9accd01820a 100644
--- a/databases/spatialite-tools/Makefile
+++ b/databases/spatialite-tools/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	libgeos_c.so:graphics/geos \
 		libreadosm.so:astro/readosm
 
 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig iconv
-USE_SQLITE=	yes
+USES=		gmake pkgconfig iconv sqlite
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
diff --git a/databases/spatialite/Makefile b/databases/spatialite/Makefile
index 4190f44e5170..ac505b284be4 100644
--- a/databases/spatialite/Makefile
+++ b/databases/spatialite/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS=	libgeos_c.so:graphics/geos \
 
 WRKSRC=		${WRKDIR}/lib${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
-USES=		gmake iconv pathfix pkgconfig libtool
-USE_SQLITE=	yes
+USES=		gmake iconv pathfix pkgconfig libtool sqlite
 USE_GNOME=	libxml2
 
 CFLAGS+=	-I${WRKSRC}/src/headers -I${LOCALBASE}/include
diff --git a/databases/sqlite-ext-miscfuncs/Makefile b/databases/sqlite-ext-miscfuncs/Makefile
index 4ab148fd9306..08fcb2dc3189 100644
--- a/databases/sqlite-ext-miscfuncs/Makefile
+++ b/databases/sqlite-ext-miscfuncs/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX=
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Math, string, and aggregate function library for SQLite
 
-USE_SQLITE=	yes
+USES=		sqlite
 DIST_SUBDIR=	sqlite-ext
 NO_WRKSUBDIR=	yes
 
diff --git a/databases/sqlite-ext-pcre/Makefile b/databases/sqlite-ext-pcre/Makefile
index c7daf1bd4729..ec7ae0990df7 100644
--- a/databases/sqlite-ext-pcre/Makefile
+++ b/databases/sqlite-ext-pcre/Makefile
@@ -9,7 +9,6 @@ COMMENT=	Regexp function for SQLite based on PCRE library
 
 LIB_DEPENDS+=	libpcre.so:devel/pcre
 
-USE_SQLITE=	yes
 DIST_SUBDIR=	sqlite-ext
 
 LIBFILE=	pcre.so
@@ -20,7 +19,7 @@ SUB_LIST+=	LIBFILE=${LIBFILE}
 
 PLIST_FILES=	libexec/${DIST_SUBDIR}/${LIBFILE}
 
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig sqlite
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ralight
diff --git a/databases/sqlitebrowser/Makefile b/databases/sqlitebrowser/Makefile
index 9db7feddbf49..d85a7cf1987a 100644
--- a/databases/sqlitebrowser/Makefile
+++ b/databases/sqlitebrowser/Makefile
@@ -14,10 +14,9 @@ LICENSE_COMB=	dual
 
 USE_GITHUB=	yes
 
-USES=		cmake desktop-file-utils
+USES=		cmake desktop-file-utils sqlite
 USE_QT4=	corelib network gui qmake_build linguisttools_build \
 		moc_build uic_build rcc_build
-USE_SQLITE=	yes
 
 INSTALLS_ICONS=	yes
 
diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile
index 466db836de2b..09a8112958d8 100644
--- a/databases/sqliteman/Makefile
+++ b/databases/sqliteman/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Admin's GUI tool for Sqlite3
 
 LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 
-USES=		cmake
-USE_SQLITE=	yes
+USES=		cmake sqlite
 USE_QT4=	qmake_build gui moc_build rcc_build uic_build xml sql
 
 GNU_CONFIGURE=	yes
diff --git a/databases/sqlitestudio/Makefile b/databases/sqlitestudio/Makefile
index a3e2a2eb6862..b7e7b4939e40 100644
--- a/databases/sqlitestudio/Makefile
+++ b/databases/sqlitestudio/Makefile
@@ -37,10 +37,9 @@ OPTIONS_SUB=	yes
 
 WRKSRC=		${WRKDIR}/SQLiteStudio3
 
-USES=		compiler:c++11-lib gmake ncurses qmake
+USES=		compiler:c++11-lib gmake ncurses qmake sqlite
 USE_QT5=	core gui svg sql xml network sql-sqlite3_run widgets script \
 		concurrent uitools buildtools_build linguisttools_build
-USE_SQLITE=	yes
 USE_GL=		gl
 USE_LDCONFIG=	yes
 
diff --git a/databases/virtualpg/Makefile b/databases/virtualpg/Makefile
index 499a31ddeb9a..29667e99180e 100644
--- a/databases/virtualpg/Makefile
+++ b/databases/virtualpg/Makefile
@@ -13,8 +13,7 @@ LICENSE=	MPL LGPL21 GPLv2
 LICENSE_COMB=	dual
 
 GNU_CONFIGURE=	yes
-USES=		gmake iconv pathfix pkgconfig libtool pgsql
-USE_SQLITE=	yes
+USES=		gmake iconv pathfix pkgconfig libtool pgsql sqlite
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-I${WRKSRC}/src/headers -I${LOCALBASE}/include
diff --git a/databases/vsqlite/Makefile b/databases/vsqlite/Makefile
index 847ab7303ccd..6ffbd49a36d2 100644
--- a/databases/vsqlite/Makefile
+++ b/databases/vsqlite/Makefile
@@ -16,9 +16,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	vinzenz
 GH_PROJECT=	vsqlite--
 
-USES=		autoreconf compiler:c++0x libtool
+USES=		autoreconf compiler:c++0x libtool sqlite:3
 GNU_CONFIGURE=	yes
-USE_SQLITE=	3
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index 9161e81dc4dc..f008c61e246c 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -27,9 +27,8 @@ STATUS=		debug
 STATUS=		release
 .endif
 
-USES=		compiler gmake iconv pkgconfig tar:tgz
+USES=		compiler gmake iconv pkgconfig sqlite tar:tgz
 USE_LDCONFIG=	yes
-USE_SQLITE=	yes
 
 INSTALL_TARGET=	do_install
 
diff --git a/deskutils/growl-for-linux/Makefile b/deskutils/growl-for-linux/Makefile
index 578352e5bd2f..c8255dba2f37 100644
--- a/deskutils/growl-for-linux/Makefile
+++ b/deskutils/growl-for-linux/Makefile
@@ -31,11 +31,10 @@ OPTIONS_DEFINE=	LIBNOTIFY
 
 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,^${PREFIX}/,,}
 
-USES=		autoreconf compiler:nestedfct libtool pkgconfig
+USES=		autoreconf compiler:nestedfct libtool pkgconfig sqlite:3
 USE_GITHUB=	yes
 USE_GNOME=	gtk20
 USE_OPENSSL=	yes
-USE_SQLITE=	3
 
 post-patch:
 	@${REINPLACE_CMD} '/^gol_LDADD =/s/$$/ -lgmodule-2.0/' \
diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile
index 228592f259f7..627d965e1c96 100644
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@@ -12,14 +12,13 @@ COMMENT=	GWMetadata for GNUstep workspace manager
 
 LICENSE=	GPLv2
 
-USES=		gnustep
+USES=		gnustep sqlite
 USE_GNUSTEP=	back build
 GNU_CONFIGURE=	yes
 LIB_DEPENDS=	libDBKit.so:deskutils/gworkspace \
 		libPreferencePanes.so:deskutils/systempreferences
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
-USE_SQLITE=	yes
 LDFLAGS+=	-lpthread
 
 WRKSRC=		${WRKDIR}/gworkspace-${PORTVERSION}/GWMetadata
diff --git a/deskutils/osmo/Makefile b/deskutils/osmo/Makefile
index c166e0b1c175..0b365bad1c3f 100644
--- a/deskutils/osmo/Makefile
+++ b/deskutils/osmo/Makefile
@@ -18,9 +18,8 @@ LIB_DEPENDS=	libical.so:devel/libical \
 		libgtkspell.so:textproc/gtkspell \
 		libwebkitgtk-1.0.so:www/webkit-gtk2
 
-USES=		gettext gmake libarchive pkgconfig
+USES=		gettext gmake libarchive pkgconfig sqlite
 USE_GNOME=	gtk20 libxml2
-USE_SQLITE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index 5a4460468f2d..c4e4ecc6a788 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -47,9 +47,8 @@ CONFIGURE_ENV=	MKDIR_P="${MKDIR}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lboost_system
 
-USES=		gettext libarchive libtool pkgconfig python shebangfix
+USES=		gettext libarchive libtool pkgconfig python shebangfix sqlite:3
 USE_OPENSSL=	yes
-USE_SQLITE=	3
 USE_XORG=	pixman
 USE_LDCONFIG=	${PREFIX}/lib/pinot/backends ${PREFIX}/lib/pinot/filters
 SHEBANG_FILES=	scripts/bash/*.sh
diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile
index fdf6ebf2e340..d2bbab10c32d 100644
--- a/devel/bugzilla44/Makefile
+++ b/devel/bugzilla44/Makefile
@@ -49,7 +49,7 @@ MYSQL_USE=		MYSQL=yes
 MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql
 PGSQL_USES=		pgsql
 PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
 			sqlite3>=3:databases/sqlite3
 GRAPH_REPORTS_RUN_DEPENDS=	p5-GD>=1.20:graphics/p5-GD \
diff --git a/devel/bugzilla50/Makefile b/devel/bugzilla50/Makefile
index 882800091885..e2ab32e10b74 100644
--- a/devel/bugzilla50/Makefile
+++ b/devel/bugzilla50/Makefile
@@ -52,7 +52,7 @@ MYSQL_USE=		MYSQL=yes
 MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql
 PGSQL_USES=		pgsql:91+
 PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 SQLITE_RUN_DEPENDS=	p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
 			sqlite3>=3:databases/sqlite3
 GRAPH_REPORTS_RUN_DEPENDS=	p5-GD>=1.20:graphics/p5-GD \
diff --git a/devel/cvstrac/Makefile b/devel/cvstrac/Makefile
index 8874f2291e79..e66f9e0fefc1 100644
--- a/devel/cvstrac/Makefile
+++ b/devel/cvstrac/Makefile
@@ -13,8 +13,7 @@ COMMENT?=	Web-Based Bug And Patch-Set Tracking System For CVS
 
 LICENSE=	GPLv2
 
-USES=		gmake pkgconfig
-USE_SQLITE=	yes
+USES=		gmake pkgconfig sqlite
 MAKEFILE=	bsd-gcc.mk
 MAKE_ARGS+=	BCC="${CC} ${CPPFLAGS}" TCC="${CC} ${CPPFLAGS}" \
 		LIBSQLITE="${LDFLAGS}"
diff --git a/devel/libleaftag/Makefile b/devel/libleaftag/Makefile
index 4e5fd1c566d3..eae3401fa645 100644
--- a/devel/libleaftag/Makefile
+++ b/devel/libleaftag/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	http://releases.chipx86.com/leaftag/libleaftag/
 MAINTAINER=	kaeru@inigo-tech.com
 COMMENT=	Leaftag is a library for tagging files on the desktop
 
-USE_SQLITE=	2
-USES=		gmake pathfix pkgconfig libtool
+USES=		gmake pathfix pkgconfig libtool sqlite:2
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile
index 451654f061b7..5c375237f840 100644
--- a/devel/libopensync/Makefile
+++ b/devel/libopensync/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS=	libexslt.so:textproc/libxslt
 
 CONFLICTS=	libopensync-0.22*
 
-USE_SQLITE=	3
-USES=		cmake pkgconfig python tar:bzip2
+USES=		cmake pkgconfig python tar:bzip2 sqlite:3
 CMAKE_ARGS+=	-Wno-dev
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index d622722fc7ef..7cc5e3e48e8c 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -20,10 +20,9 @@ PORTSCOUT=	limitw:1,even
 .if !defined(REFERENCE_PORT)
 
 USES+=		gettext gmake gnome libtool pathfix pkgconfig \
-		python:3:build tar:xz
+		python:3:build sqlite:3 tar:xz
 USE_GNOME=	glib20 intlhack introspection:build \
 		libxml2 referencehack
-USE_SQLITE=	3
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-more-warnings \
@@ -36,7 +35,7 @@ LIBVERSION=	1.7.0
 PLIST_SUB=	VERSION="2.4" LIBVERSION=${LIBVERSION}
 
 .if defined(SOUP_SLAVE)
-USE_SQLITE=	yes
+USES+=		sqlite
 LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
 CONFIGURE_ARGS+=--with-gnome
 .else
diff --git a/devel/matreshka/Makefile b/devel/matreshka/Makefile
index a2ee7c3c3581..2be36ff624a1 100644
--- a/devel/matreshka/Makefile
+++ b/devel/matreshka/Makefile
@@ -31,7 +31,7 @@ AMF_CONFIGURE_ENABLE=		amf
 
 MYSQL_USE=			MYSQL=yes
 PGSQL_USES=			pgsql
-SQLITE3_USE=			SQLITE=yes
+SQLITE3_USES=			sqlite
 FIREBIRD_USE=			FIREBIRD=yes
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/devel/poco-devel/Makefile b/devel/poco-devel/Makefile
index c33f20b04050..5637e483800b 100644
--- a/devel/poco-devel/Makefile
+++ b/devel/poco-devel/Makefile
@@ -65,7 +65,7 @@ CONFIGURE_ARGS+=	--omit=Data/MySQL
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=	yes
+USES+=		sqlite
 .else
 CONFIGURE_ARGS+=	--omit=Data/SQLite
 .endif
diff --git a/devel/poco-ssl/Makefile b/devel/poco-ssl/Makefile
index 95e9be47775d..e03001162b4f 100644
--- a/devel/poco-ssl/Makefile
+++ b/devel/poco-ssl/Makefile
@@ -37,7 +37,7 @@ ODBC_CONFIGURE_OFF=	--omit=Data/ODBC
 MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_OFF=	--omit=Data/MySQL
 
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_OFF=	--omit=Data/SQLite
 
 .include <bsd.port.options.mk>
diff --git a/dns/opendnssec13/Makefile b/dns/opendnssec13/Makefile
index 0159b9669a32..a541a6c453b3 100644
--- a/dns/opendnssec13/Makefile
+++ b/dns/opendnssec13/Makefile
@@ -46,7 +46,7 @@ MYSQL_CONFIGURE_OFF=	--with-sqlite3=${LOCALBASE} --with-database-backend=sqlite3
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE} --with-database-backend=mysql
 MYSQL_LIB_DEPENDS_OFF=	libsqlite3.so:databases/sqlite3
 MYSQL_USE=		MYSQL=compat
-MYSQL_USE_OFF=		SQLITE=yes
+MYSQL_USES_OFF=		sqlite
 SOFTHSM_CONFIGURE_ON=	--with-softhsm --with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm.so
 SOFTHSM_RUN_DEPENDS=	softhsm>=1.2.0:security/softhsm
 
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index aae3bdf1f62f..5529ce944002 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -91,7 +91,7 @@ POLARSSL_LIB_DEPENDS_OFF=	libmbedtls.so:security/polarssl13
 
 REMOTE_VARS=		MODULES+=remote
 
-SQLITE3_USE=		SQLITE=3
+SQLITE3_USES=		sqlite:3
 SQLITE3_VARS=		MODULES+=gsqlite3
 
 TINYDNS_CONFIGURE_ON=	CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include"
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index dd938426da7f..c780e91c3cd1 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -59,7 +59,7 @@ PGSQL_CONFIGURE_OFF=	--disable-pgsql
 PGSQL_USES=		pgsql
 
 SQLITE_CONFIGURE_ENABLE=	sqlite3
-SQLITE_USE=			SQLITE=3
+SQLITE_USES=			sqlite:3
 
 AVAHI_CONFIGURE_ON=	--with-zeroconf --enable-avahi
 AVAHI_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 92534868f984..e13ef08ff65e 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -46,10 +46,10 @@ OPTIONS_GROUP_PLUGINS=	CFLOGGER CFNEWSPAPER CFRHG
 OPTIONS_SUB=		yes
 
 CFLOGGER_DESC=		SQLite logging plugin
-CFLOGGER_USE=		sqlite=3
+CFLOGGER_USES=		sqlite:3
 CFLOGGER_CONFIGURE_ON=	--enable-logger=yes
 CFNEWSPAPER_DESC=	Newspaper plugin
-CFLOGGER_USE=		sqlite=3
+CFLOGGER_USES=		sqlite:3
 CFNEWSPAPER_CONFIGURE_ON=	--enable-newspaper=yes
 CFRHG_DESC=		Random house genetor plugin
 CFRHG_CONFIGURE_ON=	--enable-cfrhg=yes
diff --git a/games/ldmud/Makefile b/games/ldmud/Makefile
index 8c9107e02bd1..13ba85764be8 100644
--- a/games/ldmud/Makefile
+++ b/games/ldmud/Makefile
@@ -41,7 +41,7 @@ MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_ENABLE=	use-mysql
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ENABLE=	use-pgsql
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ENABLE=use-sqlite
 
 .include <bsd.port.options.mk>
diff --git a/games/pvpgn/Makefile b/games/pvpgn/Makefile
index 04decb86c37a..d355286e611b 100644
--- a/games/pvpgn/Makefile
+++ b/games/pvpgn/Makefile
@@ -50,7 +50,7 @@ MYSQL_CONFIGURE_WITH=	mysql
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	pgsql
 
-SQLITE3_USE=		SQLITE=3
+SQLITE3_USES=		sqlite:3
 SQLITE3_CONFIGURE_WITH=	sqlite3
 
 ## support files
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 28ef21bd50ce..5bad990cd68d 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -105,7 +105,7 @@ PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 SPATIALITE_CONFIGURE_WITH=	spatialite
 SPATIALITE_LIB_DEPENDS=	libspatialite.so:databases/spatialite
 SQLITE_CONFIGURE_WITH=	sqlite3
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 XERCES_CONFIGURE_WITH=	xerces
diff --git a/lang/bigloo/Makefile b/lang/bigloo/Makefile
index 51486acd24b3..025fb783d402 100644
--- a/lang/bigloo/Makefile
+++ b/lang/bigloo/Makefile
@@ -66,7 +66,7 @@ MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 MPG123_CONFIGURE_OFF=	--disable-mpg123
 OPENSSL_USE=		OPENSSL=yes
 OPENSSL_CONFIGURE_OFF=	--disable-ssl
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_OFF=	--disable-pkglib --disable-sqlite
 
 .include <bsd.port.options.mk>
diff --git a/lang/io/Makefile.addons b/lang/io/Makefile.addons
index 85acc3fa6b9a..fa9d89496afb 100644
--- a/lang/io/Makefile.addons
+++ b/lang/io/Makefile.addons
@@ -94,7 +94,7 @@ Python_USES=		python
 QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 ReadLine_USES=		readline:port
 Regex_LIB_DEPENDS=	libpcre.so:devel/pcre
-SQLite3_USE=		SQLITE=3
+SQLite3_USES=		sqlite:3
 SampleRateConverter_LIB_DEPENDS=\
 			libsamplerate.so:audio/libsamplerate
 Socket_LIB_DEPENDS=	libevent.so:devel/libevent2
diff --git a/lang/munger/Makefile b/lang/munger/Makefile
index 90633963a911..306c342ab94f 100644
--- a/lang/munger/Makefile
+++ b/lang/munger/Makefile
@@ -24,7 +24,7 @@ DATADIR=	${PREFIX}/share/${PORTNAME}-${PORTVERSION}
 OPTIONS_DEFINE=	SQLITE
 OPTIONS_DEFAULT=	SQLITE
 
-SQLITE_USE=	SQLITE=3
+SQLITE_USES=	sqlite:3
 SQLITE_MAKE_ARGS=	-DWITH_SQL
 
 post-patch:
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 9307c0b1e731..b9043fd1a61a 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -82,7 +82,7 @@ SNMP_5_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_5_CONFIGURE_ON=	--with-snmp=${LOCALBASE}
 SNMP_5_CONFIGURE_OFF=	--with-snmp=no
 SQLITE_DESC=		Enable SQLite backend (experimental)
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 
 # Autocreate Inbox and Autosieve patches from UoA
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 3d72a07a75b3..9c311075d8f8 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -77,7 +77,7 @@ REPLICATION_CONFIGURE_ENABLE=replication
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ON=	--with-snmp=${LOCALBASE}
 SNMP_CONFIGURE_OFF=	--with-snmp=no
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 
 OPTIONS_RADIO=			GSSAPI
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index 2d35783c539b..e214b0e012b2 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -27,7 +27,7 @@ OPTIONS_SUB=	yes
 
 MYSQL_USE=	MYSQL=yes
 MYSQL_CONFIGURE_WITH=	mysql
-SQLITE_USE=	SQLITE=3
+SQLITE_USES=	sqlite:3
 SQLITE_CONFIGURE_WITH=	sqlite
 PGSQL_USES=	pgsql
 PGSQL_CONFIGURE_WITH=	pgsql
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index dc349fd9e495..9853e1fb65bf 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -77,7 +77,7 @@ MYSQL_USE=		MYSQL=yes
 PGSQL_CONFIGURE_WITH=	pgsql
 PGSQL_USES=		pgsql
 SQLITE_CONFIGURE_WITH=	sqlite
-SQLITE_USE=		SQLITE=3
+SQLITE_USES=		sqlite:3
 SSL_CONFIGURE_OFF=	--without-ssl
 SSL_CONFIGURE_ON=	--with-ssl=openssl
 VPOPMAIL_BUILD_DEPENDS=	${LOCALBASE}/vpopmail/bin/vchkpw:mail/vpopmail
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 2072761df4a2..f8856920bf42 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -109,7 +109,7 @@ SOLR_CONFIGURE_WITH=	solr
 SOLR_BUILD_DEPENDS=	curl:ftp/curl
 SOLR_LIB_DEPENDS=	libexpat.so:textproc/expat2
 
-SQLITE_USE=		SQLITE=3
+SQLITE_USES=		sqlite:3
 SQLITE_CONFIGURE_WITH=	sqlite
 
 SSL_CONFIGURE_WITH=	ssl=openssl
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index e4c3801f15c5..da98675d186f 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -215,20 +215,20 @@ _DBDRV:=	${_DBDRV:S/pgsql_drv,//}
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE3}
-USE_SQLITE=	3
+USES+=		sqlite:3
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
 .else
 _DBDRV:=	${_DBDRV:S/sqlite3_drv,//}
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE2}
-USE_SQLITE=	2
+USES+=		sqlite:2
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
 .else
 _DBDRV:=	${_DBDRV:S/sqlite_drv,//}
 .endif
 
-.if defined(USE_SQLITE)
+.if ${USES:Msqlite*}
 CONFIGURE_ARGS+=	--with-sqlite-includes=${LOCALBASE}/include \
 			--with-sqlite-libraries=${LOCALBASE}/lib
 PLIST_SUB+=	SQLITE=""
@@ -464,7 +464,7 @@ pre-configure:
 	@${FALSE}
 .endif
 .if ${PORT_OPTIONS:MEXTERNAL_LOOKUP} && !( defined(USE_MYSQL) || \
-	${PORT_OPTIONS:MPGSQL} || defined(USE_SQLITE) )
+	${PORT_OPTIONS:MPGSQL} || ${PORT_OPTIONS:MSQLITE*} )
 	@${ECHO_CMD} "You need MySQL, Postgres or SQLITE for EXTERNAL_LOOKUP."
 	@${FALSE}
 .endif
@@ -505,7 +505,7 @@ post-install:
 	@cd  ${WRKSRC}/src/tools.pgsql_drv && \
 		${INSTALL_DATA} *.sql ${STAGEDIR}${EXAMPLESDIR}/pgsql
 .endif
-.ifdef(USE_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE*}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sqlite
 	cd ${WRKSRC}/src/tools.sqlite_drv && \
 		${INSTALL_DATA} *.sql ${STAGEDIR}${EXAMPLESDIR}/sqlite
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index eae67e3a7d76..791f04a5b3be 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -55,8 +55,7 @@ REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
 SASLAUTHD_RUN_DEPENDS=	${LOCALBASE}/sbin/saslauthd:security/cyrus-sasl2-saslauthd
 SA_EXIM_RUN_DEPENDS=	${LOCALBASE}/bin/spamc:mail/spamassassin
 SPF_LIB_DEPENDS=	libspf2.so:mail/libspf2
-SQLITE_USE=	sqlite=yes
-SQLITE_USES=	pkgconfig
+SQLITE_USES=	pkgconfig sqlite
 
 .include <bsd.port.options.mk>
 
diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile
index e75fde86b420..316ac15f3b1e 100644
--- a/misc/krecipes-kde4/Makefile
+++ b/misc/krecipes-kde4/Makefile
@@ -19,8 +19,8 @@ OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	SQLITE MYSQL PGSQL
 OPTIONS_DEFAULT=	SQLITE
 
-SQLITE_USE=		SQLITE=yes \
-			QT4=sql-sqlite3_run
+SQLITE_USES=		sqlite
+SQLITE_USE=		QT4=sql-sqlite3_run
 SQLITE_CMAKE_OFF=	-DWITH_Sqlite:BOOL=OFF
 
 MYSQL_USE=		MYSQL=yes \
diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index f0685dee2801..e8698ade2d88 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -67,7 +67,7 @@ SQLITE_CONFIGURE_ENABLE=sqlite
 TOOLS_CONFIGURE_ENABLE=	tools
 FULLXML_CONFIGURE_ENABLE=	full-xml
 ZLIB_CONFIGURE_ENABLE=	zlib
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 ICONV_USES=		iconv:wchar_t
 ICONV_LDFLAGS=		${ICONV_LIB}
 DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=yes
diff --git a/net-im/imspector/Makefile b/net-im/imspector/Makefile
index 476a7a4f8eeb..e0cee611780a 100644
--- a/net-im/imspector/Makefile
+++ b/net-im/imspector/Makefile
@@ -31,8 +31,8 @@ IPFW_DESC=	Add IPFW support
 PLUGINS_DESC=	Build plugins
 
 IPFW_CFLAGS=	-DIPFW_TRANSPARENT=1
-PLUGINS_USE=	MYSQL=yes SQLITE=yes
-PLUGINS_USES=	pgsql
+PLUGINS_USE=	MYSQL=yes
+PLUGINS_USES=	pgsql sqlite
 
 .include <bsd.port.options.mk>
 
diff --git a/net-mgmt/aircrack-ng/Makefile b/net-mgmt/aircrack-ng/Makefile
index b13e90736698..98ad5513d24b 100644
--- a/net-mgmt/aircrack-ng/Makefile
+++ b/net-mgmt/aircrack-ng/Makefile
@@ -33,7 +33,7 @@ PCRE_LIB_DEPENDS=   libpcre.so:devel/pcre
 PCRE_USES=	pkgconfig
 
 SQLITE_DESC=	Use SQLite for storing pre-computed key tables
-SQLITE_USE=	SQLITE=yes
+SQLITE_USES=	sqlite
 SQLITE_MAKE_ARGS=	sqlite=true
 
 post-patch:
diff --git a/net-mgmt/netxms/Makefile b/net-mgmt/netxms/Makefile
index 922c7785e4cc..663d422661f5 100644
--- a/net-mgmt/netxms/Makefile
+++ b/net-mgmt/netxms/Makefile
@@ -39,7 +39,7 @@ MYSQL_USE=		MYSQL=yes
 PGSQL_CONFIGURE_ON=	--with-pgsql
 PGSQL_USES=		pgsql
 SQLITE_CONFIGURE_ON=	--with-sqlite
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 ODBC_CONFIGURE_ON=	--with-odbc
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
index 1b0af7a376a2..380b5695bcdd 100644
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@@ -93,7 +93,7 @@ PGSQL_CONFIGURE_WITH=	postgresql
 PGSQL_USES=	pgsql
 
 SQLITE_CONFIGURE_WITH=	sqlite3
-SQLITE_USE=	SQLITE=3
+SQLITE_USES=	sqlite:3
 
 ORACLE_CONFIGURE_WITH=	oracle
 
diff --git a/net-mgmt/zabbix22-server/Makefile b/net-mgmt/zabbix22-server/Makefile
index 84ae2ff1241e..8f122c9df259 100644
--- a/net-mgmt/zabbix22-server/Makefile
+++ b/net-mgmt/zabbix22-server/Makefile
@@ -96,7 +96,7 @@ PGSQL_CONFIGURE_WITH=	postgresql
 PGSQL_USES=	pgsql
 
 SQLITE_CONFIGURE_WITH=	sqlite3
-SQLITE_USE=	SQLITE=3
+SQLITE_USES=	sqlite:3
 
 ORACLE_CONFIGURE_WITH=	oracle
 
diff --git a/net-mgmt/zabbix24-server/Makefile b/net-mgmt/zabbix24-server/Makefile
index 8009b7259d80..01cc57647b67 100644
--- a/net-mgmt/zabbix24-server/Makefile
+++ b/net-mgmt/zabbix24-server/Makefile
@@ -97,7 +97,7 @@ PGSQL_CONFIGURE_WITH=	postgresql
 PGSQL_USES=		pgsql
 
 SQLITE_CONFIGURE_WITH=	sqlite3
-SQLITE_USE=		SQLITE=3
+SQLITE_USES=		sqlite:3
 
 ORACLE_CONFIGURE_WITH=	oracle
 
diff --git a/net-mgmt/zabbix3-server/Makefile b/net-mgmt/zabbix3-server/Makefile
index 7e00db5cb2f8..ecffe3f83bdd 100644
--- a/net-mgmt/zabbix3-server/Makefile
+++ b/net-mgmt/zabbix3-server/Makefile
@@ -99,7 +99,7 @@ PGSQL_CONFIGURE_WITH=	postgresql
 PGSQL_USES=		pgsql
 
 SQLITE_CONFIGURE_WITH=	sqlite3
-SQLITE_USE=		SQLITE=3
+SQLITE_USES=		sqlite:3
 
 ORACLE_CONFIGURE_WITH=	oracle
 
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 6856458dd6df..c5a71a2ad617 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -71,7 +71,7 @@ PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-postgres=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-postgres
 SQLITE_DESC=		Use SQLite for the data store and cache
-SQLITE_USE=		sqlite=yes
+SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE_CONFIGURE_OFF=	--without-sqlite
 
diff --git a/net-p2p/uhub/Makefile b/net-p2p/uhub/Makefile
index 8454fbd5fa1c..5ee8849fcf6c 100644
--- a/net-p2p/uhub/Makefile
+++ b/net-p2p/uhub/Makefile
@@ -30,7 +30,7 @@ OPTIONS_SUB=		yes
 
 OPENSSL_USE=		openssl=yes
 OPENSSL_CMAKE_OFF=	-DSSL_SUPPORT:BOOL=OFF
-SQLITE_USE=		sqlite=yes
+SQLITE_USES=		sqlite
 SQLITE_CMAKE_OFF=	-DSQLITE_SUPPORT:BOOL=OFF
 
 .include <bsd.port.options.mk>
diff --git a/net/glusterfs/Makefile b/net/glusterfs/Makefile
index 844e169beb71..dc0cbe2b1ccd 100644
--- a/net/glusterfs/Makefile
+++ b/net/glusterfs/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libargp.so:devel/argp-standalone liburcu-bp.so:sysutils/liburcu
 USE_GCC=	any
 
 USES=		bison gettext libtool pkgconfig python:build readline \
-		shebangfix
+		shebangfix sqlite
 SHEBANG_FILES=	extras/peer_add_secret_pub.in \
 		tools/glusterfind/S57glusterfind-delete-post.py \
 		extras/ganesha/scripts/ganesha-ha.sh
@@ -24,7 +24,6 @@ SHEBANG_FILES=	extras/peer_add_secret_pub.in \
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
-USE_SQLITE=	yes
 USE_RC_SUBR=	glusterd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index aadc14a8a2ed..e33b6cf55e3c 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -21,12 +21,11 @@ RUN_DEPENDS=	lsof:sysutils/lsof \
 IGNORE=		does not build with new polkit
 
 USES=		cpe execinfo gettext gmake iconv libtool pathfix pkgconfig \
-		python:build shared-mime-info shebangfix
+		python:build shared-mime-info shebangfix sqlite:3
 CPE_VENDOR=	packagekit_project
 SHEBANG_FILES=	backends/test/helpers/search-name.sh \
 		contrib/cron/packagekit-background.cron
 USE_GNOME=	glib20 intltool introspection
-USE_SQLITE=	3
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 3f4227ee8058..4acd85b04237 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -45,10 +45,10 @@ MYSQL_CONFIGURE_OFF=	--without-mysql
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-pgsql
-SQLITE2_USE=		SQLITE=2
+SQLITE2_USES=		sqlite:2
 SQLITE2_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 SQLITE2_CONFIGURE_OFF=	--without-sqlite
-SQLITE3_USE=		SQLITE=3
+SQLITE3_USES=		sqlite:3
 SQLITE3_CONFIGURE_ON=	--with-sqlite3=${LOCALBASE}
 SQLITE3_CONFIGURE_OFF=	--without-sqlite3
 ANONYMOUS_DESC=			ANONYMOUS authentication
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index b11657491ed8..b2f3cf6c400b 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -61,7 +61,7 @@ BDB_CONFIGURE_ON=	--with-berkeley-db \
 BDB_CONFIGURE_OFF=	--without-berkeley-db
 
 SQLITE_DESC=		Enable SQLite KDC backend support
-SQLITE_USE=		SQLITE=yes
+SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite3 \
 			--with-sqlite3-include="${LOCALBASE}/include" \
 			--with-sqlite3-lib="${LOCALBASE}/lib"
diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index 5be215e14ca3..c4ced1210fd0 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -37,7 +37,7 @@ PYTHON_USES=		python:2.7
 PYTHON_CONFIGURE_WITH=	python2=${PYTHON_CMD}
 PYTHON_PLIST_SUB=	VERSION=${PORTVERSION}
 SQLITE_DESC=		SQLite3 plugin
-SQLITE_USE=		sqlite=yes
+SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_WITH=	sqlite3
 
 .include <bsd.port.mk>
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index 9647e70f9b7c..d49d40ffb1a4 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -60,7 +60,7 @@ PLIST_SUB+=	PGSQL="@comment "
 #.endif
 
 #.if defined(WITH_SQLITE)
-#USE_SQLITE=	3
+#USES+=		sqlite:3
 #CONFIGURE_ARGS+=--with-sqlite=3
 #PLIST_SUB+=	SQLITE=""
 #.else
diff --git a/www/kannel-sqlbox/Makefile b/www/kannel-sqlbox/Makefile
index 5a8343e12b38..4c59d32b837f 100644
--- a/www/kannel-sqlbox/Makefile
+++ b/www/kannel-sqlbox/Makefile
@@ -31,7 +31,7 @@ MYSQL_USE=	mysql=yes
 
 PGSQL_USE=	pgsql=yes
 
-SQLITE3_USE=	sqlite=3
+SQLITE3_USES=	sqlite:3
 
 USE_RC_SUBR=	kannel_sqlbox
 
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 8dc4a12e91e9..581b9f6e513c 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -39,7 +39,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE3
 OPTIONS_DEFAULT=	MYSQL
 
-SQLITE3_USE=	SQLITE=3
+SQLITE3_USES=	sqlite:3
 SQLITE3_CONFIGURE_WITH=	sqlite3
 
 MYSQL_USE=	MYSQL=yes
diff --git a/www/rt40/Makefile b/www/rt40/Makefile
index 5cefa42dfb5a..219eb7bd14a9 100644
--- a/www/rt40/Makefile
+++ b/www/rt40/Makefile
@@ -91,7 +91,7 @@ PGSQL_RUN_DEPENDS=		${PGSQL_DEPS}
 
 ORACLE_RUN_DEPENDS=		${ORACLE_DEPS}
 
-SQLITE_USE=			SQLITE=yes
+SQLITE_USES=			sqlite
 SQLITE_RUN_DEPENDS=		${SQLITE_DEPS}
 
 DEV_DESC=			Configure for Developers