summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-08-07 14:29:20 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-08-07 14:29:20 +0000
commit603fe7821b17b67ecf736fb534bab754346b9761 (patch)
tree56d62537139fd8b88cb02f002d94c94d83caddd1 /chat
parent6bb0fe05f030206f971a26f865eebdfafbbdadc0 (diff)
downloadpkgsrc-603fe7821b17b67ecf736fb534bab754346b9761.tar.gz
Move Makefile.options to options.mk (to follow jlam@'s changes),
by default we'll use PKG_OPTIONS.jabberd2?=mysql4 (which is the default for jabberd2).
Diffstat (limited to 'chat')
-rw-r--r--chat/jabberd2/Makefile6
-rw-r--r--chat/jabberd2/options.mk (renamed from chat/jabberd2/Makefile.options)2
2 files changed, 5 insertions, 3 deletions
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index b576b7a9e9f..64fcdb90133 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/08/07 14:13:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/08/07 14:29:20 xtraeme Exp $
#
DISTNAME= jabberd-2.0s3
@@ -62,7 +62,9 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
CONF_FILES+= ${EGDIR}/roster.xml ${PKG_SYSCONFDIR}/roster.xml
.undef f
-.include "Makefile.options"
+PKG_OPTIONS.jabberd2?= mysql4
+
+.include "options.mk"
.for f in ${JABBERD_LOGDIR} ${JABBERD_DBDIR} ${JABBERD_PIDDIR}
OWN_DIRS_PERMS+= ${f} ${JABBERD_USER} ${JABBERD_GROUP} 770
diff --git a/chat/jabberd2/Makefile.options b/chat/jabberd2/options.mk
index 725e7bbbf99..57f40d23527 100644
--- a/chat/jabberd2/Makefile.options
+++ b/chat/jabberd2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.options,v 1.1 2004/07/31 00:01:04 xtraeme Exp $
+# $NetBSD: options.mk,v 1.1 2004/08/07 14:29:20 xtraeme Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.jabberd2