CVS commit: pkgsrc/chat/ejabberd

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Wed Sep  6 12:26:32 UTC 2017

Modified Files:
        pkgsrc/chat/ejabberd: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/chat/ejabberd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/ejabberd/Makefile
diff -u pkgsrc/chat/ejabberd/Makefile:1.75 pkgsrc/chat/ejabberd/Makefile:1.76
--- pkgsrc/chat/ejabberd/Makefile:1.75  Sun Aug 20 12:58:04 2017
+++ pkgsrc/chat/ejabberd/Makefile       Wed Sep  6 12:26:32 2017
@@ -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-p1_utils>=1.0.9:../../m
 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