From 7d04f9f55e5d81d710aa5c773f39e7048cf3477c Mon Sep 17 00:00:00 2001 From: Mark Linimon Date: Wed, 10 Mar 2004 07:46:51 +0000 Subject: Fix up some conflicts issues: there was an edge case where samba-devel conflicted with itself (only shows up in edge cases); there was a case where two ports in japanese/ installed smbfs man pages -- but one installed very old ones. This seems to be the best conclusion from the following convoluted PR: PR: ports/59599 Submitted by: Koop Mast Reviewed by: eik, trevor, dwcjr, nakaji, at various times --- net/samba-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net/samba-devel') diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile index c2fad7923f6d..d4fe86947e94 100644 --- a/net/samba-devel/Makefile +++ b/net/samba-devel/Makefile @@ -28,7 +28,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/:S/.a/a/} MAINTAINER= timur@gnu.org COMMENT= A free SMB and CIFS client and server for UNIX -CONFLICTS= ja-samba-2.* samba-3.* sharity-light-1.* samba-libsmbclient-3.* +CONFLICTS= ja-samba-2.* samba-2.* sharity-light-1.* samba-libsmbclient-3.* OPTIONS= CUPS "With CUPS printing support" on \ LDAP "With LDAP support" on \ -- cgit v1.2.3