[pkgsrc/trunk]: pkgsrc Add CONFLICTS between "azara" and "connect"

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ff0e0bfbeb05
branches:  trunk
changeset: 610245:ff0e0bfbeb05
user:      cheusov <cheusov%pkgsrc.org@localhost>
date:      Sun Oct 21 17:56:13 2012 +0000

description:
Add CONFLICTS between "azara" and "connect"

diffstat:

 biology/azara/Makefile |  6 ++++--
 net/connect/Makefile   |  5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r 4101bcc7f052 -r ff0e0bfbeb05 biology/azara/Makefile
--- a/biology/azara/Makefile    Sun Oct 21 17:55:05 2012 +0000
+++ b/biology/azara/Makefile    Sun Oct 21 17:56:13 2012 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2012/10/21 17:53:09 cheusov Exp $
+# $NetBSD: Makefile,v 1.12 2012/10/21 17:56:13 cheusov Exp $
 #
 
 DISTNAME=              azara-2.7-src
 PKGNAME=               azara-2.7
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            biology
 MASTER_SITES=          http://www.ccpn.ac.uk/download/azara/
 
@@ -11,6 +11,8 @@
 HOMEPAGE=              http://www.ccpn.ac.uk/azara/
 COMMENT=               Programs to process and view NMR data
 
+CONFLICTS=             connect-[0-9]*
+
 MAKE_JOBS_SAFE=                no
 
 WRKSRC=                        ${WRKDIR}/azara-2.7
diff -r 4101bcc7f052 -r ff0e0bfbeb05 net/connect/Makefile
--- a/net/connect/Makefile      Sun Oct 21 17:55:05 2012 +0000
+++ b/net/connect/Makefile      Sun Oct 21 17:56:13 2012 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2012/10/21 17:52:31 cheusov Exp $
+# $NetBSD: Makefile,v 1.13 2012/10/21 17:56:13 cheusov Exp $
 
 DISTNAME=      connect
 PKGNAME=       ${DISTNAME}-1.95
+PKGREVISION=   1
 CATEGORIES=    net security
 MASTER_SITES=  http://zippo.taiyo.co.jp/~gotoh/ssh/
 EXTRACT_SUFX=  .c
@@ -11,6 +12,8 @@
 COMMENT=       Open a TCP connection using a SOCKS4/5 or HTTP proxy server
 LICENSE=       gnu-gpl-v2
 
+CONFLICTS=     azara-[0-9]*
+
 EXTRACT_ONLY=  # empty
 DIST_SUBDIR=   ${PKGNAME_NOREV}