pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/jabberd2 Use PKG_DEFAULT_OPTIONS.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2eae7ffc50a3
branches:  trunk
changeset: 484774:2eae7ffc50a3
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon Nov 29 17:59:11 2004 +0000

description:
Use PKG_DEFAULT_OPTIONS.

diffstat:

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

diffs (32 lines):

diff -r 89b2490ff083 -r 2eae7ffc50a3 chat/jabberd2/Makefile
--- a/chat/jabberd2/Makefile    Mon Nov 29 17:55:08 2004 +0000
+++ b/chat/jabberd2/Makefile    Mon Nov 29 17:59:11 2004 +0000
@@ -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}/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 -r 89b2490ff083 -r 2eae7ffc50a3 chat/jabberd2/options.mk
--- a/chat/jabberd2/options.mk  Mon Nov 29 17:55:08 2004 +0000
+++ b/chat/jabberd2/options.mk  Mon Nov 29 17:59:11 2004 +0000
@@ -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)



Home | Main Index | Thread Index | Old Index