summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--biology/azara/Makefile6
-rw-r--r--net/connect/Makefile5
2 files changed, 8 insertions, 3 deletions
diff --git a/biology/azara/Makefile b/biology/azara/Makefile
index afeb5c830ec..3b6254425ff 100644
--- a/biology/azara/Makefile
+++ b/biology/azara/Makefile
@@ -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 @@ MAINTAINER= mchittur@cs.nmsu.edu
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 --git a/net/connect/Makefile b/net/connect/Makefile
index 4b4cbcc96e8..07b5c2f1f76 100644
--- a/net/connect/Makefile
+++ b/net/connect/Makefile
@@ -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 @@ HOMEPAGE= http://zippo.taiyo.co.jp/~gotoh/ssh/connect.html
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}