diff options
author | timur <timur@FreeBSD.org> | 2009-08-02 07:44:59 +0800 |
---|---|---|
committer | timur <timur@FreeBSD.org> | 2009-08-02 07:44:59 +0800 |
commit | bed3f2419fe4cf01b95795129f56493c6daa241b (patch) | |
tree | a23599a1f0b556f4d5a40202a02c2ba4cbab7ab5 /devel | |
parent | 85154e097ad3f1eb0ab9c8fbf9c218664aeeaf06 (diff) | |
download | freebsd-ports-gnome-bed3f2419fe4cf01b95795129f56493c6daa241b.tar.gz freebsd-ports-gnome-bed3f2419fe4cf01b95795129f56493c6daa241b.tar.zst freebsd-ports-gnome-bed3f2419fe4cf01b95795129f56493c6daa241b.zip |
Fix CONFLICTS
Diffstat (limited to 'devel')
-rw-r--r-- | devel/talloc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile index a07e0dbd6e82..c37db739649b 100644 --- a/devel/talloc/Makefile +++ b/devel/talloc/Makefile @@ -14,7 +14,7 @@ PKGNAMESUFFIX= COMMENT= Hierarchical pool based memory allocator -CONFLICTS= +CONFLICTS= samba-3.3* SAMBA_PORT?= samba4-devel SAMBA_SUBPORT= yes |