From 9d5426ff76defa85311d3e55ed2c442fb5ae9977 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
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.
---
 net/flow-tools/Makefile | 13 +++++++------
 net/samba/options.mk    | 41 ++++++++++++++++-------------------------
 2 files changed, 23 insertions(+), 31 deletions(-)

(limited to 'net')

diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index fec3e3ee40b..a642560fe92 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/08/09 22:37:34 seb Exp $
+# $NetBSD: Makefile,v 1.9 2004/08/22 19:32:52 jlam Exp $
 
 DISTNAME=	flow-tools-0.67
 CATEGORIES=	net
@@ -27,12 +27,13 @@ SUPPORT_FILES+=	${EGDIR}/sym/${_f_} ${PKG_SYSCONFDIR}/sym/${_f_}
 .endfor
 MESSAGE_SUBST+=	EGDIR=${EGDIR}
 
-# legacy options
-.if defined(FLOW_TOOLS_USE_MYSQL) && !empty(FLOW_TOOLS_USE_MYSQL:M[yY][eE][sS])
-PKG_OPTIONS.flow-tools+=	mysql
+.if defined(FLOW_TOOLS_USE_MYSQL) && \
+    !empty(FLOW_TOOLS_USE_MYSQL:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	mysql
 .endif
-.if defined(FLOW_TOOLS_USE_POSTGRESQL) && !empty(FLOW_TOOLS_USE_POSTGRESQL:M[yY][eE][sS])
-PKG_OPTIONS.flow-tools+=	postgresql
+.if defined(FLOW_TOOLS_USE_POSTGRESQL) && \
+    !empty(FLOW_TOOLS_USE_POSTGRESQL:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	postgresql
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.flow-tools
diff --git a/net/samba/options.mk b/net/samba/options.mk
index 318c28c4994..dd0d87bb015 100644
--- a/net/samba/options.mk
+++ b/net/samba/options.mk
@@ -1,30 +1,21 @@
-# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:34 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $
 
 # Global and legacy options
-.if defined(USE_CUPS) || defined(USE_PAM) || defined(USE_OPENLDAP) || \
-    defined(SAMBA_WITH_ADS) || defined(SAMBA_USE_LDAP) || \
-    defined(SAMBA_USE_LDAP_COMPAT)
-.  if !defined(PKG_OPTIONS.samba)
-.    if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS])
-PKG_OPTIONS.samba+=	cups
-.    endif
-.    if defined(USE_PAM)
-PKG_OPTIONS.samba+=	PAM
-.    endif
-.    if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])
-PKG_OPTIONS.samba+=	ldap
-.    endif
-.    if defined(SAMBA_WITH_ADS) && !empty(SAMBA_WITH_ADS:M[yY][eE][sS])
-PKG_OPTIONS.samba+=	ads
-.    endif
-.    if defined(SAMBA_USE_LDAP)
-PKG_OPTIONS.samba+=	ldap
-.    endif
-.    if defined(SAMBA_USE_LDAP_COMPAT) && \
-        !empty(SAMBA_USE_LDAP_COMPAT:M[yY][eE][sS])
-PKG_OPTIONS.samba+=	ldap-compat
-.    endif
-.  endif
+.if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	cups
+.endif
+.if defined(USE_PAM)
+PKG_DEFAULT_OPTIONS+=	PAM
+.endif
+.if defined(SAMBA_WITH_ADS) && !empty(SAMBA_WITH_ADS:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	ads
+.endif
+.if defined(SAMBA_USE_LDAP)
+PKG_DEFAULT_OPTIONS+=	ldap
+.endif
+.if defined(SAMBA_USE_LDAP_COMPAT) && \
+    !empty(SAMBA_USE_LDAP_COMPAT:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	ldap-compat
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.samba
-- 
cgit v1.2.3