diff options
| author | mat <mat@FreeBSD.org> | 2015-08-17 22:20:40 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2015-08-17 22:20:40 +0800 |
| commit | 92a3a7b1bca5423036bca4932e5384d3e51591bd (patch) | |
| tree | 16be3a9188cf2781563095e15839c170074dd7a7 /Mk/bsd.database.mk | |
| parent | ed2992b93f898f5612b3952782ac7d9206ed029a (diff) | |
| download | freebsd-ports-gnome-92a3a7b1bca5423036bca4932e5384d3e51591bd.tar.gz freebsd-ports-gnome-92a3a7b1bca5423036bca4932e5384d3e51591bd.tar.zst freebsd-ports-gnome-92a3a7b1bca5423036bca4932e5384d3e51591bd.zip | |
Remove UNIQUENAME and LATEST_LINK.
UNIQUENAME was never unique, it was only used by USE_LDCONFIG and now,
we won't have conflicts there.
Use PKGBASE instead of LATEST_LINK in PKGLATESTFILE, the *only* consumer
is pkg-devel, and it works just fine without LATEST_LINK as pkg-devel
has the correct PKGNAME anyway.
Now that UNIQUENAME is gone, OPTIONSFILE is too. (it's been called
OPTIONS_FILE now.)
Reviewed by: antoine, bapt
Exp-run by: antoine
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D3336
Diffstat (limited to 'Mk/bsd.database.mk')
| -rw-r--r-- | Mk/bsd.database.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk index 7151ce1bcca5..26ab48d50222 100644 --- a/Mk/bsd.database.mk +++ b/Mk/bsd.database.mk @@ -47,7 +47,7 @@ Database_Include_MAINTAINER= ports@FreeBSD.org # build this port with (overrides WITH_BDB_VER). # WITH_BDB_VER # - User defined global variable to set Berkeley DB version. -# <UNIQUENAME>_WITH_BDB_VER +# <BDB_UNIQUENAME>_WITH_BDB_VER # - User defined port specific variable to set Berkeley DB # version. # WITH_BDB_HIGHEST @@ -191,6 +191,8 @@ IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER} # TODO: avoid malformed conditional with invalid USE_BDB/WITH_BDB_VER # check if + works properly from test builds 01h12m23s +BDB_UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} + _USE_BDB_save:=${USE_BDB} _WITH_BDB_VER_save:=${WITH_BDB_VER} @@ -211,9 +213,9 @@ db5_FIND= ${LOCALBASE}/include/db5/db.h db6_FIND= ${LOCALBASE}/include/db6/db.h # Override the global WITH_BDB_VER with the -# port specific <UNIQUENAME>_WITH_BDB_VER -.if defined(${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER) -WITH_BDB_VER= ${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER} +# port specific <BDB_UNIQUENAME>_WITH_BDB_VER +.if defined(${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER) +WITH_BDB_VER= ${${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER} .endif # Override USE_BDB with global WITH_BDB_VER @@ -340,7 +342,7 @@ BDB_VER= ${_BDB_VER} debug-bdb: @${ECHO_CMD} "--INPUTS----------------------------------------------------" - @${ECHO_CMD} "${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER: ${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}" + @${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}" @@ -374,7 +376,7 @@ BAD_VAR+= ${var}, . endif . endfor . if defined(BAD_VAR) -_IGNORE_MSG= Obsolete variable(s) ${BAD_VAR} use WITH_BDB_VER or ${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER to select Berkeley DB version +_IGNORE_MSG= Obsolete variable(s) ${BAD_VAR} use WITH_BDB_VER or ${BDB_UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER to select Berkeley DB version . if defined(IGNORE) IGNORE+= ${_IGNORE_MSG} . else |