[pkgsrc/trunk]: pkgsrc kth-krb4: add CONFLICT on tnftp.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eeab8b3d136c
branches:  trunk
changeset: 466309:eeab8b3d136c
user:      grant <grant%pkgsrc.org@localhost>
date:      Thu Jan 15 10:35:49 2004 +0000

description:
kth-krb4: add CONFLICT on tnftp.
tnftp: add CONFLICT on lukemftp, kth-krb4.

diffstat:

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

diffs (36 lines):

diff -r 2c6fd773f32d -r eeab8b3d136c net/tnftp/Makefile
--- a/net/tnftp/Makefile        Thu Jan 15 10:33:55 2004 +0000
+++ b/net/tnftp/Makefile        Thu Jan 15 10:35:49 2004 +0000
@@ -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 @@
 
 GNU_CONFIGURE=         YES
 
+CONFLICTS+=            kth-krb4-[0-9]*
+CONFLICTS+=            lukemftp-[0-9]*
+
 .include "../../mk/bsd.prefs.mk"
 
 # Include SOCKS firewall support
diff -r 2c6fd773f32d -r eeab8b3d136c security/kth-krb4/Makefile
--- a/security/kth-krb4/Makefile        Thu Jan 15 10:33:55 2004 +0000
+++ b/security/kth-krb4/Makefile        Thu Jan 15 10:35:49 2004 +0000
@@ -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 @@
 
 CONFLICTS+=            wu-ftpd-[0-9]*
 CONFLICTS+=            lukemftp-[0-9]*
+CONFLICTS+=            tnftp-[0-9]*
 CONFLICTS+=            zephyr-[0-9]*
 CONFLICTS+=            libdes-[0-9]*