From owner-svn-ports-all@FreeBSD.ORG  Fri Sep 14 19:06:34 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D3EAB1065670;
	Fri, 14 Sep 2012 19:06:34 +0000 (UTC)
	(envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BEBA68FC0A;
	Fri, 14 Sep 2012 19:06:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8EJ6Yij088429;
	Fri, 14 Sep 2012 19:06:34 GMT
	(envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8EJ6YaV088427;
	Fri, 14 Sep 2012 19:06:34 GMT
	(envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201209141906.q8EJ6YaV088427@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 14 Sep 2012 19:06:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304288 - head/net-im/mu-conference
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Sep 2012 19:06:35 -0000

Author: bdrewery
Date: Fri Sep 14 19:06:34 2012
New Revision: 304288
URL: http://svn.freebsd.org/changeset/ports/304288

Log:
  - Default to DAEMON mode

Modified:
  head/net-im/mu-conference/Makefile

Modified: head/net-im/mu-conference/Makefile
==============================================================================
--- head/net-im/mu-conference/Makefile	Fri Sep 14 19:02:12 2012	(r304287)
+++ head/net-im/mu-conference/Makefile	Fri Sep 14 19:06:34 2012	(r304288)
@@ -23,12 +23,14 @@ USE_GNOME=	glib20 pkgconfig
 USE_RC_SUBR=	${PORTNAME}
 
 OPTIONS_DEFINE=	MYSQL
+OPTIONS_DEFAULT=DAEMON
 OPTIONS_SINGLE=	SERVER
-OPTIONS_SINGLE_SERVER=	JABBER JABBERD EJABBERD
+OPTIONS_SINGLE_SERVER=	JABBER JABBERD EJABBERD DAEMON
 
 JABBER_DESC=	Use with jabberd14 (net-im/jabber)
 JABBERD_DESC=	Use with jabberd 2.x (net-im/jabberd)
 EJABBERD_DESC=	Use with ejabberd (net-im/ejabberd)
+DAEMON_DESC=	Use builtin daemon
 
 SUB_FILES+=	pkg-message README.FreeBSD.jabberd14 \
 		README.FreeBSD.jabberd2 README.FreeBSD.external
@@ -70,7 +72,7 @@ JABBER_USER?=           ejabberd
 JABBER_PIDDIR?=         /var/jabberd/pid
 JABBER_SPOOLDIR?=       /var/spool/jabber
 RUN_DEPENDS+=           ejabberdctl:${PORTSDIR}/net-im/ejabberd
-.else
+.elif ${PORT_OPTIONS:MDAEMON}
 JABBER_REQUIRE?=        DAEMON
 JABBER_USER?=           nobody
 JABBER_PIDDIR?=         /var/run/mu-conference