[pkgsrc/trunk]: pkgsrc/net Make py-twisted and cftp conflict with each other,...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/074e22d412c6
branches:  trunk
changeset: 568975:074e22d412c6
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Dec 31 08:37:31 2009 +0000

description:
Make py-twisted and cftp conflict with each other, both install a
bin/cftp file.

diffstat:

 net/cftp/Makefile       |  7 +++++--
 net/py-twisted/Makefile |  5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r d59127d730a8 -r 074e22d412c6 net/cftp/Makefile
--- a/net/cftp/Makefile Thu Dec 31 00:42:24 2009 +0000
+++ b/net/cftp/Makefile Thu Dec 31 08:37:31 2009 +0000
@@ -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 @@
 
 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
 
diff -r d59127d730a8 -r 074e22d412c6 net/py-twisted/Makefile
--- a/net/py-twisted/Makefile   Thu Dec 31 00:42:24 2009 +0000
+++ b/net/py-twisted/Makefile   Thu Dec 31 08:37:31 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/09/20 18:51:57 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2009/12/31 08:37:32 wiz Exp $
 #
 
 PKGNAME=               ${PYPKGPREFIX}-twisted-${TWISTED_VERSION}
@@ -8,6 +8,9 @@
 DEPENDS+=              ${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL
 DEPENDS+=              ${PYPKGPREFIX}-ZopeInterface>=3.0.1:../../devel/py-ZopeInterface
 
+# bin/cftp
+CONFLICTS+=            cftp-[0-9]*
+
 REPLACE_PYTHON+=       ${WRKSRC}/twisted/mail/test/pop3testserver.py
 REPLACE_PYTHON+=       ${WRKSRC}/twisted/trial/test/scripttest.py