diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-04-25 16:13:38 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-04-25 16:13:38 +0000 |
| commit | 21bc5c0345300431d6e3edc6c43d743c61fc7b5e (patch) | |
| tree | 2cf1a158cf8540bcd6bed759d4e35240e31330bb /Mk | |
| parent | Remove bogus prop. (diff) | |
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
Notes
Notes:
svn path=/head/; revision=414014
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.database.mk | 28 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.sanity.mk | 4 |
3 files changed, 3 insertions, 31 deletions
diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk index 234c1ecfe8c7..2309e5bc1fea 100644 --- a/Mk/bsd.database.mk +++ b/Mk/bsd.database.mk @@ -76,12 +76,6 @@ Database_Include_MAINTAINER= ports@FreeBSD.org # BDB_VER # - Detected Berkeley DB version. ## -# USE_SQLITE - Add dependency on SQLite library. Valid values are: -# 3 and 2. If version is not specified directly then -# SQLite-3 is used (if USE_SQLITE= yes). -# SQLITE_VER -# - Detected SQLite version. -## # USE_FIREBIRD - Add dependency on Firebird library. Valid values are: # 2 and 1. If no version is given by the maintainer (if # USE_FIREBIRD= yes) and the user did not define @@ -381,28 +375,6 @@ IGNORE= ${_IGNORE_MSG} .endif # USE_BDB -# Handling SQLite dependency -.if defined(USE_SQLITE) - -.if ${USE_SQLITE:tl} == "yes" -_SQLITE_VER= 3 -.else -_SQLITE_VER= ${USE_SQLITE} -.endif - -# USE_SQLITE is specified incorrectly, so mark this as IGNORE -.if ${_SQLITE_VER} == "3" -LIB_DEPENDS+= libsqlite3.so:databases/sqlite${_SQLITE_VER} -SQLITE_VER= ${_SQLITE_VER} -.elif ${_SQLITE_VER} == "2" -LIB_DEPENDS+= libsqlite.so:databases/sqlite${_SQLITE_VER} -SQLITE_VER= ${_SQLITE_VER} -.else -IGNORE= cannot install: unknown SQLite version: ${_SQLITE_VER} -.endif - -.endif # defined(USE_SQLITE) - .if defined(USE_FIREBIRD) .if defined(WITH_FIREBIRD_VER) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index e804fb4042c9..469427c9966e 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1864,7 +1864,7 @@ _FORCE_POST_PATTERNS= rmdir kldxref mkfontscale mkfontdir fc-cache \ .endif .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \ - defined(USE_BDB) || defined(USE_SQLITE) || defined(USE_FIREBIRD) + defined(USE_BDB) || defined(USE_FIREBIRD) .include "${PORTSDIR}/Mk/bsd.database.mk" .endif diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index 929650cb2adf..ef122ba08355 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -168,8 +168,8 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \ INSTALLS_SHLIB USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \ PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \ USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \ - UNIQUENAME LATEST_LINK -SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY USE_SQLITE \ + UNIQUENAME LATEST_LINK USE_SQLITE +SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY \ USE_FIREBIRD SANITY_NOTNEEDED= WX_UNICODE |