summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-11-15 17:54:49 +0000
committerjlam <jlam@pkgsrc.org>2004-11-15 17:54:49 +0000
commitb67b0725c487d6867521ee52db866b955f29d0fd (patch)
tree5579b0ab6b1d842e66a7d3075d37a9f9564a124e /security
parent8f9890fc252ddfbc4e7f77aea28c933fe28c5a81 (diff)
downloadpkgsrc-b67b0725c487d6867521ee52db866b955f29d0fd.tar.gz
Rework the Berkeley DB detection in buildlink3:
* Add a db1.builtin.mk file that detects whether DB-1.85 functionality exists in the base system, and remove the distinction between "native" and the other Berkeley DB packages -- we now refer to db[1234]. This paves the way for any future databases/db1 package. * USE_DB185 shouldn't need to be set by any packages -- its correct value is now automatically determined by bdb.buildlink3.mk depending on whether we explicitly request db1 or not. By default, if you include bdb.buildlink3.mk, you want DB-1.85 functionality and USE_DB185 defaults to "yes", but if you explicitly remove db1 from the list of acceptable DBs, then USE_DB185 defaults to "no". * Set BDB_LIBS to the library options needed to link against the DB library when bdb.buildlink3.mk is included. * We only add the DB library to the linker command automatically if we want DB-1.85 functionality; otherwise assume that the package configure process can figure out how to probe for the correct headers and libraries. Edit package Makefiles to nuke redundant settings of USE_DB185.
Diffstat (limited to 'security')
-rw-r--r--security/pam-dbm/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/security/pam-dbm/Makefile b/security/pam-dbm/Makefile
index ce5f9dd3888..74882a1ef76 100644
--- a/security/pam-dbm/Makefile
+++ b/security/pam-dbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/09/05 10:22:12 grant Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/15 17:54:50 jlam Exp $
#
DISTNAME= pam_dbm-0.2
@@ -13,10 +13,7 @@ COMMENT= PAM module for DBM authentication
USE_BUILDLINK3= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-
-BDB_ACCEPTED= native
-
-LIBS+= ${BUILDLINK_LIBS.bdb}
+BDB_ACCEPTED= db1
.include "../../security/PAM/buildlink3.mk"
.include "../../mk/bdb.buildlink3.mk"