diff options
| author | Trevor Johnson <trevor@FreeBSD.org> | 2003-11-25 16:12:19 +0000 |
|---|---|---|
| committer | Trevor Johnson <trevor@FreeBSD.org> | 2003-11-25 16:12:19 +0000 |
| commit | 1d9e7cf28de0ecc761850a84ef2a74961fc9546f (patch) | |
| tree | a0f2f4e4a5bc4ad6f45d3062a1e6d1e928817797 /net | |
| parent | Supersedes ports/59442 and previous hasty-fix, and fixes the following: (diff) | |
List conflicts among japanese/linux-JM, japanese/samba,
net/samba-devel, net/samba-libsmbclient and net/samba ports.
PR: 59599
Submitted by: Koop Mast (net/samba-libsmbclient maintainer) with
changes by eik
Approved by: dwcjr (net/samba-devel and net/samba maintainer),
NAKAJI Hiroyuki (japanese/samba maintainer), and
portmgr (5.2 freeze)
Notes
Notes:
svn path=/head/; revision=94776
Diffstat (limited to '')
| -rw-r--r-- | net/samba-devel/Makefile | 2 | ||||
| -rw-r--r-- | net/samba-libsmbclient/Makefile | 2 | ||||
| -rw-r--r-- | net/samba/Makefile | 2 | ||||
| -rw-r--r-- | net/samba3/Makefile | 2 |
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) |