svn commit: r416964 - head/Mk/Uses
Mathieu Arnold
mat at FreeBSD.org
Thu Jun 16 13:21:08 UTC 2016
Author: mat
Date: Thu Jun 16 13:21:06 2016
New Revision: 416964
URL: https://svnweb.freebsd.org/changeset/ports/416964
Log:
Fix USES=bdb.
Turns out that the conversion to USES was broken, and did not take the
DEFAULT_VERSIONS=bdb=foo into account.
PR: 210149
Submitted by: mat
Exp-run by: antoine
Sponsored by: The FreeBSD Foundation, Absolight
Modified:
head/Mk/Uses/bdb.mk
Modified: head/Mk/Uses/bdb.mk
==============================================================================
--- head/Mk/Uses/bdb.mk Thu Jun 16 13:17:48 2016 (r416963)
+++ head/Mk/Uses/bdb.mk Thu Jun 16 13:21:06 2016 (r416964)
@@ -65,6 +65,8 @@ WARNING+= "WITH_BDB_VER is deprecated an
BDB_DEFAULT:=${WITH_BDB_VER}
.endif
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+
_BDB_DEFAULT_save:=${BDB_DEFAULT}
_DB_PORTS= 48 5 6
@@ -91,11 +93,13 @@ BDB_DEFAULT= ${${BDB_UNIQUENAME:tu:S,-,_
# Override _bdb_ARGS with global BDB_DEFAULT if the maintainer did not
# ask for a more specific version.
-.if defined(BDB_DEFAULT)
-. if ${BDB_DEFAULT} != 1
+. if ${_bdb_ARGS} == yes
+. if ${BDB_DEFAULT} != 1
_bdb_ARGS= ${BDB_DEFAULT}
+. else
+_bdb_ARGS:= 48+
+. endif
. endif
-.endif
# Compatiblity hack:
# upgrade older plussed versions to 48+
@@ -106,10 +110,6 @@ _bdb_ARGS:= 48+
. endif
.endfor
-.if ${_bdb_ARGS} == yes
-_bdb_ARGS:= 48+
-.endif
-
# 1. detect installed versions
_INST_BDB_VER=
.for bdb in ${_DB_PORTS}
More information about the svn-ports-head
mailing list