summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/samba-devel/Makefile2
-rw-r--r--net/samba-libsmbclient/Makefile2
-rw-r--r--net/samba/Makefile2
-rw-r--r--net/samba3/Makefile2
4 files changed, 8 insertions, 0 deletions
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index c8b6c08bb753..5c542d733936 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -16,6 +16,8 @@ MASTER_SITE_SUBDIR= . rc
MAINTAINER= dwcjr@FreeBSD.org
COMMENT= A free SMB and CIFS client and server for UNIX
+CONFLICTS= ja-samba-2.* samba-3.* samba-libsmbclient-3.* sharity-light-1.*
+
USE_BZIP2="YES"
.if !defined(WITHOUT_CUPS)
diff --git a/net/samba-libsmbclient/Makefile b/net/samba-libsmbclient/Makefile
index f7639c666ec1..b5233e3381f7 100644
--- a/net/samba-libsmbclient/Makefile
+++ b/net/samba-libsmbclient/Makefile
@@ -18,6 +18,8 @@ DISTNAME= ${PORTNAME}-3.0.0
MAINTAINER= einekoai@chello.nl
COMMENT= The shared lib from the samba packges
+CONFLICTS= samba-3.*
+
USE_BZIP2= yes
USE_AUTOCONF= yes
WANT_AUTOCONF_VER= 253
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 5de81e465cb8..3dabd9cf9387 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -25,6 +25,8 @@ PATCHFILES= samba-2.2.8a-freebsd-jail-patch-20031108.gz:smbjail
MAINTAINER= dwcjr@FreeBSD.org
COMMENT= A free SMB and CIFS client and server for UNIX
+CONFLICTS= ja-samba-2.* samba-3.* sharity-light-1.*
+
USE_BZIP2= YES
USE_SUBMAKE= YES
USE_GMAKE= YES
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index c8b6c08bb753..5c542d733936 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -16,6 +16,8 @@ MASTER_SITE_SUBDIR= . rc
MAINTAINER= dwcjr@FreeBSD.org
COMMENT= A free SMB and CIFS client and server for UNIX
+CONFLICTS= ja-samba-2.* samba-3.* samba-libsmbclient-3.* sharity-light-1.*
+
USE_BZIP2="YES"
.if !defined(WITHOUT_CUPS)