diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index c2f55ce6acca..89e875457dbc 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -1,105 +1,68 @@
-PORTNAME=		talloc
-PORTVERSION=		2.3.1
-PORTREVISION=		0
-CATEGORIES=		devel
-MASTER_SITES=		SAMBA
-
-MAINTAINER=		timur@FreeBSD.org
-COMMENT=		Hierarchical pool based memory allocator
-
-LICENSE=		LGPL3
-
-IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be built with THREADS support
-
-CONFLICTS_INSTALL=	talloc1
-
-#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 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>
-
-PLIST_FILES+=		include/talloc.h \
-			lib/libtalloc.so \
-			lib/libtalloc.so.2 \
-			${PKGCONFIGDIR}/talloc.pc
-
-.if defined(NO_PYTHON)
-USES+=			python:build,test
-CONFIGURE_ARGS+=	--disable-python
-.else
-USES+=			python:3.4+
-
-PLIST_FILES+=		include/pytalloc.h \
-			lib/libpytalloc-util${PYTHON_EXT_SUFFIX}.so \
-			lib/libpytalloc-util${PYTHON_EXT_SUFFIX}.so.2 \
-			${PYTHON_SITELIBDIR}/talloc${PYTHON_EXT_SUFFIX}.so \
-			${PKGCONFIGDIR}/pytalloc-util${PYTHON_EXT_SUFFIX}.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
+PORTNAME=			talloc
+DISTVERSION=			2.3.4
+PORTREVISION=			0
+CATEGORIES=			devel
+MASTER_SITES=			SAMBA
+
+MAINTAINER=			timur@FreeBSD.org
+COMMENT=			Hierarchical pool based memory allocator
+
+LICENSE=			LGPL3
+
+USES=				compiler pkgconfig shebangfix waf
+USE_LDCONFIG=			yes
+SHEBANG_GLOB=			*.py
+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 \
+				--disable-rpath-install \
+				--bundled-libraries=NONE \
+				--builtin-libraries=replace \
+				--without-gettext
+CONFIGURE_ENV=			PYTHONHASHSEED=1
+MAKE_ENV=			PYTHONHASHSEED=1
+
+MANPAGES_DESC=			Build and install manpages (requires textproc/docbook-xsl)
+
+OPTIONS_DEFINE=			DEBUG MANPAGES PYTHON
+OPTIONS_DEFAULT=		PYTHON
+OPTIONS_SUB=			yes
+
+DEBUG_CFLAGS=			-g -ggdb3 -O0
+DEBUG_CONFIGURE_ON=		--verbose --enable-debug
+DEBUG_MAKE_ARGS=		--verbose
+
+PYTHON_USES=			gettext-runtime python:3.6+
+PYTHON_USES_OFF=		python:build,test
+PYTHON_CONFIGURE_OFF=		--disable-python
+
+MANPAGES_CONFIGURE_ENV_OFF+=	XSLTPROC="true"
+MANPAGES_BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+				xsltproc:textproc/libxslt
 # 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}
+CFLAGS+=			${CFLAGS_${CHOSEN_COMPILER_TYPE}}
+CFLAGS_clang=			-fno-color-diagnostics
+CONFIGURE_ENV+=			NOCOLOR=yes
+MAKE_ENV+=			NOCOLOR=yes
 
 post-patch:
-			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
+				@${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
+				-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
+				${INSTALL_MAN} ${FILESDIR}/talloc.3 ${BUILD_WRKSRC}/bin/default/man
 
 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
-.endif
+				${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtalloc.so.2
+
+post-install-PYTHON-on:
+				${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util*.so
+				${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/talloc*.so
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/talloc/distinfo b/devel/talloc/distinfo
index 2ae6108b0dc9..e0cdf7cb3586 100644
--- a/devel/talloc/distinfo
+++ b/devel/talloc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588982811
-SHA256 (talloc-2.3.1.tar.gz) = ef4822d2fdafd2be8e0cabc3ec3c806ae29b8268e932c5e9a4cd5585f37f9f77
-SIZE (talloc-2.3.1.tar.gz) = 638878
+TIMESTAMP = 1659003807
+SHA256 (talloc-2.3.4.tar.gz) = 179f9ebe265e67e4ab2c26cad2b7de4b6a77c6c212f966903382869f06be6505
+SIZE (talloc-2.3.4.tar.gz) = 674196
diff --git a/devel/talloc/pkg-plist b/devel/talloc/pkg-plist
new file mode 100644
index 000000000000..9779ecc45664
--- /dev/null
+++ b/devel/talloc/pkg-plist
@@ -0,0 +1,10 @@
+%%PYTHON%%include/pytalloc.h
+include/talloc.h
+%%PYTHON%%lib/libpytalloc-util%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON%%lib/libpytalloc-util%%PYTHON_EXT_SUFFIX%%.so.2
+lib/libtalloc.so
+lib/libtalloc.so.2
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/talloc%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON%%%%PKGCONFIGDIR%%/pytalloc-util%%PYTHON_EXT_SUFFIX%%.pc
+%%PKGCONFIGDIR%%/talloc.pc
+man/man3/talloc.3.gz