summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/bittorrent-gui/Makefile4
-rw-r--r--net/bittorrent/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/net/bittorrent-gui/Makefile b/net/bittorrent-gui/Makefile
index c9d9275ee7f..d193972878a 100644
--- a/net/bittorrent-gui/Makefile
+++ b/net/bittorrent-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/10 19:11:02 recht Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/06 10:55:06 wiz Exp $
#
.include "../../net/bittorrent/Makefile.common"
@@ -11,6 +11,8 @@ DEPENDS+= bittorrent>=4.0.2:../../net/bittorrent
PYTHON_PATCH_SCRIPTS= btdownloadgui.py btmaketorrentgui.py
+CONFLICTS+= bittornado-gui-[0-9]*
+
INSTALLATION_DIRS= bin
do-build: # empty
diff --git a/net/bittorrent/Makefile b/net/bittorrent/Makefile
index fbb062b85e2..5615727c193 100644
--- a/net/bittorrent/Makefile
+++ b/net/bittorrent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/07/26 13:50:58 gdt Exp $
+# $NetBSD: Makefile,v 1.29 2005/08/06 10:55:06 wiz Exp $
#
.include "Makefile.common"
@@ -8,6 +8,8 @@ PKGREVISION= 1
PYDISTUTILSPKG= YES
+CONFLICTS+= bittornado-[0-9]*
+
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../devel/py-cursespanel/buildlink3.mk"