From f81ae835adc78533f22ce227d12d3f56e6076f1a Mon Sep 17 00:00:00 2001
From: dillo <dillo@pkgsrc.org>
Date: Tue, 31 May 2005 10:01:36 +0000
Subject: Packages have no business modifying PKG_DEFAULT_OPTIONS -- it's a
 user settable variable.  Set PKG_SUGGESTED_OPTIONS instead.  Also, make use
 of PKG_OPTIONS_LEGACY_VARS.

Reviewed by wiz.
---
 chat/jabberd2/options.mk    | 5 +++--
 chat/silc-client/options.mk | 5 +++--
 chat/silc-server/options.mk | 5 +++--
 chat/xchat2/options.mk      | 7 ++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'chat')

diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk
index 18bafc54a3b..a95a5341294 100644
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.7 2005/05/24 21:02:53 xtraeme Exp $
+# $NetBSD: options.mk,v 1.8 2005/05/31 10:01:36 dillo Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.jabberd2
 PKG_SUPPORTED_OPTIONS=	db mysql pgsql ldap PAM
-PKG_DEFAULT_OPTIONS=	mysql
+PKG_SUGGESTED_OPTIONS=	mysql
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mmysql) && !empty(PKG_OPTIONS:Mpgsql)
diff --git a/chat/silc-client/options.mk b/chat/silc-client/options.mk
index 413b486971e..96a8b370cd3 100644
--- a/chat/silc-client/options.mk
+++ b/chat/silc-client/options.mk
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2005/04/08 15:12:48 salo Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:36 dillo Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.silc-client
 PKG_SUPPORTED_OPTIONS=	debug inet6 perl
-PKG_DEFAULT_OPTIONS=	inet6 perl
+PKG_SUGGESTED_OPTIONS=	inet6 perl
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
diff --git a/chat/silc-server/options.mk b/chat/silc-server/options.mk
index 5af335ff79d..9b7c6bc7b55 100644
--- a/chat/silc-server/options.mk
+++ b/chat/silc-server/options.mk
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2005/04/08 15:09:43 salo Exp $
+# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:36 dillo Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.silc-server
 PKG_SUPPORTED_OPTIONS=	debug inet6
-PKG_DEFAULT_OPTIONS=	inet6
+PKG_SUGGESTED_OPTIONS=	inet6
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
diff --git a/chat/xchat2/options.mk b/chat/xchat2/options.mk
index fed7b51ee33..2b5b07ba127 100644
--- a/chat/xchat2/options.mk
+++ b/chat/xchat2/options.mk
@@ -1,11 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2005/01/10 20:59:43 adrianp Exp $
+# $NetBSD: options.mk,v 1.4 2005/05/31 10:01:36 dillo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xchat2
 PKG_SUPPORTED_OPTIONS=	inet6 ssl socks
-
-.if !defined(PKG_OPTIONS.xchat2)
-PKG_DEFAULT_OPTIONS+=	ssl
-.endif
+PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
 
-- 
cgit v1.2.3