ports/59599: Update add conflicts to the samba-* ports

[Koop Mast]

>Number:         59599
>Category:       ports
>Synopsis:       Update add conflicts to the samba-* ports
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 22 14:00:39 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Koop Mast
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD prisma.rainbow-runner.nl 5.1-CURRENT FreeBSD 5.1-CURRENT #5: Sat Oct 11 05:31:30 CEST 2003 root at prisma.rainbow-runner.nl:/usr/obj/usr/src/sys/RainBow i386


	
>Description:
	It was pointed out to me by adamw@ that the samba-devel installes
	a libsmbclient.so, so it needs a conflicts line now.
	And add a conflics line to the samba port just to make it complete.
	The samba and libsmbclient port can live together.
	
>How-To-Repeat:
	
>Fix:

	

--- samba-conflicts.diff begins here ---
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 at 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 at 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 at chello.nl
 COMMENT=	The shared lib from the samba packges
 
+CONFLICTS=	samba-3*
+
 USE_BZIP2=		yes
 USE_AUTOCONF=		yes
 WANT_AUTOCONF_VER=	253
--- samba-conflicts.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: