diff options
| author | trevor <trevor@FreeBSD.org> | 2003-11-25 16:12:19 +0000 |
|---|---|---|
| committer | trevor <trevor@FreeBSD.org> | 2003-11-25 16:12:19 +0000 |
| commit | dfa278d36b4c05bab4db3a4f94d83e4872506c13 (patch) | |
| tree | d56b87c541e3f059ab63408aa6ffd6a92eb85558 | |
| parent | 55cb4bfe64dff671338bdc64a31af4ee8001dbe6 (diff) | |
| download | FreeBSD-ports-dfa278d36b4c05bab4db3a4f94d83e4872506c13.zip FreeBSD-ports-dfa278d36b4c05bab4db3a4f94d83e4872506c13.tar.gz | |
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)
| -rw-r--r-- | japanese/linux-JM/Makefile | 2 | ||||
| -rw-r--r-- | japanese/samba/Makefile | 2 | ||||
| -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 |
6 files changed, 12 insertions, 0 deletions
diff --git a/japanese/linux-JM/Makefile b/japanese/linux-JM/Makefile index 01d90cc..d4e2a62 100644 --- a/japanese/linux-JM/Makefile +++ b/japanese/linux-JM/Makefile @@ -14,6 +14,8 @@ DISTFILES= ${DISTFILES_GNU} ${DISTFILES_OTHERS} MAINTAINER= sada@FreeBSD.org COMMENT= Japanese translated man pages by JM Project +CONFLICTS= ja-samba-2.* + DIST_SUBDIR= ${PORTNAME} MANSECS= 1 3 4 5 8 NO_MTREE= yes diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile index ebdc93e..a6b361e 100644 --- a/japanese/samba/Makefile +++ b/japanese/samba/Makefile @@ -20,6 +20,8 @@ DISTNAME= ${PORTNAME}-${SAMBA_VERSION}-ja-${SAMBA_JA_VERSION} MAINTAINER= nakaji@jp.FreeBSD.org COMMENT= A free SMB and CIFS client and server for UNIX +CONFLICTS= samba-2.2.* samba-3.0.* sharity-light-1.* + SAMBA_VERSION= 2.2.8a SAMBA_JA_VERSION= 1.1 diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile index c8b6c08..5c542d7 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 f7639c6..b5233e3 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 5de81e4..3dabd9c 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 c8b6c08..5c542d7 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) |
