[pkgsrc/trunk]: pkgsrc/net/samba This package should be conflict with ja-samb...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/67eedb987c5a
branches:  trunk
changeset: 479221:67eedb987c5a
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Aug 08 06:13:02 2004 +0000

description:
This package should be conflict with ja-samba, too.

diffstat:

 net/samba/Makefile |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 960e423f040e -r 67eedb987c5a net/samba/Makefile
--- a/net/samba/Makefile        Sun Aug 08 04:04:53 2004 +0000
+++ b/net/samba/Makefile        Sun Aug 08 06:13:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.125 2004/08/05 03:04:34 jlam Exp $
+# $NetBSD: Makefile,v 1.126 2004/08/08 06:13:02 taca Exp $
 
 DISTNAME=              samba-3.0.5
 CATEGORIES=            net
@@ -16,7 +16,7 @@
 HOMEPAGE=              http://www.samba.org/
 COMMENT=               SMB/CIFS protocol server suite
 
-CONFLICTS+=            pam-smbpass-[0-9]* winbind-[0-9]*
+CONFLICTS+=            ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]*
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews