[pkgsrc/trunk]: pkgsrc/mk Added BUILD_DEFS_EFFECTS.

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f79db1ed03f4
branches:  trunk
changeset: 521084:f79db1ed03f4
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Nov 04 22:18:41 2006 +0000

description:
Added BUILD_DEFS_EFFECTS.

diffstat:

 mk/bdb.buildlink3.mk  |  33 +++++++++++++++++++--------------
 mk/fam.buildlink3.mk  |   6 +++---
 mk/krb5.buildlink3.mk |   6 +++---
 mk/pam.buildlink3.mk  |   6 +++---
 4 files changed, 28 insertions(+), 23 deletions(-)

diffs (117 lines):

diff -r 2641e037f8e4 -r f79db1ed03f4 mk/bdb.buildlink3.mk
--- a/mk/bdb.buildlink3.mk      Sat Nov 04 22:05:43 2006 +0000
+++ b/mk/bdb.buildlink3.mk      Sat Nov 04 22:18:41 2006 +0000
@@ -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
+#      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.
+#
+#      FIXME: Improve the wording of the text above so that one can
+#      understand it.
 #
-# 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. 
+# 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.
 #
-# 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.
+# Package-settable variables:
 #
-# BDB_ACCEPTED is a package-settable list of Berkeley DB implementations
+# 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 @@
 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 -r 2641e037f8e4 -r f79db1ed03f4 mk/fam.buildlink3.mk
--- a/mk/fam.buildlink3.mk      Sat Nov 04 22:05:43 2006 +0000
+++ b/mk/fam.buildlink3.mk      Sat Nov 04 22:18:41 2006 +0000
@@ -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 @@
 .  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 -r 2641e037f8e4 -r f79db1ed03f4 mk/krb5.buildlink3.mk
--- a/mk/krb5.buildlink3.mk     Sat Nov 04 22:05:43 2006 +0000
+++ b/mk/krb5.buildlink3.mk     Sat Nov 04 22:18:41 2006 +0000
@@ -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 @@
 .  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 -r 2641e037f8e4 -r f79db1ed03f4 mk/pam.buildlink3.mk
--- a/mk/pam.buildlink3.mk      Sat Nov 04 22:05:43 2006 +0000
+++ b/mk/pam.buildlink3.mk      Sat Nov 04 22:18:41 2006 +0000
@@ -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 @@
 .  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"