From bed3f2419fe4cf01b95795129f56493c6daa241b Mon Sep 17 00:00:00 2001 From: timur Date: Sat, 1 Aug 2009 23:44:59 +0000 Subject: Fix CONFLICTS --- net/samba32/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net/samba32') diff --git a/net/samba32/Makefile b/net/samba32/Makefile index 27ea1dd03882..dacc3fd5f3f0 100644 --- a/net/samba32/Makefile +++ b/net/samba32/Makefile @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/} MAINTAINER?= timur@FreeBSD.org COMMENT?= A free SMB and CIFS client and server for UNIX -CONFLICTS?= *samba-2.* *samba-3.[03].* sharity-light-1.* tdb-1.* +CONFLICTS?= *samba-3.[03].* samba4* tdb-1.* USE_GMAKE= yes USE_ICONV= yes -- cgit