Index: base/binutils/Makefile
===================================================================
--- base/binutils/Makefile
+++ base/binutils/Makefile
@@ -8,7 +8,7 @@
 COMMENT=	GNU binary tools for base
 
 MASTERDIR=	${.CURDIR}/../../devel/binutils
-PLIST=		${.CURDIR}/pkg-plist.${ARCH}
+PLIST=		${.CURDIR}/pkg-plist
 
 .if !defined(CROSS_TOOLCHAIN)
 .error Please define CROSS_TOOLCHAIN before building
@@ -24,3 +24,25 @@
 PREFIX=	/usr
 
 .include "${MASTERDIR}/Makefile"
+
+.if ${OSVERSION} >= 1100100
+PLIST_SUB+=	OBJCOPY="@comment "
+.else
+PLIST_SUB+=	OBJCOPY=""
+.endif
+
+.if ${ARCH:Mmips*}
+PLIST_SUB+=	MIPS=""
+.else
+PLIST_SUB+=	MIPS="@comment "
+.endif
+.if ${ARCH:Mpowerpc*}
+PLIST_SUB+=	POWERPC=""
+.else
+PLIST_SUB+=	POWERPC="@comment "
+.endif
+.if ${ARCH:Msparc*}
+PLIST_SUB+=	SPARC=""
+.else
+PLIST_SUB+=	SPARC="@comment "
+.endif