summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorbouyer <bouyer@pkgsrc.org>1999-01-29 10:39:18 +0000
committerbouyer <bouyer@pkgsrc.org>1999-01-29 10:39:18 +0000
commit4c795eafc7cb53ffb090852c826af110c4d9933a (patch)
tree0ccf747eca1eddb12988116d0d92fb1065e0d4bc /net
parentbf0f117a4ef7ca7786b79a925994947fa2e597bd (diff)
downloadpkgsrc-4c795eafc7cb53ffb090852c826af110c4d9933a.tar.gz
Make this conflict with sanba 2.*
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 1c78ba9b802..9a3fc9179c9 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1999/01/09 20:49:27 kleink Exp $
+# $NetBSD: Makefile,v 1.19 1999/01/29 10:39:18 bouyer Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1997/10/23 15:17:43 max Exp
#
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://samba.anu.edu.au/pub/samba/
MAINTAINER= tsarna@netbsd.org
HOMEPAGE= http://samba.anu.edu.au/samba/samba.html
-CONFLICTS= samba-1.9.18p8 samba-2.0.0beta2
+CONFLICTS= samba-1.9.18p8 samba-2.*
WRKSRC= ${WRKDIR}/${DISTNAME}/source