diff --git a/databases/ldb29/Makefile b/databases/ldb29/Makefile
--- 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 @@
 # 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
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -27,6 +27,8 @@
 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
--- 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_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
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -26,6 +26,8 @@
 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
--- 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_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
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -30,6 +30,8 @@
 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
--- 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 @@
 
 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_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
--- 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 @@
 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 @@
 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 @@
 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