diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index c2f55ce6acca..db01c956d279 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=		talloc
-PORTVERSION=		2.3.1
-PORTREVISION=		0
+DISTVERSION=		2.3.3
 CATEGORIES=		devel
 MASTER_SITES=		SAMBA
 
@@ -9,97 +8,41 @@ 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
+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 \
+CONFIGURE_ENV=		XSLTPROC="true"
+CONFIGURE_ARGS=		--mandir=${MANPREFIX}/man \
 			--disable-rpath \
+			--disable-rpath-install \
+			--bundled-libraries=NONE \
+			--builtin-libraries=replace \
 			--without-gettext
 
-OPTIONS_DEFINE=		MANPAGES DEBUG
-MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
+OPTIONS_DEFINE=		DEBUG PYTHON
+OPTIONS_DEFAULT=	PYTHON
+OPTIONS_SUB=		yes
 
+DEBUG_CFLAGS=		-g -ggdb3 -O0
 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
+PYTHON_USES=		gettext-runtime python:3.6+
+PYTHON_USES_OFF=	python:build,test
+PYTHON_CONFIGURE_OFF=	--disable-python
 
-.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
+pre-build:
+	${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..ae9b5010e7d4 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 = 1627254999
+SHA256 (talloc-2.3.3.tar.gz) = 6be95b2368bd0af1c4cd7a88146eb6ceea18e46c3ffc9330bf6262b40d1d8aaa
+SIZE (talloc-2.3.3.tar.gz) = 650493
diff --git a/devel/talloc/files/patch-wscript b/devel/talloc/files/patch-wscript
index 8097c806c2a4..159a035eec45 100644
--- a/devel/talloc/files/patch-wscript
+++ b/devel/talloc/files/patch-wscript
@@ -1,11 +1,11 @@
---- wscript.orig	2019-03-21 10:12:32 UTC
+--- wscript.orig	2021-07-15 07:04:32 UTC
 +++ wscript
 @@ -45,13 +45,14 @@ def configure(conf):
      conf.env.TALLOC_COMPAT1 = False
      if conf.env.standalone_talloc:
          conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
 -        conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
-+        conf.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
++        conf.env.PKGCONFIGDIR = '${LIBDIR}data/pkgconfig'
          conf.env.TALLOC_VERSION = VERSION
  
      conf.CHECK_XSLTPROC_MANPAGES()
diff --git a/devel/talloc/pkg-plist b/devel/talloc/pkg-plist
new file mode 100644
index 000000000000..cff21c476c16
--- /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%%libdata/pkgconfig/pytalloc-util%%PYTHON_EXT_SUFFIX%%.pc
+libdata/pkgconfig/talloc.pc
+man/man3/talloc.3.gz