Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Sep 2012 19:06:34 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r304288 - head/net-im/mu-conference
Message-ID:  <201209141906.q8EJ6YaV088427@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209141906.q8EJ6YaV088427>