From b5ce146836bd781f717d5cb05d39e7728949b1bd Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 31 Dec 2009 08:37:31 +0000
Subject: Make py-twisted and cftp conflict with each other, both install a
 bin/cftp file.

---
 net/cftp/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'net/cftp')

diff --git a/net/cftp/Makefile b/net/cftp/Makefile
index 7b417535fbc..dc31baca5a1 100644
--- a/net/cftp/Makefile
+++ b/net/cftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/05/25 13:16:11 dillo Exp $
+# $NetBSD: Makefile,v 1.18 2009/12/31 08:37:31 wiz Exp $
 #
 
 DISTNAME=	cftp-0.12
@@ -13,8 +13,11 @@ COMMENT=	Comfortable FTP, a full screen ftp client
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+# bin/cftp
+CONFLICTS=	py[0-9]*-twisted-[0-9]*
+
 GNU_CONFIGURE=	YES
-INFO_FILES=	# PLIST
+INFO_FILES=	YES
 
 BUILD_DEFS+=	IPV6_READY
 
-- 
cgit v1.2.3