*/*: Fix conflict of PKGNAME

* Fix conflict of PKGNAME by adding PKGNAMESUFFIX to the ports below
  - databases/tdb1410
  - devel/talloc242
  - devel/tevent016
* Set CONFLICTS_INSTALL between different versions of each port.
* Update dependencies of databases/ldb29 and net/samba420 to reflect
  change of PKGNAME.
* Bump PORTREVISION of modified ports.

Reviewed by:	0mp, kiwi
Differential Revision:	https://reviews.freebsd.org/D48826

8 files changed, 30 insertions, 10 deletions

diff --git a/databases/ldb29/Makefile b/databases/ldb29/Makefile
index ad3d19886f89..19f44c6601fd 100644
--- a/databases/ldb29/Makefile
+++ b/databases/ldb29/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ldb
 PORTVERSION=	2.9.2
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	SAMBA
 PKGNAMESUFFIX?=	${PORTVERSION:C/([[:digit:]]+)[.]([[:digit:]]+).*/\1\2/}
@@ -79,8 +80,8 @@ PYTHON3_PLIST_FILES=	${PKGCONFIGDIR}/pyldb-util${PYTHON_EXT_SUFFIX}.pc \
 # No fancy color error messages
 _CFLAGS_clang=	-fno-color-diagnostics
 
-_LDB_DEPENDS=	talloc>=2.4.2:devel/talloc242 tevent>=0.16.0:devel/tevent016 \
-		tdb>=1.4.10:databases/tdb1410 lmdb>=0.9.23:databases/lmdb \
+_LDB_DEPENDS=	talloc242>=2.4.2:devel/talloc242 tevent016>=0.16.0:devel/tevent016 \
+		tdb1410>=1.4.10:databases/tdb1410 lmdb>=0.9.23:databases/lmdb \
 		popt>=0:devel/popt
 _LDB_BINS=	bin/ldbedit bin/ldbmodify bin/ldbadd bin/ldbdel bin/ldbsearch \
 		bin/ldbrename
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index b697ca6414e2..ecbbf156c8cc 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -27,6 +27,8 @@ CONFIGURE_ARGS+=		--disable-rpath \
 CONFIGURE_ENV=			PYTHONHASHSEED=1
 MAKE_ENV=			PYTHONHASHSEED=1
 
+CONFLICTS_INSTALL=		tdb[0-9]*
+
 MANPAGES_DESC=			Build and install manpages (requires textproc/docbook-xsl)
 
 OPTIONS_DEFINE=			MANPAGES DEBUG PYTHON
diff --git a/databases/tdb1410/Makefile b/databases/tdb1410/Makefile
index f6a2386cd5d2..38e1114ada8c 100644
--- a/databases/tdb1410/Makefile
+++ b/databases/tdb1410/Makefile
@@ -1,8 +1,10 @@
 PORTNAME=			tdb
 DISTVERSION=			1.4.10
+PORTREVISION=			1
 PORTEPOCH=			1
 CATEGORIES=			databases
 MASTER_SITES=			SAMBA
+PKGNAMESUFFIX=			1410
 
 MAINTAINER=			samba@FreeBSD.org
 COMMENT=			Trivial Database
@@ -27,6 +29,8 @@ CONFIGURE_ARGS+=		--disable-rpath \
 CONFIGURE_ENV=			PYTHONHASHSEED=1
 MAKE_ENV=			PYTHONHASHSEED=1
 
+CONFLICTS_INSTALL=		tdb
+
 MANPAGES_DESC=			Build and install manpages (requires textproc/docbook-xsl)
 
 OPTIONS_DEFINE=			MANPAGES DEBUG PYTHON
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index 1adbb88f0886..0e2752159337 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -26,6 +26,8 @@ CONFIGURE_ARGS+=		--disable-rpath \
 CONFIGURE_ENV=			PYTHONHASHSEED=1
 MAKE_ENV=			PYTHONHASHSEED=1
 
+CONFLICTS_INSTALL=		talloc[0-9]*
+
 MANPAGES_DESC=			Build and install manpages (requires textproc/docbook-xsl)
 
 OPTIONS_DEFINE=			DEBUG MANPAGES PYTHON
diff --git a/devel/talloc242/Makefile b/devel/talloc242/Makefile
index 136c6b66a230..32e6c09f8a0f 100644
--- a/devel/talloc242/Makefile
+++ b/devel/talloc242/Makefile
@@ -1,7 +1,9 @@
 PORTNAME=			talloc
 DISTVERSION=			2.4.2
+PORTREVISION=			1
 CATEGORIES=			devel
 MASTER_SITES=			SAMBA
+PKGNAMESUFFIX=			242
 
 MAINTAINER=			samba@FreeBSD.org
 COMMENT=			Hierarchical pool based memory allocator
@@ -26,6 +28,8 @@ CONFIGURE_ARGS+=		--disable-rpath \
 CONFIGURE_ENV=			PYTHONHASHSEED=1
 MAKE_ENV=			PYTHONHASHSEED=1
 
+CONFLICTS_INSTALL=		talloc
+
 MANPAGES_DESC=			Build and install manpages (requires textproc/docbook-xsl)
 
 OPTIONS_DEFINE=			DEBUG MANPAGES PYTHON
diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index 0ab8dec78ce6..7f2fb453050d 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -30,6 +30,8 @@ CONFIGURE_ARGS=			--disable-rpath \
 CONFIGURE_ENV=			PYTHONHASHSEED=1
 MAKE_ENV=			PYTHONHASHSEED=1
 
+CONFLICTS_INSTALL=		tevent[0-9]*
+
 MANPAGES_DESC=			Build and install manpages (requires textproc/docbook-xsl)
 
 OPTIONS_DEFINE=			DEBUG MANPAGES PYTHON
diff --git a/devel/tevent016/Makefile b/devel/tevent016/Makefile
index 4775452bf995..d718cf50ce21 100644
--- a/devel/tevent016/Makefile
+++ b/devel/tevent016/Makefile
@@ -1,8 +1,10 @@
 PORTNAME=			tevent
 DISTVERSION=			0.16.1
+PORTREVISION=			1
 PORTEPOCH=			0
 CATEGORIES=			devel
 MASTER_SITES=			SAMBA
+PKGNAMESUFFIX=			016
 
 MAINTAINER=			samba@FreeBSD.org
 COMMENT=			Talloc based event loop library
@@ -10,8 +12,8 @@ WWW=				https://tevent.samba.org/
 
 LICENSE=			LGPL3
 
-BUILD_DEPENDS=			talloc>=2.4.2:devel/talloc242
-RUN_DEPENDS=			talloc>=2.4.2:devel/talloc242
+BUILD_DEPENDS=			talloc242>=2.4.2:devel/talloc242
+RUN_DEPENDS=			talloc242>=2.4.2:devel/talloc242
 
 USES=				compiler pkgconfig shebangfix waf
 USE_LDCONFIG=			yes
@@ -30,6 +32,8 @@ CONFIGURE_ARGS=			--disable-rpath \
 CONFIGURE_ENV=			PYTHONHASHSEED=1
 MAKE_ENV=			PYTHONHASHSEED=1
 
+CONFLICTS_INSTALL=		tevent
+
 MANPAGES_DESC=			Build and install manpages (requires textproc/docbook-xsl)
 
 OPTIONS_DEFINE=			DEBUG MANPAGES PYTHON
diff --git a/net/samba420/Makefile b/net/samba420/Makefile
index 1ef52242b8da..f0657b1b2dcc 100644
--- a/net/samba420/Makefile
+++ b/net/samba420/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=			${SAMBA4_BASENAME}420
 PORTVERSION=			${SAMBA4_VERSION}
+PORTREVISION=			1
 CATEGORIES?=			net
 MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=			${SAMBA4_DISTNAME}
@@ -220,8 +221,8 @@ PLIST_SUB+=			SAMBA4_BUNDLED_TALLOC=""
 SUB_LIST+=			SAMBA4_BUNDLED_TALLOC=""
 .else
 SAMBA4_BUNDLED_LIBS+=		!talloc
-BUILD_DEPENDS+=			talloc>=2.4.2:devel/talloc242
-RUN_DEPENDS+=			talloc>=2.4.2:devel/talloc242
+BUILD_DEPENDS+=			talloc242>=2.4.2:devel/talloc242
+RUN_DEPENDS+=			talloc242>=2.4.2:devel/talloc242
 PLIST_SUB+=			SAMBA4_BUNDLED_TALLOC="@comment "
 SUB_LIST+=			SAMBA4_BUNDLED_TALLOC="@comment "
 .endif
@@ -233,8 +234,8 @@ PLIST_SUB+=			SAMBA4_BUNDLED_TEVENT=""
 SUB_LIST+=			SAMBA4_BUNDLED_TEVENT=""
 .else
 SAMBA4_BUNDLED_LIBS+=		!tevent
-BUILD_DEPENDS+=			tevent>=0.16.1:devel/tevent016
-RUN_DEPENDS+=			tevent>=0.16.1:devel/tevent016
+BUILD_DEPENDS+=			tevent016>=0.16.1:devel/tevent016
+RUN_DEPENDS+=			tevent016>=0.16.1:devel/tevent016
 PLIST_SUB+=			SAMBA4_BUNDLED_TEVENT="@comment "
 SUB_LIST+=			SAMBA4_BUNDLED_TEVENT="@comment "
 .endif
@@ -246,8 +247,8 @@ PLIST_SUB+=			SAMBA4_BUNDLED_TDB=""
 SUB_LIST+=			SAMBA4_BUNDLED_TDB=""
 .else
 SAMBA4_BUNDLED_LIBS+=		!tdb
-BUILD_DEPENDS+=			tdb>=1.4.10:databases/tdb1410
-RUN_DEPENDS+=			tdb>=1.4.10:databases/tdb1410
+BUILD_DEPENDS+=			tdb1410>=1.4.10:databases/tdb1410
+RUN_DEPENDS+=			tdb1410>=1.4.10:databases/tdb1410
 PLIST_SUB+=			SAMBA4_BUNDLED_TDB="@comment "
 SUB_LIST+=			SAMBA4_BUNDLED_TDB="@comment "
 .endif