diff --git a/cad/libredwg/Makefile b/cad/libredwg/Makefile
index 73f5f74f84c4..9fc82518d7b6 100644
--- a/cad/libredwg/Makefile
+++ b/cad/libredwg/Makefile
@@ -1,76 +1,67 @@
 PORTNAME=	libredwg
 PORTVERSION=	0.12.4
 CATEGORIES=	cad devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Library and command line tools to handle DWG files
 WWW=		https://www.gnu.org/software/libredwg/
 
 LICENSE=	GPLv3+
 
-USES=		compiler cpe libtool tar:xz
+USES=		cpe libtool tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-trace --with-perl-install=no
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 CPE_VENDOR=	gnu
 
 INFO=		LibreDWG
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 PORTEXAMPLES=	dwgadd.example
 
 OPTIONS_DEFINE=	DOCS EXAMPLES PCRE PSLIB PYTHON
 OPTIONS_DEFAULT=	PCRE PSLIB
 OPTIONS_SUB=	yes
 PCRE_DESC=	Regular expressions support in dwggrep
 PSLIB_DESC=	PostScript export support (dwg2ps)
 
 PCRE_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 PCRE_USES=		localbase
 PCRE_CONFIGURE_ENV_OFF=	ac_cv_lib_pcre2_8_pcre2_config_8=no
 
 PSLIB_LIB_DEPENDS=	libps.so:print/pslib
 PSLIB_USES=		localbase
 PSLIB_CONFIGURE_ENV_OFF=	ac_cv_lib_ps_PS_open_file=no
 
 PYTHON_BUILD_DEPENDS=	swig:devel/swig
 PYTHON_USES=		gettext-runtime python:3.6+ shebangfix
 PYTHON_CONFIGURE_OFF=	--disable-python
 PYTHON_PORTEXAMPLES=	load_dwg.py
 PYTHON_VARS=		SHEBANG_FILES+=examples/load_dwg.py
 
-.include <bsd.port.pre.mk>
-
-.if ${COMPILER_VERSION} < 150 && ${ARCH:Mpowerpc64*}
-LLVM_VER=       15
-BUILD_DEPENDS+=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
-CC=		${LOCALBASE}/bin/clang${LLVM_VER}
-CXX=		${LOCALBASE}/bin/clang++${LLVM_VER}
-.endif
-
 post-patch:
 # XXX: switch the order of #include's to unbreak on powerpc/sparc64
 # which are still based on gcc-4.2.1 (should be no-op elsewhere)
 	@${REINPLACE_CMD} -e '/#include "com/ { x; s/^/#include <stdlib.h>/; \
 		G; }; 24d' ${WRKSRC}/src/common.c
 # Get rid of bashisms
 	@${REINPLACE_CMD} -e '/GPERF_VER/s,:2:1,##*.,' ${WRKSRC}/configure
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-PYTHON-on:
 	${CHMOD} +x ${STAGEDIR}${PREFIX}/share/load_dwg.py
 
 post-install-PYTHON-off:
 	${RM} ${STAGEDIR}${PREFIX}/share/load_dwg.py
 
 post-stage:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${MV} ${PORTEXAMPLES:S|^|${STAGEDIR}${PREFIX}/share/|} \
 		${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/libredwg/files/patch-examples_Makefile.in b/cad/libredwg/files/patch-examples_Makefile.in
new file mode 100644
index 000000000000..9dc1b31febd7
--- /dev/null
+++ b/cad/libredwg/files/patch-examples_Makefile.in
@@ -0,0 +1,12 @@
+--- examples/Makefile.in.orig	2021-03-18 08:57:40 UTC
++++ examples/Makefile.in
+@@ -90,8 +90,7 @@ host_triplet = @host@
+ build_triplet = @build@
+ host_triplet = @host@
+ @USE_WRITE_TRUE@bin_PROGRAMS = dwgadd$(EXEEXT)
+-check_PROGRAMS = load_dwg$(EXEEXT) dwg2svg2$(EXEEXT) dwgfuzz$(EXEEXT) \
+-	llvmfuzz_standalone$(EXEEXT)
++check_PROGRAMS = load_dwg$(EXEEXT) dwg2svg2$(EXEEXT)
+ EXTRA_PROGRAMS = unknown$(EXEEXT) bd$(EXEEXT) bits$(EXEEXT) \
+ 	llvmfuzz$(EXEEXT)
+ @ENABLE_GCOV_TRUE@am__append_1 = @GCOV_CFLAGS@