Added BUILD_DEFS_EFFECTS.

4 files changed, 28 insertions, 23 deletions

diff --git a/mk/bdb.buildlink3.mk b/mk/bdb.buildlink3.mk
index d22d10406ed..57315c12fce 100644
--- a/mk/bdb.buildlink3.mk
+++ b/mk/bdb.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bdb.buildlink3.mk,v 1.17 2006/07/08 23:11:17 jlam Exp $
+# $NetBSD: bdb.buildlink3.mk,v 1.18 2006/11/04 22:18:41 rillig Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a Berkeley DB implementation.  It abstracts finding the
@@ -30,20 +30,25 @@
 #	  the Berkeley DB library;
 #       * set BDB_TYPE to the Berkeley DB implementation used.
 #
-# There are two user-settable variables that can be used to control
-# the selection of the Berkeley DB implementation:
+# User-settable variables:
 #
-# BDB_DEFAULT is a user-settable variable whose value represents the
-#	package we use when either a db-1.85 interface isn't required,
-#	or a db-1.85 interface is required, but it's not built-in.
-#       This should be set in /etc/mk.conf, and should not be set by pkg
-#	Makefiles. 
+# BDB_DEFAULT
+#	This value represents the package we use when either a db-1.85
+#	interface isn't required, or a db-1.85 interface is required,
+#	but it's not built-in.
 #
-# BDB185_DEFAULT is a user-settable variable whose value represents the
-#	package we use when a db-1.85 interface is required.  It defaults
-#	to "db1" if it's built-in, or to ${BDB_DEFAULT} otherwise.
+#	FIXME: Improve the wording of the text above so that one can
+#	understand it.
 #
-# BDB_ACCEPTED is a package-settable list of Berkeley DB implementations
+# BDB185_DEFAULT
+#	The package we use when a db-1.85 interface is required.
+#	It defaults to "db1" if it's built-in, or to ${BDB_DEFAULT}
+#	otherwise.
+#
+# Package-settable variables:
+#
+# BDB_ACCEPTED
+#	The list of Berkeley DB implementations
 #       that may be used by the package.  Note that if the list does not
 #	include db1 and does not include BDB_DEFAULT, the package will not
 #	build - this is the second unhandled case above.
@@ -121,8 +126,8 @@ BDB_TYPE=	none
 BDBBASE=	${BUILDLINK_PREFIX.${BDB_TYPE}}
 BDB_LIBS=	${BUILDLINK_LDADD.${BDB_TYPE}}
 
-BUILD_DEFS+=	BDB_TYPE
-BUILD_DEFS+=	BDBBASE
+BUILD_DEFS+=		BDB_DEFAULT BDB185_DEFAULT
+BUILD_DEFS_EFFECTS+=	BDBBASE BDB_LIBS BDB_TYPE
 
 .endif	# BDB_BUILDLINK3_MK
 
diff --git a/mk/fam.buildlink3.mk b/mk/fam.buildlink3.mk
index 7f0a0cc1b3c..2b9f7c784d5 100644
--- a/mk/fam.buildlink3.mk
+++ b/mk/fam.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: fam.buildlink3.mk,v 1.4 2005/09/03 21:34:19 jlam Exp $
+# $NetBSD: fam.buildlink3.mk,v 1.5 2006/11/04 22:18:58 rillig Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a FAM implementation.  fam.buildlink3.mk will:
@@ -40,8 +40,8 @@ FAM_TYPE=	none
 .  endif
 FAMBASE=	${BUILDLINK_PREFIX.${FAM_TYPE}}
 
-BUILD_DEFS+=	FAM_TYPE
-BUILD_DEFS+=	FAMBASE
+BUILD_DEFS+=		FAM_DEFAULT
+BUILD_DEFS_EFFECTS+=	FAMBASE FAM_TYPE
 .endif	# MK_FAM_BUILDLINK3_MK
 
 .if ${FAM_TYPE} == "none"
diff --git a/mk/krb5.buildlink3.mk b/mk/krb5.buildlink3.mk
index 4478b652d0b..e3efc01ba2d 100644
--- a/mk/krb5.buildlink3.mk
+++ b/mk/krb5.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: krb5.buildlink3.mk,v 1.9 2006/04/10 15:04:44 tron Exp $
+# $NetBSD: krb5.buildlink3.mk,v 1.10 2006/11/04 22:18:58 rillig Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a Kerberos 5 implementation.  krb5.buildlink3.mk will:
@@ -44,8 +44,8 @@ KRB5_TYPE=	none
 .  endif
 KRB5BASE=	${BUILDLINK_PREFIX.${KRB5_TYPE}}
 
-BUILD_DEFS+=	KRB5_TYPE
-BUILD_DEFS+=	KRB5BASE
+BUILD_DEFS+=		KRB5_DEFAULT
+BUILD_DEFS_EFFECTS+=	KRB5BASE KRB5_TYPE
 
 # Packages that use Kerberos are automatically categorized as restricted
 # packages.
diff --git a/mk/pam.buildlink3.mk b/mk/pam.buildlink3.mk
index 85131bf407d..e2ebfbeb19c 100644
--- a/mk/pam.buildlink3.mk
+++ b/mk/pam.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pam.buildlink3.mk,v 1.7 2006/07/08 23:11:17 jlam Exp $
+# $NetBSD: pam.buildlink3.mk,v 1.8 2006/11/04 22:18:58 rillig Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a PAM implementation.  pam.buildlink3.mk will:
@@ -72,8 +72,8 @@ PAM_TYPE=	none
 .  endif
 PAMBASE=	${BUILDLINK_PREFIX.${PAM_TYPE}}
 
-BUILD_DEFS+=	PAM_TYPE
-BUILD_DEFS+=	PAMBASE
+BUILD_DEFS+=		PAM_DEFAULT
+BUILD_DEFS_EFFECTS+=	PAMBASE PAM_TYPE
 .endif	# PAM_BUILDLINK3_MK
 
 .if ${PAM_TYPE} == "none"