[pkgsrc/trunk]: pkgsrc Add CONFLICTS between chat/jabberd2 and net/sendfile

[cheusov <cheusov%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0e7ab60d38b7
branches:  trunk
changeset: 610232:0e7ab60d38b7
user:      cheusov <cheusov%pkgsrc.org@localhost>
date:      Sun Oct 21 16:05:19 2012 +0000

description:
Add CONFLICTS between chat/jabberd2 and net/sendfile

diffstat:

 chat/jabberd2/Makefile |  6 +++---
 net/sendfile/Makefile  |  6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r ad32aee499ac -r 0e7ab60d38b7 chat/jabberd2/Makefile
--- a/chat/jabberd2/Makefile    Sun Oct 21 16:01:40 2012 +0000
+++ b/chat/jabberd2/Makefile    Sun Oct 21 16:05:19 2012 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2012/10/03 21:54:01 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2012/10/21 16:05:19 cheusov Exp $
 
 DISTNAME=      jabberd-2.2.17
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    chat
 MASTER_SITES=  https://github.com/downloads/Jabberd2/jabberd2/
 EXTRACT_SUFX=  .tar.xz
@@ -12,7 +12,7 @@
 COMMENT=       XMPP (Jabber) instant messaging server
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=             jabberd-[0-9]*
+CONFLICTS=             jabberd-[0-9]* sendfile-[0-9]*
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
diff -r ad32aee499ac -r 0e7ab60d38b7 net/sendfile/Makefile
--- a/net/sendfile/Makefile     Sun Oct 21 16:01:40 2012 +0000
+++ b/net/sendfile/Makefile     Sun Oct 21 16:05:19 2012 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2012/10/21 16:01:40 cheusov Exp $
+# $NetBSD: Makefile,v 1.33 2012/10/21 16:05:19 cheusov Exp $
 #
 
 DISTNAME=      sendfile-2.1b
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  http://fex.rus.uni-stuttgart.de/download/
 
@@ -11,6 +11,8 @@
 COMMENT=       Implementation of the Simple asynchronous file transfer protocol
 LICENSE=       gnu-gpl-v2
 
+CONFLICTS=     jabberd2-[0-9]*
+
 #WRKSRC=               ${WRKDIR}/sendfile-2.1b
 
 PKG_DESTDIR_SUPPORT=   user-destdir