From 8ea2d2529f14791dc6564e84df85c89ae7695925 Mon Sep 17 00:00:00 2001 From: dinoex Date: Wed, 30 Jan 2008 08:25:45 +0000 Subject: - add CONFLICTS for bin/ed2k PR: 120112 Submitted by: Yar Tikhiy --- net-p2p/amule-devel/Makefile | 2 +- net-p2p/amule/Makefile | 2 +- net-p2p/amule2/Makefile | 2 +- net-p2p/ed2k/Makefile | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) (limited to 'net-p2p') diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile index 4c03a526eed1..22700154c2b9 100644 --- a/net-p2p/amule-devel/Makefile +++ b/net-p2p/amule-devel/Makefile @@ -20,7 +20,7 @@ MAINTAINER= boris@tagnet.ru COMMENT= The all-platform eMule p2p client LATEST_LINK= aMule2 -CONFLICTS= aMule-1.* aMule-devel-[0-9]* +CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-* USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile index 4c03a526eed1..22700154c2b9 100644 --- a/net-p2p/amule/Makefile +++ b/net-p2p/amule/Makefile @@ -20,7 +20,7 @@ MAINTAINER= boris@tagnet.ru COMMENT= The all-platform eMule p2p client LATEST_LINK= aMule2 -CONFLICTS= aMule-1.* aMule-devel-[0-9]* +CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-* USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/net-p2p/amule2/Makefile b/net-p2p/amule2/Makefile index 4c03a526eed1..22700154c2b9 100644 --- a/net-p2p/amule2/Makefile +++ b/net-p2p/amule2/Makefile @@ -20,7 +20,7 @@ MAINTAINER= boris@tagnet.ru COMMENT= The all-platform eMule p2p client LATEST_LINK= aMule2 -CONFLICTS= aMule-1.* aMule-devel-[0-9]* +CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-* USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/net-p2p/ed2k/Makefile b/net-p2p/ed2k/Makefile index 5e09f9d2ecc3..e1723b927e3a 100644 --- a/net-p2p/ed2k/Makefile +++ b/net-p2p/ed2k/Makefile @@ -17,6 +17,7 @@ EXTRACT_ONLY= MAINTAINER= dinoex@FreeBSD.org COMMENT= Calculates 'eMule' hashes or producing ed2k:// file links +CONFILTCS= aMule-* WRKSRC= ${WRKDIR} MAKEFILE= /dev/null ALL_TARGET= ed2k -- cgit