diff -ruN samba.orig/Makefile samba/Makefile
--- samba.orig/Makefile	Sat Nov  8 21:12:12 2003
+++ samba/Makefile	Sat Nov 22 22:42:52 2003
@@ -25,6 +25,8 @@
 MAINTAINER=	dwcjr@FreeBSD.org
 COMMENT=	A free SMB and CIFS client and server for UNIX
 
+CONFLICTS=	samba-3*
+
 USE_BZIP2=	YES
 USE_SUBMAKE=	YES
 USE_GMAKE=	YES
diff -ruN samba-devel.orig/Makefile samba-devel/Makefile
--- samba-devel.orig/Makefile	Fri Oct 10 23:24:14 2003
+++ samba-devel/Makefile	Sat Nov 22 22:43:46 2003
@@ -16,6 +16,8 @@
 MAINTAINER=	dwcjr@FreeBSD.org
 COMMENT=	A free SMB and CIFS client and server for UNIX
 
+CONFLICTS=	samba-*
+
 USE_BZIP2="YES"
 
 .if !defined(WITHOUT_CUPS)
diff -ruN samba-libsmbclient.orig/Makefile samba-libsmbclient/Makefile
--- samba-libsmbclient.orig/Makefile	Tue Sep 30 21:22:38 2003
+++ samba-libsmbclient/Makefile	Sat Nov 22 22:43:10 2003
@@ -18,6 +18,8 @@
 MAINTAINER=	einekoai@chello.nl
 COMMENT=	The shared lib from the samba packges
 
+CONFLICTS=	samba-3*
+
 USE_BZIP2=		yes
 USE_AUTOCONF=		yes
 WANT_AUTOCONF_VER=	253