svn commit: r482225 - head/net-im/mu-conference

[Rene Ladan]

Author: rene
Date: Tue Oct 16 13:11:05 2018
New Revision: 482225
URL: https://svnweb.freebsd.org/changeset/ports/482225

Log:
  net-im/mu-conference: remove optional dependency on expired net-im/jabber

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

Modified: head/net-im/mu-conference/Makefile
==============================================================================
--- head/net-im/mu-conference/Makefile	Tue Oct 16 13:08:21 2018	(r482224)
+++ head/net-im/mu-conference/Makefile	Tue Oct 16 13:11:05 2018	(r482225)
@@ -25,9 +25,8 @@ USE_RC_SUBR=	${PORTNAME}
 OPTIONS_DEFINE=	MYSQL DOCS
 OPTIONS_DEFAULT=DAEMON
 OPTIONS_SINGLE=	SERVER
-OPTIONS_SINGLE_SERVER=	JABBER JABBERD EJABBERD DAEMON
+OPTIONS_SINGLE_SERVER=	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
@@ -53,13 +52,7 @@ DOCFILES+=	README.sql mu-conference.sql
 
 MUC_LOGDIR?=	/var/log/mu-conference
 
-.if ${PORT_OPTIONS:MJABBER}
-JABBER_REQUIRE?=        jabber
-JABBER_USER?=           jabber
-JABBER_PIDDIR?=         /var/run/jabberd
-JABBER_SPOOLDIR?=       /var/spool/jabberd
-RUN_DEPENDS+=           jabberd14:net-im/jabber
-.elif ${PORT_OPTIONS:MJABBERD}
+.if ${PORT_OPTIONS:MJABBERD}
 JABBER_REQUIRE?=        jabberd
 JABBER_USER?=           jabber
 JABBER_PIDDIR?=         /var/jabberd/pid