diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 0cb1029f6f72..d00659f116e1 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -1,111 +1,104 @@
 PORTNAME=	distcc
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 
 MAINTAINER=	laurent.chardon@gmail.com
 COMMENT=	Distribute compilation of C(++) code across machines ${${FLAVOR}_COMMENT}
 WWW=		https://distcc.github.io/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libiberty.a:devel/gnulibiberty
 LIB_DEPENDS=	libpopt.so:devel/popt
 
 FLAVORS=	default gtk
 FLAVOR?=	${FLAVORS:[1]}
 default_COMMENT=	(text monitor)
 gtk_PKGNAMESUFFIX=	-gtk
 gtk_DESCR=	${.CURDIR}/pkg-descr.gtk
 gtk_COMMENT=	(gtk monitor)
 
 USES=		alias autoreconf cpe gmake libtool localbase pkgconfig
 USE_GITHUB=	yes
 USE_RC_SUBR=	distccd
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-Werror \
 		--sysconfdir=${ETCDIR} \
 		CC="${CC}" \
 		PTHREAD_CC="${CC}"
 
 TEST_TARGET=	check
 
 ETCDIR=		${PREFIX}/etc
 
 SUB_FILES=	pkg-message
 SUB_LIST=	DISTCCD_PIDFILE=/var/run/distccd.pid
 
 USERS=		distcc
 GROUPS=		distcc
 
 OPTIONS_DEFINE=		AVAHI CLANGLINK DOCS IPV6 LLVMLINK PUMP
 OPTIONS_DEFAULT=	CLANGLINK PUMP
 OPTIONS_SUB=	yes
 
 CLANGLINK_DESC=	Create clang compiler links if clang is installed
 LLVMLINK_DESC=	Create llvm compiler links if llvm is installed
 PUMP_DESC=	Distribute compilation as well as preprocessing to distcc servers
 
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CONFIGURE_WITH=	avahi
 IPV6_CONFIGURE_ENABLE=	rfc2553
 PUMP_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR}
 PUMP_USES=		python
-PUMP_USE_PYTHON=	flavors
 PUMP_CONFIGURE_ENABLE=	pump-mode
 
 # Leave CCLINKDIR without a leading underscore as it is a variable, which could
 # be set by the user.
 CCLINKDIR?=		libexec/distcc
 _DISTCC_COMPILERS=	CC c++ cc
 
-GNU_COMPILERS=		10 11 12 13 14 15 6
+GNU_COMPILERS=		12 13 14 15 16 6
 _DISTCC_COMPILERS+=	gcc g++ ${GNU_COMPILERS:S|^|g++|} \
 			${GNU_COMPILERS:S|^|gcc|} \
 			${EXTRA_COMPILERS}
 
 .include <bsd.port.options.mk>
 
 .if ${FLAVOR} == gtk
 USES+=		gnome
 USE_GNOME=	gtk30
 CONFIGURE_ARGS+=	--with-gtk
 PLIST_SUB+=	GTK=""
 .else
 PLIST_SUB+=	GTK="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MPUMP}
-.if ${PYTHON_VER} != ${PYTHON_DEFAULT}
-PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
-.endif
-.endif
-
 .if ${PORT_OPTIONS:MCLANGLINK}
-CLANG_COMPILERS=	-devel 11 12 13 14 15 16 17 18 19
+CLANG_COMPILERS=	-devel 11 12 13 14 15 16 17 18 19 20 21
 _DISTCC_COMPILERS+=	clang++ clang ${CLANG_COMPILERS:S|^|clang++|} \
 			${CLANG_COMPILERS:S|^|clang|}
 .endif
 .if ${PORT_OPTIONS:MLLVMLINK}
 _DISTCC_COMPILERS+=	llvm-c++ llvm-g++ llvm-gcc
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${CCLINKDIR}
 .for link in ${_DISTCC_COMPILERS}
 	@${LN} ${STAGEDIR}${PREFIX}/bin/distcc \
 	    ${STAGEDIR}${PREFIX}/${CCLINKDIR}/${link}
 .endfor
 	${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR}/*/__pycache__
 	${RM} -rf ${STAGEDIR}${PREFIX}/${DOCSDIR_REL}/example
 
 post-install-PUMP-on:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/include_server/distcc_pump_c_extensions.cpython-${PYTHON_SUFFIX}.so
 
 .include <bsd.port.post.mk>
diff --git a/devel/distcc/pkg-plist b/devel/distcc/pkg-plist
index 3a640664fc7d..a95e1bcfeba7 100644
--- a/devel/distcc/pkg-plist
+++ b/devel/distcc/pkg-plist
@@ -1,105 +1,107 @@
 bin/distcc
 %%GTK%%bin/distccmon-gnome
 bin/distccmon-text
 bin/lsdistcc
 %%PUMP%%bin/pump
 %%ETCDIR%%/default/distcc
 %%ETCDIR%%/distcc/clients.allow
 %%ETCDIR%%/distcc/commands.allow.sh
 %%ETCDIR%%/distcc/hosts
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server-3.4-py%%PYTHON_VER%%.egg-info/PKG-INFO
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server-3.4-py%%PYTHON_VER%%.egg-info/SOURCES.txt
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server-3.4-py%%PYTHON_VER%%.egg-info/dependency_links.txt
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server-3.4-py%%PYTHON_VER%%.egg-info/top_level.txt
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/basics.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/basics_test.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/c_extensions_test.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/cache_basics.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/compiler_defaults.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/compress_files.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/distcc_pump_c_extensions%%PYTHON_TAG%%.so
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/include_analyzer.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/include_analyzer_memoizing_node.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/include_analyzer_memoizing_node_test.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/include_analyzer_test.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/include_server.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/include_server_test.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/macro_eval.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/macro_eval_test.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/mirror_path.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/mirror_path_test.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/parse_command.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/parse_command_test.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/parse_file.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/parse_file_test.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/run.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/setup.py
 %%PUMP%%%%PYTHON_SITELIBDIR%%/include_server/statistics.py
 libexec/distcc/CC
 libexec/distcc/c++
 libexec/distcc/cc
 %%CLANGLINK%%libexec/distcc/clang
 %%CLANGLINK%%libexec/distcc/clang++
 %%CLANGLINK%%libexec/distcc/clang++-devel
 %%CLANGLINK%%libexec/distcc/clang++11
 %%CLANGLINK%%libexec/distcc/clang++12
 %%CLANGLINK%%libexec/distcc/clang++13
 %%CLANGLINK%%libexec/distcc/clang++14
 %%CLANGLINK%%libexec/distcc/clang++15
 %%CLANGLINK%%libexec/distcc/clang++16
 %%CLANGLINK%%libexec/distcc/clang++17
 %%CLANGLINK%%libexec/distcc/clang++18
 %%CLANGLINK%%libexec/distcc/clang++19
+%%CLANGLINK%%libexec/distcc/clang++20
+%%CLANGLINK%%libexec/distcc/clang++21
 %%CLANGLINK%%libexec/distcc/clang-devel
 %%CLANGLINK%%libexec/distcc/clang11
 %%CLANGLINK%%libexec/distcc/clang12
 %%CLANGLINK%%libexec/distcc/clang13
 %%CLANGLINK%%libexec/distcc/clang14
 %%CLANGLINK%%libexec/distcc/clang15
 %%CLANGLINK%%libexec/distcc/clang16
 %%CLANGLINK%%libexec/distcc/clang17
 %%CLANGLINK%%libexec/distcc/clang18
 %%CLANGLINK%%libexec/distcc/clang19
+%%CLANGLINK%%libexec/distcc/clang20
+%%CLANGLINK%%libexec/distcc/clang21
 libexec/distcc/g++
-libexec/distcc/g++10
-libexec/distcc/g++11
 libexec/distcc/g++12
 libexec/distcc/g++13
 libexec/distcc/g++14
 libexec/distcc/g++15
+libexec/distcc/g++16
 libexec/distcc/g++6
 libexec/distcc/gcc
-libexec/distcc/gcc10
-libexec/distcc/gcc11
 libexec/distcc/gcc12
 libexec/distcc/gcc13
 libexec/distcc/gcc14
 libexec/distcc/gcc15
+libexec/distcc/gcc16
 libexec/distcc/gcc6
 %%LLVMLINK%%libexec/distcc/llvm-c++
 %%LLVMLINK%%libexec/distcc/llvm-g++
 %%LLVMLINK%%libexec/distcc/llvm-gcc
 sbin/distccd
 %%GTK%%share/applications/distccmon-gnome.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.pump
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/protocol-1.txt
 %%PORTDOCS%%%%DOCSDIR%%/protocol-2.txt
 %%PORTDOCS%%%%DOCSDIR%%/protocol-3-impl.txt
 %%PORTDOCS%%%%DOCSDIR%%/protocol-3.txt
 %%PORTDOCS%%%%DOCSDIR%%/protocol-gssapi.txt
 %%PORTDOCS%%%%DOCSDIR%%/reporting-bugs.txt
 %%PORTDOCS%%%%DOCSDIR%%/status-1.txt
 %%PORTDOCS%%%%DOCSDIR%%/survey.txt
 share/man/man1/distcc.1.gz
 share/man/man1/distccd.1.gz
 share/man/man1/distccmon-text.1.gz
 share/man/man1/include_server.1.gz
 share/man/man1/lsdistcc.1.gz
 share/man/man1/pump.1.gz
 %%GTK%%share/pixmaps/distccmon-gnome.png