aboutsummaryrefslogtreecommitdiffstats
path: root/net/netatalk
diff options
context:
space:
mode:
authoramdmi3 <amdmi3@FreeBSD.org>2010-10-27 08:37:57 +0800
committeramdmi3 <amdmi3@FreeBSD.org>2010-10-27 08:37:57 +0800
commit69782feb6ddcdd99da6e32c7fd78ee8507c3ff0e (patch)
tree1e3c20f99283c5be899fe7c68b03d946710b59e9 /net/netatalk
parentf2135cd7c1ceb3dba2022d985b75163172ac2a05 (diff)
downloadfreebsd-ports-graphics-69782feb6ddcdd99da6e32c7fd78ee8507c3ff0e.tar.gz
freebsd-ports-graphics-69782feb6ddcdd99da6e32c7fd78ee8507c3ff0e.tar.zst
freebsd-ports-graphics-69782feb6ddcdd99da6e32c7fd78ee8507c3ff0e.zip
- Remove conflicts with graphics/uniconvertor as it no longer installs bin/uniconv
- Add mutual conflicts between netatalk<->yudit as both do install bin/uniconv
Diffstat (limited to 'net/netatalk')
-rw-r--r--net/netatalk/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 5548a11b1c5..871554823fd 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -56,7 +56,7 @@ MAN5= AppleVolumes.5 AppleVolumes.default.5 \
MAN8= afp_acls.8 afpd.8 atalkd.8 cnid_dbd.8 cnid_metad.8 papd.8 \
papstatus.8 psf.8 timelord.8
-CONFLICTS= bigloo-2.* cap-6.0.* tct-1.* netatalk-1* uniconvertor-1.*
+CONFLICTS= bigloo-2.* cap-6.0.* tct-1.* netatalk-1* yudit-[0-9]*
.include <bsd.port.pre.mk>