diff options
| -rw-r--r-- | databases/tdb/Makefile | 2 | ||||
| -rw-r--r-- | devel/talloc/Makefile | 2 | ||||
| -rw-r--r-- | japanese/samba3/Makefile | 2 | ||||
| -rw-r--r-- | net/samba3/Makefile | 2 | ||||
| -rw-r--r-- | net/samba32/Makefile | 2 | ||||
| -rw-r--r-- | net/samba33/Makefile | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile index bd8c55b868ed..64b486f0494d 100644 --- a/databases/tdb/Makefile +++ b/databases/tdb/Makefile @@ -14,7 +14,7 @@ PKGNAMESUFFIX= COMMENT= Trivial Database -CONFLICTS= +CONFLICTS= *samba-3.* SAMBA_PORT?= samba4-devel SAMBA_SUBPORT= yes diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile index a07e0dbd6e82..c37db739649b 100644 --- a/devel/talloc/Makefile +++ b/devel/talloc/Makefile @@ -14,7 +14,7 @@ PKGNAMESUFFIX= COMMENT= Hierarchical pool based memory allocator -CONFLICTS= +CONFLICTS= samba-3.3* SAMBA_PORT?= samba4-devel SAMBA_SUBPORT= yes diff --git a/japanese/samba3/Makefile b/japanese/samba3/Makefile index 1c858f49a429..5ea9184b9bf9 100644 --- a/japanese/samba3/Makefile +++ b/japanese/samba3/Makefile @@ -17,7 +17,7 @@ PATCH_DIST_STRIP= -p0 MAINTAINER= kuriyama@FreeBSD.org COMMENT= Japanese Samba -CONFLICTS= ja-samba-2.* samba-2.* samba-3.0.* sharity-light-1.* +CONFLICTS= samba-3.* samba4-* tdb-1.* SAMBA_PORT= samba3 diff --git a/net/samba3/Makefile b/net/samba3/Makefile index 31d8a6e41cf5..a504ddb22e7f 100644 --- a/net/samba3/Makefile +++ b/net/samba3/Makefile @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/} MAINTAINER?= timur@FreeBSD.org COMMENT?= A free SMB and CIFS client and server for UNIX -CONFLICTS?= ja-samba-2.* ja-samba-3.* samba-2.* samba-3.[2-9]* sharity-light-1.* tdb-1.* +CONFLICTS?= *samba-3.[1-9]* samba4-* tdb-1.* USE_ICONV= yes GNU_CONFIGURE= yes diff --git a/net/samba32/Makefile b/net/samba32/Makefile index 27ea1dd03882..dacc3fd5f3f0 100644 --- a/net/samba32/Makefile +++ b/net/samba32/Makefile @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/} MAINTAINER?= timur@FreeBSD.org COMMENT?= A free SMB and CIFS client and server for UNIX -CONFLICTS?= *samba-2.* *samba-3.[03].* sharity-light-1.* tdb-1.* +CONFLICTS?= *samba-3.[03].* samba4* tdb-1.* USE_GMAKE= yes USE_ICONV= yes diff --git a/net/samba33/Makefile b/net/samba33/Makefile index 56d03b53651e..fd7b309cfedc 100644 --- a/net/samba33/Makefile +++ b/net/samba33/Makefile @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/} MAINTAINER?= timur@FreeBSD.org COMMENT?= A free SMB and CIFS client and server for UNIX -CONFLICTS?= *samba-2.* *samba-3.[02].* sharity-light-1.* tdb-1.0.* +CONFLICTS?= *samba-3.[02].* samba4* tdb-1.* talloc-* USE_GMAKE= yes USE_ICONV= yes |