From aabe8bbf9b2d6e5c3f3f90ecd5b3c2bd33de016f Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme@pkgsrc.org>
Date: Mon, 29 Nov 2004 17:59:11 +0000
Subject: Use PKG_DEFAULT_OPTIONS.

---
 chat/jabberd2/Makefile   | 4 +---
 chat/jabberd2/options.mk | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'chat')

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index f8f31f2c526..72f6f555b0f 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/11/29 17:54:03 abs Exp $
+# $NetBSD: Makefile,v 1.16 2004/11/29 17:59:11 xtraeme Exp $
 #
 
 DISTNAME=		jabberd-2.0s4
@@ -71,8 +71,6 @@ CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 CONF_FILES+=		${EGDIR}/roster.xml ${PKG_SYSCONFDIR}/roster.xml
 .undef f
 
-PKG_OPTIONS.jabberd2?=	mysql
-
 .include "options.mk"
 
 .for f in ${JABBERD_LOGDIR} ${JABBERD_DBDIR} ${JABBERD_PIDDIR}
diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk
index 1ee248eb466..eb4d4d23704 100644
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.3 2004/11/18 23:02:00 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2004/11/29 17:59:11 xtraeme Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.jabberd2
 PKG_SUPPORTED_OPTIONS=	db mysql pgsql ldap PAM
+PKG_DEFAULT_OPTIONS+=	mysql
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdb)
-- 
cgit v1.2.3