FreeBSD Bugzilla – Attachment 169556 Details for
Bug 208971
Axe bsd.databases.mk
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch-v1
databases.diff (text/plain), 73.80 KB, created by
Mathieu Arnold
on 2016-04-22 09:40:52 UTC
(
hide
)
Description:
patch-v1
Filename:
MIME Type:
Creator:
Mathieu Arnold
Created:
2016-04-22 09:40:52 UTC
Size:
73.80 KB
patch
obsolete
>diff --git Mk/Uses/bdb.mk Mk/Uses/bdb.mk >new file mode 100644 >index 0000000..69c4e1f >--- /dev/null >+++ Mk/Uses/bdb.mk >@@ -0,0 +1,249 @@ >+# $FreeBSD$ >+# >+# Provide support for Berkeley DB >+# Feature: bdb >+# Usage: USES= bdb[:version] >+# >+# If no version is given (by the maintainer via the port or >+# by the user via defined variable), try to find the >+# currently installed version. Fall back to default if >+# necessary (db5 if compatible). >+# This adds a "debug-bdb" make target which will dump the >+# related data. >+# INVALID_BDB_VER >+# - This variable can be defined when the port does not >+# support one or more versions of Berkeley DB. >+# WITH_BDB_VER >+# - User defined global variable to set Berkeley DB version. >+# <BDB_UNIQUENAME>_WITH_BDB_VER >+# - User defined port specific variable to set Berkeley DB >+# version. >+# WITH_BDB_HIGHEST >+# - Use the highest installed version of Berkeley DB. >+# WITH_BDB6_PERMITTED >+# - If defined, BerkeleyDB 6 is added to the >+# default version set, making it eligible even >+# if not already installed. This is due to its >+# stricter Affero GNU Public License. >+# >+# These variables will then be filled in by this .mk file: >+# >+# BDB_LIB_NAME >+# - This variable is automatically set to the name of the >+# Berkeley DB library (default: db41). >+# BDB_LIB_CXX_NAME >+# - This variable is automatically set to the name of the >+# Berkeley DB C++ library (default: db41_cxx). >+# BDB_INCLUDE_DIR >+# - This variable is automatically set to the location of >+# the Berkeley DB include directory (default: >+# ${LOCALBASE}/include/db41). >+# BDB_LIB_DIR >+# - This variable is automatically set to the location of >+# the Berkeley DB library directory. >+# BDB_VER >+# - Detected Berkeley DB version. >+# >+# MAINTAINER: ports@FreeBSD.org >+ >+.if !defined(_INCLUDE_USES_BDB_MK) >+_INCLUDE_USES_BDB_MK= yes >+ >+.if !empty(bdb_ARGS) >+_bdb_ARGS:= ${bdb_ARGS} >+.endif >+_bdb_ARGS?= yes >+ >+# TODO: avoid malformed conditional with invalid _bdb_ARGS/WITH_BDB_VER >+# check if + works properly from test builds 01h12m23s >+ >+BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} >+ >+_WITH_BDB_VER_save:=${WITH_BDB_VER} >+ >+_DB_PORTS= 48 5 6 >+_DB_DEFAULTS= 48 5 # does not include 6 due to different licensing >+# but user can re-add it through WITH_BDB6_PERMITTED >+. if defined(WITH_BDB6_PERMITTED) >+_DB_DEFAULTS+= 6 >+. endif >+ >+# Dependency lines for different db versions >+db48_DEPENDS= libdb-4.8.so:databases/db48 >+db5_DEPENDS= libdb-5.3.so:databases/db5 >+db6_DEPENDS= libdb-6.1.so:databases/db6 >+# Detect db versions by finding some files >+db48_FIND= ${LOCALBASE}/include/db48/db.h >+db5_FIND= ${LOCALBASE}/include/db5/db.h >+db6_FIND= ${LOCALBASE}/include/db6/db.h >+ >+# Override the global WITH_BDB_VER with the >+# port specific <BDB_UNIQUENAME>_WITH_BDB_VER >+.if defined(${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER) >+WITH_BDB_VER= ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER} >+.endif >+ >+# Override _bdb_ARGS with global WITH_BDB_VER if the maintainer did not >+# ask for a more specific version. >+.if defined(WITH_BDB_VER) >+. if ${WITH_BDB_VER} != 1 && ${_bdb_ARGS} == yes >+_bdb_ARGS= ${WITH_BDB_VER} >+. endif >+.endif >+ >+# Compatiblity hack: >+# upgrade older plussed versions to 48+ >+_BDB_OLDPLUSVERS=4+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ >+.for i in ${_bdb_ARGS} >+. if ${_BDB_OLDPLUSVERS:M${i}} >+_bdb_ARGS:= 48+ >+. endif >+.endfor >+ >+.if ${_bdb_ARGS} == yes >+_bdb_ARGS:= 48+ >+.endif >+ >+# 1. detect installed versions >+_INST_BDB_VER= >+.for bdb in ${_DB_PORTS} >+. if exists(${db${bdb}_FIND}) >+_INST_BDB_VER+=${bdb} >+. endif >+.endfor >+ >+# 2. parse supported versions: >+# 2a. build list from _bdb_ARGS >+_SUPP_BDB_VER= >+__bdb_ARGS:=${_bdb_ARGS:C,\+$,,:C/(.)(.)$/\1.\2/} >+.if !empty(_bdb_ARGS:M*+) >+. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/} >+. if ${__bdb_ARGS} <= ${bdb} >+_SUPP_BDB_VER+=${bdb:C/\.//} >+. endif >+. endfor >+.else >+_SUPP_BDB_VER=${_bdb_ARGS} >+.endif >+# 2b. expand INVALID_BDB_VER if given with "+": >+.if !empty(INVALID_BDB_VER:M*+) >+_INV_BDB:=${INVALID_BDB_VER:C,\+$,,:C/(.)(.)$/\1.\2/} >+_INV_BDB_VER:= >+. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/} >+. if ${_INV_BDB} <= ${bdb} >+_INV_BDB_VER+=${bdb:C/\.//} >+. endif >+. endfor >+.else >+_INV_BDB_VER:=${INVALID_BDB_VER} >+.endif >+# 2c. strip versions from INVALID_BDB_VER out of _SUPP_BDB_VER >+.for unsupp in ${_INV_BDB_VER} >+_SUPP_BDB_VER:=${_SUPP_BDB_VER:N${unsupp}} >+.endfor >+ >+# 3a. calculate intersection in _INST_BDB_VER to see if there >+# is a usable installed version >+.for i in ${_INST_BDB_VER} >+. if empty(_SUPP_BDB_VER:M${i}) >+_INST_BDB_VER:= ${_INST_BDB_VER:N${i}} >+. endif >+.endfor >+_ELIGIBLE_BDB_VER:=${_INST_BDB_VER} >+ >+# 3b. if there is no usable version installed, check defaults >+.if empty(_INST_BDB_VER) >+_DFLT_BDB_VER:=${_DB_DEFAULTS} >+# make sure we use a reasonable version for package builds >+_WITH_BDB_HIGHEST=yes >+. for i in ${_DFLT_BDB_VER} >+. if empty(_SUPP_BDB_VER:M${i}) >+_DFLT_BDB_VER:= ${_DFLT_BDB_VER:N${i}} >+. endif >+. endfor >+_ELIGIBLE_BDB_VER:=${_DFLT_BDB_VER} >+.endif >+ >+# 4. elect a version >+_BDB_VER= >+.for i in ${_ELIGIBLE_BDB_VER} >+. if !empty(WITH_BDB_HIGHEST) || !empty(_WITH_BDB_HIGHEST) || empty(${_BDB_VER}) >+_BDB_VER:=${i} >+. endif >+.endfor >+ >+# 5. catch errors or set variables >+.if empty(_BDB_VER) >+IGNORE= cannot install: no eligible BerkeleyDB version. Requested: ${_bdb_ARGS}, incompatible: ${_INV_BDB_VER}. Try: make debug-bdb >+.else >+. if defined(BDB_BUILD_DEPENDS) >+BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://} >+. else >+LIB_DEPENDS+= ${db${_BDB_VER}_DEPENDS} >+. endif >+. if ${_BDB_VER} == 48 >+BDB_LIB_NAME= db-4.8 >+BDB_LIB_CXX_NAME= db_cxx-4.8 >+BDB_LIB_DIR= ${LOCALBASE}/lib/db48 >+. elif ${_BDB_VER} == 5 >+BDB_LIB_NAME= db-5.3 >+BDB_LIB_CXX_NAME= db_cxx-5.3 >+BDB_LIB_DIR= ${LOCALBASE}/lib/db5 >+. elif ${_BDB_VER} == 6 >+BDB_LIB_NAME= db-6.1 >+BDB_LIB_CXX_NAME= db_cxx-6.1 >+BDB_LIB_DIR= ${LOCALBASE}/lib/db6 >+. endif >+BDB_LIB_NAME?= db${_BDB_VER} >+BDB_LIB_CXX_NAME?= db${_BDB_VER}_cxx >+BDB_INCLUDE_DIR?= ${LOCALBASE}/include/db${_BDB_VER} >+BDB_LIB_DIR?= ${LOCALBASE}/lib >+.endif >+BDB_VER= ${_BDB_VER} >+ >+debug-bdb: >+ @${ECHO_CMD} "--INPUTS----------------------------------------------------" >+ @${ECHO_CMD} "${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER: ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}" >+ @${ECHO_CMD} "WITH_BDB_VER: ${_WITH_BDB_VER_save}" >+ @${ECHO_CMD} "BDB_BUILD_DEPENDS: ${BDB_BUILD_DEPENDS}" >+ @${ECHO_CMD} "bdb_ARGS (original): ${bdb_ARGS}" >+ @${ECHO_CMD} "WITH_BDB_HIGHEST (original): ${WITH_BDB_HIGHEST}" >+ @${ECHO_CMD} "--PROCESSING------------------------------------------------" >+ @${ECHO_CMD} "supported versions: ${_SUPP_BDB_VER}" >+ @${ECHO_CMD} "invalid versions: ${_INV_BDB_VER}" >+ @${ECHO_CMD} "installed versions: ${_INST_BDB_VER}" >+ @${ECHO_CMD} "eligible versions: ${_ELIGIBLE_BDB_VER}" >+ @${ECHO_CMD} "bdb_ARGS (effective): ${_bdb_ARGS}" >+ @${ECHO_CMD} "WITH_BDB_HIGHEST (override): ${_WITH_BDB_HIGHEST}" >+ @${ECHO_CMD} "--OUTPUTS---------------------------------------------------" >+ @${ECHO_CMD} "IGNORE=${IGNORE}" >+ @${ECHO_CMD} "BDB_VER=${BDB_VER}" >+ @${ECHO_CMD} "BDB_INCLUDE_DIR=${BDB_INCLUDE_DIR}" >+ @${ECHO_CMD} "BDB_LIB_NAME=${BDB_LIB_NAME}" >+ @${ECHO_CMD} "BDB_LIB_CXX_NAME=${BDB_LIB_CXX_NAME}" >+ @${ECHO_CMD} "BDB_LIB_DIR=${BDB_LIB_DIR}" >+ @${ECHO_CMD} "BUILD_DEPENDS=${BUILD_DEPENDS:M*/databases/db*}" >+ @${ECHO_CMD} "LIB_DEPENDS=${LIB_DEPENDS:M*/databases/db*}" >+ @${ECHO_CMD} "------------------------------------------------------------" >+ >+# Obsolete variables - ports can define these to want users about >+# variables that may be in /etc/make.conf but that are no longer >+# effective: >+.if defined(OBSOLETE_BDB_VAR) >+. for var in ${OBSOLETE_BDB_VAR} >+. if defined(${var}) >+BAD_VAR+= ${var}, >+. endif >+. endfor >+. if defined(BAD_VAR) >+_IGNORE_MSG= Obsolete variable(s) ${BAD_VAR} use WITH_BDB_VER or ${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER to select Berkeley DB version >+. if defined(IGNORE) >+IGNORE+= ${_IGNORE_MSG} >+. else >+IGNORE= ${_IGNORE_MSG} >+. endif >+. endif >+.endif >+ >+ >+.endif >diff --git Mk/Uses/mysql.mk Mk/Uses/mysql.mk >new file mode 100644 >index 0000000..b5e8549 >--- /dev/null >+++ Mk/Uses/mysql.mk >@@ -0,0 +1,136 @@ >+# $FreeBSD$ >+# >+# Provide support for MySQL >+# Feature: mysql >+# Usage: USES=mysql or USES=mysql:args >+# Valid ARGS: <version>, server, embedded >+# >+# version If no version is given (by the maintainer via the port), try to >+# find the currently installed version. Fall back to default if >+# necessary (MySQL-5.6 = 56). >+# server/embedded >+# Depend on the server at run/build time. If none of these is >+# set, depends on the client. >+# >+# IGNORE_WITH_MYSQL >+# This variable can be defined if the ports does not support one >+# or more versions of MySQL. >+# WITH_MYSQL_VER >+# User defined variable to set MySQL version. >+# MYSQL_VER >+# Detected MySQL version. >+# >+# MAINTAINER: ports@FreeBSD.org >+ >+.if !defined(_INCLUDE_USES_MYSQL_MK) >+_INCLUDE_USES_MYSQL_MK= yes >+ >+.include "${PORTSDIR}/Mk/bsd.default-versions.mk" >+ >+.if !empty(mysql_ARGS) >+.undef _WANT_MYSQL_VER >+.undef _WANT_MYSQL_SERVER >+.undef _WANT_MYSQL_EMBEDDED >+_MYSQL_ARGS= ${mysql_ARGS:S/,/ /g} >+.if ${_MYSQL_ARGS:Mserver} >+_WANT_MYSQL_SERVER= yes >+_MYSQL_ARGS:= ${_MYSQL_ARGS:Nserver} >+.endif >+.if ${_MYSQL_ARGS:Membedded} >+_WANT_MYSQL_EMBEDDED= yes >+_MYSQL_ARGS:= ${_MYSQL_ARGS:Nembedded} >+.endif >+ >+# Port requested a version >+.if !empty(_MYSQL_ARGS) >+_WANT_MYSQL_VER= ${_MYSQL_ARGS} >+.endif >+.endif # !empty(mysql_ARGS) >+ >+.if defined(DEFAULT_MYSQL_VER) >+WARNING+= "DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=${DEFAULT_MYSQL_VER} instead" >+.endif >+ >+DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} >+# MySQL client version currently supported. >+# When adding a version, please keep the comment in >+# Mk/bsd.default-versions.mk in sync. >+MYSQL51_LIBVER= 16 >+MYSQL55_LIBVER= 18 >+MYSQL55m_LIBVER= 18 >+MYSQL55p_LIBVER= 18 >+MYSQL56_LIBVER= 18 >+MYSQL56p_LIBVER= 18 >+MYSQL57_LIBVER= 20 >+MYSQL100m_LIBVER= 18 >+MYSQL101m_LIBVER= 18 >+ >+# Setting/finding MySQL version we want. >+.if exists(${LOCALBASE}/bin/mysql) >+_MYSQL!= ${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/' >+_PERCONA!= ${LOCALBASE}/bin/mysql --version | ${GREP} Percona | wc -l >+_MARIADB!= ${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l >+ >+.if ${_PERCONA} == 1 >+_MYSQL_VER= ${_MYSQL}p >+.elif ${_MARIADB} == 1 >+_MYSQL_VER= ${_MYSQL}m >+.else >+_MYSQL_VER= ${_MYSQL} >+.endif >+.endif >+ >+.if defined(_WANT_MYSQL_VER) >+.if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${_WANT_MYSQL_VER} >+IGNORE= cannot install: the port wants mysql${_WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client >+.endif >+MYSQL_VER= ${_WANT_MYSQL_VER} >+.elif defined(WITH_MYSQL_VER) >+MYSQL_VER= ${WITH_MYSQL_VER} >+.else >+.if defined(_MYSQL_VER) >+MYSQL_VER= ${_MYSQL_VER} >+.else >+MYSQL_VER= ${DEFAULT_MYSQL_VER} >+.endif >+.endif # _WANT_MYSQL_VER >+ >+.if defined(_MYSQL_VER) >+.if ${_MYSQL_VER} != ${MYSQL_VER} >+IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client >+.endif >+.endif >+ >+.if (${MYSQL_VER:C/[0-9]*//} == "m") >+_MYSQL_FLAVOUR= mariadb >+.elif (${MYSQL_VER:C/[0-9]*//} == "p") >+_MYSQL_FLAVOUR= percona >+.else >+_MYSQL_FLAVOUR= mysql >+.endif >+ >+_MYSQL_CLIENT= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-client >+_MYSQL_SERVER= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-server >+ >+# And now we are checking if we can use it >+.if defined(MYSQL${MYSQL_VER}_LIBVER) >+.if defined(IGNORE_WITH_MYSQL) >+. for VER in ${IGNORE_WITH_MYSQL} >+. if (${MYSQL_VER} == "${VER}") >+IGNORE= cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${IGNORE_WITH_MYSQL} not supported) >+. endif >+. endfor >+.endif # IGNORE_WITH_MYSQL >+.if defined(_WANT_MYSQL_SERVER) || defined(_WANT_MYSQL_EMBEDDED) >+RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER} >+.if defined(_WANT_MYSQL_EMBEDDED) >+BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER} >+.endif >+.else >+LIB_DEPENDS+= libmysqlclient.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT} >+.endif >+.else >+IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} >+.endif # Check for correct libs >+ >+.endif >diff --git Mk/bsd.database.mk Mk/bsd.database.mk >deleted file mode 100644 >index 234c1ec..0000000 >--- Mk/bsd.database.mk >+++ /dev/null >@@ -1,426 +0,0 @@ >-# $FreeBSD$ >-# >- >-.if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) >- >-Database_Post_Include= bsd.database.mk >-Database_Include_MAINTAINER= ports@FreeBSD.org >- >-# This file contains some routines to interact with different databases, such >-# as MySQL and Berkley DB. To include this file, define macro >-# USE_[DATABASE], for example USE_MYSQL. Defining macro like >-# USE_[DATABASE]_VER or WANT_[DATABASE]_VER will include this file as well. >-# >-## >-# USE_MYSQL - Add MySQL (client/server/embedded) dependency (default: >-# client). >-# If no version is given (by the maintainer via the port or >-# by the user via defined variable), try to find the >-# currently installed version. Fall back to default if >-# necessary (MySQL-5.6 = 56). >-# DEFAULT_MYSQL_VER >-# - MySQL default version. Can be overridden within a port. >-# Default: 56. >-# WANT_MYSQL_VER >-# - Maintainer can set an arbitrary version of MySQL to always >-# build this port with (overrides WITH_MYSQL_VER). >-# IGNORE_WITH_MYSQL >-# - This variable can be defined if the ports does not support >-# one or more versions of MySQL. >-# WITH_MYSQL_VER >-# - User defined variable to set MySQL version. >-# MYSQL_VER >-# - Detected MySQL version. >-## >-# USE_BDB - Add Berkeley DB library dependency. >-# If no version is given (by the maintainer via the port or >-# by the user via defined variable), try to find the >-# currently installed version. Fall back to default if >-# necessary (db5 if compatible). >-# This adds a "debug-bdb" make target which will dump the >-# related data. >-# INVALID_BDB_VER >-# - This variable can be defined when the port does not >-# support one or more versions of Berkeley DB. >-# WANT_BDB_VER >-# - Maintainer can set a version of Berkeley DB to always >-# build this port with (overrides WITH_BDB_VER). >-# WITH_BDB_VER >-# - User defined global variable to set Berkeley DB version. >-# <BDB_UNIQUENAME>_WITH_BDB_VER >-# - User defined port specific variable to set Berkeley DB >-# version. >-# WITH_BDB_HIGHEST >-# - Use the highest installed version of Berkeley DB. >-# WITH_BDB6_PERMITTED >-# - If defined, BerkeleyDB 6 is added to the >-# default version set, making it eligible even >-# if not already installed. This is due to its >-# stricter Affero GNU Public License. >-# >-# These variables will then be filled in by this .mk file: >-# >-# BDB_LIB_NAME >-# - This variable is automatically set to the name of the >-# Berkeley DB library (default: db41). >-# BDB_LIB_CXX_NAME >-# - This variable is automatically set to the name of the >-# Berkeley DB C++ library (default: db41_cxx). >-# BDB_INCLUDE_DIR >-# - This variable is automatically set to the location of >-# the Berkeley DB include directory (default: >-# ${LOCALBASE}/include/db41). >-# BDB_LIB_DIR >-# - This variable is automatically set to the location of >-# the Berkeley DB library directory. >-# 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 >-# WITH_FIREBIRD_VER variable, fall back to default "2". >-# WITH_FIREBIRD_VER >-# - User defined variable to set Firebird version. >-# FIREBIRD_VER >-# - Detected Firebird version. >- >-.include "${PORTSDIR}/Mk/bsd.default-versions.mk" >- >-.if defined(DEFAULT_MYSQL_VER) >-WARNING+= "DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=${DEFAULT_MYSQL_VER} instead" >-.endif >- >-.if defined(USE_MYSQL) >-DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} >-# MySQL client version currently supported. >-# When adding a version, please keep the comment in >-# Mk/bsd.default-versions.mk in sync. >-MYSQL51_LIBVER= 16 >-MYSQL55_LIBVER= 18 >-MYSQL55m_LIBVER= 18 >-MYSQL55p_LIBVER= 18 >-MYSQL56_LIBVER= 18 >-MYSQL56p_LIBVER= 18 >-MYSQL57_LIBVER= 20 >-MYSQL100m_LIBVER= 18 >-MYSQL101m_LIBVER= 18 >- >-# Setting/finding MySQL version we want. >-.if exists(${LOCALBASE}/bin/mysql) >-_MYSQL!= ${LOCALBASE}/bin/mysql --version | ${SED} -e 's/.*Distrib \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/' >-_PERCONA!= ${LOCALBASE}/bin/mysql --version | ${GREP} Percona | wc -l >-_MARIADB!= ${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l >- >-.if ${_PERCONA} == 1 >-_MYSQL_VER= ${_MYSQL}p >-.elif ${_MARIADB} == 1 >-_MYSQL_VER= ${_MYSQL}m >-.else >-_MYSQL_VER= ${_MYSQL} >-.endif >-.endif >- >-.if defined(WANT_MYSQL_VER) >-.if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${WANT_MYSQL_VER} >-IGNORE= cannot install: the port wants mysql${WANT_MYSQL_VER}-client and you try to install mysql${WITH_MYSQL_VER}-client >-.endif >-MYSQL_VER= ${WANT_MYSQL_VER} >-.elif defined(WITH_MYSQL_VER) >-MYSQL_VER= ${WITH_MYSQL_VER} >-.else >-.if defined(_MYSQL_VER) >-MYSQL_VER= ${_MYSQL_VER} >-.else >-MYSQL_VER= ${DEFAULT_MYSQL_VER} >-.endif >-.endif # WANT_MYSQL_VER >- >-.if defined(_MYSQL_VER) >-.if ${_MYSQL_VER} != ${MYSQL_VER} >-IGNORE= cannot install: MySQL versions mismatch: mysql${_MYSQL_VER}-client is installed and wanted version is mysql${MYSQL_VER}-client >-.endif >-.endif >- >-.if (${MYSQL_VER:C/[0-9]*//} == "m") >-_MYSQL_FLAVOUR= mariadb >-.elif (${MYSQL_VER:C/[0-9]*//} == "p") >-_MYSQL_FLAVOUR= percona >-.else >-_MYSQL_FLAVOUR= mysql >-.endif >- >-_MYSQL_CLIENT= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-client >-_MYSQL_SERVER= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-server >- >-# And now we are checking if we can use it >-.if defined(MYSQL${MYSQL_VER}_LIBVER) >-.if defined(IGNORE_WITH_MYSQL) >-. for VER in ${IGNORE_WITH_MYSQL} >-. if (${MYSQL_VER} == "${VER}") >-IGNORE= cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${IGNORE_WITH_MYSQL} not supported) >-. endif >-. endfor >-.endif # IGNORE_WITH_MYSQL >-.if (${USE_MYSQL} == "server" || ${USE_MYSQL} == "embedded") >-RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER} >-.if (${USE_MYSQL} == "embedded") >-BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER} >-.endif >-.else >-LIB_DEPENDS+= libmysqlclient.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT} >-.endif >-.else >-IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} >-.endif # Check for correct libs >-.endif # USE_MYSQL >- >-.if defined(USE_BDB) >-# TODO: avoid malformed conditional with invalid USE_BDB/WITH_BDB_VER >-# check if + works properly from test builds 01h12m23s >- >-BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} >- >-_USE_BDB_save:=${USE_BDB} >-_WITH_BDB_VER_save:=${WITH_BDB_VER} >- >-_DB_PORTS= 48 5 6 >-_DB_DEFAULTS= 48 5 # does not include 6 due to different licensing >-# but user can re-add it through WITH_BDB6_PERMITTED >-. if defined(WITH_BDB6_PERMITTED) >-_DB_DEFAULTS+= 6 >-. endif >- >-# Dependency lines for different db versions >-db48_DEPENDS= libdb-4.8.so:databases/db48 >-db5_DEPENDS= libdb-5.3.so:databases/db5 >-db6_DEPENDS= libdb-6.1.so:databases/db6 >-# Detect db versions by finding some files >-db48_FIND= ${LOCALBASE}/include/db48/db.h >-db5_FIND= ${LOCALBASE}/include/db5/db.h >-db6_FIND= ${LOCALBASE}/include/db6/db.h >- >-# Override the global WITH_BDB_VER with the >-# port specific <BDB_UNIQUENAME>_WITH_BDB_VER >-.if defined(${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER) >-WITH_BDB_VER= ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER} >-.endif >- >-# Override USE_BDB with global WITH_BDB_VER >-.if defined(WITH_BDB_VER) >-. if ${WITH_BDB_VER} != 1 >-USE_BDB= ${WITH_BDB_VER} >-. endif >-.endif >- >-# Override USE_BDB with maintainer's WANT_BDB_VER >-.if defined(WANT_BDB_VER) >-USE_BDB= ${WANT_BDB_VER} >-.endif >- >-# Compatiblity hack: >-# upgrade older plussed versions to 48+ >-_BDB_OLDPLUSVERS=4+ 40+ 41+ 42+ 43+ 44+ 45+ 46+ 47+ >-.for i in ${USE_BDB} >-. if ${_BDB_OLDPLUSVERS:M${i}} >-USE_BDB:= 48+ >-. endif >-.endfor >- >-.if ${USE_BDB} == yes >-USE_BDB:= 48+ >-.endif >- >-# 1. detect installed versions >-_INST_BDB_VER= >-.for bdb in ${_DB_PORTS} >-. if exists(${db${bdb}_FIND}) >-_INST_BDB_VER+=${bdb} >-. endif >-.endfor >- >-# 2. parse supported versions: >-# 2a. build list from USE_BDB >-_SUPP_BDB_VER= >-_USE_BDB:=${USE_BDB:C,\+$,,:C/(.)(.)$/\1.\2/} >-.if !empty(USE_BDB:M*+) >-. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/} >-. if ${_USE_BDB} <= ${bdb} >-_SUPP_BDB_VER+=${bdb:C/\.//} >-. endif >-. endfor >-.else >-_SUPP_BDB_VER=${USE_BDB} >-.endif >-# 2b. expand INVALID_BDB_VER if given with "+": >-.if !empty(INVALID_BDB_VER:M*+) >-_INV_BDB:=${INVALID_BDB_VER:C,\+$,,:C/(.)(.)$/\1.\2/} >-_INV_BDB_VER:= >-. for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/} >-. if ${_INV_BDB} <= ${bdb} >-_INV_BDB_VER+=${bdb:C/\.//} >-. endif >-. endfor >-.else >-_INV_BDB_VER:=${INVALID_BDB_VER} >-.endif >-# 2c. strip versions from INVALID_BDB_VER out of _SUPP_BDB_VER >-.for unsupp in ${_INV_BDB_VER} >-_SUPP_BDB_VER:=${_SUPP_BDB_VER:N${unsupp}} >-.endfor >- >-# 3a. calculate intersection in _INST_BDB_VER to see if there >-# is a usable installed version >-.for i in ${_INST_BDB_VER} >-. if empty(_SUPP_BDB_VER:M${i}) >-_INST_BDB_VER:= ${_INST_BDB_VER:N${i}} >-. endif >-.endfor >-_ELIGIBLE_BDB_VER:=${_INST_BDB_VER} >- >-# 3b. if there is no usable version installed, check defaults >-.if empty(_INST_BDB_VER) >-_DFLT_BDB_VER:=${_DB_DEFAULTS} >-# make sure we use a reasonable version for package builds >-_WITH_BDB_HIGHEST=yes >-. for i in ${_DFLT_BDB_VER} >-. if empty(_SUPP_BDB_VER:M${i}) >-_DFLT_BDB_VER:= ${_DFLT_BDB_VER:N${i}} >-. endif >-. endfor >-_ELIGIBLE_BDB_VER:=${_DFLT_BDB_VER} >-.endif >- >-# 4. elect a version >-_BDB_VER= >-.for i in ${_ELIGIBLE_BDB_VER} >-. if !empty(WITH_BDB_HIGHEST) || !empty(_WITH_BDB_HIGHEST) || empty(${_BDB_VER}) >-_BDB_VER:=${i} >-. endif >-.endfor >- >-# 5. catch errors or set variables >-.if empty(_BDB_VER) >-IGNORE= cannot install: no eligible BerkeleyDB version. Requested: ${USE_BDB}, incompatible: ${_INV_BDB_VER}. Try: make debug-bdb >-.else >-. if defined(BDB_BUILD_DEPENDS) >-BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://} >-. else >-LIB_DEPENDS+= ${db${_BDB_VER}_DEPENDS} >-. endif >-. if ${_BDB_VER} == 48 >-BDB_LIB_NAME= db-4.8 >-BDB_LIB_CXX_NAME= db_cxx-4.8 >-BDB_LIB_DIR= ${LOCALBASE}/lib/db48 >-. elif ${_BDB_VER} == 5 >-BDB_LIB_NAME= db-5.3 >-BDB_LIB_CXX_NAME= db_cxx-5.3 >-BDB_LIB_DIR= ${LOCALBASE}/lib/db5 >-. elif ${_BDB_VER} == 6 >-BDB_LIB_NAME= db-6.1 >-BDB_LIB_CXX_NAME= db_cxx-6.1 >-BDB_LIB_DIR= ${LOCALBASE}/lib/db6 >-. endif >-BDB_LIB_NAME?= db${_BDB_VER} >-BDB_LIB_CXX_NAME?= db${_BDB_VER}_cxx >-BDB_INCLUDE_DIR?= ${LOCALBASE}/include/db${_BDB_VER} >-BDB_LIB_DIR?= ${LOCALBASE}/lib >-.endif >-BDB_VER= ${_BDB_VER} >- >-debug-bdb: >- @${ECHO_CMD} "--INPUTS----------------------------------------------------" >- @${ECHO_CMD} "${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER: ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}" >- @${ECHO_CMD} "WITH_BDB_VER: ${_WITH_BDB_VER_save}" >- @${ECHO_CMD} "WANT_BDB_VER: ${WANT_BDB_VER}" >- @${ECHO_CMD} "BDB_BUILD_DEPENDS: ${BDB_BUILD_DEPENDS}" >- @${ECHO_CMD} "USE_BDB (original): ${_USE_BDB_save}" >- @${ECHO_CMD} "WITH_BDB_HIGHEST (original): ${WITH_BDB_HIGHEST}" >- @${ECHO_CMD} "--PROCESSING------------------------------------------------" >- @${ECHO_CMD} "supported versions: ${_SUPP_BDB_VER}" >- @${ECHO_CMD} "invalid versions: ${_INV_BDB_VER}" >- @${ECHO_CMD} "installed versions: ${_INST_BDB_VER}" >- @${ECHO_CMD} "eligible versions: ${_ELIGIBLE_BDB_VER}" >- @${ECHO_CMD} "USE_BDB (effective): ${USE_BDB}" >- @${ECHO_CMD} "WITH_BDB_HIGHEST (override): ${_WITH_BDB_HIGHEST}" >- @${ECHO_CMD} "--OUTPUTS---------------------------------------------------" >- @${ECHO_CMD} "IGNORE=${IGNORE}" >- @${ECHO_CMD} "BDB_VER=${BDB_VER}" >- @${ECHO_CMD} "BDB_INCLUDE_DIR=${BDB_INCLUDE_DIR}" >- @${ECHO_CMD} "BDB_LIB_NAME=${BDB_LIB_NAME}" >- @${ECHO_CMD} "BDB_LIB_CXX_NAME=${BDB_LIB_CXX_NAME}" >- @${ECHO_CMD} "BDB_LIB_DIR=${BDB_LIB_DIR}" >- @${ECHO_CMD} "BUILD_DEPENDS=${BUILD_DEPENDS:M*/databases/db*}" >- @${ECHO_CMD} "LIB_DEPENDS=${LIB_DEPENDS:M*/databases/db*}" >- @${ECHO_CMD} "------------------------------------------------------------" >- >-# Obsolete variables - ports can define these to want users about >-# variables that may be in /etc/make.conf but that are no longer >-# effective: >-.if defined(OBSOLETE_BDB_VAR) >-. for var in ${OBSOLETE_BDB_VAR} >-. if defined(${var}) >-BAD_VAR+= ${var}, >-. endif >-. endfor >-. if defined(BAD_VAR) >-_IGNORE_MSG= Obsolete variable(s) ${BAD_VAR} use WITH_BDB_VER or ${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER to select Berkeley DB version >-. if defined(IGNORE) >-IGNORE+= ${_IGNORE_MSG} >-. else >-IGNORE= ${_IGNORE_MSG} >-. endif >-. endif >-.endif >- >-.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) >-USE_FIREBIRD= ${WITH_FIREBIRD_VER} >-.endif >- >-.if ${USE_FIREBIRD:tl} == "yes" >-FIREBIRD_VER= ${FIREBIRD_DEFAULT:S/.//} >-.else >-FIREBIRD_VER= ${USE_FIREBIRD} >-.endif >- >-.if ${FIREBIRD_VER} == "25" >-LIB_DEPENDS+= libfbclient.so:databases/firebird25-client >-.else >-IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER} >-.endif >- >-.endif # defined(USE_FIREBIRD) >- >-.endif # defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) >diff --git Mk/bsd.port.mk Mk/bsd.port.mk >index b8bc2bc..bc0a12c 100644 >--- Mk/bsd.port.mk >+++ Mk/bsd.port.mk >@@ -1403,6 +1403,22 @@ USES+= gnome > USES+= mate > .endif > >+.if defined(USE_BDB) >+USES+=bdb:${USE_BDB} >+.endif >+ >+.if defined(USE_MYSQL) >+USE_MYSQL:= ${USE_MYSQL:N[yY][eE][sS]:Nclient} >+.if defined(WANT_MYSQL_VER) >+.if empty(USE_MYSQL) >+USE_MYSQL:=${WANT_MYSQL_VER} >+.else >+USE_MYSQL:=${USE_MYSQL},${WANT_MYSQL_VER} >+.endif >+.endif >+USES+=mysql:${USE_MYSQL} >+.endif >+ > .if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT) > .include "${PORTSDIR}/Mk/bsd.wx.mk" > .endif >@@ -1863,11 +1879,6 @@ _FORCE_POST_PATTERNS= rmdir kldxref mkfontscale mkfontdir fc-cache \ > .include "${PORTSDIR}/Mk/bsd.xorg.mk" > .endif > >-.if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \ >- defined(USE_BDB) || defined(USE_SQLITE) || defined(USE_FIREBIRD) >-.include "${PORTSDIR}/Mk/bsd.database.mk" >-.endif >- > .if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER1) > .include "${PORTSDIR}/Mk/bsd.gstreamer.mk" > .endif >diff --git Mk/bsd.sanity.mk Mk/bsd.sanity.mk >index 929650c..7f5258b 100644 >--- Mk/bsd.sanity.mk >+++ Mk/bsd.sanity.mk >@@ -168,9 +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 \ >- USE_FIREBIRD >+ UNIQUENAME LATEST_LINK USE_SQLITE USE_FIREBIRD >+SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY USE_BDB USE_MYSQL WANT_MYSQL_VER > SANITY_NOTNEEDED= WX_UNICODE > > USE_AUTOTOOLS_ALT= USES=autoreconf and GNU_CONFIGURE=yes >@@ -211,6 +210,9 @@ WX_UNICODE_REASON= Now no-op as only unicode is supported now > PLIST_DIRSTRY_ALT= PLIST_DIRS > USE_SQLITE_ALT= USES=sqlite > USE_FIREBIRD_ALT= USES=firebird >+USE_BDB_ALT= USES=bdb:${USE_BDB} >+USE_MYSQL_ALT= USES=mysql:${USE_MYSQL} >+WANT_MYSQL_VER_ALT= USES=mysql:${WANT_MYSQL_VER} > > .for a in ${SANITY_DEPRECATED} > .if defined(${a}) >diff --git Tools/scripts/portsvar.sh Tools/scripts/portsvar.sh >index 365389e..db8f058 100755 >--- Tools/scripts/portsvar.sh >+++ 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 astro/foxtrotgps/Makefile astro/foxtrotgps/Makefile >index 8a41882..6208f07 100644 >--- astro/foxtrotgps/Makefile >+++ 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 audio/harp/Makefile audio/harp/Makefile >index 997f870..f6733e5 100644 >--- audio/harp/Makefile >+++ 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 audio/libgpod/Makefile audio/libgpod/Makefile >index 835553c..4834887 100644 >--- audio/libgpod/Makefile >+++ 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 audio/linuxsampler/Makefile audio/linuxsampler/Makefile >index b434d1d..0dd2c4c 100644 >--- audio/linuxsampler/Makefile >+++ 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 audio/lollypop/Makefile audio/lollypop/Makefile >index d81a216..978a29bb 100644 >--- audio/lollypop/Makefile >+++ 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 audio/osd-lyrics/Makefile audio/osd-lyrics/Makefile >index f70ad67..5e777e5 100644 >--- audio/osd-lyrics/Makefile >+++ 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 audio/pragha/Makefile audio/pragha/Makefile >index 70aa43c..ae87c49 100644 >--- audio/pragha/Makefile >+++ 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 chinese/libchewing/Makefile chinese/libchewing/Makefile >index 728da48..33e4566 100644 >--- chinese/libchewing/Makefile >+++ 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 databases/akonadi/Makefile databases/akonadi/Makefile >index c303f61..664cbb1 100644 >--- databases/akonadi/Makefile >+++ 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 databases/cppdb/Makefile databases/cppdb/Makefile >index 9e8319e..3bbadd2 100644 >--- databases/cppdb/Makefile >+++ 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 databases/firebird25-server/Makefile databases/firebird25-server/Makefile >index e99a773..e25fd22 100644 >--- databases/firebird25-server/Makefile >+++ databases/firebird25-server/Makefile >@@ -72,7 +72,7 @@ IGNORE= your system does not support sysvipc > > .if !defined(CLIENT_ONLY) > # Server part stuff >-LIB_DEPENDS+= libfbembed.so:databases/firebird25-client >+USES+= firebird > > CONFIGURE_ARGS+=--enable-superserver --without-editline > >diff --git databases/flamerobin/Makefile databases/flamerobin/Makefile >index bdd7d9c..595369a 100644 >--- databases/flamerobin/Makefile >+++ databases/flamerobin/Makefile >@@ -16,8 +16,7 @@ LICENSE_NAME= FlameRobin Expat > LICENSE_FILE= ${WRKSRC}/docs/fr_license.html > LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept > >-USES= compiler >-USE_FIREBIRD= yes >+USES= compiler firebird > USE_WX= 2.8+ > WX_COMPS= wx contrib > WX_CONF_ARGS= absolute >diff --git databases/fpc-ibase/Makefile databases/fpc-ibase/Makefile >index 45603a4..c13f5dc5 100644 >--- databases/fpc-ibase/Makefile >+++ databases/fpc-ibase/Makefile >@@ -17,6 +17,6 @@ OPTIONS_DEFINE= IBASE > IBASE_DESC= Install Interbase/Firebird client > OPTIONS_DEFAULT= IBASE > >-IBASE_USE= FIREBIRD=yes >+IBASE_USES= firebird > > .include "${MASTERDIR}/Makefile" >diff --git databases/fpc-sqlite/Makefile databases/fpc-sqlite/Makefile >index 3a4a8f4..6bbfc19 100644 >--- databases/fpc-sqlite/Makefile >+++ 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 databases/grass/Makefile databases/grass/Makefile >index b5bb6e8..39af539 100644 >--- databases/grass/Makefile >+++ 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 databases/gtksql/Makefile databases/gtksql/Makefile >index 9e19a83..aebe6c5 100644 >--- databases/gtksql/Makefile >+++ 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 databases/luadbi/Makefile databases/luadbi/Makefile >index e6ff452..deff14e 100644 >--- databases/luadbi/Makefile >+++ 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 databases/opendbx/Makefile databases/opendbx/Makefile >index f7a0a00..fa0f147 100644 >--- databases/opendbx/Makefile >+++ 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 databases/p5-DBD-InterBase/Makefile databases/p5-DBD-InterBase/Makefile >index 8977788..a8adaea 100644 >--- databases/p5-DBD-InterBase/Makefile >+++ databases/p5-DBD-InterBase/Makefile >@@ -14,9 +14,7 @@ COMMENT= DBI driver for InterBase/Firebird/Yaffil RDBMS server > BUILD_DEPENDS= p5-DBI>=0:databases/p5-DBI > RUN_DEPENDS:= ${BUILD_DEPENDS} > >-USE_FIREBIRD= yes >- >-USES= perl5 >+USES= perl5 firebird > USE_PERL5= patch configure > > post-patch: >diff --git databases/p5-DBIx-Class-Schema-Loader/Makefile databases/p5-DBIx-Class-Schema-Loader/Makefile >index 1e91c33..5bdeac7 100644 >--- databases/p5-DBIx-Class-Schema-Loader/Makefile >+++ 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 databases/proftpd-mod_sql_sqlite/Makefile databases/proftpd-mod_sql_sqlite/Makefile >index 94d50d4..a050bfb 100644 >--- databases/proftpd-mod_sql_sqlite/Makefile >+++ 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 databases/py-fdb/Makefile databases/py-fdb/Makefile >index 906c515..2aa4dd9 100644 >--- databases/py-fdb/Makefile >+++ databases/py-fdb/Makefile >@@ -12,10 +12,8 @@ COMMENT= Firebird RDBMS bindings for Python > > LICENSE= ISCL > >-LIB_DEPENDS= libfbclient.so:databases/firebird25-client >- > NO_ARCH= yes >-USES= python >+USES= firebird python > USE_PYTHON= autoplist distutils > > .include <bsd.port.pre.mk> >diff --git databases/qt4-ibase-plugin/Makefile databases/qt4-ibase-plugin/Makefile >index 8bd8e63..f148f8b 100644 >--- databases/qt4-ibase-plugin/Makefile >+++ databases/qt4-ibase-plugin/Makefile >@@ -5,6 +5,6 @@ PORTREVISION= 1 > > COMMENT= Qt InterBase/Firebird database plugin > DB= ibase >-USE_FIREBIRD= yes >+USES+= firebird > > .include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers" >diff --git databases/qt5-sqldrivers-ibase/Makefile databases/qt5-sqldrivers-ibase/Makefile >index 2f7aad4..416bdb2 100644 >--- databases/qt5-sqldrivers-ibase/Makefile >+++ databases/qt5-sqldrivers-ibase/Makefile >@@ -3,6 +3,6 @@ > DB= IBase > DB_DESC= InterBase/Firebird > >-USE_FIREBIRD= yes >+USES= firebird > > .include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers" >diff --git databases/qt5-sqldrivers-sqlite2/Makefile databases/qt5-sqldrivers-sqlite2/Makefile >index 09812cb..5a4de2e 100644 >--- databases/qt5-sqldrivers-sqlite2/Makefile >+++ 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 databases/qt5-sqldrivers-sqlite3/Makefile databases/qt5-sqldrivers-sqlite3/Makefile >index 3af4eb3..6a8554b 100644 >--- databases/qt5-sqldrivers-sqlite3/Makefile >+++ 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 databases/soci/Makefile databases/soci/Makefile >index 29e1b7b..6e55d00 100644 >--- databases/soci/Makefile >+++ 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 > >@@ -46,7 +46,7 @@ BOOST_LIB_DEPENDS= libboost_date_time.so:devel/boost-libs > BOOST_CMAKE_ON= -DWITH_BOOST:BOOL=ON > BOOST_CMAKE_OFF= -DWITH_BOOST:BOOL=OFF > >-FIREBIRD_USE= FIREBIRD=yes >+FIREBIRD_USES= firebird > FIREBIRD_CMAKE_ARGS_ON= -DWITH_FIREBIRD:BOOL=ON > FIREBIRD_CMAKE_ARGS_OFF= -DWITH_FIREBIRD:BOOL=OFF > >diff --git databases/spatialite-tools/Makefile databases/spatialite-tools/Makefile >index 4c4aa41..c9accd0 100644 >--- databases/spatialite-tools/Makefile >+++ 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 databases/spatialite/Makefile databases/spatialite/Makefile >index 4190f44..ac505b2 100644 >--- databases/spatialite/Makefile >+++ 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 databases/sqlite-ext-miscfuncs/Makefile databases/sqlite-ext-miscfuncs/Makefile >index 4ab148f..08fcb2d 100644 >--- databases/sqlite-ext-miscfuncs/Makefile >+++ 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 databases/sqlite-ext-pcre/Makefile databases/sqlite-ext-pcre/Makefile >index c7daf1b..ec7ae09 100644 >--- databases/sqlite-ext-pcre/Makefile >+++ 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 databases/sqlitebrowser/Makefile databases/sqlitebrowser/Makefile >index 9db7fed..d85a7cf 100644 >--- databases/sqlitebrowser/Makefile >+++ 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 databases/sqliteman/Makefile databases/sqliteman/Makefile >index 466db83..09a8112 100644 >--- databases/sqliteman/Makefile >+++ 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 databases/sqlitestudio/Makefile databases/sqlitestudio/Makefile >index a3e2a2e..b7e7b49 100644 >--- databases/sqlitestudio/Makefile >+++ 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 databases/sqlrelay/Makefile databases/sqlrelay/Makefile >index a54b23c..4f43829 100644 >--- databases/sqlrelay/Makefile >+++ databases/sqlrelay/Makefile >@@ -110,7 +110,7 @@ CONFIGURE_ARGS+= --disable-mysql > .endif > > .if ${PORT_OPTIONS:MFIREBIRD} >-USE_FIREBIRD= yes >+USES+= firebird > CONFIGURE_ARGS+= --with-firebird-prefix="${LOCALBASE}" > TOSTRIP+= libexec/sqlrelay/sqlrconnection_firebird.so > .else >diff --git databases/virtualpg/Makefile databases/virtualpg/Makefile >index 499a31d..29667e9 100644 >--- databases/virtualpg/Makefile >+++ 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 databases/vsqlite/Makefile databases/vsqlite/Makefile >index 847ab73..6ffbd49 100644 >--- databases/vsqlite/Makefile >+++ 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 deskutils/fbreader/Makefile deskutils/fbreader/Makefile >index 9161e81..f008c61 100644 >--- deskutils/fbreader/Makefile >+++ 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 deskutils/growl-for-linux/Makefile deskutils/growl-for-linux/Makefile >index 578352e..c8255db 100644 >--- deskutils/growl-for-linux/Makefile >+++ 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 deskutils/gworkspace-gwmetadata/Makefile deskutils/gworkspace-gwmetadata/Makefile >index 228592f..627d965 100644 >--- deskutils/gworkspace-gwmetadata/Makefile >+++ 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 deskutils/osmo/Makefile deskutils/osmo/Makefile >index c166e0b..0b365ba 100644 >--- deskutils/osmo/Makefile >+++ 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 deskutils/pinot/Makefile deskutils/pinot/Makefile >index 5a44604..c4e4ecc 100644 >--- deskutils/pinot/Makefile >+++ 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 devel/bugzilla44/Makefile devel/bugzilla44/Makefile >index 9bcfcea..ae52648 100644 >--- devel/bugzilla44/Makefile >+++ devel/bugzilla44/Makefile >@@ -64,7 +64,7 @@ RUN_DEPENDS+= p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg > .endif > > .if ${PORT_OPTIONS:MSQLITE} >-USE_SQLITE= yes >+USES+= sqlite > RUN_DEPENDS+= p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \ > sqlite3>=3:databases/sqlite3 > .endif >diff --git devel/bugzilla50/Makefile devel/bugzilla50/Makefile >index f210b10..9236d94 100644 >--- devel/bugzilla50/Makefile >+++ devel/bugzilla50/Makefile >@@ -67,7 +67,7 @@ RUN_DEPENDS+= p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg > .endif > > .if ${PORT_OPTIONS:MSQLITE} >-USE_SQLITE= yes >+USES+= sqlite > RUN_DEPENDS+= p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \ > sqlite3>=3:databases/sqlite3 > .endif >diff --git devel/cvstrac/Makefile devel/cvstrac/Makefile >index 8874f22..e66f9e0 100644 >--- devel/cvstrac/Makefile >+++ 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 devel/ice/Makefile devel/ice/Makefile >index efb18b7..15bf322 100644 >--- devel/ice/Makefile >+++ devel/ice/Makefile >@@ -36,8 +36,7 @@ BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib > > WRKSRC= ${WRKDIR}/ice-${PORTVERSION} > >-USE_BDB= yes >-WANT_BDB_VER= 5 >+USE_BDB= 5 > INVALID_BDB_VER= 40 41 42 43 44 46 47 48 6 > USE_LDCONFIG= yes > BUILD_WRKSRC?= ${WRKSRC}/cpp >diff --git devel/libleaftag/Makefile devel/libleaftag/Makefile >index 4e5fd1c..eae3401 100644 >--- devel/libleaftag/Makefile >+++ 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 devel/libopensync/Makefile devel/libopensync/Makefile >index 451654f..5c37523 100644 >--- devel/libopensync/Makefile >+++ 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 devel/libsoup/Makefile devel/libsoup/Makefile >index d622722..7cc5e3e 100644 >--- devel/libsoup/Makefile >+++ 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 devel/matreshka/Makefile devel/matreshka/Makefile >index a2ee7c3..454801c 100644 >--- devel/matreshka/Makefile >+++ devel/matreshka/Makefile >@@ -31,8 +31,8 @@ AMF_CONFIGURE_ENABLE= amf > > MYSQL_USE= MYSQL=yes > PGSQL_USES= pgsql >-SQLITE3_USE= SQLITE=yes >-FIREBIRD_USE= FIREBIRD=yes >+SQLITE3_USES= sqlite >+FIREBIRD_USES= firebird > > MAKE_JOBS_UNSAFE= yes > >diff --git devel/poco-devel/Makefile devel/poco-devel/Makefile >index c33f20b..5637e48 100644 >--- devel/poco-devel/Makefile >+++ 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 devel/poco-ssl/Makefile devel/poco-ssl/Makefile >index 95e9be4..e030011 100644 >--- devel/poco-ssl/Makefile >+++ 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 dns/powerdns/Makefile dns/powerdns/Makefile >index aae3bdf..5529ce9 100644 >--- dns/powerdns/Makefile >+++ 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 editors/libreoffice/Makefile editors/libreoffice/Makefile >index 6dd3b4a..1986ff8 100644 >--- editors/libreoffice/Makefile >+++ editors/libreoffice/Makefile >@@ -27,8 +27,7 @@ BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ > ${LOCALBASE}/include/glm/glm.hpp:math/glm \ > bash:shells/bash \ > gsed:textproc/gsed >-LIB_DEPENDS= libfbembed.so:databases/firebird25-client \ >- libapr-1.so:devel/apr1 \ >+LIB_DEPENDS= libapr-1.so:devel/apr1 \ > libboost_date_time.so:devel/boost-libs \ > libicutu.so:devel/icu \ > liblangtag.so:devel/liblangtag \ >@@ -96,7 +95,7 @@ USE_OPENLDAP= yes > USE_PERL5= build > USE_QT4= # empty but required > USE_XORG= xaw xrandr >-USES= bison compiler:c++11-lib cpe gmake jpeg perl5 pkgconfig \ >+USES= bison compiler:c++11-lib cpe firebird gmake jpeg perl5 pkgconfig \ > python shared-mime-info tar:xz > WANT_GNOME= yes > >diff --git ftp/wzdftpd/Makefile ftp/wzdftpd/Makefile >index dd93842..c780e91 100644 >--- ftp/wzdftpd/Makefile >+++ 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 games/crossfire-server/Makefile games/crossfire-server/Makefile >index 9253486..e13ef08 100644 >--- games/crossfire-server/Makefile >+++ 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 games/ldmud/Makefile games/ldmud/Makefile >index 8c9107e..13ba857 100644 >--- games/ldmud/Makefile >+++ 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 games/pvpgn/Makefile games/pvpgn/Makefile >index 04decb8..d355286 100644 >--- games/pvpgn/Makefile >+++ 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 graphics/gdal/Makefile graphics/gdal/Makefile >index 28ef21b..5bad990 100644 >--- graphics/gdal/Makefile >+++ 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 lang/bigloo/Makefile lang/bigloo/Makefile >index 51486ac..025fb78 100644 >--- lang/bigloo/Makefile >+++ 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 lang/io/Makefile.addons lang/io/Makefile.addons >index 85acc3f..fa9d894 100644 >--- lang/io/Makefile.addons >+++ 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 lang/munger/Makefile lang/munger/Makefile >index 9063396..306c342 100644 >--- lang/munger/Makefile >+++ 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 lang/php55/Makefile.ext lang/php55/Makefile.ext >index c5f4435..69a16f4 100644 >--- lang/php55/Makefile.ext >+++ lang/php55/Makefile.ext >@@ -464,7 +464,7 @@ CONFIGURE_ARGS+=--enable-zip \ > CONFIGURE_ARGS+=--with-zlib=/usr > .endif > >-.include <bsd.port.pre.mk> >+.include <bsd.port.options.mk> > > .if ${PHP_MODNAME} == "dba" > . if empty(PORT_OPTIONS:MCDB) >@@ -499,6 +499,8 @@ CONFIGURE_ARGS+=--disable-flatfile > . endif > .endif > >+.include <bsd.port.pre.mk> >+ > .if ${PHP_MODNAME} == "gd" > . if ${PORT_OPTIONS:MT1LIB} > LIB_DEPENDS+= libt1.so:devel/t1lib >diff --git lang/php56/Makefile.ext lang/php56/Makefile.ext >index e74eccc..8ed5295 100644 >--- lang/php56/Makefile.ext >+++ lang/php56/Makefile.ext >@@ -467,7 +467,7 @@ CONFIGURE_ARGS+=--enable-zip \ > CONFIGURE_ARGS+=--with-zlib=/usr > .endif > >-.include <bsd.port.pre.mk> >+.include <bsd.port.options.mk> > > .if ${PHP_MODNAME} == "dba" > . if empty(PORT_OPTIONS:MCDB) >@@ -502,6 +502,8 @@ CONFIGURE_ARGS+=--disable-flatfile > . endif > .endif > >+.include <bsd.port.pre.mk> >+ > .if ${PHP_MODNAME} == "gd" > . if ${PORT_OPTIONS:MT1LIB} > LIB_DEPENDS+= libt1.so:devel/t1lib >diff --git lang/php70/Makefile.ext lang/php70/Makefile.ext >index 871e1ed..88c8d16 100644 >--- lang/php70/Makefile.ext >+++ lang/php70/Makefile.ext >@@ -459,7 +459,7 @@ CONFIGURE_ARGS+=--enable-zip \ > CONFIGURE_ARGS+=--with-zlib=/usr > .endif > >-.include <bsd.port.pre.mk> >+.include <bsd.port.options.mk> > > .if ${PHP_MODNAME} == "dba" > . if empty(PORT_OPTIONS:MCDB) >@@ -494,6 +494,8 @@ CONFIGURE_ARGS+=--disable-flatfile > . endif > .endif > >+.include <bsd.port.pre.mk> >+ > .if ${PHP_MODNAME} == "gd" > . if ${PORT_OPTIONS:MT1LIB} > LIB_DEPENDS+= libt1.so:devel/t1lib >diff --git mail/cyrus-imapd23/Makefile mail/cyrus-imapd23/Makefile >index 9307c0b..b9043fd 100644 >--- mail/cyrus-imapd23/Makefile >+++ 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 mail/cyrus-imapd24/Makefile mail/cyrus-imapd24/Makefile >index 3d72a07..9c31107 100644 >--- mail/cyrus-imapd24/Makefile >+++ 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 mail/dbmail22/Makefile mail/dbmail22/Makefile >index 2d35783..e214b0e 100644 >--- mail/dbmail22/Makefile >+++ 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 mail/dk-milter/Makefile mail/dk-milter/Makefile >index b55dcec..a717b0c 100644 >--- mail/dk-milter/Makefile >+++ mail/dk-milter/Makefile >@@ -41,6 +41,22 @@ SITE_SUB+= -e "s|%%PREFIX%%|${PREFIX}|g" \ > > OPTIONS_DEFINE= DOCS > >+.if defined(WITH_POPAUTH) >+. if defined(WITH_BDB_BASE) >+IGNORE= does not work with base bdb >+SITE_SUB+= -e 's|%%BDB%%|dnl |g' >+. else >+USE_BDB= 41+ >+INVALID_BDB_VER= 2 40 >+SITE_SUB+= -e 's|%%BDB%%||g' \ >+ -e "s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g" \ >+ -e "s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g" \ >+ -e "s|%%BDB_LIB_NAME%%|${BDB_LIB_NAME}|g" >+. endif >+.else >+SITE_SUB+= -e 's|%%BDB%%|dnl |g' >+.endif >+ > .include <bsd.port.pre.mk> > > WITHOUT_MILTER_CFLAGS= yes >@@ -69,21 +85,6 @@ SITE_SUB+= -e '\|bld_USE_ARLIB|s/^dnl //g' > SITE_SUB+= -e '/-DPOPAUTH/s/^dnl //g' > .endif > >-.if defined(WITH_POPAUTH) >-. if defined(WITH_BDB_BASE) >-IGNORE= does not work with base bdb >-SITE_SUB+= -e 's|%%BDB%%|dnl |g' >-. else >-USE_BDB= 41+ >-INVALID_BDB_VER= 2 40 >-SITE_SUB+= -e 's|%%BDB%%||g' \ >- -e "s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g" \ >- -e "s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g" \ >- -e "s|%%BDB_LIB_NAME%%|${BDB_LIB_NAME}|g" >-. endif >-.else >-SITE_SUB+= -e 's|%%BDB%%|dnl |g' >-.endif > .if defined(WITH_OPENSSL_BASE) > SITE_SUB+= -e 's|%%OPENSSL%%|dnl |g' > .else >diff --git mail/dovecot/Makefile mail/dovecot/Makefile >index dc349fd..9853e1fb 100644 >--- mail/dovecot/Makefile >+++ 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 mail/dovecot2/Makefile mail/dovecot2/Makefile >index 2072761..f885692 100644 >--- mail/dovecot2/Makefile >+++ 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 mail/dspam/Makefile mail/dspam/Makefile >index e4c3801..da98675 100644 >--- mail/dspam/Makefile >+++ 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 mail/exim/Makefile mail/exim/Makefile >index eae67e3..8646612 100644 >--- mail/exim/Makefile >+++ mail/exim/Makefile >@@ -55,7 +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= sqlite > SQLITE_USES= pkgconfig > > .include <bsd.port.options.mk> >diff --git misc/krecipes-kde4/Makefile misc/krecipes-kde4/Makefile >index e75fde8..316ac15 100644 >--- misc/krecipes-kde4/Makefile >+++ 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 net-im/ejabberd/Makefile net-im/ejabberd/Makefile >index f0685de..e8698ad 100644 >--- net-im/ejabberd/Makefile >+++ 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 net-im/imspector/Makefile net-im/imspector/Makefile >index 476a7a4..e0cee61 100644 >--- net-im/imspector/Makefile >+++ 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 net-mgmt/aircrack-ng/Makefile net-mgmt/aircrack-ng/Makefile >index b13e907..98ad551 100644 >--- net-mgmt/aircrack-ng/Makefile >+++ 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 net-mgmt/netxms/Makefile net-mgmt/netxms/Makefile >index 922c778..663d422 100644 >--- net-mgmt/netxms/Makefile >+++ 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 net-mgmt/zabbix2-server/Makefile net-mgmt/zabbix2-server/Makefile >index ef01e99..ec04c01 100644 >--- net-mgmt/zabbix2-server/Makefile >+++ 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 net-mgmt/zabbix22-server/Makefile net-mgmt/zabbix22-server/Makefile >index 239415d..4d618ed 100644 >--- net-mgmt/zabbix22-server/Makefile >+++ net-mgmt/zabbix22-server/Makefile >@@ -95,7 +95,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 net-mgmt/zabbix24-server/Makefile net-mgmt/zabbix24-server/Makefile >index 7540e70..dbce09da 100644 >--- net-mgmt/zabbix24-server/Makefile >+++ 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 net-mgmt/zabbix3-server/Makefile net-mgmt/zabbix3-server/Makefile >index f790b3d..ff3fa79 100644 >--- net-mgmt/zabbix3-server/Makefile >+++ 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 net-p2p/digitalcoin/Makefile net-p2p/digitalcoin/Makefile >index 18e7301..4a5a75c 100644 >--- net-p2p/digitalcoin/Makefile >+++ net-p2p/digitalcoin/Makefile >@@ -21,8 +21,7 @@ GH_TAGNAME= 96b098a > > USES= desktop-file-utils gmake > USE_OPENSSL= yes >-USE_BDB= yes >-WANT_BDB_VER= 48 >+USE_BDB= 48 > USE_QT4= corelib gui qmake_build linguisttools_build uic_build \ > moc_build rcc_build > >diff --git net-p2p/dogecoin/Makefile net-p2p/dogecoin/Makefile >index c89b8bf..6dd3477 100644 >--- net-p2p/dogecoin/Makefile >+++ net-p2p/dogecoin/Makefile >@@ -31,8 +31,7 @@ CONFIGURE_ARGS+= --with-incompatible-bdb \ > CRYPTO_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" CRYPTO_LIBS="-lcrypto" > CONFIGURE_ENV+= OBJC="${CC}" OBJCFLAGS="${CFLAGS}" OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}" > USE_OPENSSL= yes >-USE_BDB= yes >-WANT_BDB_VER= 5 >+USE_BDB= 5 > > CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} \ > -L${LOCALBASE}/lib -L${BDB_LIB_DIR} >diff --git net-p2p/gnunet/Makefile net-p2p/gnunet/Makefile >index 6856458..c5a71a2 100644 >--- net-p2p/gnunet/Makefile >+++ 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 net-p2p/namecoin/Makefile net-p2p/namecoin/Makefile >index 19fd126..1180e8e 100644 >--- net-p2p/namecoin/Makefile >+++ net-p2p/namecoin/Makefile >@@ -27,8 +27,7 @@ USE_GITHUB= yes > USES= gmake compiler:c++11-lib > MAKE_JOBS_UNSAFE=yes > USE_OPENSSL= yes >-USE_BDB= yes >-WANT_BDB_VER= 48 >+USE_BDB= 48 > > CXXFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} > CXXFLAGS+= -L${LOCALBASE}/lib -L${BDB_LIB_DIR} >diff --git net-p2p/twister/Makefile net-p2p/twister/Makefile >index 25f1d8e..8492c7c 100644 >--- net-p2p/twister/Makefile >+++ net-p2p/twister/Makefile >@@ -25,8 +25,7 @@ OPTIONS_DEFINE= DOCS > USE_GITHUB= yes > GH_ACCOUNT= miguelfreitas > >-USE_BDB= yes >-WANT_BDB_VER= 48 >+USE_BDB= 48 > USE_OPENSSL= yes > USES= autoreconf:build gmake iconv libtool > >diff --git net-p2p/uhub/Makefile net-p2p/uhub/Makefile >index 8454fbd..5ee8849 100644 >--- net-p2p/uhub/Makefile >+++ 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 net/glusterfs/Makefile net/glusterfs/Makefile >index 844e169..dc0cbe2 100644 >--- net/glusterfs/Makefile >+++ 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 ports-mgmt/packagekit/Makefile ports-mgmt/packagekit/Makefile >index aadc14a..e33b6cf 100644 >--- ports-mgmt/packagekit/Makefile >+++ 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 security/cyrus-sasl2/Makefile security/cyrus-sasl2/Makefile >index 3f4227e..1cfe50d 100644 >--- security/cyrus-sasl2/Makefile >+++ 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 security/heimdal/Makefile security/heimdal/Makefile >index b116574..b2f3cf6 100644 >--- security/heimdal/Makefile >+++ 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 security/hydra/Makefile security/hydra/Makefile >index fecfdf0..de0592b 100644 >--- security/hydra/Makefile >+++ security/hydra/Makefile >@@ -28,7 +28,7 @@ WANT_GNOME= yes > OPTIONS_DEFINE= FIREBIRD SSH SVN X11 > OPTIONS_DEFAULT=SSH > OPTIONS_EXCLUDE=NLS DOCS >-FIREBIRD_LIB_DEPENDS= libfbclient.so:databases/firebird25-client >+FIREBIRD_USES= firebird > SVN_LIB_DEPENDS= libsvn_client-1.so:devel/subversion > > .include <bsd.port.options.mk> >diff --git security/libpreludedb/Makefile security/libpreludedb/Makefile >index 5be215e..c4ced12 100644 >--- security/libpreludedb/Makefile >+++ 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 textproc/redland/Makefile textproc/redland/Makefile >index 9647e70f..d49d40f 100644 >--- textproc/redland/Makefile >+++ 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 www/kannel-sqlbox/Makefile www/kannel-sqlbox/Makefile >index 5a8343e..4c59d32 100644 >--- www/kannel-sqlbox/Makefile >+++ 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 www/kannel/Makefile www/kannel/Makefile >index 8dc4a12..581b9f6 100644 >--- www/kannel/Makefile >+++ 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 www/rt40/Makefile www/rt40/Makefile >index 5cefa42..219eb7b 100644 >--- www/rt40/Makefile >+++ 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 208971
: 169556