From feb040df65a82d00d73918947e69c23b3abfe74b Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 25 Apr 2016 16:13:38 +0000 Subject: Remove USE_SQLITE from bsd.databases.mk, replaced by USES=sqlite. While there replace USE_SQLITE=x by USES=sqlite:x. PR: 208971 Submitted by: mat Exp-run by: antoine With hat: portmgr Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D5951 --- Mk/bsd.database.mk | 28 -------------------------- Mk/bsd.port.mk | 2 +- Mk/bsd.sanity.mk | 4 ++-- Tools/scripts/portsvar.sh | 2 +- astro/foxtrotgps/Makefile | 3 +-- audio/harp/Makefile | 4 +--- audio/libgpod/Makefile | 3 +-- audio/linuxsampler/Makefile | 3 +-- audio/lollypop/Makefile | 3 +-- audio/osd-lyrics/Makefile | 3 +-- audio/pragha/Makefile | 3 +-- chinese/libchewing/Makefile | 3 +-- databases/akonadi/Makefile | 2 +- databases/cppdb/Makefile | 2 +- databases/fpc-sqlite/Makefile | 2 +- databases/grass/Makefile | 2 +- databases/gtksql/Makefile | 2 +- databases/luadbi/Makefile | 2 +- databases/opendbx/Makefile | 2 +- databases/p5-DBIx-Class-Schema-Loader/Makefile | 2 +- databases/proftpd-mod_sql_sqlite/Makefile | 2 +- databases/qt5-sqldrivers-sqlite2/Makefile | 2 +- databases/qt5-sqldrivers-sqlite3/Makefile | 2 +- databases/soci/Makefile | 2 +- databases/spatialite-tools/Makefile | 3 +-- databases/spatialite/Makefile | 3 +-- databases/sqlite-ext-miscfuncs/Makefile | 2 +- databases/sqlite-ext-pcre/Makefile | 3 +-- databases/sqlitebrowser/Makefile | 3 +-- databases/sqliteman/Makefile | 3 +-- databases/sqlitestudio/Makefile | 3 +-- databases/virtualpg/Makefile | 3 +-- databases/vsqlite/Makefile | 3 +-- deskutils/fbreader/Makefile | 3 +-- deskutils/growl-for-linux/Makefile | 3 +-- deskutils/gworkspace-gwmetadata/Makefile | 3 +-- deskutils/osmo/Makefile | 3 +-- deskutils/pinot/Makefile | 3 +-- devel/bugzilla44/Makefile | 2 +- devel/bugzilla50/Makefile | 2 +- devel/cvstrac/Makefile | 3 +-- devel/libleaftag/Makefile | 3 +-- devel/libopensync/Makefile | 3 +-- devel/libsoup/Makefile | 5 ++--- devel/matreshka/Makefile | 2 +- devel/poco-devel/Makefile | 2 +- devel/poco-ssl/Makefile | 2 +- dns/opendnssec13/Makefile | 2 +- dns/powerdns/Makefile | 2 +- ftp/wzdftpd/Makefile | 2 +- games/crossfire-server/Makefile | 4 ++-- games/ldmud/Makefile | 2 +- games/pvpgn/Makefile | 2 +- graphics/gdal/Makefile | 2 +- lang/bigloo/Makefile | 2 +- lang/io/Makefile.addons | 2 +- lang/munger/Makefile | 2 +- mail/cyrus-imapd23/Makefile | 2 +- mail/cyrus-imapd24/Makefile | 2 +- mail/dbmail22/Makefile | 2 +- mail/dovecot/Makefile | 2 +- mail/dovecot2/Makefile | 2 +- mail/dspam/Makefile | 10 ++++----- mail/exim/Makefile | 3 +-- misc/krecipes-kde4/Makefile | 4 ++-- net-im/ejabberd/Makefile | 2 +- net-im/imspector/Makefile | 4 ++-- net-mgmt/aircrack-ng/Makefile | 2 +- net-mgmt/netxms/Makefile | 2 +- net-mgmt/zabbix2-server/Makefile | 2 +- net-mgmt/zabbix22-server/Makefile | 2 +- net-mgmt/zabbix24-server/Makefile | 2 +- net-mgmt/zabbix3-server/Makefile | 2 +- net-p2p/gnunet/Makefile | 2 +- net-p2p/uhub/Makefile | 2 +- net/glusterfs/Makefile | 3 +-- ports-mgmt/packagekit/Makefile | 3 +-- security/cyrus-sasl2/Makefile | 4 ++-- security/heimdal/Makefile | 2 +- security/libpreludedb/Makefile | 2 +- textproc/redland/Makefile | 2 +- www/kannel-sqlbox/Makefile | 2 +- www/kannel/Makefile | 2 +- www/rt40/Makefile | 2 +- 84 files changed, 93 insertions(+), 150 deletions(-) diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk index 234c1ec..2309e5b 100644 --- a/Mk/bsd.database.mk +++ b/Mk/bsd.database.mk @@ -76,12 +76,6 @@ Database_Include_MAINTAINER= ports@FreeBSD.org # BDB_VER # - Detected Berkeley DB version. ## -# USE_SQLITE - Add dependency on SQLite library. Valid values are: -# 3 and 2. If version is not specified directly then -# SQLite-3 is used (if USE_SQLITE= yes). -# SQLITE_VER -# - Detected SQLite version. -## # USE_FIREBIRD - Add dependency on Firebird library. Valid values are: # 2 and 1. If no version is given by the maintainer (if # USE_FIREBIRD= yes) and the user did not define @@ -381,28 +375,6 @@ IGNORE= ${_IGNORE_MSG} .endif # USE_BDB -# Handling SQLite dependency -.if defined(USE_SQLITE) - -.if ${USE_SQLITE:tl} == "yes" -_SQLITE_VER= 3 -.else -_SQLITE_VER= ${USE_SQLITE} -.endif - -# USE_SQLITE is specified incorrectly, so mark this as IGNORE -.if ${_SQLITE_VER} == "3" -LIB_DEPENDS+= libsqlite3.so:databases/sqlite${_SQLITE_VER} -SQLITE_VER= ${_SQLITE_VER} -.elif ${_SQLITE_VER} == "2" -LIB_DEPENDS+= libsqlite.so:databases/sqlite${_SQLITE_VER} -SQLITE_VER= ${_SQLITE_VER} -.else -IGNORE= cannot install: unknown SQLite version: ${_SQLITE_VER} -.endif - -.endif # defined(USE_SQLITE) - .if defined(USE_FIREBIRD) .if defined(WITH_FIREBIRD_VER) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index e804fb4..469427c 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1864,7 +1864,7 @@ _FORCE_POST_PATTERNS= rmdir kldxref mkfontscale mkfontdir fc-cache \ .endif .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \ - defined(USE_BDB) || defined(USE_SQLITE) || defined(USE_FIREBIRD) + defined(USE_BDB) || defined(USE_FIREBIRD) .include "${PORTSDIR}/Mk/bsd.database.mk" .endif diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index 929650c..ef122ba 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -168,8 +168,8 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \ INSTALLS_SHLIB USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \ PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \ USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \ - UNIQUENAME LATEST_LINK -SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY USE_SQLITE \ + UNIQUENAME LATEST_LINK USE_SQLITE +SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY \ USE_FIREBIRD SANITY_NOTNEEDED= WX_UNICODE diff --git a/Tools/scripts/portsvar.sh b/Tools/scripts/portsvar.sh index 365389e..db8f058 100755 --- a/Tools/scripts/portsvar.sh +++ b/Tools/scripts/portsvar.sh @@ -58,7 +58,7 @@ do apache) setvar="$setvar USE_APACHE=yes";; autotools) setvar="$setvar USE_AUTOTOOLS=yes";; database) setvar="$setvar USE_MYSQL=yes USE_PGSQL=yes" - setvar="$setvar USE_BDB=yes USE_SQLITE=yes";; + setvar="$setvar USE_BDB=yes";; emacs) setvar="$setvar EMACS_PORT_NAME=yes";; gcc) setvar="$setvar USE_GCC=yes";; gnome) setvar="$setvar USE_GNOME=yes";; diff --git a/astro/foxtrotgps/Makefile b/astro/foxtrotgps/Makefile index 8a41882..6208f07 100644 --- a/astro/foxtrotgps/Makefile +++ b/astro/foxtrotgps/Makefile @@ -20,14 +20,13 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ GNU_CONFIGURE= yes CONFIGURE_ENV= DATADIRNAME=share CONFIGURE_ARGS= --disable-schemas-install -USES= gettext gmake pkgconfig shebangfix +USES= gettext gmake pkgconfig shebangfix sqlite:3 SHEBANG_FILES= contrib/convert2gpx \ contrib/convert2osm \ contrib/georss2foxtrotgps-poi\ contrib/gpx2osm USE_GNOME= gtk20 gconf2 libxml2 intltool libglade2 -USE_SQLITE= 3 INSTALLS_ICONS= yes GCONF_SCHEMAS= apps_foxtrotgps.schemas diff --git a/audio/harp/Makefile b/audio/harp/Makefile index 997f870..f6733e5 100644 --- a/audio/harp/Makefile +++ b/audio/harp/Makefile @@ -12,9 +12,7 @@ LICENSE= GPLv3 USE_GITHUB= yes GH_ACCOUNT= heckendorfc -USES= cmake - -USE_SQLITE= yes +USES= cmake sqlite USE_LDCONFIG= yes diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile index 835553c..4834887 100644 --- a/audio/libgpod/Makefile +++ b/audio/libgpod/Makefile @@ -16,13 +16,12 @@ LIB_DEPENDS= libplist.so:devel/libplist \ libtag.so:audio/taglib \ libsgutils2.so:sysutils/sg3_utils -USES= gettext gmake libtool localbase pathfix pkgconfig tar:bzip2 +USES= gettext gmake libtool localbase pathfix pkgconfig sqlite:3 tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules --disable-udev --without-hal \ --with-html-dir="${DOCSDIR:H}" USE_CSTD= gnu89 USE_GNOME= gdkpixbuf2 gtk20 intltool -USE_SQLITE= 3 INSTALL_TARGET= install-strip USE_LDCONFIG= yes diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile index b434d1d..0dd2c4c 100644 --- a/audio/linuxsampler/Makefile +++ b/audio/linuxsampler/Makefile @@ -22,9 +22,8 @@ OPTIONS_DEFAULT= JACK DSSI_DESC= Enable DSSI support LV2CORE_DESC= Enable LV2 support -USES= tar:bzip2 libtool gmake pathfix pkgconfig +USES= tar:bzip2 libtool gmake pathfix pkgconfig sqlite:3 GNU_CONFIGURE= yes -USE_SQLITE= 3 CONFIGURE_ENV= HAVE_UNIX98=1 USE_LDCONFIG= yes INSTALL_TARGET= install-strip diff --git a/audio/lollypop/Makefile b/audio/lollypop/Makefile index d81a216..978a29b 100644 --- a/audio/lollypop/Makefile +++ b/audio/lollypop/Makefile @@ -18,10 +18,9 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:databases/py-sqlite3 \ LIB_DEPENDS= libnotify.so:devel/libnotify \ libtotem-plparser.so:multimedia/totem-pl-parser -USES= shebangfix python:3 pkgconfig gettext gmake tar:xz +USES= shebangfix python:3 pkgconfig gettext gmake sqlite tar:xz GNU_CONFIGURE= yes USE_GNOME= glib20 gtk30 py3gobject3 introspection:build intltool intlhack -USE_SQLITE= yes USE_GSTREAMER1= yes mad ogg flac opus libav faad good speex USE_PYTHON= py3kplist INSTALLS_ICONS= yes diff --git a/audio/osd-lyrics/Makefile b/audio/osd-lyrics/Makefile index f70ad67..5e777e5 100644 --- a/audio/osd-lyrics/Makefile +++ b/audio/osd-lyrics/Makefile @@ -17,9 +17,8 @@ LIB_DEPENDS= libnotify.so:devel/libnotify \ libdbus-glib-1.so:devel/dbus-glib \ libcurl.so:ftp/curl -USES= desktop-file-utils gettext gmake iconv localbase pkgconfig +USES= desktop-file-utils gettext gmake iconv localbase pkgconfig sqlite USE_GNOME= gtk20 intltool -USE_SQLITE= yes GNU_CONFIGURE= yes # Cannot enable -Werror yet: Clang does not like the code `printf(_("..."))', # see this bug for details: http://llvm.org/bugs/show_bug.cgi?id=3814 diff --git a/audio/pragha/Makefile b/audio/pragha/Makefile index 70aa43c..ae87c49 100644 --- a/audio/pragha/Makefile +++ b/audio/pragha/Makefile @@ -19,10 +19,9 @@ LIB_DEPENDS= libtag.so:audio/taglib \ libtotem-plparser.so:multimedia/totem-pl-parser USES= compiler:c11 desktop-file-utils gettext-tools gmake libtool \ - pkgconfig tar:bz2 + pkgconfig sqlite tar:bz2 GNU_CONFIGURE= yes USE_GNOME= glib20 gtk30 intltool intlhack -USE_SQLITE= yes USE_GSTREAMER1= yes faad flac libav mad ogg speex INSTALLS_ICONS= yes USE_LDCONFIG= yes diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile index 728da48..33e4566 100644 --- a/chinese/libchewing/Makefile +++ b/chinese/libchewing/Makefile @@ -15,8 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/bin/makeinfo:print/texinfo -USES= cmake libtool pathfix pkgconfig tar:bzip2 -USE_SQLITE= yes +USES= cmake libtool pathfix pkgconfig sqlite tar:bzip2 USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= chewing diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile index c303f61..664cbb1 100644 --- a/databases/akonadi/Makefile +++ b/databases/akonadi/Makefile @@ -41,7 +41,7 @@ PGSQL_DESC= Install PostgreSQL Qt plugin PGSQL_USE= QT4=sql-pgsql_run SQLITE_DESC= Enable SQLite backend -SQLITE_USE= SQLITE=3 +SQLITE_USES= sqlite:3 SQLITE_CMAKE_OFF= -DAKONADI_BUILD_QSQLITE=off OPTIONS_DEFAULT= MYSQL diff --git a/databases/cppdb/Makefile b/databases/cppdb/Makefile index 9e8319e..3bbadd2 100644 --- a/databases/cppdb/Makefile +++ b/databases/cppdb/Makefile @@ -91,7 +91,7 @@ PLIST_SUB+= PGSQL="" CMAKE_ARGS+= -DDISABLE_SQLITE:BOOL=ON PLIST_SUB+= SQLITE3="@comment " .else -USE_SQLITE= 3 +USES+= sqlite:3 CMAKE_ARGS+= -DDISABLE_SQLITE:BOOL=OFF .if ${PORT_OPTIONS:MSQLITE3_INTERNAL} CMAKE_ARGS+= -DSQLITE_BACKEND_INTERNAL:BOOL=ON diff --git a/databases/fpc-sqlite/Makefile b/databases/fpc-sqlite/Makefile index 3a4a8f4..6bbfc19 100644 --- a/databases/fpc-sqlite/Makefile +++ b/databases/fpc-sqlite/Makefile @@ -16,6 +16,6 @@ EXTRACTUNITDIR= ${WRKUNITDIR} OPTIONS_DEFINE= SQLITE OPTIONS_DEFAULT= SQLITE -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite .include "${MASTERDIR}/Makefile" diff --git a/databases/grass/Makefile b/databases/grass/Makefile index b5bb6e8..39af539 100644 --- a/databases/grass/Makefile +++ b/databases/grass/Makefile @@ -111,7 +111,7 @@ ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC ODBC_CONFIGURE_ON= --with-odbc PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --with-postgres -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite SQLITE_CONFIGURE_ON= --with-sqlite .include diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index 9e19a83..aebe6c5 100644 --- a/databases/gtksql/Makefile +++ b/databases/gtksql/Makefile @@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --without-mysql .endif .if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= yes +USES+= sqlite .else CONFIGURE_ARGS+= --without-sqlite .endif diff --git a/databases/luadbi/Makefile b/databases/luadbi/Makefile index e6ff452..deff14e 100644 --- a/databases/luadbi/Makefile +++ b/databases/luadbi/Makefile @@ -35,7 +35,7 @@ MYSQL_CFLAGS= -I ${LOCALBASE}/include/mysql MYSQL_ALL_TARGET= mysql MYSQL_PLIST_FILES= %%LUA_MODLIBDIR%%/dbdmysql.so -SQLITE3_USE= SQLITE=3 +SQLITE3_USES= sqlite:3 SQLITE3_ALL_TARGET= sqlite3 SQLITE3_PLIST_FILES= %%LUA_MODLIBDIR%%/dbdsqlite3.so diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile index f7a0a00..fa0f147 100644 --- a/databases/opendbx/Makefile +++ b/databases/opendbx/Makefile @@ -38,7 +38,7 @@ PGSQL_USES= pgsql SQLITE_LIB_DEPENDS= libsqlite.so:databases/sqlite2 -SQLITE3_USE= SQLITE=3 +SQLITE3_USES= sqlite:3 MSSQL_LIB_DEPENDS= libsybdb.so:databases/freetds diff --git a/databases/p5-DBIx-Class-Schema-Loader/Makefile b/databases/p5-DBIx-Class-Schema-Loader/Makefile index 1e91c33..5bdeac7 100644 --- a/databases/p5-DBIx-Class-Schema-Loader/Makefile +++ b/databases/p5-DBIx-Class-Schema-Loader/Makefile @@ -51,7 +51,7 @@ MYSQL_USE= MYSQL=yes ORACLE_BUILD_DEPENDS= p5-DBD-Oracle>=0.19:databases/p5-DBD-Oracle ORACLE_RUN_DEPENDS= p5-DBD-Oracle>=0.19:databases/p5-DBD-Oracle PGSQL_USES= pgsql -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite .include diff --git a/databases/proftpd-mod_sql_sqlite/Makefile b/databases/proftpd-mod_sql_sqlite/Makefile index 94d50d4..a050bfb 100644 --- a/databases/proftpd-mod_sql_sqlite/Makefile +++ b/databases/proftpd-mod_sql_sqlite/Makefile @@ -15,7 +15,7 @@ DESCR= ${.CURDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../../ftp/proftpd -USE_SQLITE= yes +USES= sqlite INCLUDEDIRS= ${LOCALBASE}/include LIBDIRS= ${LOCALBASE}/lib diff --git a/databases/qt5-sqldrivers-sqlite2/Makefile b/databases/qt5-sqldrivers-sqlite2/Makefile index 09812cb..5a4de2e 100644 --- a/databases/qt5-sqldrivers-sqlite2/Makefile +++ b/databases/qt5-sqldrivers-sqlite2/Makefile @@ -3,6 +3,6 @@ DB= SQLite2 DB_DESC= SQLite 2 -USE_SQLITE= 2 +USES= sqlite:2 .include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers" diff --git a/databases/qt5-sqldrivers-sqlite3/Makefile b/databases/qt5-sqldrivers-sqlite3/Makefile index 3af4eb3..6a8554b 100644 --- a/databases/qt5-sqldrivers-sqlite3/Makefile +++ b/databases/qt5-sqldrivers-sqlite3/Makefile @@ -5,7 +5,7 @@ PORTNAME= sqlite3 DB= SQLite DB_DESC= SQLite 3 -USE_SQLITE= 3 +USES= sqlite:3 CONFIGURE_ARGS= -system-sqlite .include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers" diff --git a/databases/soci/Makefile b/databases/soci/Makefile index 29e1b7b..82155ae 100644 --- a/databases/soci/Makefile +++ b/databases/soci/Makefile @@ -33,7 +33,7 @@ PGSQL_USES= pgsql PGSQL_CMAKE_ON= -DWITH_POSTGRESQL:BOOL=ON PGSQL_CMAKE_OFF= -DWITH_POSTGRESQL:BOOL=OFF -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite SQLITE_CMAKE_ON= -DWITH_SQLITE3:BOOL=ON SQLITE_CMAKE_OFF= -DWITH_SQLITE3:BOOL=OFF diff --git a/databases/spatialite-tools/Makefile b/databases/spatialite-tools/Makefile index 4c4aa41..c9accd0 100644 --- a/databases/spatialite-tools/Makefile +++ b/databases/spatialite-tools/Makefile @@ -18,8 +18,7 @@ LIB_DEPENDS= libgeos_c.so:graphics/geos \ libreadosm.so:astro/readosm GNU_CONFIGURE= yes -USES= gmake pkgconfig iconv -USE_SQLITE= yes +USES= gmake pkgconfig iconv sqlite CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} diff --git a/databases/spatialite/Makefile b/databases/spatialite/Makefile index 4190f44..ac505b2 100644 --- a/databases/spatialite/Makefile +++ b/databases/spatialite/Makefile @@ -19,8 +19,7 @@ LIB_DEPENDS= libgeos_c.so:graphics/geos \ WRKSRC= ${WRKDIR}/lib${PORTNAME}-${PORTVERSION} GNU_CONFIGURE= yes -USES= gmake iconv pathfix pkgconfig libtool -USE_SQLITE= yes +USES= gmake iconv pathfix pkgconfig libtool sqlite USE_GNOME= libxml2 CFLAGS+= -I${WRKSRC}/src/headers -I${LOCALBASE}/include diff --git a/databases/sqlite-ext-miscfuncs/Makefile b/databases/sqlite-ext-miscfuncs/Makefile index 4ab148f..08fcb2d 100644 --- a/databases/sqlite-ext-miscfuncs/Makefile +++ b/databases/sqlite-ext-miscfuncs/Makefile @@ -13,7 +13,7 @@ EXTRACT_SUFX= MAINTAINER= ports@FreeBSD.org COMMENT= Math, string, and aggregate function library for SQLite -USE_SQLITE= yes +USES= sqlite DIST_SUBDIR= sqlite-ext NO_WRKSUBDIR= yes diff --git a/databases/sqlite-ext-pcre/Makefile b/databases/sqlite-ext-pcre/Makefile index c7daf1b..ec7ae09 100644 --- a/databases/sqlite-ext-pcre/Makefile +++ b/databases/sqlite-ext-pcre/Makefile @@ -9,7 +9,6 @@ COMMENT= Regexp function for SQLite based on PCRE library LIB_DEPENDS+= libpcre.so:devel/pcre -USE_SQLITE= yes DIST_SUBDIR= sqlite-ext LIBFILE= pcre.so @@ -20,7 +19,7 @@ SUB_LIST+= LIBFILE=${LIBFILE} PLIST_FILES= libexec/${DIST_SUBDIR}/${LIBFILE} -USES= gmake pkgconfig +USES= gmake pkgconfig sqlite USE_GITHUB= yes GH_ACCOUNT= ralight diff --git a/databases/sqlitebrowser/Makefile b/databases/sqlitebrowser/Makefile index 9db7fed..d85a7cf 100644 --- a/databases/sqlitebrowser/Makefile +++ b/databases/sqlitebrowser/Makefile @@ -14,10 +14,9 @@ LICENSE_COMB= dual USE_GITHUB= yes -USES= cmake desktop-file-utils +USES= cmake desktop-file-utils sqlite USE_QT4= corelib network gui qmake_build linguisttools_build \ moc_build uic_build rcc_build -USE_SQLITE= yes INSTALLS_ICONS= yes diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile index 466db83..09a8112 100644 --- a/databases/sqliteman/Makefile +++ b/databases/sqliteman/Makefile @@ -12,8 +12,7 @@ COMMENT= Admin's GUI tool for Sqlite3 LIB_DEPENDS= libqscintilla2.so:devel/qscintilla2 -USES= cmake -USE_SQLITE= yes +USES= cmake sqlite USE_QT4= qmake_build gui moc_build rcc_build uic_build xml sql GNU_CONFIGURE= yes diff --git a/databases/sqlitestudio/Makefile b/databases/sqlitestudio/Makefile index a3e2a2e..b7e7b49 100644 --- a/databases/sqlitestudio/Makefile +++ b/databases/sqlitestudio/Makefile @@ -37,10 +37,9 @@ OPTIONS_SUB= yes WRKSRC= ${WRKDIR}/SQLiteStudio3 -USES= compiler:c++11-lib gmake ncurses qmake +USES= compiler:c++11-lib gmake ncurses qmake sqlite USE_QT5= core gui svg sql xml network sql-sqlite3_run widgets script \ concurrent uitools buildtools_build linguisttools_build -USE_SQLITE= yes USE_GL= gl USE_LDCONFIG= yes diff --git a/databases/virtualpg/Makefile b/databases/virtualpg/Makefile index 499a31d..29667e9 100644 --- a/databases/virtualpg/Makefile +++ b/databases/virtualpg/Makefile @@ -13,8 +13,7 @@ LICENSE= MPL LGPL21 GPLv2 LICENSE_COMB= dual GNU_CONFIGURE= yes -USES= gmake iconv pathfix pkgconfig libtool pgsql -USE_SQLITE= yes +USES= gmake iconv pathfix pkgconfig libtool pgsql sqlite USE_LDCONFIG= yes CFLAGS+= -I${WRKSRC}/src/headers -I${LOCALBASE}/include diff --git a/databases/vsqlite/Makefile b/databases/vsqlite/Makefile index 847ab73..6ffbd49 100644 --- a/databases/vsqlite/Makefile +++ b/databases/vsqlite/Makefile @@ -16,9 +16,8 @@ USE_GITHUB= yes GH_ACCOUNT= vinzenz GH_PROJECT= vsqlite-- -USES= autoreconf compiler:c++0x libtool +USES= autoreconf compiler:c++0x libtool sqlite:3 GNU_CONFIGURE= yes -USE_SQLITE= 3 USE_LDCONFIG= yes INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile index 9161e81..f008c61 100644 --- a/deskutils/fbreader/Makefile +++ b/deskutils/fbreader/Makefile @@ -27,9 +27,8 @@ STATUS= debug STATUS= release .endif -USES= compiler gmake iconv pkgconfig tar:tgz +USES= compiler gmake iconv pkgconfig sqlite tar:tgz USE_LDCONFIG= yes -USE_SQLITE= yes INSTALL_TARGET= do_install diff --git a/deskutils/growl-for-linux/Makefile b/deskutils/growl-for-linux/Makefile index 578352e..c8255db 100644 --- a/deskutils/growl-for-linux/Makefile +++ b/deskutils/growl-for-linux/Makefile @@ -31,11 +31,10 @@ OPTIONS_DEFINE= LIBNOTIFY PLIST_SUB= DESKTOPDIR=${DESKTOPDIR:S,^${PREFIX}/,,} -USES= autoreconf compiler:nestedfct libtool pkgconfig +USES= autoreconf compiler:nestedfct libtool pkgconfig sqlite:3 USE_GITHUB= yes USE_GNOME= gtk20 USE_OPENSSL= yes -USE_SQLITE= 3 post-patch: @${REINPLACE_CMD} '/^gol_LDADD =/s/$$/ -lgmodule-2.0/' \ diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile index 228592f..627d965 100644 --- a/deskutils/gworkspace-gwmetadata/Makefile +++ b/deskutils/gworkspace-gwmetadata/Makefile @@ -12,14 +12,13 @@ COMMENT= GWMetadata for GNUstep workspace manager LICENSE= GPLv2 -USES= gnustep +USES= gnustep sqlite USE_GNUSTEP= back build GNU_CONFIGURE= yes LIB_DEPENDS= libDBKit.so:deskutils/gworkspace \ libPreferencePanes.so:deskutils/systempreferences USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} -USE_SQLITE= yes LDFLAGS+= -lpthread WRKSRC= ${WRKDIR}/gworkspace-${PORTVERSION}/GWMetadata diff --git a/deskutils/osmo/Makefile b/deskutils/osmo/Makefile index c166e0b..0b365ba 100644 --- a/deskutils/osmo/Makefile +++ b/deskutils/osmo/Makefile @@ -18,9 +18,8 @@ LIB_DEPENDS= libical.so:devel/libical \ libgtkspell.so:textproc/gtkspell \ libwebkitgtk-1.0.so:www/webkit-gtk2 -USES= gettext gmake libarchive pkgconfig +USES= gettext gmake libarchive pkgconfig sqlite USE_GNOME= gtk20 libxml2 -USE_SQLITE= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile index 5a44604..c4e4ecc 100644 --- a/deskutils/pinot/Makefile +++ b/deskutils/pinot/Makefile @@ -47,9 +47,8 @@ CONFIGURE_ENV= MKDIR_P="${MKDIR}" CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lboost_system -USES= gettext libarchive libtool pkgconfig python shebangfix +USES= gettext libarchive libtool pkgconfig python shebangfix sqlite:3 USE_OPENSSL= yes -USE_SQLITE= 3 USE_XORG= pixman USE_LDCONFIG= ${PREFIX}/lib/pinot/backends ${PREFIX}/lib/pinot/filters SHEBANG_FILES= scripts/bash/*.sh diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile index fdf6ebf..d2bbab1 100644 --- a/devel/bugzilla44/Makefile +++ b/devel/bugzilla44/Makefile @@ -49,7 +49,7 @@ MYSQL_USE= MYSQL=yes MYSQL_RUN_DEPENDS= p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql PGSQL_USES= pgsql PGSQL_RUN_DEPENDS= p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite SQLITE_RUN_DEPENDS= p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \ sqlite3>=3:databases/sqlite3 GRAPH_REPORTS_RUN_DEPENDS= p5-GD>=1.20:graphics/p5-GD \ diff --git a/devel/bugzilla50/Makefile b/devel/bugzilla50/Makefile index 8828000..e2ab32e 100644 --- a/devel/bugzilla50/Makefile +++ b/devel/bugzilla50/Makefile @@ -52,7 +52,7 @@ MYSQL_USE= MYSQL=yes MYSQL_RUN_DEPENDS= p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql PGSQL_USES= pgsql:91+ PGSQL_RUN_DEPENDS= p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite SQLITE_RUN_DEPENDS= p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \ sqlite3>=3:databases/sqlite3 GRAPH_REPORTS_RUN_DEPENDS= p5-GD>=1.20:graphics/p5-GD \ diff --git a/devel/cvstrac/Makefile b/devel/cvstrac/Makefile index 8874f22..e66f9e0 100644 --- a/devel/cvstrac/Makefile +++ b/devel/cvstrac/Makefile @@ -13,8 +13,7 @@ COMMENT?= Web-Based Bug And Patch-Set Tracking System For CVS LICENSE= GPLv2 -USES= gmake pkgconfig -USE_SQLITE= yes +USES= gmake pkgconfig sqlite MAKEFILE= bsd-gcc.mk MAKE_ARGS+= BCC="${CC} ${CPPFLAGS}" TCC="${CC} ${CPPFLAGS}" \ LIBSQLITE="${LDFLAGS}" diff --git a/devel/libleaftag/Makefile b/devel/libleaftag/Makefile index 4e5fd1c..eae3401 100644 --- a/devel/libleaftag/Makefile +++ b/devel/libleaftag/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= http://releases.chipx86.com/leaftag/libleaftag/ MAINTAINER= kaeru@inigo-tech.com COMMENT= Leaftag is a library for tagging files on the desktop -USE_SQLITE= 2 -USES= gmake pathfix pkgconfig libtool +USES= gmake pathfix pkgconfig libtool sqlite:2 GNU_CONFIGURE= yes USE_GNOME= glib20 USE_LDCONFIG= yes diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile index 451654f..5c37523 100644 --- a/devel/libopensync/Makefile +++ b/devel/libopensync/Makefile @@ -16,8 +16,7 @@ LIB_DEPENDS= libexslt.so:textproc/libxslt CONFLICTS= libopensync-0.22* -USE_SQLITE= 3 -USES= cmake pkgconfig python tar:bzip2 +USES= cmake pkgconfig python tar:bzip2 sqlite:3 CMAKE_ARGS+= -Wno-dev USE_GNOME= glib20 libxml2 USE_LDCONFIG= yes diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index d622722..7cc5e3e 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -20,10 +20,9 @@ PORTSCOUT= limitw:1,even .if !defined(REFERENCE_PORT) USES+= gettext gmake gnome libtool pathfix pkgconfig \ - python:3:build tar:xz + python:3:build sqlite:3 tar:xz USE_GNOME= glib20 intlhack introspection:build \ libxml2 referencehack -USE_SQLITE= 3 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-more-warnings \ @@ -36,7 +35,7 @@ LIBVERSION= 1.7.0 PLIST_SUB= VERSION="2.4" LIBVERSION=${LIBVERSION} .if defined(SOUP_SLAVE) -USE_SQLITE= yes +USES+= sqlite LIB_DEPENDS+= libsoup-2.4.so:devel/libsoup CONFIGURE_ARGS+=--with-gnome .else diff --git a/devel/matreshka/Makefile b/devel/matreshka/Makefile index a2ee7c3..2be36ff 100644 --- a/devel/matreshka/Makefile +++ b/devel/matreshka/Makefile @@ -31,7 +31,7 @@ AMF_CONFIGURE_ENABLE= amf MYSQL_USE= MYSQL=yes PGSQL_USES= pgsql -SQLITE3_USE= SQLITE=yes +SQLITE3_USES= sqlite FIREBIRD_USE= FIREBIRD=yes MAKE_JOBS_UNSAFE= yes diff --git a/devel/poco-devel/Makefile b/devel/poco-devel/Makefile index c33f20b..5637e48 100644 --- a/devel/poco-devel/Makefile +++ b/devel/poco-devel/Makefile @@ -65,7 +65,7 @@ CONFIGURE_ARGS+= --omit=Data/MySQL .endif .if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= yes +USES+= sqlite .else CONFIGURE_ARGS+= --omit=Data/SQLite .endif diff --git a/devel/poco-ssl/Makefile b/devel/poco-ssl/Makefile index 95e9be4..e030011 100644 --- a/devel/poco-ssl/Makefile +++ b/devel/poco-ssl/Makefile @@ -37,7 +37,7 @@ ODBC_CONFIGURE_OFF= --omit=Data/ODBC MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_OFF= --omit=Data/MySQL -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite SQLITE_CONFIGURE_OFF= --omit=Data/SQLite .include diff --git a/dns/opendnssec13/Makefile b/dns/opendnssec13/Makefile index 0159b96..a541a6c 100644 --- a/dns/opendnssec13/Makefile +++ b/dns/opendnssec13/Makefile @@ -46,7 +46,7 @@ MYSQL_CONFIGURE_OFF= --with-sqlite3=${LOCALBASE} --with-database-backend=sqlite3 MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} --with-database-backend=mysql MYSQL_LIB_DEPENDS_OFF= libsqlite3.so:databases/sqlite3 MYSQL_USE= MYSQL=compat -MYSQL_USE_OFF= SQLITE=yes +MYSQL_USES_OFF= sqlite SOFTHSM_CONFIGURE_ON= --with-softhsm --with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm.so SOFTHSM_RUN_DEPENDS= softhsm>=1.2.0:security/softhsm diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile index aae3bdf..5529ce9 100644 --- a/dns/powerdns/Makefile +++ b/dns/powerdns/Makefile @@ -91,7 +91,7 @@ POLARSSL_LIB_DEPENDS_OFF= libmbedtls.so:security/polarssl13 REMOTE_VARS= MODULES+=remote -SQLITE3_USE= SQLITE=3 +SQLITE3_USES= sqlite:3 SQLITE3_VARS= MODULES+=gsqlite3 TINYDNS_CONFIGURE_ON= CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include" diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile index dd93842..c780e91 100644 --- a/ftp/wzdftpd/Makefile +++ b/ftp/wzdftpd/Makefile @@ -59,7 +59,7 @@ PGSQL_CONFIGURE_OFF= --disable-pgsql PGSQL_USES= pgsql SQLITE_CONFIGURE_ENABLE= sqlite3 -SQLITE_USE= SQLITE=3 +SQLITE_USES= sqlite:3 AVAHI_CONFIGURE_ON= --with-zeroconf --enable-avahi AVAHI_LIB_DEPENDS= libdbus-1.so:devel/dbus \ diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile index 9253486..e13ef08 100644 --- a/games/crossfire-server/Makefile +++ b/games/crossfire-server/Makefile @@ -46,10 +46,10 @@ OPTIONS_GROUP_PLUGINS= CFLOGGER CFNEWSPAPER CFRHG OPTIONS_SUB= yes CFLOGGER_DESC= SQLite logging plugin -CFLOGGER_USE= sqlite=3 +CFLOGGER_USES= sqlite:3 CFLOGGER_CONFIGURE_ON= --enable-logger=yes CFNEWSPAPER_DESC= Newspaper plugin -CFLOGGER_USE= sqlite=3 +CFLOGGER_USES= sqlite:3 CFNEWSPAPER_CONFIGURE_ON= --enable-newspaper=yes CFRHG_DESC= Random house genetor plugin CFRHG_CONFIGURE_ON= --enable-cfrhg=yes diff --git a/games/ldmud/Makefile b/games/ldmud/Makefile index 8c9107e..13ba857 100644 --- a/games/ldmud/Makefile +++ b/games/ldmud/Makefile @@ -41,7 +41,7 @@ MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ENABLE= use-mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_ENABLE= use-pgsql -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite SQLITE_CONFIGURE_ENABLE=use-sqlite .include diff --git a/games/pvpgn/Makefile b/games/pvpgn/Makefile index 04decb8..d355286 100644 --- a/games/pvpgn/Makefile +++ b/games/pvpgn/Makefile @@ -50,7 +50,7 @@ MYSQL_CONFIGURE_WITH= mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= pgsql -SQLITE3_USE= SQLITE=3 +SQLITE3_USES= sqlite:3 SQLITE3_CONFIGURE_WITH= sqlite3 ## support files diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index 28ef21b..5bad990 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -105,7 +105,7 @@ PROJ_LIB_DEPENDS= libproj.so:graphics/proj SPATIALITE_CONFIGURE_WITH= spatialite SPATIALITE_LIB_DEPENDS= libspatialite.so:databases/spatialite SQLITE_CONFIGURE_WITH= sqlite3 -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp XERCES_CONFIGURE_WITH= xerces diff --git a/lang/bigloo/Makefile b/lang/bigloo/Makefile index 51486ac..025fb78 100644 --- a/lang/bigloo/Makefile +++ b/lang/bigloo/Makefile @@ -66,7 +66,7 @@ MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 MPG123_CONFIGURE_OFF= --disable-mpg123 OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_OFF= --disable-ssl -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite SQLITE_CONFIGURE_OFF= --disable-pkglib --disable-sqlite .include diff --git a/lang/io/Makefile.addons b/lang/io/Makefile.addons index 85acc3f..fa9d894 100644 --- a/lang/io/Makefile.addons +++ b/lang/io/Makefile.addons @@ -94,7 +94,7 @@ Python_USES= python QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm ReadLine_USES= readline:port Regex_LIB_DEPENDS= libpcre.so:devel/pcre -SQLite3_USE= SQLITE=3 +SQLite3_USES= sqlite:3 SampleRateConverter_LIB_DEPENDS=\ libsamplerate.so:audio/libsamplerate Socket_LIB_DEPENDS= libevent.so:devel/libevent2 diff --git a/lang/munger/Makefile b/lang/munger/Makefile index 9063396..306c342 100644 --- a/lang/munger/Makefile +++ b/lang/munger/Makefile @@ -24,7 +24,7 @@ DATADIR= ${PREFIX}/share/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= SQLITE OPTIONS_DEFAULT= SQLITE -SQLITE_USE= SQLITE=3 +SQLITE_USES= sqlite:3 SQLITE_MAKE_ARGS= -DWITH_SQL post-patch: diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index 9307c0b..b9043fd 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -82,7 +82,7 @@ SNMP_5_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_5_CONFIGURE_ON= --with-snmp=${LOCALBASE} SNMP_5_CONFIGURE_OFF= --with-snmp=no SQLITE_DESC= Enable SQLite backend (experimental) -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} # Autocreate Inbox and Autosieve patches from UoA diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index 3d72a07..9c31107 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -77,7 +77,7 @@ REPLICATION_CONFIGURE_ENABLE=replication SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_ON= --with-snmp=${LOCALBASE} SNMP_CONFIGURE_OFF= --with-snmp=no -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} OPTIONS_RADIO= GSSAPI diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile index 2d35783..e214b0e 100644 --- a/mail/dbmail22/Makefile +++ b/mail/dbmail22/Makefile @@ -27,7 +27,7 @@ OPTIONS_SUB= yes MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_WITH= mysql -SQLITE_USE= SQLITE=3 +SQLITE_USES= sqlite:3 SQLITE_CONFIGURE_WITH= sqlite PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= pgsql diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index dc349fd..9853e1f 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -77,7 +77,7 @@ MYSQL_USE= MYSQL=yes PGSQL_CONFIGURE_WITH= pgsql PGSQL_USES= pgsql SQLITE_CONFIGURE_WITH= sqlite -SQLITE_USE= SQLITE=3 +SQLITE_USES= sqlite:3 SSL_CONFIGURE_OFF= --without-ssl SSL_CONFIGURE_ON= --with-ssl=openssl VPOPMAIL_BUILD_DEPENDS= ${LOCALBASE}/vpopmail/bin/vchkpw:mail/vpopmail diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile index 2072761..f885692 100644 --- a/mail/dovecot2/Makefile +++ b/mail/dovecot2/Makefile @@ -109,7 +109,7 @@ SOLR_CONFIGURE_WITH= solr SOLR_BUILD_DEPENDS= curl:ftp/curl SOLR_LIB_DEPENDS= libexpat.so:textproc/expat2 -SQLITE_USE= SQLITE=3 +SQLITE_USES= sqlite:3 SQLITE_CONFIGURE_WITH= sqlite SSL_CONFIGURE_WITH= ssl=openssl diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index e4c3801..da98675 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -215,20 +215,20 @@ _DBDRV:= ${_DBDRV:S/pgsql_drv,//} .endif .if ${PORT_OPTIONS:MSQLITE3} -USE_SQLITE= 3 +USES+= sqlite:3 _DBDRV_COUNT:= ${_DBDRV_COUNT}o .else _DBDRV:= ${_DBDRV:S/sqlite3_drv,//} .endif .if ${PORT_OPTIONS:MSQLITE2} -USE_SQLITE= 2 +USES+= sqlite:2 _DBDRV_COUNT:= ${_DBDRV_COUNT}o .else _DBDRV:= ${_DBDRV:S/sqlite_drv,//} .endif -.if defined(USE_SQLITE) +.if ${USES:Msqlite*} CONFIGURE_ARGS+= --with-sqlite-includes=${LOCALBASE}/include \ --with-sqlite-libraries=${LOCALBASE}/lib PLIST_SUB+= SQLITE="" @@ -464,7 +464,7 @@ pre-configure: @${FALSE} .endif .if ${PORT_OPTIONS:MEXTERNAL_LOOKUP} && !( defined(USE_MYSQL) || \ - ${PORT_OPTIONS:MPGSQL} || defined(USE_SQLITE) ) + ${PORT_OPTIONS:MPGSQL} || ${PORT_OPTIONS:MSQLITE*} ) @${ECHO_CMD} "You need MySQL, Postgres or SQLITE for EXTERNAL_LOOKUP." @${FALSE} .endif @@ -505,7 +505,7 @@ post-install: @cd ${WRKSRC}/src/tools.pgsql_drv && \ ${INSTALL_DATA} *.sql ${STAGEDIR}${EXAMPLESDIR}/pgsql .endif -.ifdef(USE_SQLITE) +.if ${PORT_OPTIONS:MSQLITE*} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sqlite cd ${WRKSRC}/src/tools.sqlite_drv && \ ${INSTALL_DATA} *.sql ${STAGEDIR}${EXAMPLESDIR}/sqlite diff --git a/mail/exim/Makefile b/mail/exim/Makefile index eae67e3..791f04a 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -55,8 +55,7 @@ REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis SASLAUTHD_RUN_DEPENDS= ${LOCALBASE}/sbin/saslauthd:security/cyrus-sasl2-saslauthd SA_EXIM_RUN_DEPENDS= ${LOCALBASE}/bin/spamc:mail/spamassassin SPF_LIB_DEPENDS= libspf2.so:mail/libspf2 -SQLITE_USE= sqlite=yes -SQLITE_USES= pkgconfig +SQLITE_USES= pkgconfig sqlite .include diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile index e75fde8..316ac15 100644 --- a/misc/krecipes-kde4/Makefile +++ b/misc/krecipes-kde4/Makefile @@ -19,8 +19,8 @@ OPTIONS_MULTI= DB OPTIONS_MULTI_DB= SQLITE MYSQL PGSQL OPTIONS_DEFAULT= SQLITE -SQLITE_USE= SQLITE=yes \ - QT4=sql-sqlite3_run +SQLITE_USES= sqlite +SQLITE_USE= QT4=sql-sqlite3_run SQLITE_CMAKE_OFF= -DWITH_Sqlite:BOOL=OFF MYSQL_USE= MYSQL=yes \ diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile index f0685de..e8698ad 100644 --- a/net-im/ejabberd/Makefile +++ b/net-im/ejabberd/Makefile @@ -67,7 +67,7 @@ SQLITE_CONFIGURE_ENABLE=sqlite TOOLS_CONFIGURE_ENABLE= tools FULLXML_CONFIGURE_ENABLE= full-xml ZLIB_CONFIGURE_ENABLE= zlib -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite ICONV_USES= iconv:wchar_t ICONV_LDFLAGS= ${ICONV_LIB} DOCS_MAKE_ARGS_OFF= NOPORTDOCS=yes diff --git a/net-im/imspector/Makefile b/net-im/imspector/Makefile index 476a7a4..e0cee61 100644 --- a/net-im/imspector/Makefile +++ b/net-im/imspector/Makefile @@ -31,8 +31,8 @@ IPFW_DESC= Add IPFW support PLUGINS_DESC= Build plugins IPFW_CFLAGS= -DIPFW_TRANSPARENT=1 -PLUGINS_USE= MYSQL=yes SQLITE=yes -PLUGINS_USES= pgsql +PLUGINS_USE= MYSQL=yes +PLUGINS_USES= pgsql sqlite .include diff --git a/net-mgmt/aircrack-ng/Makefile b/net-mgmt/aircrack-ng/Makefile index b13e907..98ad551 100644 --- a/net-mgmt/aircrack-ng/Makefile +++ b/net-mgmt/aircrack-ng/Makefile @@ -33,7 +33,7 @@ PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PCRE_USES= pkgconfig SQLITE_DESC= Use SQLite for storing pre-computed key tables -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite SQLITE_MAKE_ARGS= sqlite=true post-patch: diff --git a/net-mgmt/netxms/Makefile b/net-mgmt/netxms/Makefile index 922c778..663d422 100644 --- a/net-mgmt/netxms/Makefile +++ b/net-mgmt/netxms/Makefile @@ -39,7 +39,7 @@ MYSQL_USE= MYSQL=yes PGSQL_CONFIGURE_ON= --with-pgsql PGSQL_USES= pgsql SQLITE_CONFIGURE_ON= --with-sqlite -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite ODBC_CONFIGURE_ON= --with-odbc ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile index 1b0af7a..380b569 100644 --- a/net-mgmt/zabbix2-server/Makefile +++ b/net-mgmt/zabbix2-server/Makefile @@ -93,7 +93,7 @@ PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES= pgsql SQLITE_CONFIGURE_WITH= sqlite3 -SQLITE_USE= SQLITE=3 +SQLITE_USES= sqlite:3 ORACLE_CONFIGURE_WITH= oracle diff --git a/net-mgmt/zabbix22-server/Makefile b/net-mgmt/zabbix22-server/Makefile index 84ae2ff..8f122c9 100644 --- a/net-mgmt/zabbix22-server/Makefile +++ b/net-mgmt/zabbix22-server/Makefile @@ -96,7 +96,7 @@ PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES= pgsql SQLITE_CONFIGURE_WITH= sqlite3 -SQLITE_USE= SQLITE=3 +SQLITE_USES= sqlite:3 ORACLE_CONFIGURE_WITH= oracle diff --git a/net-mgmt/zabbix24-server/Makefile b/net-mgmt/zabbix24-server/Makefile index 8009b72..01cc576 100644 --- a/net-mgmt/zabbix24-server/Makefile +++ b/net-mgmt/zabbix24-server/Makefile @@ -97,7 +97,7 @@ PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES= pgsql SQLITE_CONFIGURE_WITH= sqlite3 -SQLITE_USE= SQLITE=3 +SQLITE_USES= sqlite:3 ORACLE_CONFIGURE_WITH= oracle diff --git a/net-mgmt/zabbix3-server/Makefile b/net-mgmt/zabbix3-server/Makefile index 7e00db5..ecffe3f 100644 --- a/net-mgmt/zabbix3-server/Makefile +++ b/net-mgmt/zabbix3-server/Makefile @@ -99,7 +99,7 @@ PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES= pgsql SQLITE_CONFIGURE_WITH= sqlite3 -SQLITE_USE= SQLITE=3 +SQLITE_USES= sqlite:3 ORACLE_CONFIGURE_WITH= oracle diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile index 6856458..c5a71a2 100644 --- a/net-p2p/gnunet/Makefile +++ b/net-p2p/gnunet/Makefile @@ -71,7 +71,7 @@ PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --with-postgres=${LOCALBASE} PGSQL_CONFIGURE_OFF= --without-postgres SQLITE_DESC= Use SQLite for the data store and cache -SQLITE_USE= sqlite=yes +SQLITE_USES= sqlite SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} SQLITE_CONFIGURE_OFF= --without-sqlite diff --git a/net-p2p/uhub/Makefile b/net-p2p/uhub/Makefile index 8454fbd..5ee8849 100644 --- a/net-p2p/uhub/Makefile +++ b/net-p2p/uhub/Makefile @@ -30,7 +30,7 @@ OPTIONS_SUB= yes OPENSSL_USE= openssl=yes OPENSSL_CMAKE_OFF= -DSSL_SUPPORT:BOOL=OFF -SQLITE_USE= sqlite=yes +SQLITE_USES= sqlite SQLITE_CMAKE_OFF= -DSQLITE_SUPPORT:BOOL=OFF .include diff --git a/net/glusterfs/Makefile b/net/glusterfs/Makefile index 844e169..dc0cbe2 100644 --- a/net/glusterfs/Makefile +++ b/net/glusterfs/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libargp.so:devel/argp-standalone liburcu-bp.so:sysutils/liburcu USE_GCC= any USES= bison gettext libtool pkgconfig python:build readline \ - shebangfix + shebangfix sqlite SHEBANG_FILES= extras/peer_add_secret_pub.in \ tools/glusterfind/S57glusterfind-delete-post.py \ extras/ganesha/scripts/ganesha-ha.sh @@ -24,7 +24,6 @@ SHEBANG_FILES= extras/peer_add_secret_pub.in \ USE_GNOME= glib20 libxml2 USE_LDCONFIG= yes USE_OPENSSL= yes -USE_SQLITE= yes USE_RC_SUBR= glusterd GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile index aadc14a..e33b6cf 100644 --- a/ports-mgmt/packagekit/Makefile +++ b/ports-mgmt/packagekit/Makefile @@ -21,12 +21,11 @@ RUN_DEPENDS= lsof:sysutils/lsof \ IGNORE= does not build with new polkit USES= cpe execinfo gettext gmake iconv libtool pathfix pkgconfig \ - python:build shared-mime-info shebangfix + python:build shared-mime-info shebangfix sqlite:3 CPE_VENDOR= packagekit_project SHEBANG_FILES= backends/test/helpers/search-name.sh \ contrib/cron/packagekit-background.cron USE_GNOME= glib20 intltool introspection -USE_SQLITE= 3 USE_LDCONFIG= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index 3f4227e..4acd85b 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -45,10 +45,10 @@ MYSQL_CONFIGURE_OFF= --without-mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} PGSQL_CONFIGURE_OFF= --without-pgsql -SQLITE2_USE= SQLITE=2 +SQLITE2_USES= sqlite:2 SQLITE2_CONFIGURE_ON= --with-sqlite=${LOCALBASE} SQLITE2_CONFIGURE_OFF= --without-sqlite -SQLITE3_USE= SQLITE=3 +SQLITE3_USES= sqlite:3 SQLITE3_CONFIGURE_ON= --with-sqlite3=${LOCALBASE} SQLITE3_CONFIGURE_OFF= --without-sqlite3 ANONYMOUS_DESC= ANONYMOUS authentication diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index b116574..b2f3cf6 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -61,7 +61,7 @@ BDB_CONFIGURE_ON= --with-berkeley-db \ BDB_CONFIGURE_OFF= --without-berkeley-db SQLITE_DESC= Enable SQLite KDC backend support -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite SQLITE_CONFIGURE_ON= --with-sqlite3 \ --with-sqlite3-include="${LOCALBASE}/include" \ --with-sqlite3-lib="${LOCALBASE}/lib" diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile index 5be215e..c4ced12 100644 --- a/security/libpreludedb/Makefile +++ b/security/libpreludedb/Makefile @@ -37,7 +37,7 @@ PYTHON_USES= python:2.7 PYTHON_CONFIGURE_WITH= python2=${PYTHON_CMD} PYTHON_PLIST_SUB= VERSION=${PORTVERSION} SQLITE_DESC= SQLite3 plugin -SQLITE_USE= sqlite=yes +SQLITE_USES= sqlite SQLITE_CONFIGURE_WITH= sqlite3 .include diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile index 9647e70..d49d40f 100644 --- a/textproc/redland/Makefile +++ b/textproc/redland/Makefile @@ -60,7 +60,7 @@ PLIST_SUB+= PGSQL="@comment " #.endif #.if defined(WITH_SQLITE) -#USE_SQLITE= 3 +#USES+= sqlite:3 #CONFIGURE_ARGS+=--with-sqlite=3 #PLIST_SUB+= SQLITE="" #.else diff --git a/www/kannel-sqlbox/Makefile b/www/kannel-sqlbox/Makefile index 5a8343e..4c59d32 100644 --- a/www/kannel-sqlbox/Makefile +++ b/www/kannel-sqlbox/Makefile @@ -31,7 +31,7 @@ MYSQL_USE= mysql=yes PGSQL_USE= pgsql=yes -SQLITE3_USE= sqlite=3 +SQLITE3_USES= sqlite:3 USE_RC_SUBR= kannel_sqlbox diff --git a/www/kannel/Makefile b/www/kannel/Makefile index 8dc4a12..581b9f6 100644 --- a/www/kannel/Makefile +++ b/www/kannel/Makefile @@ -39,7 +39,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -pthread OPTIONS_DEFINE= MYSQL PGSQL SQLITE3 OPTIONS_DEFAULT= MYSQL -SQLITE3_USE= SQLITE=3 +SQLITE3_USES= sqlite:3 SQLITE3_CONFIGURE_WITH= sqlite3 MYSQL_USE= MYSQL=yes diff --git a/www/rt40/Makefile b/www/rt40/Makefile index 5cefa42..219eb7b 100644 --- a/www/rt40/Makefile +++ b/www/rt40/Makefile @@ -91,7 +91,7 @@ PGSQL_RUN_DEPENDS= ${PGSQL_DEPS} ORACLE_RUN_DEPENDS= ${ORACLE_DEPS} -SQLITE_USE= SQLITE=yes +SQLITE_USES= sqlite SQLITE_RUN_DEPENDS= ${SQLITE_DEPS} DEV_DESC= Configure for Developers -- cgit v1.1