pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/ejabberd Remove the CONFLICT on jabberd, it doesn...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c95126161490
branches:  trunk
changeset: 367755:c95126161490
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Wed Sep 06 12:26:32 2017 +0000

description:
Remove the CONFLICT on jabberd, it doesn't make any sense.

diffstat:

 chat/ejabberd/Makefile |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 5c0be01804af -r c95126161490 chat/ejabberd/Makefile
--- a/chat/ejabberd/Makefile    Wed Sep 06 12:21:32 2017 +0000
+++ b/chat/ejabberd/Makefile    Wed Sep 06 12:26:32 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2017/08/20 12:58:04 fhajny Exp $
+# $NetBSD: Makefile,v 1.76 2017/09/06 12:26:32 fhajny Exp $
 
 DISTNAME=      ejabberd-17.08
 CATEGORIES=    chat
@@ -29,7 +29,6 @@
 DEPENDS+=      erlang-stringprep>=1.0.9:../../textproc/erlang-stringprep
 DEPENDS+=      erlang-stun>=1.0.14:../../net/erlang-stun
 DEPENDS+=      erlang-xmpp>=1.1.14:../../net/erlang-xmpp
-CONFLICTS+=    jabberd-[0-9]*
 
 GNU_CONFIGURE=         yes
 USE_GCC_RUNTIME=       yes



Home | Main Index | Thread Index | Old Index