diff --git a/lang/nim/Makefile b/lang/nim/Makefile
index bf2ca8375e75..c4bb97383e8c 100644
--- a/lang/nim/Makefile
+++ b/lang/nim/Makefile
@@ -1,107 +1,94 @@
 PORTNAME=	nim
 DISTVERSION=	2.0.2
 CATEGORIES=	lang
 MASTER_SITES=	https://nim-lang.org/download/
 
 MAINTAINER=	ports@nicandneal.net
 COMMENT=	Nim programming language
 WWW=		https://nim-lang.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/copying.txt
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 TEST_DEPENDS=	node18>=0:www/node
 
 USES=		compiler:c11 cpe tar:xz
 CPE_VENDOR=	nim-lang
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		DOCS TOOLS
 OPTIONS_DEFAULT=	TOOLS
 OPTIONS_EXCLUDE_powerpc64=	DOCS
 OPTIONS_SUB=		yes
 
 TOOLS_DESC=	Build and install nim tools, not including nimble nor nimfind
 
 TEST_BINARY_ALIAS=	node=nodejs
 
 .include <bsd.port.pre.mk>
 
 TLIST=		nimgrep nimpretty nimsuggest testament
 
-.if ${CHOSEN_COMPILER_TYPE} == "gcc"
-EXTRA_PATCHES=	${PATCHDIR}/elfv1-patch-build.sh
-.else
-EXTRA_PATCHES=	${PATCHDIR}/clang-patch-build.sh
-.endif
-
 NIMDIR=	${STAGEDIR}${PREFIX}/nim
 
-post-patch:
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv1
-	@${REINPLACE_CMD} -e '/cc =/s/clang/gcc/' ${WRKSRC}/config/nim.cfg
-	@${REINPLACE_CMD} -e s/%%GCC_DEFAULT%%/${GCC_DEFAULT}/ \
-		${WRKSRC}/build.sh ${WRKSRC}/config/nim.cfg
-.endif
-
 do-build:
 	cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \
 		COMP_FLAGS="${CPPFLAGS} ${CFLAGS}" LINK_FLAGS="${LDFLAGS}" \
 		${SH} build.sh
 	cd ${WRKSRC} && bin/nim c --parallelBuild=${MAKE_JOBS_NUMBER} \
 		--nimcache=${WRKDIR}/nimcache -d:release koch
 	cd ${WRKSRC} && ./koch boot --parallelBuild=${MAKE_JOBS_NUMBER} \
 		-d:release --nimcache=${WRKDIR}/nimcache
 	cd ${WRKSRC} && bin/nim c --parallelBuild=${MAKE_JOBS_NUMBER} \
 		-d:release --nimcache=${WRKDIR}/nimcache --app:lib \
 		-d:createNimRtl lib/nimrtl.nim
 
 do-build-DOCS-on:
 	cd ${WRKSRC} && ./koch --localdocs docs \
 		-d:release --nimcache=${WRKDIR}/nimcache --docCmd=skip
 
 do-build-TOOLS-on:
 	cd ${WRKSRC} && ./koch tools --parallelBuild=${MAKE_JOBS_NUMBER} \
 		-d:release --nimcache=${WRKSRC}/nimcache
 
 do-install:
 	${MKDIR} ${NIMDIR}
 	${MKDIR} ${NIMDIR}/bin
 	# Install nim compiler
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${NIMDIR}/bin
 	${STRIP_CMD} ${NIMDIR}/bin/nim
 	# Install lib nim rtl
 	${MKDIR} ${NIMDIR}/lib
 	${INSTALL_LIB} ${WRKSRC}/lib/libnimrtl.so ${NIMDIR}/lib
 	# Install nim lib files
 	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${NIMDIR}/lib "! -name libnimrtl.so")
 	${MKDIR} ${NIMDIR}/lib/compiler
 	(cd ${WRKSRC}/compiler && ${COPYTREE_SHARE} . ${NIMDIR}/lib/compiler "! -name nim ! -name nim1")
 	(cd ${WRKSRC}/dist/checksums && ${COPYTREE_SHARE} . ${NIMDIR}/lib/dist/checksums)
 	# Configuration files
 	${MKDIR} ${NIMDIR}/config
 .for file in nim.cfg nimdoc.cfg nimdoc.tex.cfg
 	${INSTALL_DATA} ${WRKSRC}/config/${file} ${NIMDIR}/config
 .endfor
 
 do-install-DOCS-on:
 	${FIND} ${WRKSRC}/doc -name "*.idx" -delete
 	${MKDIR} ${NIMDIR}/doc
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${NIMDIR}/doc)
 	${MKDIR} ${NIMDIR}/tools/dochack
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/dochack/dochack.nim ${NIMDIR}/tools/dochack
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/dochack/dochack.js ${NIMDIR}/tools/dochack
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/dochack/fuzzysearch.nim ${NIMDIR}/tools/dochack
 
 do-install-TOOLS-on:
 .for t in ${TLIST}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${t} ${NIMDIR}/bin
 .endfor
 
 do-test:
 	cd ${WRKSRC} && ${SETENV} ./koch test all -d:release \
 	--nimcache=${WRKDIR}/nimcache --putenv:"PATH=${PATH}"
 
 .include <bsd.port.post.mk>
diff --git a/lang/nim/files/elfv1-patch-build.sh b/lang/nim/files/elfv1-patch-build.sh
deleted file mode 100644
index 556eedaca8e1..000000000000
--- a/lang/nim/files/elfv1-patch-build.sh
+++ /dev/null
@@ -1,25 +0,0 @@
---- build.sh.orig	2019-10-24 12:53:39 UTC
-+++ build.sh
-@@ -84,7 +84,11 @@
-     ;;
-   *freebsd* )
-     myos="freebsd"
--    CC="clang"
-+    if [ "$ucpu" = "powerpc" ] ; then
-+      CC="gcc%%GCC_DEFAULT%%"
-+	else
-+      CC="clang"
-+    fi
-     LINK_FLAGS="$LINK_FLAGS -lm"
-     ;;
-   *openbsd* )
---- config/nim.cfg.orig	2020-09-15 13:59:31 UTC
-+++ config/nim.cfg
-@@ -9,6 +9,7 @@
- #  gcc.path %= "$CC_PATH"
- 
- cc = gcc
-+gcc.exe = "gcc%%GCC_DEFAULT%%"
- 
- # additional options always passed to the compiler:
- --parallel_build: "0" # 0 to auto-detect number of processors
diff --git a/lang/nim/files/clang-patch-build.sh b/lang/nim/files/patch-build.sh
similarity index 100%
rename from lang/nim/files/clang-patch-build.sh
rename to lang/nim/files/patch-build.sh