pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net CONFLICTS should be symmetric, so add ones for bit...
details: https://anonhg.NetBSD.org/pkgsrc/rev/13c1be526297
branches: trunk
changeset: 497867:13c1be526297
user: wiz <wiz%pkgsrc.org@localhost>
date: Sat Aug 06 10:55:06 2005 +0000
description:
CONFLICTS should be symmetric, so add ones for bittornado.
diffstat:
net/bittorrent-gui/Makefile | 4 +++-
net/bittorrent/Makefile | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diffs (36 lines):
diff -r ca09e3dfc63e -r 13c1be526297 net/bittorrent-gui/Makefile
--- a/net/bittorrent-gui/Makefile Sat Aug 06 08:08:33 2005 +0000
+++ b/net/bittorrent-gui/Makefile Sat Aug 06 10:55:06 2005 +0000
@@ -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 @@
PYTHON_PATCH_SCRIPTS= btdownloadgui.py btmaketorrentgui.py
+CONFLICTS+= bittornado-gui-[0-9]*
+
INSTALLATION_DIRS= bin
do-build: # empty
diff -r ca09e3dfc63e -r 13c1be526297 net/bittorrent/Makefile
--- a/net/bittorrent/Makefile Sat Aug 06 08:08:33 2005 +0000
+++ b/net/bittorrent/Makefile Sat Aug 06 10:55:06 2005 +0000
@@ -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 @@
PYDISTUTILSPKG= YES
+CONFLICTS+= bittornado-[0-9]*
+
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../devel/py-cursespanel/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index