Index: devel/freebsd-gcc12/Makefile
===================================================================
--- devel/freebsd-gcc12/Makefile
+++ devel/freebsd-gcc12/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gcc
-PORTVERSION=	12.3.0
+DISTVERSION=	12.3.0
 CATEGORIES=	devel
 MASTER_SITES=	GCC
 PKGNAMEPREFIX=	${TARGETARCH}-
@@ -106,36 +106,21 @@
 .endif
 
 PLIST=		${.CURDIR}/pkg-plist
+PLISTARCH=	${TARGETARCH:C/armv[67]/arm_gnueabi/}
+PLIST+=		${.CURDIR}/pkg-plist.${PLISTARCH}
 
-.if ${TARGETARCH} == "aarch64"
-PLIST+=		${.CURDIR}/pkg-plist.aarch64
-.endif
 .if ${TARGETARCH} == "aarch64" || ${TARGETARCH:Marm*}
 PLIST+=		${.CURDIR}/pkg-plist.arm
 .endif
-.if ${TARGETARCH:Marm*}
-PLIST+=		${.CURDIR}/pkg-plist.arm_gnueabi
-.endif
 .if ${TARGETARCH} == "amd64"
-PLIST+=		${.CURDIR}/pkg-plist.amd64
-.endif
-.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 PLIST+=		${.CURDIR}/pkg-plist.i386
 .endif
-.if ${TARGETARCH:Mpowerpc64*}
-PLIST+=		${.CURDIR}/pkg-plist.powerpc64
-.elif ${TARGETARCH:Mpowerpc*}
-PLIST+=		${.CURDIR}/pkg-plist.powerpc
-.endif
-.if ${TARGETARCH:Mriscv*}
-PLIST+=		${.CURDIR}/pkg-plist.riscv
-.endif
 
 post-install:
-	@${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
-	@${RM} ${STAGEDIR}${PREFIX}/share/info/*
-	@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
-	@${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
+	${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
+	${RM} ${STAGEDIR}${PREFIX}/share/info/*
+	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 	# Conflicts with sys/x86/include/float.h
 	${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h
Index: devel/freebsd-gcc12/pkg-plist.riscv
===================================================================
--- /dev/null
+++ devel/freebsd-gcc12/pkg-plist.riscv
@@ -1,4 +0,0 @@
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/riscv/%%OPSYS%%.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/riscv/riscv-opts.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/riscv/riscv-protos.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/riscv/riscv.h
Index: devel/freebsd-gcc9/Makefile
===================================================================
--- devel/freebsd-gcc9/Makefile
+++ devel/freebsd-gcc9/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gcc
-PORTVERSION=	9.5.0
+DISTVERSION=	9.5.0
 PORTREVISION=	11
 CATEGORIES=	devel
 MASTER_SITES=	GCC
@@ -107,42 +107,21 @@
 .endif
 
 PLIST=		${.CURDIR}/pkg-plist
+PLISTARCH=	${TARGETARCH:C/armv[67]/arm_gnueabi/:C/mips.*/mips/}
+PLIST+=		${.CURDIR}/pkg-plist.${PLISTARCH}
 
-.if ${TARGETARCH} == "aarch64"
-PLIST+=		${.CURDIR}/pkg-plist.aarch64
-.endif
 .if ${TARGETARCH} == "aarch64" || ${TARGETARCH:Marm*}
 PLIST+=		${.CURDIR}/pkg-plist.arm
 .endif
-.if ${TARGETARCH:Marm*}
-PLIST+=		${.CURDIR}/pkg-plist.arm_gnueabi
-.endif
 .if ${TARGETARCH} == "amd64"
-PLIST+=		${.CURDIR}/pkg-plist.amd64
-.endif
-.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 PLIST+=		${.CURDIR}/pkg-plist.i386
 .endif
-.if ${TARGETARCH:Mmips*}
-PLIST+=		${.CURDIR}/pkg-plist.mips
-.endif
-.if ${TARGETARCH:Mpowerpc64*}
-PLIST+=		${.CURDIR}/pkg-plist.powerpc64
-.elif ${TARGETARCH:Mpowerpc*}
-PLIST+=		${.CURDIR}/pkg-plist.powerpc
-.endif
-.if ${TARGETARCH:Mriscv*}
-PLIST+=		${.CURDIR}/pkg-plist.riscv
-.endif
-.if ${TARGETARCH} == "sparc64"
-PLIST+=		${.CURDIR}/pkg-plist.sparc64
-.endif
 
 post-install:
-	@${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
-	@${RM} ${STAGEDIR}${PREFIX}/share/info/*
-	@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
-	@${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
+	${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
+	${RM} ${STAGEDIR}${PREFIX}/share/info/*
+	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
 .if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
 	# Conflicts with sys/x86/include/float.h
 	${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h
Index: devel/freebsd-gcc9/pkg-plist.riscv
===================================================================
--- /dev/null
+++ devel/freebsd-gcc9/pkg-plist.riscv
@@ -1,4 +0,0 @@
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/riscv/%%OPSYS%%.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/riscv/riscv-opts.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/riscv/riscv-protos.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/riscv/riscv.h