From b1276828b47cd0e050c7db6a6dd702ffc806f96a Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 22 Aug 2004 19:32:51 +0000
Subject: Change the way that legacy USE_* and FOO_USE_* options are converted
 into the bsd.options.mk framework.  Instead of appending to
 ${PKG_OPTIONS_VAR}, it appends to PKG_DEFAULT_OPTIONS.  This causes the
 default options to be the union of PKG_DEFAULT_OPTIONS and any old USE_* and
 FOO_USE_* settings.

This fixes PR pkg/26590.
---
 mk/bsd.options.mk | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk
index 7eacd9f33e1..7fe6e367530 100644
--- a/mk/bsd.options.mk
+++ b/mk/bsd.options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.options.mk,v 1.6 2004/08/10 05:33:05 schmonz Exp $
+# $NetBSD: bsd.options.mk,v 1.7 2004/08/22 19:32:52 jlam Exp $
 #
 # This Makefile fragment provides boilerplate code for standard naming
 # conventions for handling per-package build options.
@@ -60,19 +60,21 @@
 #
 # -------------8<-------------8<-------------8<-------------8<-------------
 # # Global and legacy options
-# .if defined(USE_OPENLDAP) || defined(USE_SASL2)
-# .  if !defined(PKG_OPTIONS.wibble)
-# .    if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])
-# PKG_OPTIONS.wibble+=	ldap
-# .    endif
-# .    if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
-# PKG_OPTIONS.wibble+=	sasl
-# .    endif
-# .  endif
+# .if defined(WIBBLE_USE_OPENLDAP) && !empty(WIBBLE_USE_OPENLDAP:M[yY][eE][sS])
+# PKG_DEFAULT_OPTIONS+=	ldap
+# .endif
+# .if defined(WIBBLE_USE_SASL2) && !empty(WIBBLE_USE_SASL2:M[yY][eE][sS])
+# PKG_DEFAULT_OPTIONS+=	sasl
 # .endif
 #
 # PKG_OPTIONS_VAR=		PKG_OPTIONS.wibble
 # PKG_SUPPORTED_OPTIONS=	ldap sasl
+#
+# # Default options for ``wibble'' package.
+# .if !defined(PKG_OPTIONS.wibble)
+# PKG_DEFAULT_OPTIONS+=		sasl
+# endif
+#
 # .include "../../mk/bsd.options.mk"
 #
 # # Package-specific option-handling
-- 
cgit v1.2.3