Index: Mk/Uses/bdb.mk =================================================================== --- Mk/Uses/bdb.mk +++ Mk/Uses/bdb.mk @@ -1,38 +1,9 @@ # $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. +# Provide support for Berkeley DB +# Feature: bdb +# Usage: USES= bdb[:version] # -## -# 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 @@ -42,9 +13,6 @@ # 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. # _WITH_BDB_VER @@ -75,119 +43,22 @@ # 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 +# +# MAINTAINER: ports@FreeBSD.org -_MYSQL_CLIENT= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-client -_MYSQL_SERVER= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-server +.if !defined(_INCLUDE_USES_BDB_MK) +_INCLUDE_USES_BDB_MK= yes -# 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} +.if !empty(bdb_ARGS) +_bdb_ARGS:= ${bdb_ARGS} .endif -.else -IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} -.endif # Check for correct libs -.endif # USE_MYSQL +_bdb_ARGS?= yes -.if defined(USE_BDB) -# TODO: avoid malformed conditional with invalid USE_BDB/WITH_BDB_VER +# TODO: avoid malformed conditional with invalid _bdb_ARGS/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 @@ -212,29 +83,25 @@ WITH_BDB_VER= ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER} .endif -# Override USE_BDB with global WITH_BDB_VER +# 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 -USE_BDB= ${WITH_BDB_VER} +. if ${WITH_BDB_VER} != 1 && ${_bdb_ARGS} == yes +_bdb_ARGS= ${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} +.for i in ${_bdb_ARGS} . if ${_BDB_OLDPLUSVERS:M${i}} -USE_BDB:= 48+ +_bdb_ARGS:= 48+ . endif .endfor -.if ${USE_BDB} == yes -USE_BDB:= 48+ +.if ${_bdb_ARGS} == yes +_bdb_ARGS:= 48+ .endif # 1. detect installed versions @@ -246,17 +113,17 @@ .endfor # 2. parse supported versions: -# 2a. build list from USE_BDB +# 2a. build list from _bdb_ARGS _SUPP_BDB_VER= -_USE_BDB:=${USE_BDB:C,\+$,,:C/(.)(.)$/\1.\2/} -.if !empty(USE_BDB:M*+) +__bdb_ARGS:=${_bdb_ARGS:C,\+$,,:C/(.)(.)$/\1.\2/} +.if !empty(_bdb_ARGS:M*+) . for bdb in ${_DB_PORTS:C/(.)(.)$/\1.\2/} -. if ${_USE_BDB} <= ${bdb} +. if ${__bdb_ARGS} <= ${bdb} _SUPP_BDB_VER+=${bdb:C/\.//} . endif . endfor .else -_SUPP_BDB_VER=${USE_BDB} +_SUPP_BDB_VER=${_bdb_ARGS} .endif # 2b. expand INVALID_BDB_VER if given with "+": .if !empty(INVALID_BDB_VER:M*+) @@ -307,7 +174,7 @@ # 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 +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.*://} @@ -338,16 +205,15 @@ @${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} "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} "USE_BDB (effective): ${USE_BDB}" + @${ECHO_CMD} "bdb_ARGS (effective): ${_bdb_ARGS}" @${ECHO_CMD} "WITH_BDB_HIGHEST (override): ${_WITH_BDB_HIGHEST}" @${ECHO_CMD} "--OUTPUTS---------------------------------------------------" @${ECHO_CMD} "IGNORE=${IGNORE}" @@ -379,48 +245,5 @@ . 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) Index: Mk/Uses/mysql.mk =================================================================== --- /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: , 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 Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk +++ Mk/bsd.port.mk @@ -1403,6 +1403,22 @@ 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 @@ .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 Index: Mk/bsd.sanity.mk =================================================================== --- Mk/bsd.sanity.mk +++ Mk/bsd.sanity.mk @@ -168,9 +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 \ - 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 @@ 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}) Index: Tools/scripts/portsvar.sh =================================================================== --- Tools/scripts/portsvar.sh +++ 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: astro/foxtrotgps/Makefile =================================================================== --- astro/foxtrotgps/Makefile +++ 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: audio/harp/Makefile =================================================================== --- audio/harp/Makefile +++ 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: audio/libgpod/Makefile =================================================================== --- audio/libgpod/Makefile +++ 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: audio/linuxsampler/Makefile =================================================================== --- audio/linuxsampler/Makefile +++ 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: audio/lollypop/Makefile =================================================================== --- audio/lollypop/Makefile +++ 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: audio/osd-lyrics/Makefile =================================================================== --- audio/osd-lyrics/Makefile +++ 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: audio/pragha/Makefile =================================================================== --- audio/pragha/Makefile +++ 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: chinese/libchewing/Makefile =================================================================== --- chinese/libchewing/Makefile +++ 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: databases/akonadi/Makefile =================================================================== --- databases/akonadi/Makefile +++ 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: databases/cppdb/Makefile =================================================================== --- databases/cppdb/Makefile +++ 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: databases/flamerobin/Makefile =================================================================== --- databases/flamerobin/Makefile +++ databases/flamerobin/Makefile @@ -16,8 +16,7 @@ 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 Index: databases/fpc-ibase/Makefile =================================================================== --- databases/fpc-ibase/Makefile +++ databases/fpc-ibase/Makefile @@ -17,6 +17,6 @@ IBASE_DESC= Install Interbase/Firebird client OPTIONS_DEFAULT= IBASE -IBASE_USE= FIREBIRD=yes +IBASE_USES= firebird .include "${MASTERDIR}/Makefile" Index: databases/fpc-sqlite/Makefile =================================================================== --- databases/fpc-sqlite/Makefile +++ 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: databases/grass/Makefile =================================================================== --- databases/grass/Makefile +++ 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 Index: databases/gtksql/Makefile =================================================================== --- databases/gtksql/Makefile +++ databases/gtksql/Makefile @@ -50,7 +50,7 @@ .endif .if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= yes +USES+= sqlite .else CONFIGURE_ARGS+= --without-sqlite .endif Index: databases/luadbi/Makefile =================================================================== --- databases/luadbi/Makefile +++ 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: databases/mysql-connector-c++/Makefile =================================================================== --- databases/mysql-connector-c++/Makefile +++ databases/mysql-connector-c++/Makefile @@ -15,8 +15,7 @@ LIB_DEPENDS= libboost_regex.so:devel/boost-libs -USE_MYSQL= 51+ -USES= cmake:outsource +USES= cmake:outsource mysql USE_LDCONFIG= yes CMAKE_ARGS= -DDOC_DESTINATION="${DOCSDIR}" Index: databases/mysql-connector-c/Makefile =================================================================== --- databases/mysql-connector-c/Makefile +++ databases/mysql-connector-c/Makefile @@ -12,10 +12,9 @@ LICENSE= GPLv2 -USE_MYSQL= 51+ USE_OPENSSL= yes WITH_OPENSSL_PORT=yes -USES= cmake:outsource compiler:features +USES= cmake:outsource compiler:features mysql CMAKE_ARGS+= -DWITH_SSL=system \ -DOPENSSL_INCLUDE_DIR=${LOCALBASE}/include/openssl USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} Index: databases/opendbx/Makefile =================================================================== --- databases/opendbx/Makefile +++ 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: databases/p5-DBD-InterBase/Makefile =================================================================== --- databases/p5-DBD-InterBase/Makefile +++ databases/p5-DBD-InterBase/Makefile @@ -14,9 +14,7 @@ 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: Index: databases/p5-DBIx-Class-Schema-Loader/Makefile =================================================================== --- databases/p5-DBIx-Class-Schema-Loader/Makefile +++ 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 Index: databases/proftpd-mod_sql_sqlite/Makefile =================================================================== --- databases/proftpd-mod_sql_sqlite/Makefile +++ 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: databases/py-fdb/Makefile =================================================================== --- databases/py-fdb/Makefile +++ databases/py-fdb/Makefile @@ -12,10 +12,8 @@ LICENSE= ISCL -LIB_DEPENDS= libfbclient.so:databases/firebird25-client - NO_ARCH= yes -USES= python +USES= firebird python USE_PYTHON= autoplist distutils .include Index: databases/qt4-ibase-plugin/Makefile =================================================================== --- databases/qt4-ibase-plugin/Makefile +++ databases/qt4-ibase-plugin/Makefile @@ -5,6 +5,6 @@ COMMENT= Qt InterBase/Firebird database plugin DB= ibase -USE_FIREBIRD= yes +USES+= firebird .include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers" Index: databases/qt5-sqldrivers-ibase/Makefile =================================================================== --- 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" Index: databases/qt5-sqldrivers-sqlite2/Makefile =================================================================== --- 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" Index: databases/qt5-sqldrivers-sqlite3/Makefile =================================================================== --- databases/qt5-sqldrivers-sqlite3/Makefile +++ 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: databases/soci/Makefile =================================================================== --- databases/soci/Makefile +++ 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 @@ -46,7 +46,7 @@ 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 Index: databases/spatialite-tools/Makefile =================================================================== --- databases/spatialite-tools/Makefile +++ 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: databases/spatialite/Makefile =================================================================== --- databases/spatialite/Makefile +++ 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: databases/sqlite-ext-miscfuncs/Makefile =================================================================== --- databases/sqlite-ext-miscfuncs/Makefile +++ 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: databases/sqlite-ext-pcre/Makefile =================================================================== --- databases/sqlite-ext-pcre/Makefile +++ 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: databases/sqlitebrowser/Makefile =================================================================== --- databases/sqlitebrowser/Makefile +++ 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: databases/sqliteman/Makefile =================================================================== --- databases/sqliteman/Makefile +++ 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: databases/sqlitestudio/Makefile =================================================================== --- databases/sqlitestudio/Makefile +++ 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: databases/sqlrelay/Makefile =================================================================== --- databases/sqlrelay/Makefile +++ databases/sqlrelay/Makefile @@ -110,7 +110,7 @@ .endif .if ${PORT_OPTIONS:MFIREBIRD} -USE_FIREBIRD= yes +USES+= firebird CONFIGURE_ARGS+= --with-firebird-prefix="${LOCALBASE}" TOSTRIP+= libexec/sqlrelay/sqlrconnection_firebird.so .else Index: databases/tcl-Mysql/Makefile =================================================================== --- databases/tcl-Mysql/Makefile +++ databases/tcl-Mysql/Makefile @@ -15,8 +15,7 @@ PATCH_DEPENDS= rcsdiff:devel/rcs -USE_MYSQL= 41+ -USES= tcl tar:tgz +USES= mysql tcl tar:tgz TCL_NODOT= tcl${TCL_VER:S/.//} WRKSRC= ${WRKDIR}/tcl-sql LIB_NAME= libTclMySQL.so.1 Index: databases/virtualpg/Makefile =================================================================== --- databases/virtualpg/Makefile +++ 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: databases/vsqlite/Makefile =================================================================== --- databases/vsqlite/Makefile +++ 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: deskutils/fbreader/Makefile =================================================================== --- deskutils/fbreader/Makefile +++ 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: deskutils/growl-for-linux/Makefile =================================================================== --- deskutils/growl-for-linux/Makefile +++ 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: deskutils/gworkspace-gwmetadata/Makefile =================================================================== --- deskutils/gworkspace-gwmetadata/Makefile +++ 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: deskutils/osmo/Makefile =================================================================== --- deskutils/osmo/Makefile +++ 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: deskutils/pinot/Makefile =================================================================== --- deskutils/pinot/Makefile +++ 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: devel/bugzilla44/Makefile =================================================================== --- devel/bugzilla44/Makefile +++ devel/bugzilla44/Makefile @@ -64,7 +64,7 @@ .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 Index: devel/bugzilla50/Makefile =================================================================== --- devel/bugzilla50/Makefile +++ devel/bugzilla50/Makefile @@ -67,7 +67,7 @@ .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 Index: devel/cvstrac/Makefile =================================================================== --- devel/cvstrac/Makefile +++ 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: devel/ice/Makefile =================================================================== --- devel/ice/Makefile +++ devel/ice/Makefile @@ -36,8 +36,7 @@ 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 Index: devel/libleaftag/Makefile =================================================================== --- devel/libleaftag/Makefile +++ 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: devel/libopensync/Makefile =================================================================== --- devel/libopensync/Makefile +++ 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: devel/libsoup/Makefile =================================================================== --- devel/libsoup/Makefile +++ 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: devel/matreshka/Makefile =================================================================== --- devel/matreshka/Makefile +++ devel/matreshka/Makefile @@ -31,8 +31,8 @@ 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 Index: devel/poco-devel/Makefile =================================================================== --- devel/poco-devel/Makefile +++ 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: devel/poco-ssl/Makefile =================================================================== --- devel/poco-ssl/Makefile +++ 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 Index: dns/opendnssec/Makefile =================================================================== --- dns/opendnssec/Makefile +++ dns/opendnssec/Makefile @@ -47,7 +47,7 @@ .if ${PORT_OPTIONS:MMYSQL} CONFIGURE_ARGS+= --with-database-backend=mysql -USE_MYSQL= compat +USES+= mysql SCRIPTDATA= migrate_adapters_1.mysql migrate_keyshare_mysql.pl \ migrate_zone_delete.mysql migrate_id_mysql.pl \ migrate_to_ng_mysql.pl migrate_1_4_8.mysql Index: dns/opendnssec13/Makefile =================================================================== --- dns/opendnssec13/Makefile +++ 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: dns/powerdns/Makefile =================================================================== --- dns/powerdns/Makefile +++ 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: editors/libreoffice/Makefile =================================================================== --- editors/libreoffice/Makefile +++ editors/libreoffice/Makefile @@ -27,8 +27,7 @@ ${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_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 Index: ftp/wzdftpd/Makefile =================================================================== --- ftp/wzdftpd/Makefile +++ 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: games/crossfire-server/Makefile =================================================================== --- games/crossfire-server/Makefile +++ 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: games/ldmud/Makefile =================================================================== --- games/ldmud/Makefile +++ 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 Index: games/pvpgn/Makefile =================================================================== --- games/pvpgn/Makefile +++ 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: graphics/gdal/Makefile =================================================================== --- graphics/gdal/Makefile +++ 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: lang/bigloo/Makefile =================================================================== --- lang/bigloo/Makefile +++ 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 Index: lang/io/Makefile.addons =================================================================== --- lang/io/Makefile.addons +++ 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: lang/munger/Makefile =================================================================== --- lang/munger/Makefile +++ 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: lang/php55/Makefile.ext =================================================================== --- lang/php55/Makefile.ext +++ lang/php55/Makefile.ext @@ -464,7 +464,7 @@ CONFIGURE_ARGS+=--with-zlib=/usr .endif -.include +.include .if ${PHP_MODNAME} == "dba" . if empty(PORT_OPTIONS:MCDB) @@ -499,6 +499,8 @@ . endif .endif +.include + .if ${PHP_MODNAME} == "gd" . if ${PORT_OPTIONS:MT1LIB} LIB_DEPENDS+= libt1.so:devel/t1lib Index: lang/php56/Makefile.ext =================================================================== --- lang/php56/Makefile.ext +++ lang/php56/Makefile.ext @@ -467,7 +467,7 @@ CONFIGURE_ARGS+=--with-zlib=/usr .endif -.include +.include .if ${PHP_MODNAME} == "dba" . if empty(PORT_OPTIONS:MCDB) @@ -502,6 +502,8 @@ . endif .endif +.include + .if ${PHP_MODNAME} == "gd" . if ${PORT_OPTIONS:MT1LIB} LIB_DEPENDS+= libt1.so:devel/t1lib Index: lang/php70/Makefile.ext =================================================================== --- lang/php70/Makefile.ext +++ lang/php70/Makefile.ext @@ -459,7 +459,7 @@ CONFIGURE_ARGS+=--with-zlib=/usr .endif -.include +.include .if ${PHP_MODNAME} == "dba" . if empty(PORT_OPTIONS:MCDB) @@ -494,6 +494,8 @@ . endif .endif +.include + .if ${PHP_MODNAME} == "gd" . if ${PORT_OPTIONS:MT1LIB} LIB_DEPENDS+= libt1.so:devel/t1lib Index: mail/cyrus-imapd23/Makefile =================================================================== --- mail/cyrus-imapd23/Makefile +++ 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: mail/cyrus-imapd24/Makefile =================================================================== --- mail/cyrus-imapd24/Makefile +++ 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: mail/dbmail22/Makefile =================================================================== --- mail/dbmail22/Makefile +++ 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: mail/dk-milter/Makefile =================================================================== --- mail/dk-milter/Makefile +++ mail/dk-milter/Makefile @@ -41,6 +41,22 @@ 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 WITHOUT_MILTER_CFLAGS= yes @@ -69,21 +85,6 @@ 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 Index: mail/dovecot/Makefile =================================================================== --- mail/dovecot/Makefile +++ 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: mail/dovecot2/Makefile =================================================================== --- mail/dovecot2/Makefile +++ 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: mail/dspam/Makefile =================================================================== --- mail/dspam/Makefile +++ 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: mail/exim/Makefile =================================================================== --- mail/exim/Makefile +++ 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 Index: misc/krecipes-kde4/Makefile =================================================================== --- misc/krecipes-kde4/Makefile +++ 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: net-im/ejabberd/Makefile =================================================================== --- net-im/ejabberd/Makefile +++ 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: net-im/imspector/Makefile =================================================================== --- net-im/imspector/Makefile +++ 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 Index: net-mgmt/aircrack-ng/Makefile =================================================================== --- net-mgmt/aircrack-ng/Makefile +++ 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: net-mgmt/netxms/Makefile =================================================================== --- net-mgmt/netxms/Makefile +++ 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: net-mgmt/ocsinventory-ng/Makefile =================================================================== --- net-mgmt/ocsinventory-ng/Makefile +++ net-mgmt/ocsinventory-ng/Makefile @@ -22,9 +22,8 @@ p5-SOAP-Lite>=0:net/p5-SOAP-Lite \ p5-XML-Entities>=0:textproc/p5-XML-Entities -USES= perl5 +USES= mysql perl5 USE_APACHE_RUN= 22+ -USE_MYSQL= 41+ WANT_PHP_WEB= yes USE_PHP= mysql pcre zlib session xml gd zip openssl mbstring NO_BUILD= yes Index: net-mgmt/zabbix2-server/Makefile =================================================================== --- net-mgmt/zabbix2-server/Makefile +++ 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: net-mgmt/zabbix22-server/Makefile =================================================================== --- net-mgmt/zabbix22-server/Makefile +++ net-mgmt/zabbix22-server/Makefile @@ -95,7 +95,7 @@ PGSQL_USES= pgsql SQLITE_CONFIGURE_WITH= sqlite3 -SQLITE_USE= SQLITE=3 +SQLITE_USES= sqlite:3 ORACLE_CONFIGURE_WITH= oracle Index: net-mgmt/zabbix24-server/Makefile =================================================================== --- net-mgmt/zabbix24-server/Makefile +++ 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: net-mgmt/zabbix3-server/Makefile =================================================================== --- net-mgmt/zabbix3-server/Makefile +++ 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: net-p2p/digitalcoin/Makefile =================================================================== --- net-p2p/digitalcoin/Makefile +++ net-p2p/digitalcoin/Makefile @@ -21,8 +21,7 @@ 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 Index: net-p2p/dogecoin/Makefile =================================================================== --- net-p2p/dogecoin/Makefile +++ net-p2p/dogecoin/Makefile @@ -31,8 +31,7 @@ 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} Index: net-p2p/gnunet/Makefile =================================================================== --- net-p2p/gnunet/Makefile +++ 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: net-p2p/namecoin/Makefile =================================================================== --- net-p2p/namecoin/Makefile +++ net-p2p/namecoin/Makefile @@ -27,8 +27,7 @@ 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} Index: net-p2p/twister/Makefile =================================================================== --- net-p2p/twister/Makefile +++ net-p2p/twister/Makefile @@ -25,8 +25,7 @@ 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 Index: net-p2p/uhub/Makefile =================================================================== --- net-p2p/uhub/Makefile +++ 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 Index: net/glusterfs/Makefile =================================================================== --- net/glusterfs/Makefile +++ 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: net/mediatomb/Makefile =================================================================== --- net/mediatomb/Makefile +++ net/mediatomb/Makefile @@ -55,13 +55,15 @@ ID3LIB_DESC= id3lib support LIBEXTRACTOR_DESC= libextractor support +SQLITE_USES= sqlite +MYSQL_USES= mysql + .include .if ${PORT_OPTIONS:MSQLITE} CONFIGURE_ARGS+= --enable-sqlite3 \ --with-sqlite3-h="${LOCALBASE}/include" \ --with-sqlite3-libs="${LOCALBASE}/lib" -LIB_DEPENDS+= libsqlite3.so:databases/sqlite3 .else CONFIGURE_ARGS+= --disable-sqlite3 .endif @@ -69,7 +71,6 @@ .if ${PORT_OPTIONS:MMYSQL} CONFIGURE_ARGS+= --enable-mysql \ --with-mysql-cfg="${LOCALBASE}/bin/mysql_config" -USE_MYSQL= yes .else CONFIGURE_ARGS+= --disable-mysql .endif Index: ports-mgmt/packagekit/Makefile =================================================================== --- ports-mgmt/packagekit/Makefile +++ 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: security/cyrus-sasl2/Makefile =================================================================== --- security/cyrus-sasl2/Makefile +++ 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: security/heimdal/Makefile =================================================================== --- security/heimdal/Makefile +++ 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: security/hydra/Makefile =================================================================== --- security/hydra/Makefile +++ security/hydra/Makefile @@ -28,7 +28,7 @@ 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 Index: security/libpreludedb/Makefile =================================================================== --- security/libpreludedb/Makefile +++ 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 Index: textproc/redland/Makefile =================================================================== --- textproc/redland/Makefile +++ 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: textproc/sphinxsearch-devel/Makefile =================================================================== --- textproc/sphinxsearch-devel/Makefile +++ textproc/sphinxsearch-devel/Makefile @@ -68,7 +68,7 @@ MYSQL_CONFIGURE_WITH= mysql MYSQL_CONFIGURE_ON= --with-mysql-includes=${LOCALBASE}/include/mysql \ --with-mysql-libs=${LOCALBASE}/lib/mysql -MYSQL_USE= mysql +MYSQL_USES= mysql OPTIMIZED_CFLAGS_CXXFLAGS=-O3 -fomit-frame-pointer Index: textproc/sphinxsearch/Makefile =================================================================== --- textproc/sphinxsearch/Makefile +++ textproc/sphinxsearch/Makefile @@ -65,7 +65,7 @@ MYSQL_CONFIGURE_WITH= mysql MYSQL_CONFIGURE_ON= --with-mysql-includes=${LOCALBASE}/include/mysql \ --with-mysql-libs=${LOCALBASE}/lib/mysql -MYSQL_USE= mysql +MYSQL_USES= mysql OPTIMIZED_CFLAGS_CXXFLAGS=-O3 -fomit-frame-pointer Index: www/kannel-sqlbox/Makefile =================================================================== --- www/kannel-sqlbox/Makefile +++ 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: www/kannel/Makefile =================================================================== --- www/kannel/Makefile +++ 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: www/rt40/Makefile =================================================================== --- www/rt40/Makefile +++ 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