PKG_OPTIONS.<pkg> isn't a good approximation to PKG_OPTIONS for the

package because PKG_OPTION.<pkg> could contain negative options, which
are never part of PKG_OPTIONS.  Instead, use the show-var target to
display the value.  We cache it in WRAPPER_VARS and in MAKE_FLAGS to
prevent reinvoking the show-var target recursively.

7 files changed, 57 insertions, 15 deletions

diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index b4b024c30c4..ee6a588373b 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2004/11/27 05:32:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2005/05/08 12:03:56 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENLDAP_BUILDLINK3_MK:=	${OPENLDAP_BUILDLINK3_MK}+
@@ -18,9 +18,16 @@ BUILDLINK_RECOMMENDED.openldap+=	openldap>=2.2.18nb1
 BUILDLINK_PKGSRCDIR.openldap?=		../../databases/openldap
 .endif	# OPENLDAP_BUILDLINK3_MK
 
-PKG_OPTIONS.openldap?=	${PKG_DEFAULT_OPTIONS}
+.if !defined(PKG_OPTIONS.openldap)
+PKG_OPTIONS.openldap!=							\
+	cd ${BUILDLINK_PKGSRCDIR.openldap} &&				\
+	${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
+MAKE_FLAGS+=			PKG_OPTIONS.openldap=${PKG_OPTIONS.openldap:Q}
+WRAPPER_VARS+=			PKG_OPTIONS.openldap
+.endif
 
-.if !empty(PKG_OPTIONS.openldap:Mkerberos) || !empty(PKG_OPTIONS.openldap:Msasl)
+.if !empty(PKG_OPTIONS.openldap:Mkerberos) || \
+    !empty(PKG_OPTIONS.openldap:Msasl)
 .  include "../../security/cyrus-sasl2/buildlink3.mk"
 .endif
 .include "../../security/openssl/buildlink3.mk"
diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk
index 0859d8a7f01..d7c6bc0159d 100644
--- a/devel/apr/buildlink3.mk
+++ b/devel/apr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2005/02/13 00:51:13 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2005/05/08 12:03:56 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APR_BUILDLINK3_MK:=	${APR_BUILDLINK3_MK}+
@@ -24,7 +24,12 @@ BUILDLINK_FILES.apr+=	bin/apu-config
 BUILDLINK_FILES.apr+=	lib/*.exp
 .endif	# APR_BUILDLINK3_MK
 
-PKG_OPTIONS.apr?=	${PKG_DEFAULT_OPTIONS}
+.if !defined(PKG_OPTIONS.apr)
+PKG_OPTIONS.apr!=	cd ${BUILDLINK_PKGSRCDIR.apr} && \
+			${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
+MAKE_FLAGS+=		PKG_OPTIONS.apr=${PKG_OPTIONS.apr:Q}
+WRAPPER_VARS+=		PKG_OPTIONS.apr
+.endif
 
 .if !empty(PKG_OPTIONS.apr:Mdb4)
 .  include "../../databases/db4/buildlink3.mk"
diff --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk
index 0518ef87935..f510dda5766 100644
--- a/misc/kdepim3/buildlink3.mk
+++ b/misc/kdepim3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/03/28 09:39:57 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/05/08 12:03:56 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEPIM_BUILDLINK3_MK:=	${KDEPIM_BUILDLINK3_MK}+
@@ -16,7 +16,13 @@ BUILDLINK_RECOMMENDED.kdepim+=	kdepim>=3.4.0
 BUILDLINK_PKGSRCDIR.kdepim?=	../../misc/kdepim3
 .endif	# KDEPIM_BUILDLINK3_MK
 
-PKG_OPTIONS.kdepim?=	${PKG_DEFAULT_OPTIONS}
+.if !defined(PKG_OPTIONS.kdepim)
+PKG_OPTIONS.kdepim!=							\
+	cd ${BUILDLINK_PKGSRCDIR.kdepim} &&				\
+	${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
+MAKE_FLAGS+=			PKG_OPTIONS.kdepim=${PKG_OPTIONS.kdepim:Q}
+WRAPPER_VARS+=			PKG_OPTIONS.kdepim
+.endif
 
 .include "../../comms/libmal/buildlink3.mk"
 .include "../../comms/pilot-link-libs/buildlink3.mk"
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index 76258d44153..1f403d63e99 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2004/11/19 23:16:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2005/05/08 12:03:56 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HEIMDAL_BUILDLINK3_MK:=	${HEIMDAL_BUILDLINK3_MK}+
@@ -19,7 +19,13 @@ BUILDLINK_PKGSRCDIR.heimdal?=	../../security/heimdal
 BUILDLINK_INCDIRS.heimdal?=	include/krb5
 .endif	# HEIMDAL_BUILDLINK3_MK
 
-PKG_OPTIONS.heimdal?=	${PKG_DEFAULT_OPTIONS}
+.if !defined(PKG_OPTIONS.heimdal)
+PKG_OPTIONS.heimdal!=							\
+	cd ${BUILDLINK_PKGSRCDIR.heimdal} &&				\
+	${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
+MAKE_FLAGS+=			PKG_OPTIONS.heimdal=${PKG_OPTIONS.heimdal:Q}
+WRAPPER_VARS+=			PKG_OPTIONS.heimdal
+.endif
 
 .include "../../security/openssl/buildlink3.mk"
 .if !empty(PKG_OPTIONS.heimdal:Mdb4)
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index b779915f225..55e9e012f92 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2004/12/24 22:02:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2005/05/08 12:03:56 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSSL_BUILDLINK3_MK:=	${OPENSSL_BUILDLINK3_MK}+
@@ -26,7 +26,13 @@ SSLBASE=	${BUILDLINK_PREFIX.openssl}
 BUILD_DEFS+=	SSLBASE
 .endif	# OPENSSL_BUILDLINK3_MK
 
-PKG_OPTIONS.openssl?=	${PKG_DEFAULT_OPTIONS}
+.if !defined(PKG_OPTIONS.openssl)
+PKG_OPTIONS.openssl!=							\
+	cd ${BUILDLINK_PKGSRCDIR.openssl} &&				\
+	${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
+MAKE_FLAGS+=			PKG_OPTIONS.openssl=${PKG_OPTIONS.openssl:Q}
+WRAPPER_VARS+=			PKG_OPTIONS.openssl
+.endif
 
 .if !empty(PKG_OPTIONS.openssl:Mrsaref)
 .  include "../../security/rsaref/buildlink3.mk"
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk
index 5ddc2a5d7d2..a9c69eca04e 100644
--- a/x11/kdebase3/buildlink3.mk
+++ b/x11/kdebase3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/03/28 09:39:58 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/05/08 12:03:56 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEBASE_BUILDLINK3_MK:=	${KDEBASE_BUILDLINK3_MK}+
@@ -16,7 +16,13 @@ BUILDLINK_RECOMMENDED.kdebase?=	kdebase>=3.4.0
 BUILDLINK_PKGSRCDIR.kdebase?=	../../x11/kdebase3
 .endif	# KDEBASE_BUILDLINK3_MK
 
-PKG_OPTIONS.kdebase?=   ${PKG_DEFAULT_OPTIONS}
+.if !defined(PKG_OPTIONS.kdebase)
+PKG_OPTIONS.kdebase!=							\
+	cd ${BUILDLINK_PKGSRCDIR.kdebase} &&				\
+	${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
+MAKE_FLAGS+=			PKG_OPTIONS.kdebase=${PKG_OPTIONS.kdebase:Q}
+WRAPPER_VARS+=			PKG_OPTIONS.kdebase
+.endif
 
 BUILDLINK_DEPENDS.Xrandr+=      Xrandr>=1.0
 
diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk
index e7ba25acc90..8fd57cb315e 100644
--- a/x11/kdelibs3/buildlink3.mk
+++ b/x11/kdelibs3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/04/13 22:13:53 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2005/05/08 12:03:57 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDELIBS_BUILDLINK3_MK:=	${KDELIBS_BUILDLINK3_MK}+
@@ -20,7 +20,13 @@ BUILDLINK_PKGSRCDIR.kdelibs?=	../../x11/kdelibs3
 .include "../../x11/kdelibs3/dirs.mk"
 .endif	# KDELIBS_BUILDLINK3_MK
 
-PKG_OPTIONS.kdelibs?=	${PKG_DEFAULT_OPTIONS}
+.if !defined(PKG_OPTIONS.kdelibs)
+PKG_OPTIONS.kdelibs!=							\
+	cd ${BUILDLINK_PKGSRCDIR.kdelibs} &&				\
+	${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
+MAKE_FLAGS+=			PKG_OPTIONS.kdelibs=${PKG_OPTIONS.kdelibs:Q}
+WRAPPER_VARS+=			PKG_OPTIONS.kdelibs
+.endif
 
 .if !empty(PKG_OPTIONS.kdelibs:Mcups)
 .  include "../../print/cups/buildlink3.mk"