From owner-svn-ports-all@freebsd.org Tue Oct 16 13:11:06 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6217110D2D18; Tue, 16 Oct 2018 13:11:06 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 161C28C63D; Tue, 16 Oct 2018 13:11:06 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 113211CFCA; Tue, 16 Oct 2018 13:11:06 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9GDB5rL095002; Tue, 16 Oct 2018 13:11:05 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9GDB5ml095001; Tue, 16 Oct 2018 13:11:05 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201810161311.w9GDB5ml095001@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Tue, 16 Oct 2018 13:11:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482225 - head/net-im/mu-conference X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: head/net-im/mu-conference X-SVN-Commit-Revision: 482225 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Oct 2018 13:11:06 -0000 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