diff --git a/cad/ghdl/Makefile b/cad/ghdl/Makefile
index da98a6dc1271..0ed4eb7784fd 100644
--- a/cad/ghdl/Makefile
+++ b/cad/ghdl/Makefile
@@ -1,66 +1,61 @@
 PORTNAME=	ghdl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.0.0
+DISTVERSION=	4.1.0
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	GNU VHDL simulator
 WWW=		https://github.com/ghdl/ghdl
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.md
 
 BROKEN_aarch64=	build breaks, see https://github.com/ghdl/ghdl/issues/2639
 
 TEST_DEPENDS=	bash:shells/bash \
 		${PYTHON_PKGNAMEPREFIX}pyTooling>=2.11.0:devel/py-pyTooling@${PY_FLAVOR}
 
 USES=		ada:run gmake python:test shebangfix
 SHEBANG_FILES=	testsuite/testsuite.sh
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
 
-LLVMVER=	15 # last supported version, see https://github.com/ghdl/ghdl/blob/master/configure#L317
-
 OPTIONS_DEFINE=		SYNTH
 OPTIONS_SINGLE=		BACKEND
 OPTIONS_SINGLE_BACKEND=	MCODE LLVM
 OPTIONS_DEFAULT=	LLVM SYNTH
 OPTIONS_SUB=		yes
 
 MCODE_DESC=		Use the MCODE backend
 # MCODE is enabled by default and doesn't require any configuration options
 
-LLVM_DESC=		Code generator is LLVM
-LLVM_USES=		ncurses
-LLVM_CONFIGURE_ON=	--with-llvm-config=${LOCALBASE}/bin/llvm-config${LLVMVER}
-LLVM_BUILD_DEPENDS=	llvm-config${LLVMVER}:devel/llvm${LLVMVER}
-LLVM_RUN_DEPENDS=	llc${LLVMVER}:devel/llvm${LLVMVER}
+LLVM_USES=		llvm:15,lib ncurses
+LLVM_CONFIGURE_ON=	--with-llvm-config=${LOCALBASE}/bin/llvm-config${LLVM_VERSION}
 
 SYNTH_DESC=		Enable Synthesis Features in ghdl
 SYNTH_CONFIGURE_ON=	--enable-synth
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libghdl-4_0_0.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libghdl-${DISTVERSION:S/./_/g}.so
 
 post-install-MCODE-on:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/bin/ghdl \
 		${STAGEDIR}${PREFIX}/lib/libghdlvpi.so
 
 post-install-LLVM-on:
 	@${STRIP_CMD} \
 		${STAGEDIR}${PREFIX}/bin/ghdl \
 		${STAGEDIR}${PREFIX}/bin/ghwdump \
 		${STAGEDIR}${PREFIX}/bin/ghdl1-llvm \
 		${STAGEDIR}${PREFIX}/lib/libghdlvpi.so \
 		${STAGEDIR}${PREFIX}/lib/libghw.so
 
 do-test:
 	@cd ${WRKSRC}/testsuite && \
 		${SETENV} ${MAKE_ENV} GHDL=${STAGEDIR}${PREFIX}/bin/ghdl ${SH} testsuite.sh
 
 .include <bsd.port.mk>
diff --git a/cad/ghdl/distinfo b/cad/ghdl/distinfo
index c471a49afd80..a07abc1b7294 100644
--- a/cad/ghdl/distinfo
+++ b/cad/ghdl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709785110
-SHA256 (ghdl-ghdl-v4.0.0_GH0.tar.gz) = 97c88b36b73e7b5086366c1dd49a4224f3b200142b60c005305fc5c8a835740c
-SIZE (ghdl-ghdl-v4.0.0_GH0.tar.gz) = 7683124
+TIMESTAMP = 1716623048
+SHA256 (ghdl-ghdl-v4.1.0_GH0.tar.gz) = 0aab531b45a6613b0918f3ac6ec717b8acfad051d1abb1c39eb7490590c7a324
+SIZE (ghdl-ghdl-v4.1.0_GH0.tar.gz) = 7704716
diff --git a/cad/ghdl/pkg-plist b/cad/ghdl/pkg-plist
index 3a0cb1796f1b..8e71496ee3d6 100644
--- a/cad/ghdl/pkg-plist
+++ b/cad/ghdl/pkg-plist
@@ -1,207 +1,207 @@
 bin/ghdl
 %%LLVM%%bin/ghdl1-llvm
 bin/ghwdump
 include/ghdl/libghw.h
 include/ghdl/vhpi_user.h
 include/ghdl/vpi_user.h
 %%SYNTH%%include/ghdl/synth.h
 %%SYNTH%%include/ghdl/synth_gates.h
 lib/ghdl/ansi_color.sh
-lib/libghdl-4_0_0.so
+lib/libghdl-4_1_0.so
 lib/libghdl.a
 lib/libghdl.link
 %%LLVM%%lib/ghdl/grt-exec.lst
 %%LLVM%%lib/ghdl/grt-shared.lst
 %%LLVM%%lib/ghdl/grt.lst
 %%LLVM%%lib/ghdl/grt.ver
 %%LLVM%%lib/ghdl/ieee/v08/fixed_float_types.o
 %%LLVM%%lib/ghdl/ieee/v08/fixed_generic_pkg-body.o
 %%LLVM%%lib/ghdl/ieee/v08/fixed_generic_pkg.o
 %%LLVM%%lib/ghdl/ieee/v08/fixed_pkg.o
 %%LLVM%%lib/ghdl/ieee/v08/float_generic_pkg-body.o
 %%LLVM%%lib/ghdl/ieee/v08/float_generic_pkg.o
 %%LLVM%%lib/ghdl/ieee/v08/float_pkg.o
 lib/ghdl/ieee/v08/ieee-obj08.cf
 %%LLVM%%lib/ghdl/ieee/v08/ieee_bit_context.o
 %%LLVM%%lib/ghdl/ieee/v08/ieee_std_context.o
 %%LLVM%%lib/ghdl/ieee/v08/math_complex-body.o
 %%LLVM%%lib/ghdl/ieee/v08/math_complex.o
 %%LLVM%%lib/ghdl/ieee/v08/math_real-body.o
 %%LLVM%%lib/ghdl/ieee/v08/math_real.o
 %%LLVM%%lib/ghdl/ieee/v08/memory_b.o
 %%LLVM%%lib/ghdl/ieee/v08/memory_p.o
 %%LLVM%%lib/ghdl/ieee/v08/numeric_bit-body.o
 %%LLVM%%lib/ghdl/ieee/v08/numeric_bit.o
 %%LLVM%%lib/ghdl/ieee/v08/numeric_bit_unsigned-body.o
 %%LLVM%%lib/ghdl/ieee/v08/numeric_bit_unsigned.o
 %%LLVM%%lib/ghdl/ieee/v08/numeric_std-body.o
 %%LLVM%%lib/ghdl/ieee/v08/numeric_std.o
 %%LLVM%%lib/ghdl/ieee/v08/numeric_std_unsigned-body.o
 %%LLVM%%lib/ghdl/ieee/v08/numeric_std_unsigned.o
 %%LLVM%%lib/ghdl/ieee/v08/prmtvs_b.o
 %%LLVM%%lib/ghdl/ieee/v08/prmtvs_p.o
 %%LLVM%%lib/ghdl/ieee/v08/std_logic_1164-body.o
 %%LLVM%%lib/ghdl/ieee/v08/std_logic_1164.o
 %%LLVM%%lib/ghdl/ieee/v08/std_logic_arith.o
 %%LLVM%%lib/ghdl/ieee/v08/std_logic_misc-body.o
 %%LLVM%%lib/ghdl/ieee/v08/std_logic_misc.o
 %%LLVM%%lib/ghdl/ieee/v08/std_logic_signed.o
 %%LLVM%%lib/ghdl/ieee/v08/std_logic_textio.o
 %%LLVM%%lib/ghdl/ieee/v08/std_logic_unsigned.o
 %%LLVM%%lib/ghdl/ieee/v08/timing_b.o
 %%LLVM%%lib/ghdl/ieee/v08/timing_p.o
 %%LLVM%%lib/ghdl/ieee/v08/upf-body.o
 %%LLVM%%lib/ghdl/ieee/v08/upf.o
 lib/ghdl/ieee/v87/ieee-obj87.cf
 %%LLVM%%lib/ghdl/ieee/v87/numeric_bit-body.o
 %%LLVM%%lib/ghdl/ieee/v87/numeric_bit.o
 %%LLVM%%lib/ghdl/ieee/v87/numeric_std-body.o
 %%LLVM%%lib/ghdl/ieee/v87/numeric_std.o
 %%LLVM%%lib/ghdl/ieee/v87/std_logic_1164-body.o
 %%LLVM%%lib/ghdl/ieee/v87/std_logic_1164.o
 %%LLVM%%lib/ghdl/ieee/v87/std_logic_arith.o
 %%LLVM%%lib/ghdl/ieee/v87/std_logic_misc-body.o
 %%LLVM%%lib/ghdl/ieee/v87/std_logic_misc.o
 %%LLVM%%lib/ghdl/ieee/v87/std_logic_signed.o
 %%LLVM%%lib/ghdl/ieee/v87/std_logic_textio.o
 %%LLVM%%lib/ghdl/ieee/v87/std_logic_unsigned.o
 %%LLVM%%lib/ghdl/ieee/v87/upf-body.o
 %%LLVM%%lib/ghdl/ieee/v87/upf.o
 %%LLVM%%lib/ghdl/ieee/v87/vital_primitives-body.o
 %%LLVM%%lib/ghdl/ieee/v87/vital_primitives.o
 %%LLVM%%lib/ghdl/ieee/v87/vital_timing-body.o
 %%LLVM%%lib/ghdl/ieee/v87/vital_timing.o
 lib/ghdl/ieee/v93/ieee-obj93.cf
 %%LLVM%%lib/ghdl/ieee/v93/math_complex-body.o
 %%LLVM%%lib/ghdl/ieee/v93/math_complex.o
 %%LLVM%%lib/ghdl/ieee/v93/math_real-body.o
 %%LLVM%%lib/ghdl/ieee/v93/math_real.o
 %%LLVM%%lib/ghdl/ieee/v93/memory_b.o
 %%LLVM%%lib/ghdl/ieee/v93/memory_p.o
 %%LLVM%%lib/ghdl/ieee/v93/numeric_bit-body.o
 %%LLVM%%lib/ghdl/ieee/v93/numeric_bit.o
 %%LLVM%%lib/ghdl/ieee/v93/numeric_std-body.o
 %%LLVM%%lib/ghdl/ieee/v93/numeric_std.o
 %%LLVM%%lib/ghdl/ieee/v93/prmtvs_b.o
 %%LLVM%%lib/ghdl/ieee/v93/prmtvs_p.o
 %%LLVM%%lib/ghdl/ieee/v93/std_logic_1164-body.o
 %%LLVM%%lib/ghdl/ieee/v93/std_logic_1164.o
 %%LLVM%%lib/ghdl/ieee/v93/std_logic_arith.o
 %%LLVM%%lib/ghdl/ieee/v93/std_logic_misc-body.o
 %%LLVM%%lib/ghdl/ieee/v93/std_logic_misc.o
 %%LLVM%%lib/ghdl/ieee/v93/std_logic_signed.o
 %%LLVM%%lib/ghdl/ieee/v93/std_logic_textio.o
 %%LLVM%%lib/ghdl/ieee/v93/std_logic_unsigned.o
 %%LLVM%%lib/ghdl/ieee/v93/timing_b.o
 %%LLVM%%lib/ghdl/ieee/v93/timing_p.o
 %%LLVM%%lib/ghdl/ieee/v93/upf-body.o
 %%LLVM%%lib/ghdl/ieee/v93/upf.o
 %%LLVM%%lib/ghdl/libgrt.a
 lib/ghdl/src/ieee/math_complex-body.vhdl
 lib/ghdl/src/ieee/math_complex.vhdl
 lib/ghdl/src/ieee/math_real-body.vhdl
 lib/ghdl/src/ieee/math_real.vhdl
 lib/ghdl/src/ieee/v87/numeric_bit-body.vhdl
 lib/ghdl/src/ieee/v87/numeric_bit.vhdl
 lib/ghdl/src/ieee/v87/numeric_std-body.vhdl
 lib/ghdl/src/ieee/v87/numeric_std.vhdl
 lib/ghdl/src/ieee/v87/std_logic_1164-body.vhdl
 lib/ghdl/src/ieee/v87/std_logic_1164.vhdl
 lib/ghdl/src/ieee/v93/numeric_bit-body.vhdl
 lib/ghdl/src/ieee/v93/numeric_bit.vhdl
 lib/ghdl/src/ieee/v93/numeric_std-body.vhdl
 lib/ghdl/src/ieee/v93/numeric_std.vhdl
 lib/ghdl/src/ieee/v93/std_logic_1164-body.vhdl
 lib/ghdl/src/ieee/v93/std_logic_1164.vhdl
 lib/ghdl/src/ieee2008/LICENSE
 lib/ghdl/src/ieee2008/fixed_float_types.vhdl
 lib/ghdl/src/ieee2008/fixed_generic_pkg-body.vhdl
 lib/ghdl/src/ieee2008/fixed_generic_pkg.vhdl
 lib/ghdl/src/ieee2008/fixed_pkg.vhdl
 lib/ghdl/src/ieee2008/float_generic_pkg-body.vhdl
 lib/ghdl/src/ieee2008/float_generic_pkg.vhdl
 lib/ghdl/src/ieee2008/float_pkg.vhdl
 lib/ghdl/src/ieee2008/ieee_bit_context.vhdl
 lib/ghdl/src/ieee2008/ieee_std_context.vhdl
 lib/ghdl/src/ieee2008/math_complex-body.vhdl
 lib/ghdl/src/ieee2008/math_complex.vhdl
 lib/ghdl/src/ieee2008/math_real-body.vhdl
 lib/ghdl/src/ieee2008/math_real.vhdl
 lib/ghdl/src/ieee2008/numeric_bit-body.vhdl
 lib/ghdl/src/ieee2008/numeric_bit.vhdl
 lib/ghdl/src/ieee2008/numeric_bit_unsigned-body.vhdl
 lib/ghdl/src/ieee2008/numeric_bit_unsigned.vhdl
 lib/ghdl/src/ieee2008/numeric_std-body.vhdl
 lib/ghdl/src/ieee2008/numeric_std.vhdl
 lib/ghdl/src/ieee2008/numeric_std_unsigned-body.vhdl
 lib/ghdl/src/ieee2008/numeric_std_unsigned.vhdl
 lib/ghdl/src/ieee2008/std_logic_1164-body.vhdl
 lib/ghdl/src/ieee2008/std_logic_1164.vhdl
 lib/ghdl/src/ieee2008/std_logic_textio.vhdl
 lib/ghdl/src/std/env-body.vhdl
 lib/ghdl/src/std/env.vhdl
 lib/ghdl/src/std/v08/standard.vhdl
 lib/ghdl/src/std/v08/textio-body.vhdl
 lib/ghdl/src/std/v08/textio.vhdl
 lib/ghdl/src/std/v87/standard.vhdl
 lib/ghdl/src/std/v87/textio-body.vhdl
 lib/ghdl/src/std/v87/textio.vhdl
 lib/ghdl/src/std/v93/standard.vhdl
 lib/ghdl/src/std/v93/textio-body.vhdl
 lib/ghdl/src/std/v93/textio.vhdl
 lib/ghdl/src/synopsys/std_logic_arith.vhdl
 lib/ghdl/src/synopsys/std_logic_misc-body.vhdl
 lib/ghdl/src/synopsys/std_logic_misc.vhdl
 lib/ghdl/src/synopsys/std_logic_signed.vhdl
 lib/ghdl/src/synopsys/std_logic_textio.vhdl
 lib/ghdl/src/synopsys/std_logic_unsigned.vhdl
 lib/ghdl/src/synopsys/v08/std_logic_misc-body.vhdl
 lib/ghdl/src/synopsys/v08/std_logic_misc.vhdl
 lib/ghdl/src/upf/upf-body.vhdl
 lib/ghdl/src/upf/upf.vhdl
 lib/ghdl/src/vital2000/memory_b.vhdl
 lib/ghdl/src/vital2000/memory_p.vhdl
 lib/ghdl/src/vital2000/prmtvs_b.vhdl
 lib/ghdl/src/vital2000/prmtvs_p.vhdl
 lib/ghdl/src/vital2000/timing_b.vhdl
 lib/ghdl/src/vital2000/timing_p.vhdl
 lib/ghdl/src/vital95/vital_primitives-body.vhdl
 lib/ghdl/src/vital95/vital_primitives.vhdl
 lib/ghdl/src/vital95/vital_timing-body.vhdl
 lib/ghdl/src/vital95/vital_timing.vhdl
 %%LLVM%%lib/ghdl/std/v08/env-body.o
 %%LLVM%%lib/ghdl/std/v08/env.o
 lib/ghdl/std/v08/std-obj08.cf
 %%LLVM%%lib/ghdl/std/v08/std_standard.o
 %%LLVM%%lib/ghdl/std/v08/textio-body.o
 %%LLVM%%lib/ghdl/std/v08/textio.o
 lib/ghdl/std/v87/std-obj87.cf
 %%LLVM%%lib/ghdl/std/v87/std_standard.o
 %%LLVM%%lib/ghdl/std/v87/textio-body.o
 %%LLVM%%lib/ghdl/std/v87/textio.o
 lib/ghdl/std/v93/std-obj93.cf
 %%LLVM%%lib/ghdl/std/v93/std_standard.o
 %%LLVM%%lib/ghdl/std/v93/textio-body.o
 %%LLVM%%lib/ghdl/std/v93/textio.o
 lib/ghdl/vendors/README.md
 lib/ghdl/vendors/compile-altera.ps1
 lib/ghdl/vendors/compile-altera.sh
 lib/ghdl/vendors/compile-intel.ps1
 lib/ghdl/vendors/compile-intel.sh
 lib/ghdl/vendors/compile-lattice.ps1
 lib/ghdl/vendors/compile-lattice.sh
 lib/ghdl/vendors/compile-osvvm.ps1
 lib/ghdl/vendors/compile-osvvm.sh
 lib/ghdl/vendors/compile-uvvm.ps1
 lib/ghdl/vendors/compile-uvvm.sh
 lib/ghdl/vendors/compile-xilinx-ise.ps1
 lib/ghdl/vendors/compile-xilinx-ise.sh
 lib/ghdl/vendors/compile-xilinx-vivado.ps1
 lib/ghdl/vendors/compile-xilinx-vivado.sh
 lib/ghdl/vendors/config.psm1
 lib/ghdl/vendors/config.sh
 lib/ghdl/vendors/filter.analyze.sh
 lib/ghdl/vendors/shared.psm1
 lib/ghdl/vendors/shared.sh
 lib/libghdlvpi.so
 lib/libghw.so