summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2004-08-08 06:13:02 +0000
committertaca <taca@pkgsrc.org>2004-08-08 06:13:02 +0000
commit38b5acdc166176323ce2442ce05822038c84d76d (patch)
tree16a3dc8a7cfcecc772437d9b3b2da59d988d24e3 /net
parentb27f9c2af93662abe285ea0cbd44c16cec8eae2e (diff)
downloadpkgsrc-38b5acdc166176323ce2442ce05822038c84d76d.tar.gz
This package should be conflict with ja-samba, too.
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 ef6f4f68b2a..d4f244f2f2b 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -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 @@ MAINTAINER= jlam@NetBSD.org
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