diff options
| author | mandree <mandree@FreeBSD.org> | 2013-08-06 03:43:39 +0800 |
|---|---|---|
| committer | mandree <mandree@FreeBSD.org> | 2013-08-06 03:43:39 +0800 |
| commit | 78098f2269aa8d9fad0d02bd3e97ad475a465ef0 (patch) | |
| tree | 353ea1860aa94d26c0fe86d2a956f39c4460bfd6 | |
| parent | af06f3aad24caa75b324f533abae86a492cb237c (diff) | |
| download | freebsd-ports-gnome-78098f2269aa8d9fad0d02bd3e97ad475a465ef0.tar.gz freebsd-ports-gnome-78098f2269aa8d9fad0d02bd3e97ad475a465ef0.tar.zst freebsd-ports-gnome-78098f2269aa8d9fad0d02bd3e97ad475a465ef0.zip | |
Fix BUILD_DEPENDS line for devel/subversion builds with STATIC option.
While here, complete _DB_PORTS list for 5 and 6,
and add a few descriptive comments.
Submitted by: Tim Kientzle
| -rw-r--r-- | Mk/bsd.database.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk index 186bf2aab0e2..0adcd31be0a7 100644 --- a/Mk/bsd.database.mk +++ b/Mk/bsd.database.mk @@ -283,7 +283,7 @@ LDFLAGS+= -L${LOCALBASE}/lib .if defined(USE_BDB) -_DB_PORTS= 40 41 42 43 44 46 47 48 5 40+ 41+ 42+ 43+ 44+ 46+ 47+ 48+ +_DB_PORTS= 40 41 42 43 44 46 47 48 5 6 40+ 41+ 42+ 43+ 44+ 46+ 47+ 48+ 5+ 6+ # Dependence lines for different db versions db40_DEPENDS= libdb4.so:${PORTSDIR}/databases/db4 db41_DEPENDS= libdb41.so:${PORTSDIR}/databases/db41 @@ -420,8 +420,10 @@ _BDB_IGNORE= yes IGNORE= cannot install: does not work with Berkeley DB version ${_BDB_VER} (${INVALID_BDB_VER} not supported) . else # Now add the dependency on Berkeley DB ${_BDB_VER) version +# This is for ports that want to link Berkeley DB statically, such +# as devel/subversion, if the corresponding option is active: .if defined(BDB_BUILD_DEPENDS) -BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^db.*://} +BUILD_DEPENDS+= ${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://} .else LIB_DEPENDS+= ${db${_BDB_VER}_DEPENDS} .endif @@ -470,7 +472,9 @@ BDB_LIB_DIR?= ${LOCALBASE}/lib BDB_VER= ${_BDB_VER} .endif -# Obsolete variables +# Obsolete variables - ports can define these to want users about +# variables that may be in /etc/make.conf but that are no longer +# effective: .if defined(OBSOLETE_BDB_VAR) . for var in ${OBSOLETE_BDB_VAR} . if defined(${var}) |