[pkgsrc/trunk]: pkgsrc Match documentation to reality to reflect recent chang...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7de69b03f813
branches:  trunk
changeset: 479796:7de69b03f813
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Aug 22 19:42:10 2004 +0000

description:
Match documentation to reality to reflect recent change in semantics for
PKG_DEFAULT_OPTIONS.

diffstat:

 Packages.txt      |  23 ++++++++++++-----------
 mk/bsd.options.mk |   6 +++---
 2 files changed, 15 insertions(+), 14 deletions(-)

diffs (65 lines):

diff -r 65bdd2aeb822 -r 7de69b03f813 Packages.txt
--- a/Packages.txt      Sun Aug 22 19:32:51 2004 +0000
+++ b/Packages.txt      Sun Aug 22 19:42:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Packages.txt,v 1.351 2004/08/12 10:07:28 jlam Exp $
+# $NetBSD: Packages.txt,v 1.352 2004/08/22 19:42:10 jlam Exp $
 ###########################################################################
 
                        ==========================
@@ -2138,20 +2138,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(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=  sasl
 .endif
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.wibble
-PKG_OPTIONS.wibble?=   sasl                    # package-specific default
 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
diff -r 65bdd2aeb822 -r 7de69b03f813 mk/bsd.options.mk
--- a/mk/bsd.options.mk Sun Aug 22 19:32:51 2004 +0000
+++ b/mk/bsd.options.mk Sun Aug 22 19:42:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.options.mk,v 1.7 2004/08/22 19:32:52 jlam Exp $
+# $NetBSD: bsd.options.mk,v 1.8 2004/08/22 19:42:10 jlam Exp $
 #
 # This Makefile fragment provides boilerplate code for standard naming
 # conventions for handling per-package build options.
@@ -69,12 +69,12 @@
 #
 # 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