aboutsummaryrefslogtreecommitdiffstats
path: root/net/samba32
diff options
context:
space:
mode:
authortimur <timur@FreeBSD.org>2009-08-02 07:44:59 +0800
committertimur <timur@FreeBSD.org>2009-08-02 07:44:59 +0800
commitbed3f2419fe4cf01b95795129f56493c6daa241b (patch)
treea23599a1f0b556f4d5a40202a02c2ba4cbab7ab5 /net/samba32
parent85154e097ad3f1eb0ab9c8fbf9c218664aeeaf06 (diff)
downloadfreebsd-ports-gnome-bed3f2419fe4cf01b95795129f56493c6daa241b.tar.gz
freebsd-ports-gnome-bed3f2419fe4cf01b95795129f56493c6daa241b.tar.zst
freebsd-ports-gnome-bed3f2419fe4cf01b95795129f56493c6daa241b.zip
Fix CONFLICTS
Diffstat (limited to 'net/samba32')
-rw-r--r--net/samba32/Makefile2
1 files changed, 1 insertions, 1 deletions
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