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.
---
 mail/ezmlm-idx/options.mk | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'mail/ezmlm-idx')

diff --git a/mail/ezmlm-idx/options.mk b/mail/ezmlm-idx/options.mk
index 1baee735cfb..94a9e6cd278 100644
--- a/mail/ezmlm-idx/options.mk
+++ b/mail/ezmlm-idx/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2004/08/10 05:59:01 schmonz Exp $
+# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:51 jlam Exp $
 
 # Legacy options
 #
@@ -7,13 +7,11 @@
 # XXX
 # XXX	EZMLM_IDX_USE_MYSQL	EZMLM_IDX_USE_PGSQL
 #
-.if !defined(PKG_OPTIONS.ezmlm-idx)
-.  if defined(EZMLM_IDX_USE_MYSQL) && !empty(EZMLM_IDX_USE_MYSQL:M[yY][eE][sS])
-PKG_OPTIONS.ezmlm-idx+=	mysql
-.  endif
-.  if defined(EZMLM_IDX_USE_PGSQL) && !empty(EZMLM_IDX_USE_PGSQL:M[yY][eE][sS])
-PKG_OPTIONS.ezmlm-idx+=	pgsql
-.  endif
+.if defined(EZMLM_IDX_USE_MYSQL) && !empty(EZMLM_IDX_USE_MYSQL:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	mysql
+.endif
+.if defined(EZMLM_IDX_USE_PGSQL) && !empty(EZMLM_IDX_USE_PGSQL:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+=	pgsql
 .endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ezmlm-idx
-- 
cgit v1.2.3