lang/gnatdroid-binutils-x86: Attempt to fix build on i386

This should fix i386 pkg-plist check failures, but I haven't tested
it due to not having access to FreeBSD i386 at this moment.

2 files changed, 41 insertions, 39 deletions

diff --git a/lang/gnatdroid-binutils-x86/Makefile b/lang/gnatdroid-binutils-x86/Makefile
index 1ebf21f14688..de1d74bb3e58 100644
--- a/lang/gnatdroid-binutils-x86/Makefile
+++ b/lang/gnatdroid-binutils-x86/Makefile
@@ -15,4 +15,6 @@ MASTERDIR=	${.CURDIR}/../../lang/gnatdroid-binutils
 PLIST=		${.CURDIR}/pkg-plist
 DESCR=		${.CURDIR}/pkg-descr
 
+PLIST_SUB=	AMD64=${ARCH:S/i386/"@comment "/:S/${ARCH}/""/}
+
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/gnatdroid-binutils-x86/pkg-plist b/lang/gnatdroid-binutils-x86/pkg-plist
index ab0740ba6754..0c6675a6e780 100644
--- a/lang/gnatdroid-binutils-x86/pkg-plist
+++ b/lang/gnatdroid-binutils-x86/pkg-plist
@@ -49,45 +49,45 @@
 %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.xsw
 %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.xu
 %%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_i386.xw
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.x
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xbn
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xc
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xd
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xdc
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xdw
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xn
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xr
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xs
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xsc
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xsw
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xu
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xw
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.x
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xbn
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xc
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xd
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xdc
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xdw
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xn
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xr
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xs
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xsc
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xsw
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xu
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xw
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.x
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xbn
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xc
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xd
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xdc
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xdw
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xn
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xr
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xs
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xsc
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xsw
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xu
-%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xw
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.x
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xbn
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xc
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xd
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xdc
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xdw
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xn
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xr
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xs
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xsc
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xsw
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xu
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_k1om.xw
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.x
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xbn
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xc
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xd
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xdc
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xdw
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xn
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xr
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xs
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xsc
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xsw
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xu
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_l1om.xw
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.x
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xbn
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xc
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xd
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xdc
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xdw
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xn
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xr
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xs
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xsc
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xsw
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xu
+%%AMD64%%%%BRANCH2%%/%%TARGET%%/lib/ldscripts/elf_x86_64.xw
 %%BRANCH2%%/%%TARGET%%/lib/ldscripts/i386linux.x
 %%BRANCH2%%/%%TARGET%%/lib/ldscripts/i386linux.xbn
 %%BRANCH2%%/%%TARGET%%/lib/ldscripts/i386linux.xn