diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-04-25 16:14:02 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-04-25 16:14:02 +0000 |
| commit | 38cbe5cc9e99750df54915725121abf28135a148 (patch) | |
| tree | 308ec6a88700b00819d64b8c4aeca9c20dd8bd87 /Mk | |
| parent | Remove USE_SQLITE from bsd.databases.mk, replaced by USES=sqlite. (diff) | |
Remove USE_FIREBIRD from bsd.databases.mk, replaced by USES=firebird.
Also:
- replace USE_FIREBIRD by USES=firebird.
- convert ports depending on databases/firebird25-client directly to USES=firebird.
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=414015
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.database.mk | 29 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.sanity.mk | 5 |
3 files changed, 3 insertions, 33 deletions
diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk index 2309e5bc1fea..6b258c9c28a9 100644 --- a/Mk/bsd.database.mk +++ b/Mk/bsd.database.mk @@ -75,15 +75,6 @@ Database_Include_MAINTAINER= ports@FreeBSD.org # the Berkeley DB library directory. # BDB_VER # - Detected Berkeley DB 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" @@ -375,24 +366,4 @@ IGNORE= ${_IGNORE_MSG} .endif # USE_BDB -.if defined(USE_FIREBIRD) - -.if defined(WITH_FIREBIRD_VER) -USE_FIREBIRD= ${WITH_FIREBIRD_VER} -.endif - -.if ${USE_FIREBIRD:tl} == "yes" -FIREBIRD_VER= ${FIREBIRD_DEFAULT:S/.//} -.else -FIREBIRD_VER= ${USE_FIREBIRD} -.endif - -.if ${FIREBIRD_VER} == "25" -LIB_DEPENDS+= libfbclient.so:databases/firebird25-client -.else -IGNORE= cannot install: unknown Firebird version: ${FIREBIRD_VER} -.endif - -.endif # defined(USE_FIREBIRD) - .endif # defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 469427c9966e..34a356df9dd2 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_FIREBIRD) + defined(USE_BDB) .include "${PORTSDIR}/Mk/bsd.database.mk" .endif diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index ef122ba08355..12cd532d4fe9 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -168,9 +168,8 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \ INSTALLS_SHLIB USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \ PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \ USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \ - UNIQUENAME LATEST_LINK USE_SQLITE -SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY \ - USE_FIREBIRD + UNIQUENAME LATEST_LINK USE_SQLITE USE_FIREBIRD +SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY SANITY_NOTNEEDED= WX_UNICODE USE_AUTOTOOLS_ALT= USES=autoreconf and GNU_CONFIGURE=yes |