summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authorfhajny <fhajny@pkgsrc.org>2017-09-06 12:26:32 +0000
committerfhajny <fhajny@pkgsrc.org>2017-09-06 12:26:32 +0000
commitf31f7ad82dbadbf908c5f8575f47cd7ef22ee1c8 (patch)
tree9a7077bd7712e9c38d6a5e067b6ec3e655ed3dbe /chat
parent8ed80a336d6d6fc61fd38d64da269fdf4c796809 (diff)
downloadpkgsrc-f31f7ad82dbadbf908c5f8575f47cd7ef22ee1c8.tar.gz
Remove the CONFLICT on jabberd, it doesn't make any sense.
Diffstat (limited to 'chat')
-rw-r--r--chat/ejabberd/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index ee685e364de..35cf9dfd9b2 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -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:../../misc/erlang-p1_utils
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