summaryrefslogtreecommitdiff
path: root/net-p2p/amule2
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2008-01-30 08:25:45 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2008-01-30 08:25:45 +0000
commitd6118edb463e408e4b4df7be4d4ab94321ba7791 (patch)
tree439d7a4e1f41e15368474f438fbd152266cd225b /net-p2p/amule2
parentRevert part of the previous commit that accidentily (diff)
- add CONFLICTS for bin/ed2k
PR: 120112 Submitted by: Yar Tikhiy
Notes
Notes: svn path=/head/; revision=206443
Diffstat (limited to 'net-p2p/amule2')
-rw-r--r--net-p2p/amule2/Makefile2
1 files changed, 1 insertions, 1 deletions
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