summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorwiz <wiz>2005-04-15 11:45:16 +0000
committerwiz <wiz>2005-04-15 11:45:16 +0000
commite06e64b529780bfad652fe164a9dcd366fcb7680 (patch)
tree406c09eef9d348f0ff2eb2afd51a98ac46209375 /net
parent7da013e26efd7339648ce58af15d243e6f2e715d (diff)
downloadpkgsrc-e06e64b529780bfad652fe164a9dcd366fcb7680.tar.gz
Add conflicts between samba and tdb: both install tdbtool and tdbdump.
Diffstat (limited to 'net')
-rw-r--r--net/samba/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 40122a561ac..605c1fdcf7e 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -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 @@ MAINTAINER= jlam@NetBSD.org
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