diff options
author | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2010-10-19 05:35:32 +0000 |
---|---|---|
committer | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2010-10-19 05:35:32 +0000 |
commit | ae88d5bec306a71c6bfa6e74a37bea3fbc572c9b (patch) | |
tree | ba28eb119bd4073f954dfd1eb5d402fbc0ac8e88 /net-p2p | |
parent | 6a1951bdce4446ed6b271e4a7d2ffd3f8b0d9f7c (diff) | |
download | ports-ae88d5bec306a71c6bfa6e74a37bea3fbc572c9b.tar.gz ports-ae88d5bec306a71c6bfa6e74a37bea3fbc572c9b.zip |
- Update CONFLICTS for dynamic PKGNAME
PR: ports/150985
Submitted by: swell.k@gmail.com (maintainer)
Notes
Notes:
svn path=/head/; revision=263249
Diffstat (limited to 'net-p2p')
-rw-r--r-- | net-p2p/amule-devel/Makefile | 2 | ||||
-rw-r--r-- | net-p2p/amule/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile index 862b2fc929f7..637f16796879 100644 --- a/net-p2p/amule-devel/Makefile +++ b/net-p2p/amule-devel/Makefile @@ -128,7 +128,7 @@ PLIST_SUB+= CAS="@comment " .endif .if !defined(WITHOUT_ED2K) -CONFLICTS+= ed2k-hash-[0-9]* +CONFLICTS+= ed2k-hash* CONFIGURE_ARGS+= --enable-ed2k PLIST_SUB+= ED2K="" .else diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile index 7244ec9aa378..0584cb98f084 100644 --- a/net-p2p/amule/Makefile +++ b/net-p2p/amule/Makefile @@ -121,7 +121,7 @@ PLIST_SUB+= CAS="@comment " .endif .if !defined(WITHOUT_ED2K) -CONFLICTS+= ed2k-hash-[0-9]* +CONFLICTS+= ed2k-hash* CONFIGURE_ARGS+= --enable-ed2k PLIST_SUB+= ED2K="" .else |