diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index 9506d5ce8f38..ca088f473318 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -1,7 +1,5 @@
 PORTNAME=		tevent
-PORTVERSION=		0.10.2
-PORTREVISION=		1
-PORTEPOCH=		0
+DISTVERSION=		0.11.0
 CATEGORIES=		devel
 MASTER_SITES=		SAMBA
 
@@ -10,91 +8,39 @@ COMMENT=		Talloc based event loop library
 
 LICENSE=		LGPL3
 
-IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
+LIB_DEPENDS=		libtalloc.so:devel/talloc
 
-BUILD_DEPENDS=		talloc>=2.3.1:devel/talloc
-RUN_DEPENDS=		talloc>=2.3.1:devel/talloc
-
-CONFLICTS_INSTALL=	tevent1-*
-
-#FLAVORS=		default nopython
-#nopython_PKGNAMESUFFIX=	-nopython
-#nopython_CONFLICTS=	tevent
-#default_CONFLICTS=	tevent-nopython
-
-USES=			compiler gettext-runtime pkgconfig waf
+USES=			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+=	--bundled-libraries=!talloc
-
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
+CONFIGURE_ENV=		XSLTPROC="true"
+CONFIGURE_ARGS=		--mandir=${MANPREFIX}/man \
 			--disable-rpath \
-			--without-gettext
+			--without-gettext \
+			--bundled-libraries=!talloc
 
-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/tevent.h \
-			lib/libtevent.so \
-			lib/libtevent.so.0 \
-			${PKGCONFIGDIR}/tevent.pc
-
-.if defined(NO_PYTHON)
-USES+=			python:build,test
-CONFIGURE_ARGS+=	--disable-python
-.else
-USES+=			python:3.4+
-USE_PYTHON=		py3kplist
-
-PLIST_FILES+=		${PYTHON_SITELIBDIR}/_tevent${PYTHON_EXT_SUFFIX}.so \
-			${PYTHON_SITELIBDIR}/tevent.py \
-			${PYTHON_SITELIBDIR}/__pycache__/tevent.cpython-${PYTHON_SUFFIX}.pyc
-.endif
+PYTHON_USES=		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
-
-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
-
 post-install:
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtevent.so
-.if !defined(NO_PYTHON)
-			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tevent*.so
-			${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
-.endif
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtevent.so
+
+post-install-PYTHON-on:
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tevent*.so
+	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 
 .include <bsd.port.post.mk>
diff --git a/devel/tevent/distinfo b/devel/tevent/distinfo
index 4ce5130ba8c1..d48b15cb40ce 100644
--- a/devel/tevent/distinfo
+++ b/devel/tevent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588983240
-SHA256 (tevent-0.10.2.tar.gz) = f8427822e5b2878fb8b28d6f50d96848734f3f3130612fb574fdd2d2148a6696
-SIZE (tevent-0.10.2.tar.gz) = 800731
+TIMESTAMP = 1627305596
+SHA256 (tevent-0.11.0.tar.gz) = ee9a86c8e808aac2fe1e924eaa139ff7f0269d0e8e4fafa850ae5c7489bc82ba
+SIZE (tevent-0.11.0.tar.gz) = 866327
diff --git a/devel/tevent/files/patch-wscript b/devel/tevent/files/patch-wscript
index b17d04a3f874..6c28ae30623a 100644
--- a/devel/tevent/files/patch-wscript
+++ b/devel/tevent/files/patch-wscript
@@ -1,11 +1,11 @@
---- wscript.orig	2017-07-22 22:25:22 UTC
+--- wscript.orig	2021-07-08 07:42:39 UTC
 +++ wscript
-@@ -88,7 +88,7 @@ def build(bld):
+@@ -97,7 +97,7 @@ def build(bld):
          SRC += ' tevent_port.c'
  
      if bld.env.standalone_tevent:
 -        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
-+        bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
++        bld.env.PKGCONFIGDIR = '${LIBDIR}data/pkgconfig'
          private_library = False
      else:
          private_library = True
diff --git a/devel/tevent/pkg-plist b/devel/tevent/pkg-plist
new file mode 100644
index 000000000000..791bb06698f8
--- /dev/null
+++ b/devel/tevent/pkg-plist
@@ -0,0 +1,8 @@
+include/tevent.h
+lib/libtevent.so
+lib/libtevent.so.0
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/__pycache__/tevent%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_tevent%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/tevent.py
+lib/tevent/libcmocka-tevent.so
+libdata/pkgconfig/tevent.pc