[pkgsrc/trunk]: pkgsrc Add conflicts between samba and tdb: both install tdbt...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6eee88b02b33
branches:  trunk
changeset: 492548:6eee88b02b33
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Apr 15 11:45:16 2005 +0000

description:
Add conflicts between samba and tdb: both install tdbtool and tdbdump.

diffstat:

 databases/tdb/Makefile |  5 ++++-
 net/samba/Makefile     |  4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r cbac6414ffc4 -r 6eee88b02b33 databases/tdb/Makefile
--- a/databases/tdb/Makefile    Fri Apr 15 11:33:00 2005 +0000
+++ b/databases/tdb/Makefile    Fri Apr 15 11:45:16 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:16 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/15 11:45:16 wiz Exp $
 #
 
 DISTNAME=      tdb-1.0.6
@@ -10,6 +10,9 @@
 HOMEPAGE=      http://www.sourceforge.net/projects/tdb/
 COMMENT=       Small database system which uses files to store data
 
+# both install tdbtool and tdbdump
+CONFLICTS+=    samba-[0-9]*
+
 GNU_CONFIGURE=         YES
 USE_GNU_TOOLS+=                make
 USE_LIBTOOL=           YES
diff -r cbac6414ffc4 -r 6eee88b02b33 net/samba/Makefile
--- a/net/samba/Makefile        Fri Apr 15 11:33:00 2005 +0000
+++ b/net/samba/Makefile        Fri Apr 15 11:45:16 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2005/04/11 21:46:59 tv Exp $
+# $NetBSD: Makefile,v 1.140 2005/04/15 11:45:16 wiz Exp $
 
 DISTNAME=              samba-3.0.10
 PKGREVISION=           2
@@ -16,7 +16,7 @@
 HOMEPAGE=              http://www.samba.org/
 COMMENT=               SMB/CIFS protocol server suite
 
-CONFLICTS+=            ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]*
+CONFLICTS+=            ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews