Index: head/databases/ldb/Makefile
===================================================================
--- head/databases/ldb/Makefile	(revision 504588)
+++ head/databases/ldb/Makefile	(revision 504589)
@@ -1,171 +1,171 @@
 # $FreeBSD$
 
 PORTNAME=		ldb
 PORTVERSION=		1.1.29
-PORTREVISION=		2
+PORTREVISION=		3
 PORTEPOCH=		0
 CATEGORIES=		databases
 MASTER_SITES=		SAMBA
 
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		LDAP-like embedded database
 
 LICENSE=		GPLv3
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 BUILD_DEPENDS=		${LDB_DEPENDS}
 RUN_DEPENDS=		${LDB_DEPENDS}
 
-LDB_DEPENDS=		talloc>=2.1.8:devel/talloc \
-			tevent>=0.9.31:devel/tevent \
-			tdb>=1.3.12,1:databases/tdb \
+LDB_DEPENDS=		talloc1>=2.1.8:devel/talloc1 \
+			tevent1>=0.9.31:devel/tevent1 \
+			tdb1>=1.3.12,1:databases/tdb1 \
 			popt>=0:devel/popt
 
-CONFLICTS_INSTALL=	ldb1[23]-1.*
+CONFLICTS_INSTALL=	ldb1[2-6]-1.*
 
 #FLAVORS=		default nopython
 #nopython_PKGNAMESUFFIX=	-nopython
 #nopython_CONFLICTS=	ldb
 #default_CONFLICTS=	ldb-nopython
 
 USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 USE_OPENLDAP=		yes
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
 CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!tdb,!popt \
 			--with-modulesdir=${PREFIX}/lib/shared-modules \
 			--with-privatelibdir=${PREFIX}/lib/ldb
 
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 			--with-openldap=${LOCALBASE} \
 			--disable-rpath \
 			--without-gettext
 
 OPTIONS_DEFINE=		MANPAGES
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
 .include <bsd.port.options.mk>
 
 LDB_BINS=		bin/ldbedit \
 			bin/ldbmodify \
 			bin/ldbadd \
 			bin/ldbdel \
 			bin/ldbsearch \
 			bin/ldbrename
 
 LDB_LIBS=		lib/libldb.so \
 			lib/libldb.so.1 \
 			lib/ldb/libldb-cmdline.so \
 			lib/shared-modules/ldb/asq.so \
 			lib/shared-modules/ldb/ldap.so \
 			lib/shared-modules/ldb/paged_results.so \
 			lib/shared-modules/ldb/paged_searches.so \
 			lib/shared-modules/ldb/rdn_name.so \
 			lib/shared-modules/ldb/sample.so \
 			lib/shared-modules/ldb/server_sort.so \
 			lib/shared-modules/ldb/skel.so \
 			lib/shared-modules/ldb/tdb.so
 
 PLIST_FILES=		include/ldb_version.h \
 			include/ldb_handlers.h \
 			include/ldb_errors.h \
 			include/ldb.h \
 			include/ldb_module.h \
 			${LDB_BINS} \
 			${LDB_LIBS} \
 			${PKGCONFIGDIR}/ldb.pc
 
 .if defined(NO_PYTHON)
 USES+=			python:2.7,build
 #CONFIGURE_ARGS+=	--disable-python
 .else
 USES+=			python:2.7
 
 PLIST_FILES+=		include/pyldb.h \
 			lib/libpyldb-util.so \
 			lib/libpyldb-util.so.1 \
 			${PYTHON_SITELIBDIR}/ldb.so \
 			${PYTHON_SITELIBDIR}/_ldb_text.py \
 			${PKGCONFIGDIR}/pyldb-util.pc
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
 BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 .endif
 # No fancy color error messages
 .if ${COMPILER_TYPE} == "clang"
 CFLAGS+=		-fno-color-diagnostics
 .endif
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
 LDB_MAN1=		man/man1/ldbadd.1.gz \
 			man/man1/ldbdel.1.gz \
 			man/man1/ldbedit.1.gz \
 			man/man1/ldbmodify.1.gz \
 			man/man1/ldbrename.1.gz \
 			man/man1/ldbsearch.1.gz
 
 LDB_MAN3=		man/man3/ldb.3.gz
 
 PLIST_FILES+=		${LDB_MAN1} ${LDB_MAN3}
 
 post-patch:
 			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
 				${BUILD_WRKSRC}/wscript
 
 # Use threading (or multiprocessing) but not thread (renamed in python 3+).
 pre-configure:
 			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
 				${ECHO_CMD}; \
 				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
 				${ECHO_CMD}; \
 				${FALSE}; \
 			fi
 
 pre-build-MANPAGES-off:
 			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
 .for man in ${LDB_MAN1} ${LDB_MAN3}
 			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
 .endfor
 
 post-install:
 .for lib in ${LDB_BINS} ${LDB_LIBS}
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib}
 .endfor
 .if !defined(NO_PYTHON)
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so
 .else
 .for f in		include/pyldb.h \
 			lib/libpyldb-util.so \
 			lib/libpyldb-util.so.1 \
 			lib/ldb/libpytalloc-util.so.2
 				${RM} ${STAGEDIR}${PREFIX}/${f}
 .endfor
 .for f in		${PYTHON_SITELIBDIR}/ldb.so \
 			${PYTHON_SITELIBDIR}/_ldb_text.py \
 			${PYTHON_SITELIBDIR}/_tdb_text.py \
 			${PYTHON_SITELIBDIR}/_tevent.so \
 			${PYTHON_SITELIBDIR}/talloc.so \
 			${PYTHON_SITELIBDIR}/tdb.so \
 			${PYTHON_SITELIBDIR}/tevent.py \
 			${PKGCONFIGDIR}/pyldb-util.pc
 				${RM} ${STAGEDIR}/${f}
 .endfor
 			${RMDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 			${RMDIR} ${STAGEDIR}${PYTHON_LIBDIR}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/databases/ldb12/Makefile
===================================================================
--- head/databases/ldb12/Makefile	(revision 504588)
+++ head/databases/ldb12/Makefile	(revision 504589)
@@ -1,185 +1,185 @@
 # $FreeBSD$
 
 PORTNAME=		ldb
 PORTVERSION=		1.2.3
-PORTREVISION=		1
+PORTREVISION=		2
 PORTEPOCH=		0
 CATEGORIES=		databases
 MASTER_SITES=		SAMBA
 PKGNAMESUFFIX=		12
 
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		LDAP-like embedded database
 
 LICENSE=		GPLv3
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 BUILD_DEPENDS=		${LDB_DEPENDS}
 RUN_DEPENDS=		${LDB_DEPENDS}
 
-LDB_DEPENDS=		talloc>=2.1.10:devel/talloc \
-			tevent>=0.9.34:devel/tevent \
-			tdb>=1.3.15:databases/tdb \
+LDB_DEPENDS=		talloc1>=2.1.10:devel/talloc1 \
+			tevent1>=0.9.34:devel/tevent1 \
+			tdb1>=1.3.15:databases/tdb1 \
 			cmocka>=1.1.1:sysutils/cmocka \
 			popt>=0:devel/popt
 
-CONFLICTS_INSTALL=	ldb-1.1.* ldb13-1.3.*
+CONFLICTS_INSTALL=	ldb-1.1.* ldb1[3-6]-1.*
 
 #FLAVORS=		default nopython
 #nopython_PKGNAMESUFFIX=	-nopython
 #nopython_CONFLICTS=	ldb
 #default_CONFLICTS=	ldb-nopython
 
 USES=			compiler:c++11-lang pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 USE_OPENLDAP=		yes
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
 CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!tdb,!popt,!cmocka \
 			--with-modulesdir=${PREFIX}/lib/shared-modules \
 			--with-privatelibdir=${PREFIX}/lib/ldb
 
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 			--with-openldap=${LOCALBASE} \
 			--disable-rpath \
 			--without-gettext
 
 OPTIONS_DEFINE=		MANPAGES
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
 .include <bsd.port.options.mk>
 
 LDB_BINS=		bin/ldbedit \
 			bin/ldbmodify \
 			bin/ldbadd \
 			bin/ldbdel \
 			bin/ldbsearch \
 			bin/ldbrename
 
 LDB_LIBS=		lib/libldb.so \
 			lib/libldb.so.1 \
 			lib/ldb/libldb-cmdline.so \
 			lib/shared-modules/ldb/asq.so \
 			lib/shared-modules/ldb/ldap.so \
 			lib/shared-modules/ldb/paged_results.so \
 			lib/shared-modules/ldb/paged_searches.so \
 			lib/shared-modules/ldb/rdn_name.so \
 			lib/shared-modules/ldb/sample.so \
 			lib/shared-modules/ldb/server_sort.so \
 			lib/shared-modules/ldb/skel.so \
 			lib/shared-modules/ldb/tdb.so
 
 PLIST_FILES=		include/ldb_version.h \
 			include/ldb_handlers.h \
 			include/ldb_errors.h \
 			include/ldb.h \
 			include/ldb_module.h \
 			${LDB_BINS} \
 			${LDB_LIBS} \
 			${PKGCONFIGDIR}/ldb.pc
 
 .if defined(NO_PYTHON)
 USES+=			python:2.7,build
 CONFIGURE_ARGS+=	--disable-python
 .else
 USES+=			python:2.7
 
 PLIST_FILES+=		include/pyldb.h \
 			lib/libpyldb-util.so \
 			lib/libpyldb-util.so.1 \
 			${PYTHON_SITELIBDIR}/ldb.so \
 			${PYTHON_SITELIBDIR}/_ldb_text.py \
 			${PKGCONFIGDIR}/pyldb-util.pc
 # XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
 # This is not officially supported, use at your own risk
 .if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
 SAMBA4_PYTHON3_VERSION=	${WITH_SAMBA4_PYTHON3}
 SAMBA4_PYTHON3=		python${SAMBA4_PYTHON3_VERSION}
 SAMBA4_PYTHON3_VER=	${SAMBA4_PYTHON3_VERSION:C/\.//}
 .if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
 .error			unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
 .endif
 BUILD_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
 RUN_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
 # cpython-36m
 SAMBA4_PYTHON3_SO_ABI!=	[ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
 SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
 
 CONFIGURE_ENV+=		PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
 CONFIGURE_ARGS+=	--extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
 
 PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
 			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
 
 PLIST_FILES+=		lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so \
 			lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so.1 \
 			${SAMBA4_PYTHON3_SITELIBDIR}/ldb.${SAMBA4_PYTHON3_SO_ABI}.so \
 			${SAMBA4_PYTHON3_SITELIBDIR}/_ldb_text.py  \
 			${PKGCONFIGDIR}/pyldb-util.${SAMBA4_PYTHON3_SO_ABI}.pc
 .endif
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
 BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 .endif
 # No fancy color error messages
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CFLAGS+=		-fno-color-diagnostics
 .endif
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
 LDB_MAN1=		man/man1/ldbadd.1.gz \
 			man/man1/ldbdel.1.gz \
 			man/man1/ldbedit.1.gz \
 			man/man1/ldbmodify.1.gz \
 			man/man1/ldbrename.1.gz \
 			man/man1/ldbsearch.1.gz
 
 LDB_MAN3=		man/man3/ldb.3.gz
 
 PLIST_FILES+=		${LDB_MAN1} ${LDB_MAN3}
 
 post-patch:
 			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
 				${BUILD_WRKSRC}/wscript
 
 # Use threading (or multiprocessing) but not thread (renamed in python 3+).
 pre-configure:
 			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
 				${ECHO_CMD}; \
 				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
 				${ECHO_CMD}; \
 				${FALSE}; \
 			fi
 
 pre-build-MANPAGES-off:
 			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
 .for man in ${LDB_MAN1} ${LDB_MAN3}
 			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
 .endfor
 
 post-install:
 .for lib in ${LDB_BINS} ${LDB_LIBS}
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib}
 .endfor
 .if !defined(NO_PYTHON)
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so
 .if defined(SAMBA4_PYTHON3)
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.${SAMBA4_PYTHON3_SO_ABI}.so
 .endif
 .endif
 
 .include <bsd.port.post.mk>
Index: head/databases/ldb13/Makefile
===================================================================
--- head/databases/ldb13/Makefile	(revision 504588)
+++ head/databases/ldb13/Makefile	(revision 504589)
@@ -1,188 +1,188 @@
 # $FreeBSD$
 
 PORTNAME=		ldb
 PORTVERSION=		1.3.8
-PORTREVISION=		0
+PORTREVISION=		1
 PORTEPOCH=		0
 CATEGORIES=		databases
 MASTER_SITES=		SAMBA
 PKGNAMESUFFIX=		13
 
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		LDAP-like embedded database
 
 LICENSE=		GPLv3
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 BUILD_DEPENDS=		${LDB_DEPENDS}
 RUN_DEPENDS=		${LDB_DEPENDS}
 
-LDB_DEPENDS=		talloc>=2.1.14:devel/talloc \
-			tevent>=0.9.37:devel/tevent \
-			tdb>=1.3.16:databases/tdb \
+LDB_DEPENDS=		talloc1>=2.1.14:devel/talloc1 \
+			tevent1>=0.9.37:devel/tevent1 \
+			tdb1>=1.3.16:databases/tdb1 \
 			cmocka>=1.1.1:sysutils/cmocka \
 			popt>=0:devel/popt
 
-CONFLICTS_INSTALL=	ldb-1.1.* ldb12-1.2.*
+CONFLICTS_INSTALL=	ldb-1.1.* ldb1[24-6]-1.*
 
 #FLAVORS=		default nopython
 #nopython_PKGNAMESUFFIX=	-nopython
 #nopython_CONFLICTS=	ldb
 #default_CONFLICTS=	ldb-nopython
 
 USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 USE_OPENLDAP=		yes
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
 CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!tdb,!popt,!cmocka \
 			--with-modulesdir=${PREFIX}/lib/shared-modules \
 			--with-privatelibdir=${PREFIX}/lib/ldb \
 			--mandir=${MANPREFIX}/man \
 			--with-openldap=${LOCALBASE} \
 			--disable-rpath \
 			--without-gettext
 
 OPTIONS_DEFINE=		MANPAGES DEBUG
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
 DEBUG_CONFIGURE_ON=	--verbose --enable-debug
 DEBUG_MAKE_ARGS=	--verbose
 DEBUG_FLAGS=		-g -ggdb3 -O0
 
 .include <bsd.port.options.mk>
 
 LDB_BINS=		bin/ldbedit \
 			bin/ldbmodify \
 			bin/ldbadd \
 			bin/ldbdel \
 			bin/ldbsearch \
 			bin/ldbrename
 
 LDB_LIBS=		lib/libldb.so \
 			lib/libldb.so.1 \
 			lib/ldb/libldb-cmdline.so \
 			lib/shared-modules/ldb/asq.so \
 			lib/shared-modules/ldb/ldap.so \
 			lib/shared-modules/ldb/paged_results.so \
 			lib/shared-modules/ldb/paged_searches.so \
 			lib/shared-modules/ldb/rdn_name.so \
 			lib/shared-modules/ldb/sample.so \
 			lib/shared-modules/ldb/server_sort.so \
 			lib/shared-modules/ldb/skel.so \
 			lib/shared-modules/ldb/tdb.so
 
 PLIST_FILES=		include/ldb_version.h \
 			include/ldb_handlers.h \
 			include/ldb_errors.h \
 			include/ldb.h \
 			include/ldb_module.h \
 			${LDB_BINS} \
 			${LDB_LIBS} \
 			${PKGCONFIGDIR}/ldb.pc
 
 .if defined(NO_PYTHON)
 USES+=			python:2.7,build
 CONFIGURE_ARGS+=	--disable-python
 .else
 USES+=			python:2.7
 
 PLIST_FILES+=		include/pyldb.h \
 			lib/libpyldb-util.so \
 			lib/libpyldb-util.so.1 \
 			${PYTHON_SITELIBDIR}/ldb.so \
 			${PYTHON_SITELIBDIR}/_ldb_text.py \
 			${PKGCONFIGDIR}/pyldb-util.pc
 # XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
 # This is not officially supported, use at your own risk
 .if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
 SAMBA4_PYTHON3_VERSION=	${WITH_SAMBA4_PYTHON3}
 SAMBA4_PYTHON3=		python${SAMBA4_PYTHON3_VERSION}
 SAMBA4_PYTHON3_VER=	${SAMBA4_PYTHON3_VERSION:C/\.//}
 .if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
 .error			unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
 .endif
 BUILD_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
 RUN_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
 # cpython-36m
 SAMBA4_PYTHON3_SO_ABI!=	[ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
 SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
 
 CONFIGURE_ENV+=		PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
 CONFIGURE_ARGS+=	--extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
 
 PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
 			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
 
 PLIST_FILES+=		lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so \
 			lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so.1 \
 			${SAMBA4_PYTHON3_SITELIBDIR}/ldb.${SAMBA4_PYTHON3_SO_ABI}.so \
 			${SAMBA4_PYTHON3_SITELIBDIR}/_ldb_text.py  \
 			${PKGCONFIGDIR}/pyldb-util.${SAMBA4_PYTHON3_SO_ABI}.pc
 .endif
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
 BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 .endif
 # No fancy color error messages
 .if ${COMPILER_TYPE} == "clang"
 CFLAGS+=		-fno-color-diagnostics
 .endif
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
 LDB_MAN1=		man/man1/ldbadd.1.gz \
 			man/man1/ldbdel.1.gz \
 			man/man1/ldbedit.1.gz \
 			man/man1/ldbmodify.1.gz \
 			man/man1/ldbrename.1.gz \
 			man/man1/ldbsearch.1.gz
 
 LDB_MAN3=		man/man3/ldb.3.gz
 
 PLIST_FILES+=		${LDB_MAN1} ${LDB_MAN3}
 
 post-patch:
 			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
 				${BUILD_WRKSRC}/wscript
 
 # Use threading (or multiprocessing) but not thread (renamed in python 3+).
 pre-configure:
 			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
 				${ECHO_CMD}; \
 				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
 				${ECHO_CMD}; \
 				${FALSE}; \
 			fi
 
 pre-build-MANPAGES-off:
 			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
 .for man in ${LDB_MAN1} ${LDB_MAN3}
 			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
 .endfor
 
 post-install:
 .for lib in ${LDB_BINS} ${LDB_LIBS}
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib}
 .endfor
 .if !defined(NO_PYTHON)
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so
 		${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so
 .	if defined(SAMBA4_PYTHON3)
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.${SAMBA4_PYTHON3_SO_ABI}.so
 .	endif
 .endif
 
 .include <bsd.port.post.mk>
Index: head/databases/tdb1/Makefile
===================================================================
--- head/databases/tdb1/Makefile	(revision 504588)
+++ head/databases/tdb1/Makefile	(revision 504589)
@@ -1,143 +1,145 @@
 # $FreeBSD$
 
 PORTNAME=		tdb
 PORTVERSION=		1.3.16
 PORTREVISION=		0
 PORTEPOCH=		1
 CATEGORIES=		databases
 MASTER_SITES=		SAMBA
 PKGNAMESUFFIX=		1
 
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		Trivial Database
 
 LICENSE=		GPLv3
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
+CONFLICTS_INSTALL=	tdb-*
+
 #FLAVORS=		default nopython debug
 #nopython_PKGNAMESUFFIX=	-nopython
 #debug_PKGNAMESUFFIX=	-debug
 #nopython_CONFLICTS=	tdb tdb-debug
 #debug_CONFLICTS=	tdb tdb-nopython
 #default_CONFLICTS=	tdb-nopython tdb-debug
 
 USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 			--disable-rpath \
 			--without-gettext
 
 OPTIONS_DEFINE=		MANPAGES
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
 .include <bsd.port.options.mk>
 
 TDB_BINS=		bin/tdbbackup \
 			bin/tdbdump \
 			bin/tdbrestore \
 			bin/tdbtool
 
 PLIST_FILES+=		include/tdb.h \
 			${TDB_BINS} \
 			lib/libtdb.so \
 			lib/libtdb.so.1 \
 			${PKGCONFIGDIR}/tdb.pc
 
 .if defined(SAMBA4_DEBUG)
 CFLAGS+=		-DTDB_TRACE=1
 .endif
 
 .if defined(NO_PYTHON)
 USES+=			python:2.7,build
 CONFIGURE_ARGS+=	--disable-python
 .else
 USES+=			python:2.7
 
 PLIST_FILES+=		${PYTHON_SITELIBDIR}/tdb.so \
 			${PYTHON_SITELIBDIR}/_tdb_text.py
 # XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
 # This is not officially supported, use at your own risk
 .if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
 SAMBA4_PYTHON3_VERSION=	${WITH_SAMBA4_PYTHON3}
 SAMBA4_PYTHON3=		python${SAMBA4_PYTHON3_VERSION}
 SAMBA4_PYTHON3_VER=	${SAMBA4_PYTHON3_VERSION:C/\.//}
 .if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
 .error			unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
 .endif
 BUILD_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
 RUN_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
 # cpython-36m
 SAMBA4_PYTHON3_SO_ABI!=	[ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
 SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
 
 CONFIGURE_ENV+=		PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
 CONFIGURE_ARGS+=	--extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
 
 PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
 			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
 
 PLIST_FILES+=		${SAMBA4_PYTHON3_SITELIBDIR}/tdb.${SAMBA4_PYTHON3_SO_ABI}.so \
 			${SAMBA4_PYTHON3_SITELIBDIR}/_tdb_text.py
 .endif
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
 BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 .endif
 # No fancy color error messages
 .if ${COMPILER_TYPE} == "clang"
 CFLAGS+=		-fno-color-diagnostics
 .endif
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
 TDB_MAN8=		man/man8/tdbbackup.8.gz \
 			man/man8/tdbdump.8.gz \
 			man/man8/tdbrestore.8.gz \
 			man/man8/tdbtool.8.gz
 
 PLIST_FILES+=		${TDB_MAN8}
 
 post-patch:
 			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
 				${BUILD_WRKSRC}/wscript
 
 # Use threading (or multiprocessing) but not thread (renamed in python 3+).
 pre-configure:
 			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
 				${ECHO_CMD}; \
 				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
 				${ECHO_CMD}; \
 				${FALSE}; \
 			fi
 
 pre-build-MANPAGES-off:
 			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
 .for man in ${TDB_MAN8}
 			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
 .endfor
 
 post-install:
 .for lib in ${TDB_BINS} lib/libtdb.so
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib}
 .endfor
 .if !defined(NO_PYTHON)
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tdb.so
 .if defined(SAMBA4_PYTHON3)
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/tdb.${SAMBA4_PYTHON3_SO_ABI}.so
 .endif
 .endif
 
 .include <bsd.port.post.mk>
Index: head/devel/talloc1/Makefile
===================================================================
--- head/devel/talloc1/Makefile	(revision 504588)
+++ head/devel/talloc1/Makefile	(revision 504589)
@@ -1,132 +1,134 @@
 # $FreeBSD$
 
 PORTNAME=		talloc
 PORTVERSION=		2.1.14
 PORTREVISION=		0
 CATEGORIES=		devel
 MASTER_SITES=		SAMBA
 PKGNAMESUFFIX=		1
 
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		Hierarchical pool based memory allocator
 
 LICENSE=		LGPL3
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
+CONFLICTS_INSTALL=	talloc-*
+
 #FLAVORS=		default nopython
 #nopython_PKGNAMESUFFIX=	-nopython
 #nopython_CONFLICTS=	talloc
 #default_CONFLICTS=	talloc-nopython
 
 USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 			--disable-rpath \
 			--without-gettext
 
 OPTIONS_DEFINE=		MANPAGES
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
 .include <bsd.port.options.mk>
 
 PLIST_FILES+=		include/talloc.h \
 			lib/libtalloc.so \
 			lib/libtalloc.so.2 \
 			${PKGCONFIGDIR}/talloc.pc
 
 .if defined(NO_PYTHON)
 USES+=			python:2.7,build
 CONFIGURE_ARGS+=	--disable-python
 .else
 USES+=			python:2.7
 
 PLIST_FILES+=		include/pytalloc.h \
 			lib/libpytalloc-util.so \
 			lib/libpytalloc-util.so.2 \
 			${PYTHON_SITELIBDIR}/talloc.so \
 			${PKGCONFIGDIR}/pytalloc-util.pc
 # XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
 # This is not officially supported, use at your own risk
 .if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
 SAMBA4_PYTHON3_VERSION=	${WITH_SAMBA4_PYTHON3}
 SAMBA4_PYTHON3=		python${SAMBA4_PYTHON3_VERSION}
 SAMBA4_PYTHON3_VER=	${SAMBA4_PYTHON3_VERSION:C/\.//}
 .if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
 .error			unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
 .endif
 BUILD_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
 RUN_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
 # cpython-36m
 SAMBA4_PYTHON3_SO_ABI!=	[ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
 SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
 
 CONFIGURE_ENV+=		PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
 CONFIGURE_ARGS+=	--extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
 
 PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
 			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
 
 PLIST_FILES+=		lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so \
 			lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so.2 \
 			${SAMBA4_PYTHON3_SITELIBDIR}/talloc.${SAMBA4_PYTHON3_SO_ABI}.so \
 			${PKGCONFIGDIR}/pytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.pc
 .endif
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
 BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 .endif
 # No fancy color error messages
 .if ${COMPILER_TYPE} == "clang"
 CFLAGS+=		-fno-color-diagnostics
 .endif
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
 TALLOC_MAN3=		man/man3/talloc.3.gz
 
 PLIST_FILES+=		${TALLOC_MAN3}
 
 post-patch:
 			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
 				${BUILD_WRKSRC}/wscript
 
 # Use threading (or multiprocessing) but not thread (renamed in python 3+).
 pre-configure:
 			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
 				${ECHO_CMD}; \
 				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
 				${ECHO_CMD}; \
 				${FALSE}; \
 			fi
 
 pre-build-MANPAGES-off:
 			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
 .for man in ${TALLOC_MAN3}
 			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
 .endfor
 
 post-install:
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtalloc.so
 .if !defined(NO_PYTHON)
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util.so
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/talloc.so
 .if defined(SAMBA4_PYTHON3)
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/talloc.${SAMBA4_PYTHON3_SO_ABI}.so
 .endif
 .endif
 
 .include <bsd.port.post.mk>
Index: head/devel/tevent1/Makefile
===================================================================
--- head/devel/tevent1/Makefile	(revision 504588)
+++ head/devel/tevent1/Makefile	(revision 504589)
@@ -1,131 +1,133 @@
 # $FreeBSD$
 
 PORTNAME=		tevent
 PORTVERSION=		0.9.37
 PORTREVISION=		0
 PORTEPOCH=		0
 CATEGORIES=		devel
 MASTER_SITES=		SAMBA
 PKGNAMESUFFIX=		1
 
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		Talloc based event loop library
 
 LICENSE=		LGPL3
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
-BUILD_DEPENDS=		talloc>=2.1.11:devel/talloc
-RUN_DEPENDS=		talloc>=2.1.11:devel/talloc
+BUILD_DEPENDS=		talloc1>=2.1.11:devel/talloc1
+RUN_DEPENDS=		talloc1>=2.1.11:devel/talloc1
+
+CONFLICTS_INSTALL=	tevent-*
 
 #FLAVORS=		default nopython
 #nopython_PKGNAMESUFFIX=	-nopython
 #nopython_CONFLICTS=	tevent
 #default_CONFLICTS=	tevent-nopython
 
 USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
 CONFIGURE_ARGS+=	--bundled-libraries=!talloc
 
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 			--disable-rpath \
 			--without-gettext
 
 OPTIONS_DEFINE=		MANPAGES
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
 .include <bsd.port.options.mk>
 
 PLIST_FILES+=		include/tevent.h \
 			lib/libtevent.so \
 			lib/libtevent.so.0 \
 			${PKGCONFIGDIR}/tevent.pc
 
 .if defined(NO_PYTHON)
 USES+=			python:2.7,build
 CONFIGURE_ARGS+=	--disable-python
 .else
 USES+=			python:2.7
 
 PLIST_FILES+=		${PYTHON_SITELIBDIR}/_tevent.so \
 			${PYTHON_SITELIBDIR}/tevent.py  \
 			${PYTHON_SITELIBDIR}/tevent.pyc \
 			${PYTHON_SITELIBDIR}/tevent.pyo
 # XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
 # This is not officially supported, use at your own risk
 .if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
 SAMBA4_PYTHON3_VERSION=	${WITH_SAMBA4_PYTHON3}
 SAMBA4_PYTHON3=		python${SAMBA4_PYTHON3_VERSION}
 SAMBA4_PYTHON3_VER=	${SAMBA4_PYTHON3_VERSION:C/\.//}
 .if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
 .error			unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
 .endif
 BUILD_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
 RUN_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
 # cpython-36m
 SAMBA4_PYTHON3_SO_ABI!=	[ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
 SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
 
 CONFIGURE_ENV+=		PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
 CONFIGURE_ARGS+=	--extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
 
 PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
 			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
 
 PLIST_FILES+=		${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.${SAMBA4_PYTHON3_SO_ABI}.so \
 			${SAMBA4_PYTHON3_SITELIBDIR}/tevent.py  \
 			${SAMBA4_PYTHON3_SITELIBDIR}/tevent.pyc \
 			${SAMBA4_PYTHON3_SITELIBDIR}/tevent.pyo
 .endif
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
 BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 .endif
 # No fancy color error messages
 .if ${COMPILER_TYPE} == "clang"
 CFLAGS+=		-fno-color-diagnostics
 .endif
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
 post-patch:
 			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
 				${BUILD_WRKSRC}/wscript
 
 # Use threading (or multiprocessing) but not thread (renamed in python 3+).
 pre-configure:
 			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
 				${ECHO_CMD}; \
 				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
 				${ECHO_CMD}; \
 				${FALSE}; \
 			fi
 
 .if !defined(NO_PYTHON)
 post-build:
 			${PYTHON_CMD} -m py_compile ${BUILD_WRKSRC}/tevent.py
 			${PYTHON_CMD} -O -m py_compile ${BUILD_WRKSRC}/tevent.py
 .endif
 
 post-install:
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtevent.so
 .if !defined(NO_PYTHON)
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tevent.so
 .if defined(SAMBA4_PYTHON3)
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.${SAMBA4_PYTHON3_SO_ABI}.so
 .endif
 .endif
 
 .include <bsd.port.post.mk>