summaryrefslogtreecommitdiff
path: root/net/netatalk
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2004-06-06 05:46:43 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2004-06-06 05:46:43 +0000
commit8a636d3db02d1900c68101e9daabe7baa93b577e (patch)
tree4d85fcdcffa25ce81961cc28fa1965deb4ebba60 /net/netatalk
parentAdd gmdns, a GNU implementation of the multicast DNS protocol used by Zeroconf. (diff)
This port conflicts with netatalk-devel.
Notes
Notes: svn path=/head/; revision=110931
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 81bc965992e9..d70f25e11d9f 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -81,7 +81,7 @@ MAN5= AppleVolumes.default.5 afpd.conf.5 atalkd.conf.5 \
netatalk.conf.5 papd.conf.5
MAN8= afpd.8 atalkd.8 papd.8 papstatus.8 psf.8 timelord.8
-CONFLICTS= bigloo-2.* cap-6.0.* tct-1.*
+CONFLICTS= bigloo-2.* cap-6.0.* tct-1.* netatalk-2*
pre-everything::
@${ECHO_MSG} ""