From c1ba386ea12582feb51225989da128d9d458b83b Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Thu, 15 Jan 2004 10:35:49 +0000
Subject: [PATCH] kth-krb4: add CONFLICT on tnftp. tnftp: add CONFLICT on
 lukemftp, kth-krb4.

---
 net/tnftp/Makefile         | 5 ++++-
 security/kth-krb4/Makefile | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net/tnftp/Makefile b/net/tnftp/Makefile
index 72d0fb9f89a9..8c9bd18762c0 100644
--- a/net/tnftp/Makefile
+++ b/net/tnftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/12/19 12:02:04 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/15 10:35:49 grant Exp $
 #
 
 DISTNAME=		tnftp-20030825
@@ -11,6 +11,9 @@ COMMENT=		The enhanced FTP client in NetBSD
 
 GNU_CONFIGURE=		YES
 
+CONFLICTS+=		kth-krb4-[0-9]*
+CONFLICTS+=		lukemftp-[0-9]*
+
 .include "../../mk/bsd.prefs.mk"
 
 # Include SOCKS firewall support
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index 7f4ce73981f9..ec5011c6c477 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2003/11/12 03:39:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.28 2004/01/15 10:35:49 grant Exp $
 #
 
 DISTNAME=		krb4-1.2.1
@@ -18,6 +18,7 @@ COMMENT=		Kerberos IV distribution from KTH
 
 CONFLICTS+=		wu-ftpd-[0-9]*
 CONFLICTS+=		lukemftp-[0-9]*
+CONFLICTS+=		tnftp-[0-9]*
 CONFLICTS+=		zephyr-[0-9]*
 CONFLICTS+=		libdes-[0-9]*