diff options
| author | wiz <wiz> | 2009-12-31 08:37:31 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2009-12-31 08:37:31 +0000 |
| commit | 44d4b49868b7612d1c512c6ffc85c3ef381c948f (patch) | |
| tree | 3a25138afc77db27417c98d11b2bc49ae78cf1fb /net | |
| parent | 62d15d29221b73377d8f133e0808ea47ff4c24a0 (diff) | |
| download | pkgsrc-44d4b49868b7612d1c512c6ffc85c3ef381c948f.tar.gz | |
Make py-twisted and cftp conflict with each other, both install a
bin/cftp file.
Diffstat (limited to 'net')
| -rw-r--r-- | net/cftp/Makefile | 7 | ||||
| -rw-r--r-- | net/py-twisted/Makefile | 5 |
2 files changed, 9 insertions, 3 deletions
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 diff --git a/net/py-twisted/Makefile b/net/py-twisted/Makefile index c41e1ec2dd9..cee1dbe15c7 100644 --- a/net/py-twisted/Makefile +++ b/net/py-twisted/Makefile @@ -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 @@ COMMENT= Framework for writing networked applications 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 |