D5951.diff
No OneTemporary
Actions

Size

38 KB

Referenced Files

None

Subscribers

None

D5951.diff
View Options

	Index: head/Mk/bsd.database.mk
	===================================================================
	--- head/Mk/bsd.database.mk
	+++ head/Mk/bsd.database.mk
	@@ -76,12 +76,6 @@
	# 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 @@

	.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)
	Index: head/Mk/bsd.port.mk
	===================================================================
	--- head/Mk/bsd.port.mk
	+++ head/Mk/bsd.port.mk
	@@ -1864,7 +1864,7 @@
	.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

	Index: head/Mk/bsd.sanity.mk
	===================================================================
	--- head/Mk/bsd.sanity.mk
	+++ head/Mk/bsd.sanity.mk
	@@ -168,8 +168,8 @@
	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

	Index: head/Tools/scripts/portsvar.sh
	===================================================================
	--- head/Tools/scripts/portsvar.sh
	+++ head/Tools/scripts/portsvar.sh
	@@ -58,7 +58,7 @@
	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";;
	Index: head/astro/foxtrotgps/Makefile
	===================================================================
	--- head/astro/foxtrotgps/Makefile
	+++ head/astro/foxtrotgps/Makefile
	@@ -20,14 +20,13 @@
	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
	Index: head/audio/harp/Makefile
	===================================================================
	--- head/audio/harp/Makefile
	+++ head/audio/harp/Makefile
	@@ -12,9 +12,7 @@
	USE_GITHUB= yes
	GH_ACCOUNT= heckendorfc

	-USES= cmake
	-
	-USE_SQLITE= yes
	+USES= cmake sqlite

	USE_LDCONFIG= yes

	Index: head/audio/libgpod/Makefile
	===================================================================
	--- head/audio/libgpod/Makefile
	+++ head/audio/libgpod/Makefile
	@@ -16,13 +16,12 @@
	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

	Index: head/audio/linuxsampler/Makefile
	===================================================================
	--- head/audio/linuxsampler/Makefile
	+++ head/audio/linuxsampler/Makefile
	@@ -22,9 +22,8 @@
	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
	Index: head/audio/lollypop/Makefile
	===================================================================
	--- head/audio/lollypop/Makefile
	+++ head/audio/lollypop/Makefile
	@@ -18,10 +18,9 @@
	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
	Index: head/audio/osd-lyrics/Makefile
	===================================================================
	--- head/audio/osd-lyrics/Makefile
	+++ head/audio/osd-lyrics/Makefile
	@@ -17,9 +17,8 @@
	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
	Index: head/audio/pragha/Makefile
	===================================================================
	--- head/audio/pragha/Makefile
	+++ head/audio/pragha/Makefile
	@@ -19,10 +19,9 @@
	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
	Index: head/chinese/libchewing/Makefile
	===================================================================
	--- head/chinese/libchewing/Makefile
	+++ head/chinese/libchewing/Makefile
	@@ -15,8 +15,7 @@

	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
	Index: head/databases/akonadi/Makefile
	===================================================================
	--- head/databases/akonadi/Makefile
	+++ head/databases/akonadi/Makefile
	@@ -41,7 +41,7 @@
	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
	Index: head/databases/cppdb/Makefile
	===================================================================
	--- head/databases/cppdb/Makefile
	+++ head/databases/cppdb/Makefile
	@@ -91,7 +91,7 @@
	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
	Index: head/databases/fpc-sqlite/Makefile
	===================================================================
	--- head/databases/fpc-sqlite/Makefile
	+++ head/databases/fpc-sqlite/Makefile
	@@ -16,6 +16,6 @@
	OPTIONS_DEFINE= SQLITE
	OPTIONS_DEFAULT= SQLITE

	-SQLITE_USE= SQLITE=yes
	+SQLITE_USES= sqlite

	.include "${MASTERDIR}/Makefile"
	Index: head/databases/grass/Makefile
	===================================================================
	--- head/databases/grass/Makefile
	+++ head/databases/grass/Makefile
	@@ -111,7 +111,7 @@
	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>
	Index: head/databases/gtksql/Makefile
	===================================================================
	--- head/databases/gtksql/Makefile
	+++ head/databases/gtksql/Makefile
	@@ -50,7 +50,7 @@
	.endif

	.if ${PORT_OPTIONS:MSQLITE}
	-USE_SQLITE= yes
	+USES+= sqlite
	.else
	CONFIGURE_ARGS+= --without-sqlite
	.endif
	Index: head/databases/luadbi/Makefile
	===================================================================
	--- head/databases/luadbi/Makefile
	+++ head/databases/luadbi/Makefile
	@@ -35,7 +35,7 @@
	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

	Index: head/databases/opendbx/Makefile
	===================================================================
	--- head/databases/opendbx/Makefile
	+++ head/databases/opendbx/Makefile
	@@ -38,7 +38,7 @@

	SQLITE_LIB_DEPENDS= libsqlite.so:databases/sqlite2

	-SQLITE3_USE= SQLITE=3
	+SQLITE3_USES= sqlite:3

	MSSQL_LIB_DEPENDS= libsybdb.so:databases/freetds

	Index: head/databases/p5-DBIx-Class-Schema-Loader/Makefile
	===================================================================
	--- head/databases/p5-DBIx-Class-Schema-Loader/Makefile
	+++ head/databases/p5-DBIx-Class-Schema-Loader/Makefile
	@@ -51,7 +51,7 @@
	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>

	Index: head/databases/proftpd-mod_sql_sqlite/Makefile
	===================================================================
	--- head/databases/proftpd-mod_sql_sqlite/Makefile
	+++ head/databases/proftpd-mod_sql_sqlite/Makefile
	@@ -15,7 +15,7 @@

	MASTERDIR= ${.CURDIR}/../../ftp/proftpd

	-USE_SQLITE= yes
	+USES= sqlite

	INCLUDEDIRS= ${LOCALBASE}/include
	LIBDIRS= ${LOCALBASE}/lib
	Index: head/databases/qt5-sqldrivers-sqlite2/Makefile
	===================================================================
	--- head/databases/qt5-sqldrivers-sqlite2/Makefile
	+++ head/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"
	Index: head/databases/qt5-sqldrivers-sqlite3/Makefile
	===================================================================
	--- head/databases/qt5-sqldrivers-sqlite3/Makefile
	+++ head/databases/qt5-sqldrivers-sqlite3/Makefile
	@@ -5,7 +5,7 @@
	DB= SQLite
	DB_DESC= SQLite 3

	-USE_SQLITE= 3
	+USES= sqlite:3
	CONFIGURE_ARGS= -system-sqlite

	.include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers"
	Index: head/databases/soci/Makefile
	===================================================================
	--- head/databases/soci/Makefile
	+++ head/databases/soci/Makefile
	@@ -33,7 +33,7 @@
	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

	Index: head/databases/spatialite-tools/Makefile
	===================================================================
	--- head/databases/spatialite-tools/Makefile
	+++ head/databases/spatialite-tools/Makefile
	@@ -18,8 +18,7 @@
	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}
	Index: head/databases/spatialite/Makefile
	===================================================================
	--- head/databases/spatialite/Makefile
	+++ head/databases/spatialite/Makefile
	@@ -19,8 +19,7 @@

	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
	Index: head/databases/sqlite-ext-miscfuncs/Makefile
	===================================================================
	--- head/databases/sqlite-ext-miscfuncs/Makefile
	+++ head/databases/sqlite-ext-miscfuncs/Makefile
	@@ -13,7 +13,7 @@
	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

	Index: head/databases/sqlite-ext-pcre/Makefile
	===================================================================
	--- head/databases/sqlite-ext-pcre/Makefile
	+++ head/databases/sqlite-ext-pcre/Makefile
	@@ -9,7 +9,6 @@

	LIB_DEPENDS+= libpcre.so:devel/pcre

	-USE_SQLITE= yes
	DIST_SUBDIR= sqlite-ext

	LIBFILE= pcre.so
	@@ -20,7 +19,7 @@

	PLIST_FILES= libexec/${DIST_SUBDIR}/${LIBFILE}

	-USES= gmake pkgconfig
	+USES= gmake pkgconfig sqlite

	USE_GITHUB= yes
	GH_ACCOUNT= ralight
	Index: head/databases/sqlitebrowser/Makefile
	===================================================================
	--- head/databases/sqlitebrowser/Makefile
	+++ head/databases/sqlitebrowser/Makefile
	@@ -14,10 +14,9 @@

	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

	Index: head/databases/sqliteman/Makefile
	===================================================================
	--- head/databases/sqliteman/Makefile
	+++ head/databases/sqliteman/Makefile
	@@ -12,8 +12,7 @@

	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
	Index: head/databases/sqlitestudio/Makefile
	===================================================================
	--- head/databases/sqlitestudio/Makefile
	+++ head/databases/sqlitestudio/Makefile
	@@ -37,10 +37,9 @@

	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

	Index: head/databases/virtualpg/Makefile
	===================================================================
	--- head/databases/virtualpg/Makefile
	+++ head/databases/virtualpg/Makefile
	@@ -13,8 +13,7 @@
	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
	Index: head/databases/vsqlite/Makefile
	===================================================================
	--- head/databases/vsqlite/Makefile
	+++ head/databases/vsqlite/Makefile
	@@ -16,9 +16,8 @@
	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
	Index: head/deskutils/fbreader/Makefile
	===================================================================
	--- head/deskutils/fbreader/Makefile
	+++ head/deskutils/fbreader/Makefile
	@@ -27,9 +27,8 @@
	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

	Index: head/deskutils/growl-for-linux/Makefile
	===================================================================
	--- head/deskutils/growl-for-linux/Makefile
	+++ head/deskutils/growl-for-linux/Makefile
	@@ -31,11 +31,10 @@

	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/' \
	Index: head/deskutils/gworkspace-gwmetadata/Makefile
	===================================================================
	--- head/deskutils/gworkspace-gwmetadata/Makefile
	+++ head/deskutils/gworkspace-gwmetadata/Makefile
	@@ -12,14 +12,13 @@

	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
	Index: head/deskutils/osmo/Makefile
	===================================================================
	--- head/deskutils/osmo/Makefile
	+++ head/deskutils/osmo/Makefile
	@@ -18,9 +18,8 @@
	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

	Index: head/deskutils/pinot/Makefile
	===================================================================
	--- head/deskutils/pinot/Makefile
	+++ head/deskutils/pinot/Makefile
	@@ -47,9 +47,8 @@
	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
	Index: head/devel/bugzilla44/Makefile
	===================================================================
	--- head/devel/bugzilla44/Makefile
	+++ head/devel/bugzilla44/Makefile
	@@ -49,7 +49,7 @@
	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 \
	Index: head/devel/bugzilla50/Makefile
	===================================================================
	--- head/devel/bugzilla50/Makefile
	+++ head/devel/bugzilla50/Makefile
	@@ -52,7 +52,7 @@
	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 \
	Index: head/devel/cvstrac/Makefile
	===================================================================
	--- head/devel/cvstrac/Makefile
	+++ head/devel/cvstrac/Makefile
	@@ -13,8 +13,7 @@

	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}"
	Index: head/devel/libleaftag/Makefile
	===================================================================
	--- head/devel/libleaftag/Makefile
	+++ head/devel/libleaftag/Makefile
	@@ -10,8 +10,7 @@
	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
	Index: head/devel/libopensync/Makefile
	===================================================================
	--- head/devel/libopensync/Makefile
	+++ head/devel/libopensync/Makefile
	@@ -16,8 +16,7 @@

	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
	Index: head/devel/libsoup/Makefile
	===================================================================
	--- head/devel/libsoup/Makefile
	+++ head/devel/libsoup/Makefile
	@@ -20,10 +20,9 @@
	.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 @@
	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
	Index: head/devel/matreshka/Makefile
	===================================================================
	--- head/devel/matreshka/Makefile
	+++ head/devel/matreshka/Makefile
	@@ -31,7 +31,7 @@

	MYSQL_USE= MYSQL=yes
	PGSQL_USES= pgsql
	-SQLITE3_USE= SQLITE=yes
	+SQLITE3_USES= sqlite
	FIREBIRD_USE= FIREBIRD=yes

	MAKE_JOBS_UNSAFE= yes
	Index: head/devel/poco-devel/Makefile
	===================================================================
	--- head/devel/poco-devel/Makefile
	+++ head/devel/poco-devel/Makefile
	@@ -65,7 +65,7 @@
	.endif

	.if ${PORT_OPTIONS:MSQLITE}
	-USE_SQLITE= yes
	+USES+= sqlite
	.else
	CONFIGURE_ARGS+= --omit=Data/SQLite
	.endif
	Index: head/devel/poco-ssl/Makefile
	===================================================================
	--- head/devel/poco-ssl/Makefile
	+++ head/devel/poco-ssl/Makefile
	@@ -37,7 +37,7 @@
	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>
	Index: head/dns/opendnssec13/Makefile
	===================================================================
	--- head/dns/opendnssec13/Makefile
	+++ head/dns/opendnssec13/Makefile
	@@ -46,7 +46,7 @@
	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

	Index: head/dns/powerdns/Makefile
	===================================================================
	--- head/dns/powerdns/Makefile
	+++ head/dns/powerdns/Makefile
	@@ -91,7 +91,7 @@

	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"
	Index: head/ftp/wzdftpd/Makefile
	===================================================================
	--- head/ftp/wzdftpd/Makefile
	+++ head/ftp/wzdftpd/Makefile
	@@ -59,7 +59,7 @@
	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 \
	Index: head/games/crossfire-server/Makefile
	===================================================================
	--- head/games/crossfire-server/Makefile
	+++ head/games/crossfire-server/Makefile
	@@ -46,10 +46,10 @@
	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
	Index: head/games/ldmud/Makefile
	===================================================================
	--- head/games/ldmud/Makefile
	+++ head/games/ldmud/Makefile
	@@ -41,7 +41,7 @@
	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>
	Index: head/games/pvpgn/Makefile
	===================================================================
	--- head/games/pvpgn/Makefile
	+++ head/games/pvpgn/Makefile
	@@ -50,7 +50,7 @@
	PGSQL_USES= pgsql
	PGSQL_CONFIGURE_WITH= pgsql

	-SQLITE3_USE= SQLITE=3
	+SQLITE3_USES= sqlite:3
	SQLITE3_CONFIGURE_WITH= sqlite3

	## support files
	Index: head/graphics/gdal/Makefile
	===================================================================
	--- head/graphics/gdal/Makefile
	+++ head/graphics/gdal/Makefile
	@@ -105,7 +105,7 @@
	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
	Index: head/lang/bigloo/Makefile
	===================================================================
	--- head/lang/bigloo/Makefile
	+++ head/lang/bigloo/Makefile
	@@ -66,7 +66,7 @@
	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>
	Index: head/lang/io/Makefile.addons
	===================================================================
	--- head/lang/io/Makefile.addons
	+++ head/lang/io/Makefile.addons
	@@ -94,7 +94,7 @@
	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
	Index: head/lang/munger/Makefile
	===================================================================
	--- head/lang/munger/Makefile
	+++ head/lang/munger/Makefile
	@@ -24,7 +24,7 @@
	OPTIONS_DEFINE= SQLITE
	OPTIONS_DEFAULT= SQLITE

	-SQLITE_USE= SQLITE=3
	+SQLITE_USES= sqlite:3
	SQLITE_MAKE_ARGS= -DWITH_SQL

	post-patch:
	Index: head/mail/cyrus-imapd23/Makefile
	===================================================================
	--- head/mail/cyrus-imapd23/Makefile
	+++ head/mail/cyrus-imapd23/Makefile
	@@ -82,7 +82,7 @@
	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
	Index: head/mail/cyrus-imapd24/Makefile
	===================================================================
	--- head/mail/cyrus-imapd24/Makefile
	+++ head/mail/cyrus-imapd24/Makefile
	@@ -77,7 +77,7 @@
	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
	Index: head/mail/dbmail22/Makefile
	===================================================================
	--- head/mail/dbmail22/Makefile
	+++ head/mail/dbmail22/Makefile
	@@ -27,7 +27,7 @@

	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
	Index: head/mail/dovecot/Makefile
	===================================================================
	--- head/mail/dovecot/Makefile
	+++ head/mail/dovecot/Makefile
	@@ -77,7 +77,7 @@
	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
	Index: head/mail/dovecot2/Makefile
	===================================================================
	--- head/mail/dovecot2/Makefile
	+++ head/mail/dovecot2/Makefile
	@@ -109,7 +109,7 @@
	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
	Index: head/mail/dspam/Makefile
	===================================================================
	--- head/mail/dspam/Makefile
	+++ head/mail/dspam/Makefile
	@@ -215,20 +215,20 @@
	.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 @@
	@${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 @@
	@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
	Index: head/mail/exim/Makefile
	===================================================================
	--- head/mail/exim/Makefile
	+++ head/mail/exim/Makefile
	@@ -55,8 +55,7 @@
	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>

	Index: head/misc/krecipes-kde4/Makefile
	===================================================================
	--- head/misc/krecipes-kde4/Makefile
	+++ head/misc/krecipes-kde4/Makefile
	@@ -19,8 +19,8 @@
	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 \
	Index: head/net-im/ejabberd/Makefile
	===================================================================
	--- head/net-im/ejabberd/Makefile
	+++ head/net-im/ejabberd/Makefile
	@@ -67,7 +67,7 @@
	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
	Index: head/net-im/imspector/Makefile
	===================================================================
	--- head/net-im/imspector/Makefile
	+++ head/net-im/imspector/Makefile
	@@ -31,8 +31,8 @@
	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>

	Index: head/net-mgmt/aircrack-ng/Makefile
	===================================================================
	--- head/net-mgmt/aircrack-ng/Makefile
	+++ head/net-mgmt/aircrack-ng/Makefile
	@@ -33,7 +33,7 @@
	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:
	Index: head/net-mgmt/netxms/Makefile
	===================================================================
	--- head/net-mgmt/netxms/Makefile
	+++ head/net-mgmt/netxms/Makefile
	@@ -39,7 +39,7 @@
	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

	Index: head/net-mgmt/zabbix2-server/Makefile
	===================================================================
	--- head/net-mgmt/zabbix2-server/Makefile
	+++ head/net-mgmt/zabbix2-server/Makefile
	@@ -93,7 +93,7 @@
	PGSQL_USES= pgsql

	SQLITE_CONFIGURE_WITH= sqlite3
	-SQLITE_USE= SQLITE=3
	+SQLITE_USES= sqlite:3

	ORACLE_CONFIGURE_WITH= oracle

	Index: head/net-mgmt/zabbix22-server/Makefile
	===================================================================
	--- head/net-mgmt/zabbix22-server/Makefile
	+++ head/net-mgmt/zabbix22-server/Makefile
	@@ -96,7 +96,7 @@
	PGSQL_USES= pgsql

	SQLITE_CONFIGURE_WITH= sqlite3
	-SQLITE_USE= SQLITE=3
	+SQLITE_USES= sqlite:3

	ORACLE_CONFIGURE_WITH= oracle

	Index: head/net-mgmt/zabbix24-server/Makefile
	===================================================================
	--- head/net-mgmt/zabbix24-server/Makefile
	+++ head/net-mgmt/zabbix24-server/Makefile
	@@ -97,7 +97,7 @@
	PGSQL_USES= pgsql

	SQLITE_CONFIGURE_WITH= sqlite3
	-SQLITE_USE= SQLITE=3
	+SQLITE_USES= sqlite:3

	ORACLE_CONFIGURE_WITH= oracle

	Index: head/net-mgmt/zabbix3-server/Makefile
	===================================================================
	--- head/net-mgmt/zabbix3-server/Makefile
	+++ head/net-mgmt/zabbix3-server/Makefile
	@@ -99,7 +99,7 @@
	PGSQL_USES= pgsql

	SQLITE_CONFIGURE_WITH= sqlite3
	-SQLITE_USE= SQLITE=3
	+SQLITE_USES= sqlite:3

	ORACLE_CONFIGURE_WITH= oracle

	Index: head/net-p2p/gnunet/Makefile
	===================================================================
	--- head/net-p2p/gnunet/Makefile
	+++ head/net-p2p/gnunet/Makefile
	@@ -71,7 +71,7 @@
	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

	Index: head/net-p2p/uhub/Makefile
	===================================================================
	--- head/net-p2p/uhub/Makefile
	+++ head/net-p2p/uhub/Makefile
	@@ -30,7 +30,7 @@

	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>
	Index: head/net/glusterfs/Makefile
	===================================================================
	--- head/net/glusterfs/Makefile
	+++ head/net/glusterfs/Makefile
	@@ -16,7 +16,7 @@
	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 @@
	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 \
	Index: head/ports-mgmt/packagekit/Makefile
	===================================================================
	--- head/ports-mgmt/packagekit/Makefile
	+++ head/ports-mgmt/packagekit/Makefile
	@@ -21,12 +21,11 @@
	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
	Index: head/security/cyrus-sasl2/Makefile
	===================================================================
	--- head/security/cyrus-sasl2/Makefile
	+++ head/security/cyrus-sasl2/Makefile
	@@ -45,10 +45,10 @@
	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
	Index: head/security/heimdal/Makefile
	===================================================================
	--- head/security/heimdal/Makefile
	+++ head/security/heimdal/Makefile
	@@ -61,7 +61,7 @@
	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"
	Index: head/security/libpreludedb/Makefile
	===================================================================
	--- head/security/libpreludedb/Makefile
	+++ head/security/libpreludedb/Makefile
	@@ -37,7 +37,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>
	Index: head/textproc/redland/Makefile
	===================================================================
	--- head/textproc/redland/Makefile
	+++ head/textproc/redland/Makefile
	@@ -60,7 +60,7 @@
	#.endif

	#.if defined(WITH_SQLITE)
	-#USE_SQLITE= 3
	+#USES+= sqlite:3
	#CONFIGURE_ARGS+=--with-sqlite=3
	#PLIST_SUB+= SQLITE=""
	#.else
	Index: head/www/kannel-sqlbox/Makefile
	===================================================================
	--- head/www/kannel-sqlbox/Makefile
	+++ head/www/kannel-sqlbox/Makefile
	@@ -31,7 +31,7 @@

	PGSQL_USE= pgsql=yes

	-SQLITE3_USE= sqlite=3
	+SQLITE3_USES= sqlite:3

	USE_RC_SUBR= kannel_sqlbox

	Index: head/www/kannel/Makefile
	===================================================================
	--- head/www/kannel/Makefile
	+++ head/www/kannel/Makefile
	@@ -39,7 +39,7 @@
	OPTIONS_DEFINE= MYSQL PGSQL SQLITE3
	OPTIONS_DEFAULT= MYSQL

	-SQLITE3_USE= SQLITE=3
	+SQLITE3_USES= sqlite:3
	SQLITE3_CONFIGURE_WITH= sqlite3

	MYSQL_USE= MYSQL=yes
	Index: head/www/rt40/Makefile
	===================================================================
	--- head/www/rt40/Makefile
	+++ head/www/rt40/Makefile
	@@ -91,7 +91,7 @@

	ORACLE_RUN_DEPENDS= ${ORACLE_DEPS}

	-SQLITE_USE= SQLITE=yes
	+SQLITE_USES= sqlite
	SQLITE_RUN_DEPENDS= ${SQLITE_DEPS}

	DEV_DESC= Configure for Developers

File Metadata

Mime Type: text/plain
Expires: Thu, Apr 2, 10:42 PM (54 m, 33 s)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 30738168
Default Alt Text: D5951.diff (38 KB)

D5951.diffNo OneTemporaryActions

D5951.diffView Options

File Metadata

Event Timeline

D5951.diff
No OneTemporary
Actions

D5951.diff
View Options