aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvsevolod <vsevolod@FreeBSD.org>2005-11-11 18:29:21 +0800
committervsevolod <vsevolod@FreeBSD.org>2005-11-11 18:29:21 +0800
commitb9533c9c6d474932ac0a2c769519dba5aa4e8905 (patch)
treed51a8ae5191db6eba56bedefa4cb460e5dafd0d8
parentb11f456c588b235d766196f99390b0157d2e8503 (diff)
downloadfreebsd-ports-gnome-b9533c9c6d474932ac0a2c769519dba5aa4e8905.tar.gz
freebsd-ports-gnome-b9533c9c6d474932ac0a2c769519dba5aa4e8905.tar.zst
freebsd-ports-gnome-b9533c9c6d474932ac0a2c769519dba5aa4e8905.zip
- Use lower in USE_BDB and USE_SQLITE to make tests
- Fix comment about BROKEN - Fix wrong dependency on sqlite PR: 88661 Submitted by: mnag
-rw-r--r--Mk/bsd.database.mk15
1 files changed, 9 insertions, 6 deletions
diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk
index 02b07bd0c291..ab1ece58b5ca 100644
--- a/Mk/bsd.database.mk
+++ b/Mk/bsd.database.mk
@@ -173,7 +173,7 @@ _DB_42P= 42 43
_WANT_BDB_VER= ${USE_BDB}
# Assume the default bdb version as 41
-.if ${USE_BDB} == "yes"
+.if ${USE_BDB:L} == "yes"
_WANT_BDB_VER= 41+
.endif
@@ -204,7 +204,7 @@ _FOUND= yes
.endif
.endfor
-# USE_BDB is specified incorrectly, so mark this as BROKEN
+# USE_BDB is specified incorrectly, so mark this as IGNORE
.if ${_FOUND} == "no"
IGNORE= "Unknown bdb version: ${USE_BDB}"
.endif
@@ -214,18 +214,21 @@ IGNORE= "Unknown bdb version: ${USE_BDB}"
# Handling sqlite dependency
.if defined(USE_SQLITE)
-.if ${USE_SQLITE} == "yes"
+.if ${USE_SQLITE:L} == "yes"
_SQLITE_VER= 3
.else
_SQLITE_VER= ${USE_SQLITE}
.endif
-.if ${_SQLITE_VER} != "3" && ${_SQLITE_VER} != "2"
+# USE_SQLITE is specified incorrectly, so mark this as IGNORE
+.if ${_SQLITE_VER} == "3"
+LIB_DEPENDS+= sqlite${_SQLITE_VER}:${PORTSDIR}/databases/sqlite${_SQLITE_VER}
+.elif ${_SQLITE_VER} == "2"
+LIB_DEPENDS+= sqlite.${_SQLITE_VER}:${PORTSDIR}/databases/sqlite${_SQLITE_VER}
+.else
IGNORE= "Unknown sqlite version: ${_SQLITE_VER}"
.endif
-LIB_DEPENDS+= sqlite${_SQLITE_VER}:${PORTSDIR}/databases/sqlite${_SQLITE_VER}
-
.endif # defined(USE_SQLITE)
.endif # defined(_POSTMKINCLUDED) && !defined(Database_Post_Include)