Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -13455,3 +13455,17 @@
 www/p5-WWW-Mechanize-PhantomJS||2019-11-02|Has expired: uses expired lang/phantomjs
 x11/xfwp||2019-11-06|Has expired: Deprecated upstream
 x11/xfindproxy||2019-11-06|Has expired: Deprecated upstream
+devel/aarch64-binutils|devel/binutils@aarch64|2019-11-05|Moved to a flavored version
+devel/aarch64-none-elf-binutils|devel/binutils@aarch64_none_elf|2019-11-05|Moved to a flavored version
+devel/amd64-binutils|devel/binutils@amd64|2019-11-05|Moved to a flavored version
+devel/arm-gnueabi-binutils|devel/binutils@arm_gnueabi|2019-11-05|Moved to a flavored version
+devel/arm-none-eabi-binutils|devel/binutils@arm_none_eabi|2019-11-05|Moved to a flavored version
+devel/avr-binutils|devel/binutils@avr|2019-11-05|Moved to a flavored version
+devel/i386-binutils|devel/binutils@i386|2019-11-05|Moved to a flavored version
+devel/mingw32-binutils|devel/binutils@mingw32|2019-11-05|Moved to a flavored version
+devel/mips-binutils|devel/binutils@mips|2019-11-05|Moved to a flavored version
+devel/mips64-binutils|devel/binutils@mips64|2019-11-05|Moved to a flavored version
+devel/powerpc64-binutils|devel/binutils@powerpc64|2019-11-05|Moved to a flavored version
+devel/riscv64-binutils|devel/binutils@riscv64|2019-11-05|Moved to a flavored version
+devel/s390x-binutils|devel/binutils@s390x|2019-11-05|Moved to a flavored version
+devel/sparc64-binutils|devel/binutils@sparc64|2019-11-05|Moved to a flavored version
Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -90,9 +90,7 @@
     SUBDIR += RStudio
     SUBDIR += SpecTcl
     SUBDIR += aap
-    SUBDIR += aarch64-binutils
     SUBDIR += aarch64-gcc
-    SUBDIR += aarch64-none-elf-binutils
     SUBDIR += aarch64-none-elf-gcc
     SUBDIR += aarch64-xtoolchain-gcc
     SUBDIR += abi-compliance-checker
@@ -112,7 +110,6 @@
     SUBDIR += allegro
     SUBDIR += allegro-devel
     SUBDIR += alog
-    SUBDIR += amd64-binutils
     SUBDIR += amd64-gcc
     SUBDIR += amd64-xtoolchain-gcc
     SUBDIR += amqp-cpp
@@ -159,8 +156,6 @@
     SUBDIR += args
     SUBDIR += argtable
     SUBDIR += arm-elf-binutils
-    SUBDIR += arm-gnueabi-binutils
-    SUBDIR += arm-none-eabi-binutils
     SUBDIR += arm-none-eabi-gcc
     SUBDIR += arm-none-eabi-gcc492
     SUBDIR += arm-none-eabi-gdb
@@ -192,7 +187,6 @@
     SUBDIR += avalon-framework
     SUBDIR += avarice
     SUBDIR += avce00
-    SUBDIR += avr-binutils
     SUBDIR += avr-gcc
     SUBDIR += avr-gdb
     SUBDIR += avr-libc
@@ -984,7 +978,6 @@
     SUBDIR += hub
     SUBDIR += hwloc
     SUBDIR += hyperscan
-    SUBDIR += i386-binutils
     SUBDIR += i386-gcc
     SUBDIR += i386-xtoolchain-gcc
     SUBDIR += ice
@@ -1547,7 +1540,6 @@
     SUBDIR += mime
     SUBDIR += mimir
     SUBDIR += mingw32-bin-msvcrt
-    SUBDIR += mingw32-binutils
     SUBDIR += mingw32-directx
     SUBDIR += mingw32-gcc
     SUBDIR += mingw32-libffi
@@ -1556,10 +1548,8 @@
     SUBDIR += mingw32-pdcurses
     SUBDIR += mingw32-pthreads
     SUBDIR += mingw32-zlib
-    SUBDIR += mips-binutils
     SUBDIR += mips-gcc
     SUBDIR += mips-xtoolchain-gcc
-    SUBDIR += mips64-binutils
     SUBDIR += mips64-gcc
     SUBDIR += mips64-xtoolchain-gcc
     SUBDIR += mir-core
@@ -3968,7 +3958,6 @@
     SUBDIR += pmdk
     SUBDIR += poco
     SUBDIR += popt
-    SUBDIR += powerpc64-binutils
     SUBDIR += powerpc64-gcc
     SUBDIR += powerpc64-xtoolchain-gcc
     SUBDIR += poxml
@@ -5393,7 +5382,6 @@
     SUBDIR += replxx
     SUBDIR += resolv_wrapper
     SUBDIR += rhtvision
-    SUBDIR += riscv64-binutils
     SUBDIR += riscv64-gcc
     SUBDIR += riscv64-xtoolchain-gcc
     SUBDIR += rlog
@@ -6359,7 +6347,6 @@
     SUBDIR += rust-cbindgen
     SUBDIR += rvi
     SUBDIR += rvm
-    SUBDIR += s390x-binutils
     SUBDIR += sabre
     SUBDIR += safe-iop
     SUBDIR += samurai
@@ -6420,7 +6407,6 @@
     SUBDIR += sope4
     SUBDIR += sord
     SUBDIR += sourcenav
-    SUBDIR += sparc64-binutils
     SUBDIR += sparc64-gcc
     SUBDIR += sparc64-xtoolchain-gcc
     SUBDIR += spark
Index: devel/aarch64-binutils/Makefile
===================================================================
--- devel/aarch64-binutils/Makefile
+++ devel/aarch64-binutils/Makefile
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-COMMENT=	GNU binutils for AArch64 cross-development
-PKGNAMEPREFIX=	aarch64-
-PLIST=	${.CURDIR}/pkg-plist
-
-BROKEN_mips=		fails to configure: error: C compiler cannot create executables
-BROKEN_mips64=		fails to configure: error: C compiler cannot create executables
-BROKEN_powerpc64=	fails to configure: error: C compiler cannot create executables
-
-MASTERDIR=	${.CURDIR}/../binutils
-OPTIONS_DEFAULT=	STATIC
-
-.include "${MASTERDIR}/Makefile"
Index: devel/aarch64-binutils/pkg-plist
===================================================================
--- devel/aarch64-binutils/pkg-plist
+++ devel/aarch64-binutils/pkg-plist
@@ -1,111 +0,0 @@
-%%BUTARGET%%/bin/ar
-%%BUTARGET%%/bin/as
-%%BUTARGET%%/bin/ld
-%%BUTARGET%%/bin/ld.bfd
-%%BUTARGET%%/bin/nm
-%%BUTARGET%%/bin/objcopy
-%%BUTARGET%%/bin/objdump
-%%BUTARGET%%/bin/ranlib
-%%BUTARGET%%/bin/readelf
-%%BUTARGET%%/bin/size
-%%BUTARGET%%/bin/strip
-%%BUTARGET%%/lib/ldscripts/aarch64elf.x
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xbn
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xc
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xce
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xd
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xdc
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xdce
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xde
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xdw
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xdwe
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xe
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xn
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xr
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xs
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xsc
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xsce
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xse
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xsw
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xswe
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xu
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xw
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xwe
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.x
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xc
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xce
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xd
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xde
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xe
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xn
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xr
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xs
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xse
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xu
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xw
-%%BUTARGET%%/lib/ldscripts/aarch64fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.x
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xbn
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xc
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xce
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xd
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xdc
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xdce
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xde
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xdw
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xdwe
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xe
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xn
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xr
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xs
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xsc
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xsce
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xse
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xsw
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xswe
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xu
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xw
-%%BUTARGET%%/lib/ldscripts/aarch64fbsdb.xwe
-bin/%%BUTARGET%%-addr2line
-bin/%%BUTARGET%%-ar
-bin/%%BUTARGET%%-as
-bin/%%BUTARGET%%-c++filt
-bin/%%BUTARGET%%-elfedit
-bin/%%BUTARGET%%-gprof
-bin/%%BUTARGET%%-ld
-bin/%%BUTARGET%%-ld.bfd
-bin/%%BUTARGET%%-nm
-bin/%%BUTARGET%%-objcopy
-bin/%%BUTARGET%%-objdump
-bin/%%BUTARGET%%-ranlib
-bin/%%BUTARGET%%-readelf
-bin/%%BUTARGET%%-size
-bin/%%BUTARGET%%-strings
-bin/%%BUTARGET%%-strip
-man/man1/%%BUTARGET%%-addr2line.1.gz
-man/man1/%%BUTARGET%%-ar.1.gz
-man/man1/%%BUTARGET%%-as.1.gz
-man/man1/%%BUTARGET%%-c++filt.1.gz
-man/man1/%%BUTARGET%%-dlltool.1.gz
-man/man1/%%BUTARGET%%-elfedit.1.gz
-man/man1/%%BUTARGET%%-gprof.1.gz
-man/man1/%%BUTARGET%%-ld.1.gz
-man/man1/%%BUTARGET%%-nm.1.gz
-man/man1/%%BUTARGET%%-objcopy.1.gz
-man/man1/%%BUTARGET%%-objdump.1.gz
-man/man1/%%BUTARGET%%-ranlib.1.gz
-man/man1/%%BUTARGET%%-readelf.1.gz
-man/man1/%%BUTARGET%%-size.1.gz
-man/man1/%%BUTARGET%%-strings.1.gz
-man/man1/%%BUTARGET%%-strip.1.gz
-man/man1/%%BUTARGET%%-windmc.1.gz
-man/man1/%%BUTARGET%%-windres.1.gz
Index: devel/aarch64-none-elf-binutils/Makefile
===================================================================
--- devel/aarch64-none-elf-binutils/Makefile
+++ devel/aarch64-none-elf-binutils/Makefile
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-COMMENT=	GNU binutils for bare metal AArch64 cross-development
-PKGNAMEPREFIX=	aarch64-none-elf-
-BUTARGET=	aarch64-none-elf
-PLIST=	${.CURDIR}/pkg-plist
-
-MASTERDIR=	${.CURDIR}/../binutils
-
-.include "${MASTERDIR}/Makefile"
Index: devel/aarch64-none-elf-binutils/pkg-plist
===================================================================
--- devel/aarch64-none-elf-binutils/pkg-plist
+++ devel/aarch64-none-elf-binutils/pkg-plist
@@ -1,177 +0,0 @@
-%%BUTARGET%%/bin/ar
-%%BUTARGET%%/bin/as
-%%BUTARGET%%/bin/ld
-%%BUTARGET%%/bin/ld.bfd
-%%BUTARGET%%/bin/nm
-%%BUTARGET%%/bin/objcopy
-%%BUTARGET%%/bin/objdump
-%%BUTARGET%%/bin/ranlib
-%%BUTARGET%%/bin/readelf
-%%BUTARGET%%/bin/size
-%%BUTARGET%%/bin/strip
-%%BUTARGET%%/lib/ldscripts/aarch64elf.x
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xbn
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xc
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xce
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xd
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xdc
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xdce
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xde
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xdw
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xdwe
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xe
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xn
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xr
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xs
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xsc
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xsce
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xse
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xsw
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xswe
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xu
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xw
-%%BUTARGET%%/lib/ldscripts/aarch64elf.xwe
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.x
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xbn
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xc
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xce
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xd
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xdc
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xdce
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xde
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xdw
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xdwe
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xe
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xn
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xr
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xs
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xsc
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xsce
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xse
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xsw
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xswe
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xu
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xw
-%%BUTARGET%%/lib/ldscripts/aarch64elf32.xwe
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.x
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xbn
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xc
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xce
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xd
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xdc
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xdce
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xde
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xdw
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xdwe
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xe
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xn
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xr
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xs
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xsc
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xsce
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xse
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xsw
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xswe
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xu
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xw
-%%BUTARGET%%/lib/ldscripts/aarch64elf32b.xwe
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.x
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xbn
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xc
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xce
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xd
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xdc
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xdce
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xde
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xdw
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xdwe
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xe
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xn
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xr
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xs
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xsc
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xsce
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xse
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xsw
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xswe
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xu
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xw
-%%BUTARGET%%/lib/ldscripts/aarch64elfb.xwe
-%%BUTARGET%%/lib/ldscripts/armelf.x
-%%BUTARGET%%/lib/ldscripts/armelf.xbn
-%%BUTARGET%%/lib/ldscripts/armelf.xc
-%%BUTARGET%%/lib/ldscripts/armelf.xce
-%%BUTARGET%%/lib/ldscripts/armelf.xd
-%%BUTARGET%%/lib/ldscripts/armelf.xdc
-%%BUTARGET%%/lib/ldscripts/armelf.xdce
-%%BUTARGET%%/lib/ldscripts/armelf.xde
-%%BUTARGET%%/lib/ldscripts/armelf.xdw
-%%BUTARGET%%/lib/ldscripts/armelf.xdwe
-%%BUTARGET%%/lib/ldscripts/armelf.xe
-%%BUTARGET%%/lib/ldscripts/armelf.xn
-%%BUTARGET%%/lib/ldscripts/armelf.xr
-%%BUTARGET%%/lib/ldscripts/armelf.xs
-%%BUTARGET%%/lib/ldscripts/armelf.xsc
-%%BUTARGET%%/lib/ldscripts/armelf.xsce
-%%BUTARGET%%/lib/ldscripts/armelf.xse
-%%BUTARGET%%/lib/ldscripts/armelf.xsw
-%%BUTARGET%%/lib/ldscripts/armelf.xswe
-%%BUTARGET%%/lib/ldscripts/armelf.xu
-%%BUTARGET%%/lib/ldscripts/armelf.xw
-%%BUTARGET%%/lib/ldscripts/armelf.xwe
-%%BUTARGET%%/lib/ldscripts/armelfb.x
-%%BUTARGET%%/lib/ldscripts/armelfb.xbn
-%%BUTARGET%%/lib/ldscripts/armelfb.xc
-%%BUTARGET%%/lib/ldscripts/armelfb.xce
-%%BUTARGET%%/lib/ldscripts/armelfb.xd
-%%BUTARGET%%/lib/ldscripts/armelfb.xdc
-%%BUTARGET%%/lib/ldscripts/armelfb.xdce
-%%BUTARGET%%/lib/ldscripts/armelfb.xde
-%%BUTARGET%%/lib/ldscripts/armelfb.xdw
-%%BUTARGET%%/lib/ldscripts/armelfb.xdwe
-%%BUTARGET%%/lib/ldscripts/armelfb.xe
-%%BUTARGET%%/lib/ldscripts/armelfb.xn
-%%BUTARGET%%/lib/ldscripts/armelfb.xr
-%%BUTARGET%%/lib/ldscripts/armelfb.xs
-%%BUTARGET%%/lib/ldscripts/armelfb.xsc
-%%BUTARGET%%/lib/ldscripts/armelfb.xsce
-%%BUTARGET%%/lib/ldscripts/armelfb.xse
-%%BUTARGET%%/lib/ldscripts/armelfb.xsw
-%%BUTARGET%%/lib/ldscripts/armelfb.xswe
-%%BUTARGET%%/lib/ldscripts/armelfb.xu
-%%BUTARGET%%/lib/ldscripts/armelfb.xw
-%%BUTARGET%%/lib/ldscripts/armelfb.xwe
-bin/%%BUTARGET%%-addr2line
-bin/%%BUTARGET%%-ar
-bin/%%BUTARGET%%-as
-bin/%%BUTARGET%%-c++filt
-bin/%%BUTARGET%%-elfedit
-bin/%%BUTARGET%%-gprof
-bin/%%BUTARGET%%-ld
-bin/%%BUTARGET%%-ld.bfd
-bin/%%BUTARGET%%-nm
-bin/%%BUTARGET%%-objcopy
-bin/%%BUTARGET%%-objdump
-bin/%%BUTARGET%%-ranlib
-bin/%%BUTARGET%%-readelf
-bin/%%BUTARGET%%-size
-bin/%%BUTARGET%%-strings
-bin/%%BUTARGET%%-strip
-man/man1/%%BUTARGET%%-addr2line.1.gz
-man/man1/%%BUTARGET%%-ar.1.gz
-man/man1/%%BUTARGET%%-as.1.gz
-man/man1/%%BUTARGET%%-c++filt.1.gz
-man/man1/%%BUTARGET%%-dlltool.1.gz
-man/man1/%%BUTARGET%%-elfedit.1.gz
-man/man1/%%BUTARGET%%-gprof.1.gz
-man/man1/%%BUTARGET%%-ld.1.gz
-man/man1/%%BUTARGET%%-nm.1.gz
-man/man1/%%BUTARGET%%-objcopy.1.gz
-man/man1/%%BUTARGET%%-objdump.1.gz
-man/man1/%%BUTARGET%%-ranlib.1.gz
-man/man1/%%BUTARGET%%-readelf.1.gz
-man/man1/%%BUTARGET%%-size.1.gz
-man/man1/%%BUTARGET%%-strings.1.gz
-man/man1/%%BUTARGET%%-strip.1.gz
-man/man1/%%BUTARGET%%-windmc.1.gz
-man/man1/%%BUTARGET%%-windres.1.gz
Index: devel/aarch64-none-elf-gcc/Makefile
===================================================================
--- devel/aarch64-none-elf-gcc/Makefile
+++ devel/aarch64-none-elf-gcc/Makefile
@@ -19,8 +19,8 @@
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
-BUILD_DEPENDS=	${GCC_TARGET}-as:devel/${PKGNAMEPREFIX}binutils
-RUN_DEPENDS=	${GCC_TARGET}-as:devel/${PKGNAMEPREFIX}binutils
+BUILD_DEPENDS=	${GCC_TARGET}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g}
+RUN_DEPENDS=	${GCC_TARGET}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g}
 
 USES=	gmake iconv libtool tar:xz makeinfo compiler:c++11-lang
 
Index: devel/amd64-binutils/Makefile
===================================================================
--- devel/amd64-binutils/Makefile
+++ devel/amd64-binutils/Makefile
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-COMMENT=	GNU binutils for amd64 cross-development
-PKGNAMEPREFIX=	amd64-
-PLIST=	${.CURDIR}/pkg-plist
-
-MASTERDIR=	${.CURDIR}/../binutils
-
-BUTARGET=	x86_64-unknown-${OPSYS:tl}${OSREL}
-
-.include "${MASTERDIR}/Makefile"
Index: devel/amd64-binutils/pkg-plist
===================================================================
--- devel/amd64-binutils/pkg-plist
+++ devel/amd64-binutils/pkg-plist
@@ -1,243 +0,0 @@
-bin/%%BUTARGET%%-addr2line
-bin/%%BUTARGET%%-ar
-bin/%%BUTARGET%%-as
-bin/%%BUTARGET%%-c++filt
-bin/%%BUTARGET%%-elfedit
-bin/%%BUTARGET%%-gprof
-bin/%%BUTARGET%%-ld
-bin/%%BUTARGET%%-ld.bfd
-bin/%%BUTARGET%%-nm
-bin/%%BUTARGET%%-objcopy
-bin/%%BUTARGET%%-objdump
-bin/%%BUTARGET%%-ranlib
-bin/%%BUTARGET%%-readelf
-bin/%%BUTARGET%%-size
-bin/%%BUTARGET%%-strings
-bin/%%BUTARGET%%-strip
-man/man1/%%BUTARGET%%-addr2line.1.gz
-man/man1/%%BUTARGET%%-ar.1.gz
-man/man1/%%BUTARGET%%-as.1.gz
-man/man1/%%BUTARGET%%-c++filt.1.gz
-man/man1/%%BUTARGET%%-dlltool.1.gz
-man/man1/%%BUTARGET%%-elfedit.1.gz
-man/man1/%%BUTARGET%%-gprof.1.gz
-man/man1/%%BUTARGET%%-ld.1.gz
-man/man1/%%BUTARGET%%-nm.1.gz
-man/man1/%%BUTARGET%%-objcopy.1.gz
-man/man1/%%BUTARGET%%-objdump.1.gz
-man/man1/%%BUTARGET%%-ranlib.1.gz
-man/man1/%%BUTARGET%%-readelf.1.gz
-man/man1/%%BUTARGET%%-size.1.gz
-man/man1/%%BUTARGET%%-strings.1.gz
-man/man1/%%BUTARGET%%-strip.1.gz
-man/man1/%%BUTARGET%%-windmc.1.gz
-man/man1/%%BUTARGET%%-windres.1.gz
-%%BUTARGET%%/bin/ar
-%%BUTARGET%%/bin/as
-%%BUTARGET%%/bin/ld
-%%BUTARGET%%/bin/ld.bfd
-%%BUTARGET%%/bin/nm
-%%BUTARGET%%/bin/objcopy
-%%BUTARGET%%/bin/objdump
-%%BUTARGET%%/bin/ranlib
-%%BUTARGET%%/bin/readelf
-%%BUTARGET%%/bin/size
-%%BUTARGET%%/bin/strip
-%%BUTARGET%%/lib/ldscripts/elf_i386.x
-%%BUTARGET%%/lib/ldscripts/elf_i386.xbn
-%%BUTARGET%%/lib/ldscripts/elf_i386.xc
-%%BUTARGET%%/lib/ldscripts/elf_i386.xce
-%%BUTARGET%%/lib/ldscripts/elf_i386.xd
-%%BUTARGET%%/lib/ldscripts/elf_i386.xdc
-%%BUTARGET%%/lib/ldscripts/elf_i386.xdce
-%%BUTARGET%%/lib/ldscripts/elf_i386.xde
-%%BUTARGET%%/lib/ldscripts/elf_i386.xdw
-%%BUTARGET%%/lib/ldscripts/elf_i386.xdwe
-%%BUTARGET%%/lib/ldscripts/elf_i386.xe
-%%BUTARGET%%/lib/ldscripts/elf_i386.xn
-%%BUTARGET%%/lib/ldscripts/elf_i386.xr
-%%BUTARGET%%/lib/ldscripts/elf_i386.xs
-%%BUTARGET%%/lib/ldscripts/elf_i386.xsc
-%%BUTARGET%%/lib/ldscripts/elf_i386.xsce
-%%BUTARGET%%/lib/ldscripts/elf_i386.xse
-%%BUTARGET%%/lib/ldscripts/elf_i386.xsw
-%%BUTARGET%%/lib/ldscripts/elf_i386.xswe
-%%BUTARGET%%/lib/ldscripts/elf_i386.xu
-%%BUTARGET%%/lib/ldscripts/elf_i386.xw
-%%BUTARGET%%/lib/ldscripts/elf_i386.xwe
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.x
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xbn
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xc
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xce
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xd
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xdc
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xdce
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xde
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xdw
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xdwe
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xe
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xn
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xr
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xs
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xsc
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xsce
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xse
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xsw
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xswe
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xu
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xw
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xwe
-%%BUTARGET%%/lib/ldscripts/elf_k1om.x
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xbn
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xc
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xce
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xd
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xdc
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xdce
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xde
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xdw
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xdwe
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xe
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xn
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xr
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xs
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xsc
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xsce
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xse
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xsw
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xswe
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xu
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xw
-%%BUTARGET%%/lib/ldscripts/elf_k1om.xwe
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf_k1om_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf_l1om.x
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xbn
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xc
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xce
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xd
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xdc
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xdce
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xde
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xdw
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xdwe
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xe
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xn
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xr
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xs
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xsc
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xsce
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xse
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xsw
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xswe
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xu
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xw
-%%BUTARGET%%/lib/ldscripts/elf_l1om.xwe
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf_l1om_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.x
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xbn
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xc
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xce
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xd
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xdc
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xdce
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xde
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xdw
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xdwe
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xe
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xn
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xr
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xs
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xsc
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xsce
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xse
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xsw
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xswe
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xu
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xw
-%%BUTARGET%%/lib/ldscripts/elf_x86_64.xwe
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf_x86_64_fbsd.xwe
Index: devel/arduino-tools/Makefile
===================================================================
--- devel/arduino-tools/Makefile
+++ devel/arduino-tools/Makefile
@@ -15,7 +15,7 @@
 
 RUN_DEPENDS=	arduino-avrdude:devel/arduino-avrdude \
 		bossac:devel/bossa \
-		avr-as:devel/avr-binutils \
+		avr-as:devel/binutils@avr \
 		avr-gcc:devel/avr-gcc \
 		${LOCALBASE}/avr/include/avr/io.h:devel/avr-libc \
 		gcc-arm-embedded>0:devel/gcc-arm-embedded \
Index: devel/arm-gnueabi-binutils/Makefile
===================================================================
--- devel/arm-gnueabi-binutils/Makefile
+++ devel/arm-gnueabi-binutils/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-COMMENT=	GNU binutils for arm cross-development
-PKGNAMEPREFIX=	arm-gnueabi-
-PLIST=	${.CURDIR}/pkg-plist
-
-MASTERDIR=	${.CURDIR}/../binutils
-
-.include "${MASTERDIR}/Makefile"
Index: devel/arm-gnueabi-binutils/pkg-plist
===================================================================
--- devel/arm-gnueabi-binutils/pkg-plist
+++ devel/arm-gnueabi-binutils/pkg-plist
@@ -1,111 +0,0 @@
-%%BUTARGET%%/bin/ar
-%%BUTARGET%%/bin/as
-%%BUTARGET%%/bin/ld
-%%BUTARGET%%/bin/ld.bfd
-%%BUTARGET%%/bin/nm
-%%BUTARGET%%/bin/objcopy
-%%BUTARGET%%/bin/objdump
-%%BUTARGET%%/bin/ranlib
-%%BUTARGET%%/bin/readelf
-%%BUTARGET%%/bin/size
-%%BUTARGET%%/bin/strip
-%%BUTARGET%%/lib/ldscripts/armelf.x
-%%BUTARGET%%/lib/ldscripts/armelf.xbn
-%%BUTARGET%%/lib/ldscripts/armelf.xc
-%%BUTARGET%%/lib/ldscripts/armelf.xce
-%%BUTARGET%%/lib/ldscripts/armelf.xd
-%%BUTARGET%%/lib/ldscripts/armelf.xdc
-%%BUTARGET%%/lib/ldscripts/armelf.xdce
-%%BUTARGET%%/lib/ldscripts/armelf.xde
-%%BUTARGET%%/lib/ldscripts/armelf.xdw
-%%BUTARGET%%/lib/ldscripts/armelf.xdwe
-%%BUTARGET%%/lib/ldscripts/armelf.xe
-%%BUTARGET%%/lib/ldscripts/armelf.xn
-%%BUTARGET%%/lib/ldscripts/armelf.xr
-%%BUTARGET%%/lib/ldscripts/armelf.xs
-%%BUTARGET%%/lib/ldscripts/armelf.xsc
-%%BUTARGET%%/lib/ldscripts/armelf.xsce
-%%BUTARGET%%/lib/ldscripts/armelf.xse
-%%BUTARGET%%/lib/ldscripts/armelf.xsw
-%%BUTARGET%%/lib/ldscripts/armelf.xswe
-%%BUTARGET%%/lib/ldscripts/armelf.xu
-%%BUTARGET%%/lib/ldscripts/armelf.xw
-%%BUTARGET%%/lib/ldscripts/armelf.xwe
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.x
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/armelf_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.x
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/armelfb_fbsd.xwe
-bin/%%BUTARGET%%-addr2line
-bin/%%BUTARGET%%-ar
-bin/%%BUTARGET%%-as
-bin/%%BUTARGET%%-c++filt
-bin/%%BUTARGET%%-elfedit
-bin/%%BUTARGET%%-gprof
-bin/%%BUTARGET%%-ld
-bin/%%BUTARGET%%-ld.bfd
-bin/%%BUTARGET%%-nm
-bin/%%BUTARGET%%-objcopy
-bin/%%BUTARGET%%-objdump
-bin/%%BUTARGET%%-ranlib
-bin/%%BUTARGET%%-readelf
-bin/%%BUTARGET%%-size
-bin/%%BUTARGET%%-strings
-bin/%%BUTARGET%%-strip
-man/man1/%%BUTARGET%%-addr2line.1.gz
-man/man1/%%BUTARGET%%-ar.1.gz
-man/man1/%%BUTARGET%%-as.1.gz
-man/man1/%%BUTARGET%%-c++filt.1.gz
-man/man1/%%BUTARGET%%-dlltool.1.gz
-man/man1/%%BUTARGET%%-elfedit.1.gz
-man/man1/%%BUTARGET%%-gprof.1.gz
-man/man1/%%BUTARGET%%-ld.1.gz
-man/man1/%%BUTARGET%%-nm.1.gz
-man/man1/%%BUTARGET%%-objcopy.1.gz
-man/man1/%%BUTARGET%%-objdump.1.gz
-man/man1/%%BUTARGET%%-ranlib.1.gz
-man/man1/%%BUTARGET%%-readelf.1.gz
-man/man1/%%BUTARGET%%-size.1.gz
-man/man1/%%BUTARGET%%-strings.1.gz
-man/man1/%%BUTARGET%%-strip.1.gz
-man/man1/%%BUTARGET%%-windmc.1.gz
-man/man1/%%BUTARGET%%-windres.1.gz
Index: devel/arm-none-eabi-binutils/Makefile
===================================================================
--- devel/arm-none-eabi-binutils/Makefile
+++ devel/arm-none-eabi-binutils/Makefile
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-COMMENT=	GNU binutils for bare metal arm cross-development
-PKGNAMEPREFIX=	arm-none-eabi-
-BUTARGET=	arm-none-eabi
-PLIST=	${.CURDIR}/pkg-plist
-
-MASTERDIR=	${.CURDIR}/../binutils
-
-.include "${MASTERDIR}/Makefile"
Index: devel/arm-none-eabi-binutils/pkg-plist
===================================================================
--- devel/arm-none-eabi-binutils/pkg-plist
+++ devel/arm-none-eabi-binutils/pkg-plist
@@ -1,67 +0,0 @@
-%%BUTARGET%%/bin/ar
-%%BUTARGET%%/bin/as
-%%BUTARGET%%/bin/ld
-%%BUTARGET%%/bin/ld.bfd
-%%BUTARGET%%/bin/nm
-%%BUTARGET%%/bin/objcopy
-%%BUTARGET%%/bin/objdump
-%%BUTARGET%%/bin/ranlib
-%%BUTARGET%%/bin/readelf
-%%BUTARGET%%/bin/size
-%%BUTARGET%%/bin/strip
-%%BUTARGET%%/lib/ldscripts/armelf.x
-%%BUTARGET%%/lib/ldscripts/armelf.xbn
-%%BUTARGET%%/lib/ldscripts/armelf.xc
-%%BUTARGET%%/lib/ldscripts/armelf.xce
-%%BUTARGET%%/lib/ldscripts/armelf.xd
-%%BUTARGET%%/lib/ldscripts/armelf.xdc
-%%BUTARGET%%/lib/ldscripts/armelf.xdce
-%%BUTARGET%%/lib/ldscripts/armelf.xde
-%%BUTARGET%%/lib/ldscripts/armelf.xdw
-%%BUTARGET%%/lib/ldscripts/armelf.xdwe
-%%BUTARGET%%/lib/ldscripts/armelf.xe
-%%BUTARGET%%/lib/ldscripts/armelf.xn
-%%BUTARGET%%/lib/ldscripts/armelf.xr
-%%BUTARGET%%/lib/ldscripts/armelf.xs
-%%BUTARGET%%/lib/ldscripts/armelf.xsc
-%%BUTARGET%%/lib/ldscripts/armelf.xsce
-%%BUTARGET%%/lib/ldscripts/armelf.xse
-%%BUTARGET%%/lib/ldscripts/armelf.xsw
-%%BUTARGET%%/lib/ldscripts/armelf.xswe
-%%BUTARGET%%/lib/ldscripts/armelf.xu
-%%BUTARGET%%/lib/ldscripts/armelf.xw
-%%BUTARGET%%/lib/ldscripts/armelf.xwe
-bin/%%BUTARGET%%-addr2line
-bin/%%BUTARGET%%-ar
-bin/%%BUTARGET%%-as
-bin/%%BUTARGET%%-c++filt
-bin/%%BUTARGET%%-elfedit
-bin/%%BUTARGET%%-gprof
-bin/%%BUTARGET%%-ld
-bin/%%BUTARGET%%-ld.bfd
-bin/%%BUTARGET%%-nm
-bin/%%BUTARGET%%-objcopy
-bin/%%BUTARGET%%-objdump
-bin/%%BUTARGET%%-ranlib
-bin/%%BUTARGET%%-readelf
-bin/%%BUTARGET%%-size
-bin/%%BUTARGET%%-strings
-bin/%%BUTARGET%%-strip
-man/man1/%%BUTARGET%%-addr2line.1.gz
-man/man1/%%BUTARGET%%-ar.1.gz
-man/man1/%%BUTARGET%%-as.1.gz
-man/man1/%%BUTARGET%%-c++filt.1.gz
-man/man1/%%BUTARGET%%-dlltool.1.gz
-man/man1/%%BUTARGET%%-elfedit.1.gz
-man/man1/%%BUTARGET%%-gprof.1.gz
-man/man1/%%BUTARGET%%-ld.1.gz
-man/man1/%%BUTARGET%%-nm.1.gz
-man/man1/%%BUTARGET%%-objcopy.1.gz
-man/man1/%%BUTARGET%%-objdump.1.gz
-man/man1/%%BUTARGET%%-ranlib.1.gz
-man/man1/%%BUTARGET%%-readelf.1.gz
-man/man1/%%BUTARGET%%-size.1.gz
-man/man1/%%BUTARGET%%-strings.1.gz
-man/man1/%%BUTARGET%%-strip.1.gz
-man/man1/%%BUTARGET%%-windmc.1.gz
-man/man1/%%BUTARGET%%-windres.1.gz
Index: devel/arm-none-eabi-gcc492/Makefile
===================================================================
--- devel/arm-none-eabi-gcc492/Makefile
+++ devel/arm-none-eabi-gcc492/Makefile
@@ -17,8 +17,8 @@
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
-BUILD_DEPENDS=	${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils
-RUN_DEPENDS=	${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils
+BUILD_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g}
+RUN_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g}
 
 USES=	compiler gmake iconv libtool makeinfo tar:bzip2
 PLIST_SUB=	TARGETARCH=${PKGNAMEPREFIX:C/-//g} \
Index: devel/arm-none-eabi-newlib/Makefile
===================================================================
--- devel/arm-none-eabi-newlib/Makefile
+++ devel/arm-none-eabi-newlib/Makefile
@@ -11,9 +11,9 @@
 MAINTAINER=	kevans@FreeBSD.org
 COMMENT=	Newlib distribution for ${NEWLIB_TARGET} targets
 
-BUILD_DEPENDS+=	${NEWLIB_TARGET}-ar:devel/${NEWLIB_TARGET}-binutils \
-		${NEWLIB_TARGET}-as:devel/${NEWLIB_TARGET}-binutils \
-		${NEWLIB_TARGET}-ld:devel/${NEWLIB_TARGET}-binutils \
+BUILD_DEPENDS+=	${NEWLIB_TARGET}-ar:devel/binutils@${NEWLIB_TARGET:C/-/_/g} \
+		${NEWLIB_TARGET}-as:devel/binutils@${NEWLIB_TARGET:C/-/_/g} \
+		${NEWLIB_TARGET}-ld:devel/binutils@${NEWLIB_TARGET:C/-/_/g} \
 		${LOCALBASE}/bin/${NEWLIB_TARGET}-gcc:devel/${NEWLIB_TARGET}-gcc
 
 NEWLIB_TARGET?=	arm-none-eabi
Index: devel/avr-binutils/Makefile
===================================================================
--- devel/avr-binutils/Makefile
+++ devel/avr-binutils/Makefile
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-MAINTAINER=	joerg@FreeBSD.org
-
-COMMENT=	GNU binutils for AVR cross-development
-PKGNAMEPREFIX=	avr-
-BUTARGET=	avr
-PLIST=	${.CURDIR}/pkg-plist
-
-MASTERDIR=	${.CURDIR}/../binutils
-PATCHDIR=	${.CURDIR}/files
-
-.include "${MASTERDIR}/Makefile"
Index: devel/avr-binutils/distinfo
===================================================================
--- devel/avr-binutils/distinfo
+++ devel/avr-binutils/distinfo
@@ -1,2 +0,0 @@
-SHA256 (binutils-2.24.tar.bz2) = e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
-SIZE (binutils-2.24.tar.bz2) = 22716802
Index: devel/avr-binutils/pkg-descr
===================================================================
--- devel/avr-binutils/pkg-descr
+++ devel/avr-binutils/pkg-descr
@@ -1,13 +0,0 @@
-GNU binutils for Atmel AVR cross-development
-
-Prerequisite for the GCC for AVR cross-compilation environment.
-
-Still included is the "AVR COFF beta" patch.  It allows avr-objcopy to
-generate AVR (extended) COFF files to be used on Atmel AVR Studio and
-VMLAB.  Note that this patch has known issues, see
-http://www.sax.de/~joerg/README.coff-avr-patch
-
-The support for additional devices has been synchronize with the
-latest public Atmel AVR Tools package.
-
-WWW: http://www.sourceware.org/binutils/
Index: devel/avr-binutils/pkg-plist
===================================================================
--- devel/avr-binutils/pkg-plist
+++ devel/avr-binutils/pkg-plist
@@ -1,153 +0,0 @@
-avr/bin/ar
-avr/bin/as
-avr/bin/ld
-avr/bin/ld.bfd
-avr/bin/nm
-avr/bin/objcopy
-avr/bin/objdump
-avr/bin/ranlib
-avr/bin/readelf
-avr/bin/size
-avr/bin/strip
-avr/lib/ldscripts/avr1.x
-avr/lib/ldscripts/avr1.xbn
-avr/lib/ldscripts/avr1.xe
-avr/lib/ldscripts/avr1.xn
-avr/lib/ldscripts/avr1.xr
-avr/lib/ldscripts/avr1.xu
-avr/lib/ldscripts/avr2.x
-avr/lib/ldscripts/avr2.xbn
-avr/lib/ldscripts/avr2.xe
-avr/lib/ldscripts/avr2.xn
-avr/lib/ldscripts/avr2.xr
-avr/lib/ldscripts/avr2.xu
-avr/lib/ldscripts/avr25.x
-avr/lib/ldscripts/avr25.xbn
-avr/lib/ldscripts/avr25.xe
-avr/lib/ldscripts/avr25.xn
-avr/lib/ldscripts/avr25.xr
-avr/lib/ldscripts/avr25.xu
-avr/lib/ldscripts/avr3.x
-avr/lib/ldscripts/avr3.xbn
-avr/lib/ldscripts/avr3.xe
-avr/lib/ldscripts/avr3.xn
-avr/lib/ldscripts/avr3.xr
-avr/lib/ldscripts/avr3.xu
-avr/lib/ldscripts/avr31.x
-avr/lib/ldscripts/avr31.xbn
-avr/lib/ldscripts/avr31.xe
-avr/lib/ldscripts/avr31.xn
-avr/lib/ldscripts/avr31.xr
-avr/lib/ldscripts/avr31.xu
-avr/lib/ldscripts/avr35.x
-avr/lib/ldscripts/avr35.xbn
-avr/lib/ldscripts/avr35.xe
-avr/lib/ldscripts/avr35.xn
-avr/lib/ldscripts/avr35.xr
-avr/lib/ldscripts/avr35.xu
-avr/lib/ldscripts/avr4.x
-avr/lib/ldscripts/avr4.xbn
-avr/lib/ldscripts/avr4.xe
-avr/lib/ldscripts/avr4.xn
-avr/lib/ldscripts/avr4.xr
-avr/lib/ldscripts/avr4.xu
-avr/lib/ldscripts/avr5.x
-avr/lib/ldscripts/avr5.xbn
-avr/lib/ldscripts/avr5.xe
-avr/lib/ldscripts/avr5.xn
-avr/lib/ldscripts/avr5.xr
-avr/lib/ldscripts/avr5.xu
-avr/lib/ldscripts/avr51.x
-avr/lib/ldscripts/avr51.xbn
-avr/lib/ldscripts/avr51.xe
-avr/lib/ldscripts/avr51.xn
-avr/lib/ldscripts/avr51.xr
-avr/lib/ldscripts/avr51.xu
-avr/lib/ldscripts/avr6.x
-avr/lib/ldscripts/avr6.xbn
-avr/lib/ldscripts/avr6.xe
-avr/lib/ldscripts/avr6.xn
-avr/lib/ldscripts/avr6.xr
-avr/lib/ldscripts/avr6.xu
-avr/lib/ldscripts/avrtiny.x
-avr/lib/ldscripts/avrtiny.xbn
-avr/lib/ldscripts/avrtiny.xe
-avr/lib/ldscripts/avrtiny.xn
-avr/lib/ldscripts/avrtiny.xr
-avr/lib/ldscripts/avrtiny.xu
-avr/lib/ldscripts/avrxmega1.x
-avr/lib/ldscripts/avrxmega1.xbn
-avr/lib/ldscripts/avrxmega1.xe
-avr/lib/ldscripts/avrxmega1.xn
-avr/lib/ldscripts/avrxmega1.xr
-avr/lib/ldscripts/avrxmega1.xu
-avr/lib/ldscripts/avrxmega2.x
-avr/lib/ldscripts/avrxmega2.xbn
-avr/lib/ldscripts/avrxmega2.xe
-avr/lib/ldscripts/avrxmega2.xn
-avr/lib/ldscripts/avrxmega2.xr
-avr/lib/ldscripts/avrxmega2.xu
-avr/lib/ldscripts/avrxmega3.x
-avr/lib/ldscripts/avrxmega3.xbn
-avr/lib/ldscripts/avrxmega3.xe
-avr/lib/ldscripts/avrxmega3.xn
-avr/lib/ldscripts/avrxmega3.xr
-avr/lib/ldscripts/avrxmega3.xu
-avr/lib/ldscripts/avrxmega4.x
-avr/lib/ldscripts/avrxmega4.xbn
-avr/lib/ldscripts/avrxmega4.xe
-avr/lib/ldscripts/avrxmega4.xn
-avr/lib/ldscripts/avrxmega4.xr
-avr/lib/ldscripts/avrxmega4.xu
-avr/lib/ldscripts/avrxmega5.x
-avr/lib/ldscripts/avrxmega5.xbn
-avr/lib/ldscripts/avrxmega5.xe
-avr/lib/ldscripts/avrxmega5.xn
-avr/lib/ldscripts/avrxmega5.xr
-avr/lib/ldscripts/avrxmega5.xu
-avr/lib/ldscripts/avrxmega6.x
-avr/lib/ldscripts/avrxmega6.xbn
-avr/lib/ldscripts/avrxmega6.xe
-avr/lib/ldscripts/avrxmega6.xn
-avr/lib/ldscripts/avrxmega6.xr
-avr/lib/ldscripts/avrxmega6.xu
-avr/lib/ldscripts/avrxmega7.x
-avr/lib/ldscripts/avrxmega7.xbn
-avr/lib/ldscripts/avrxmega7.xe
-avr/lib/ldscripts/avrxmega7.xn
-avr/lib/ldscripts/avrxmega7.xr
-avr/lib/ldscripts/avrxmega7.xu
-bin/avr-addr2line
-bin/avr-ar
-bin/avr-as
-bin/avr-c++filt
-bin/avr-elfedit
-bin/avr-gprof
-bin/avr-ld
-bin/avr-ld.bfd
-bin/avr-nm
-bin/avr-objcopy
-bin/avr-objdump
-bin/avr-ranlib
-bin/avr-readelf
-bin/avr-size
-bin/avr-strings
-bin/avr-strip
-man/man1/avr-addr2line.1.gz
-man/man1/avr-ar.1.gz
-man/man1/avr-as.1.gz
-man/man1/avr-c++filt.1.gz
-man/man1/avr-dlltool.1.gz
-man/man1/avr-elfedit.1.gz
-man/man1/avr-gprof.1.gz
-man/man1/avr-ld.1.gz
-man/man1/avr-nm.1.gz
-man/man1/avr-objcopy.1.gz
-man/man1/avr-objdump.1.gz
-man/man1/avr-ranlib.1.gz
-man/man1/avr-readelf.1.gz
-man/man1/avr-size.1.gz
-man/man1/avr-strings.1.gz
-man/man1/avr-strip.1.gz
-man/man1/avr-windmc.1.gz
-man/man1/avr-windres.1.gz
Index: devel/avr-gcc/Makefile
===================================================================
--- devel/avr-gcc/Makefile
+++ devel/avr-gcc/Makefile
@@ -15,14 +15,14 @@
 BROKEN_aarch64=		Fails to package: cannot find manpages
 BROKEN_mips64=		Fails to configure: cannot compute suffix of object files
 
-BUILD_DEPENDS=	avr-as:devel/avr-binutils \
-		avr-ld:devel/avr-binutils
+BUILD_DEPENDS=	avr-as:devel/binutils@avr \
+		avr-ld:devel/binutils@avr
 LIB_DEPENDS=	libmpfr.so:math/mpfr \
 		libgmp.so:math/gmp \
 		libmpc.so:math/mpc \
 		libisl.so:devel/isl
-RUN_DEPENDS=	avr-as:devel/avr-binutils \
-		avr-ld:devel/avr-binutils
+RUN_DEPENDS=	avr-as:devel/binutils@avr \
+		avr-ld:devel/binutils@avr
 
 USES=		bison compiler:c++11-lang gmake iconv libtool localbase \
 		makeinfo perl5 tar:xz
Index: devel/avr-libc/Makefile
===================================================================
--- devel/avr-libc/Makefile
+++ devel/avr-libc/Makefile
@@ -14,11 +14,11 @@
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	avr-as:devel/avr-binutils \
-		avr-ld:devel/avr-binutils \
+BUILD_DEPENDS=	avr-as:devel/binutils@avr \
+		avr-ld:devel/binutils@avr \
 		avr-gcc:devel/avr-gcc
-RUN_DEPENDS=	avr-as:devel/avr-binutils \
-		avr-ld:devel/avr-binutils \
+RUN_DEPENDS=	avr-as:devel/binutils@avr \
+		avr-ld:devel/binutils@avr \
 		avr-gcc:devel/avr-gcc
 
 OPTIONS_DEFINE=	DOXYGEN
Index: devel/binutils/Makefile
===================================================================
--- devel/binutils/Makefile
+++ devel/binutils/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	binutils
-PORTVERSION=	2.32
-PORTREVISION=	1
+PORTVERSION=	2.33.1
 PORTEPOCH?=	1
 CATEGORIES?=	devel
 MASTER_SITES=	SOURCEWARE/binutils/releases
@@ -14,12 +13,10 @@
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-.if defined(PREFIX) && ${PREFIX} != "/usr"
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.so:math/gmp \
 		${LOCALBASE}/lib/libmpfr.so:math/mpfr
 
 CONFLICTS=	libbfd-[0-9]*
-.endif
 
 #TEST_DEPENDS+=	runtest:misc/dejagnu
 TEST_TARGET=	check
@@ -36,7 +33,24 @@
 CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
 
-.if defined(PKGNAMEPREFIX)
+FLAVORS=	native aarch64 aarch64_none_elf amd64 arm_gnueabi arm_none_eabi \
+		avr i386 mingw32 mips mips64 powerpc64 riscv64 s390x sparc64
+FLAVOR?=	native
+
+RELRO_CONFIGURE_ON=	--enable-relro
+RELRO_CONFIGURE_OFF=	--enable-relro=no
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+
+STATIC_LDFLAGS+=	-all-static
+
+aarch64_COMMENT=	GNU binutils for ${FLAVOR} development
+
+.if ${FLAVOR} != native
+PKGNAMEPREFIX=	${FLAVOR:C/_/-/g}-
+PLIST=		${PKGDIR}/pkg-plist-${FLAVOR:C/_/-/g}
+
 .if ${PKGNAMEPREFIX:M*-*-}
 BUTARGET?=	${PKGNAMEPREFIX}${OPSYS:tl}${OSREL}
 .else
@@ -45,9 +59,22 @@
 PLIST_SUB=	BUTARGET=${BUTARGET}
 OPTIONS_EXCLUDE=	NLS
 INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/share/info
+
+.if ${FLAVOR} == aarch64
+BROKEN_mips=		fails to configure: error: C compiler cannot create executables
+BROKEN_mips64=		fails to configure: error: C compiler cannot create executables
+BROKEN_powerpc64=	fails to configure: error: C compiler cannot create executables
+.elif ${FLAVOR} == aarch64_none_elf || ${FLAVOR} == arm_none_eabi || ${FLAVOR} == mingw32 || ${FLAVOR} == avr
+BUTARGET=	${FLAVOR:C/_/-/g}
+.elif ${FLAVOR} == amd64
+BUTARGET=	x86_64-unknown-${OPSYS:tl}${OSREL}
+.endif
+
 CONFIGURE_ARGS+=	--disable-shared \
 			--target=${BUTARGET}
-.else
+.endif
+
+.if ${FLAVOR} == native
 BUREMOVE=	coffdump \
 		dlltool \
 		dllwrap \
@@ -56,8 +83,7 @@
 		sysdump \
 		windmc \
 		windres
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+USES+=		localbase
 CONFIGURE_ARGS+=	--with-system-zlib \
 			--with-gmp=${LOCALBASE} \
 			--with-mpfr=${LOCALBASE} \
@@ -74,18 +100,10 @@
 			--enable-deterministic-archives \
 			--with-sysroot=/ \
 			--enable-x86-relax-relocations=no
-RELRO_CONFIGURE_ON=	--enable-relro
-RELRO_CONFIGURE_OFF=	--enable-relro=no
 
 MAKE_ENV+=	ac_cv_func_sbrk=0
 MAKE_ARGS+=	LIBDL=""
 
-OPTIONS_SUB=	yes
-NLS_USES=	gettext
-NLS_CONFIGURE_ENABLE=	nls
-
-STATIC_LDFLAGS+=	-all-static
-
 .include <bsd.port.pre.mk>
 
 # Actual earliest version may differ slightly
@@ -97,9 +115,9 @@
 PLIST_SUB+=	GOLD="@comment "
 .endif
 
-.if ${ARCH} == "amd64"
+.if ${ARCH} == amd64
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
-.elif ${ARCH} == "powerpcspe"
+.elif ${ARCH} == powerpcspe
 CONFIGURE_TARGET=	powerpc-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
@@ -109,7 +127,7 @@
 	${REINPLACE_CMD} -e "s/-ldl//g" ${WRKSRC}/gold/testsuite/Makefile.in
 
 post-install:
-.if !defined(PKGNAMEPREFIX)
+.if ${FLAVOR} == native
 	${INSTALL_DATA} ${WRKSRC}/include/plugin-api.h ${STAGEDIR}${PREFIX}/include/
 	@${FIND} -ds ${STAGEDIR}${PREFIX}/${CONFIGURE_TARGET} ! -type d | \
 		${SED} -e 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
@@ -122,34 +140,6 @@
 	${RM} ${STAGEDIR}${PREFIX}/${BUTARGET}/lib/ldscripts/i386bsd.*
 	@if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH:H} ] ; then rm -rf ${STAGEDIR}${PREFIX}/${INFO_PATH:H}; fi
 	${LN} -fs ../../bin/${BUTARGET}-size ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/size
-.if ${PREFIX} == "/usr"
-.if defined(CROSS_TOOLCHAIN)
-	${MV} ${STAGEDIR}/usr/bin/as ${STAGEDIR}/usr/bin/${BUTARGET}-as
-	${MV} ${STAGEDIR}/usr/bin/ld ${STAGEDIR}/usr/bin/${BUTARGET}-ld
-	${MV} ${STAGEDIR}/usr/bin/ld.bfd ${STAGEDIR}/usr/bin/${BUTARGET}-ld.bfd
-	${MV} ${STAGEDIR}/usr/bin/objcopy ${STAGEDIR}/usr/bin/${BUTARGET}-objcopy
-	${MV} ${STAGEDIR}/usr/bin/objdump ${STAGEDIR}/usr/bin/${BUTARGET}-objdump
-	${MV} ${STAGEDIR}/${MANDIR}1/as.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-as.1
-	${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-as.1
-	${MV} ${STAGEDIR}/${MANDIR}1/ld.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-ld.1
-	${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-ld.1
-	${MV} ${STAGEDIR}/${MANDIR}1/objcopy.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objcopy.1
-	${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objcopy.1
-	${MV} ${STAGEDIR}/${MANDIR}1/objdump.1 ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objdump.1
-	${GZIP_CMD} ${STAGEDIR}/${MANDIR}1/${BUTARGET}-objdump.1
-.endif
-	${LN} -fs /usr/bin/${BUTARGET}-as ${STAGEDIR}/usr/bin/as
-	${LN} -fs /usr/bin/${BUTARGET}-ld ${STAGEDIR}/usr/bin/ld
-	${LN} -fs /usr/bin/${BUTARGET}-ld.bfd ${STAGEDIR}/usr/bin/ld.bfd
-	${LN} -fs /usr/bin/${BUTARGET}-objcopy ${STAGEDIR}/usr/bin/objcopy
-	${LN} -fs /usr/bin/${BUTARGET}-objdump ${STAGEDIR}/usr/bin/objdump
-	${LN} -fs ${BUTARGET}-as.1.gz ${STAGEDIR}/${MANDIR}1/as.1.gz
-	${LN} -fs ${BUTARGET}-ld.1.gz ${STAGEDIR}/${MANDIR}1/ld.1.gz
-	${LN} -fs ${BUTARGET}-objcopy.1.gz ${STAGEDIR}/${MANDIR}1/objcopy.1.gz
-	${LN} -fs ${BUTARGET}-objdump.1.gz ${STAGEDIR}/${MANDIR}1/objdump.1.gz
-	@${RM} -r ${STAGEDIR}${PREFIX}/include
-	@${RM} -r ${STAGEDIR}${PREFIX}/lib
-.endif
 .endif
 .for tool in ${BUREMOVE}
 	@${RM} ${STAGEDIR}${PREFIX}/bin/${BUTARGET}-${tool} \
Index: devel/binutils/distinfo
===================================================================
--- devel/binutils/distinfo
+++ devel/binutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549441338
-SHA256 (binutils-2.32.tar.bz2) = de38b15c902eb2725eac6af21183a5f34ea4634cb0bcef19612b50e5ed31072d
-SIZE (binutils-2.32.tar.bz2) = 30782392
+TIMESTAMP = 1572946280
+SHA256 (binutils-2.33.1.tar.bz2) = 0cb4843da15a65a953907c96bad658283f3c4419d6bcc56bf2789db16306adb2
+SIZE (binutils-2.33.1.tar.bz2) = 32160315
Index: devel/i386-binutils/Makefile
===================================================================
--- devel/i386-binutils/Makefile
+++ devel/i386-binutils/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-COMMENT=	GNU binutils for i386 cross-development
-PKGNAMEPREFIX=	i386-
-PLIST=	${.CURDIR}/pkg-plist
-
-MASTERDIR=	${.CURDIR}/../binutils
-
-.include "${MASTERDIR}/Makefile"
Index: devel/i386-binutils/pkg-plist
===================================================================
--- devel/i386-binutils/pkg-plist
+++ devel/i386-binutils/pkg-plist
@@ -1,111 +0,0 @@
-bin/%%BUTARGET%%-addr2line
-bin/%%BUTARGET%%-ar
-bin/%%BUTARGET%%-as
-bin/%%BUTARGET%%-c++filt
-bin/%%BUTARGET%%-elfedit
-bin/%%BUTARGET%%-gprof
-bin/%%BUTARGET%%-ld
-bin/%%BUTARGET%%-ld.bfd
-bin/%%BUTARGET%%-nm
-bin/%%BUTARGET%%-objcopy
-bin/%%BUTARGET%%-objdump
-bin/%%BUTARGET%%-ranlib
-bin/%%BUTARGET%%-readelf
-bin/%%BUTARGET%%-size
-bin/%%BUTARGET%%-strings
-bin/%%BUTARGET%%-strip
-man/man1/%%BUTARGET%%-addr2line.1.gz
-man/man1/%%BUTARGET%%-ar.1.gz
-man/man1/%%BUTARGET%%-as.1.gz
-man/man1/%%BUTARGET%%-c++filt.1.gz
-man/man1/%%BUTARGET%%-dlltool.1.gz
-man/man1/%%BUTARGET%%-elfedit.1.gz
-man/man1/%%BUTARGET%%-gprof.1.gz
-man/man1/%%BUTARGET%%-ld.1.gz
-man/man1/%%BUTARGET%%-nm.1.gz
-man/man1/%%BUTARGET%%-objcopy.1.gz
-man/man1/%%BUTARGET%%-objdump.1.gz
-man/man1/%%BUTARGET%%-ranlib.1.gz
-man/man1/%%BUTARGET%%-readelf.1.gz
-man/man1/%%BUTARGET%%-size.1.gz
-man/man1/%%BUTARGET%%-strings.1.gz
-man/man1/%%BUTARGET%%-strip.1.gz
-man/man1/%%BUTARGET%%-windmc.1.gz
-man/man1/%%BUTARGET%%-windres.1.gz
-%%BUTARGET%%/bin/ar
-%%BUTARGET%%/bin/as
-%%BUTARGET%%/bin/ld
-%%BUTARGET%%/bin/ld.bfd
-%%BUTARGET%%/bin/nm
-%%BUTARGET%%/bin/objcopy
-%%BUTARGET%%/bin/objdump
-%%BUTARGET%%/bin/ranlib
-%%BUTARGET%%/bin/readelf
-%%BUTARGET%%/bin/size
-%%BUTARGET%%/bin/strip
-%%BUTARGET%%/lib/ldscripts/elf_i386.x
-%%BUTARGET%%/lib/ldscripts/elf_i386.xbn
-%%BUTARGET%%/lib/ldscripts/elf_i386.xc
-%%BUTARGET%%/lib/ldscripts/elf_i386.xce
-%%BUTARGET%%/lib/ldscripts/elf_i386.xd
-%%BUTARGET%%/lib/ldscripts/elf_i386.xdc
-%%BUTARGET%%/lib/ldscripts/elf_i386.xdce
-%%BUTARGET%%/lib/ldscripts/elf_i386.xde
-%%BUTARGET%%/lib/ldscripts/elf_i386.xdw
-%%BUTARGET%%/lib/ldscripts/elf_i386.xdwe
-%%BUTARGET%%/lib/ldscripts/elf_i386.xe
-%%BUTARGET%%/lib/ldscripts/elf_i386.xn
-%%BUTARGET%%/lib/ldscripts/elf_i386.xr
-%%BUTARGET%%/lib/ldscripts/elf_i386.xs
-%%BUTARGET%%/lib/ldscripts/elf_i386.xsc
-%%BUTARGET%%/lib/ldscripts/elf_i386.xsce
-%%BUTARGET%%/lib/ldscripts/elf_i386.xse
-%%BUTARGET%%/lib/ldscripts/elf_i386.xsw
-%%BUTARGET%%/lib/ldscripts/elf_i386.xswe
-%%BUTARGET%%/lib/ldscripts/elf_i386.xu
-%%BUTARGET%%/lib/ldscripts/elf_i386.xw
-%%BUTARGET%%/lib/ldscripts/elf_i386.xwe
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf_i386_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.x
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xbn
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xc
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xce
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xd
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xdc
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xdce
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xde
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xdw
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xdwe
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xe
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xn
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xr
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xs
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xsc
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xsce
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xse
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xsw
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xswe
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xu
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xw
-%%BUTARGET%%/lib/ldscripts/elf_iamcu.xwe
Index: devel/mingw32-binutils/Makefile
===================================================================
--- devel/mingw32-binutils/Makefile
+++ devel/mingw32-binutils/Makefile
@@ -1,15 +0,0 @@
-# Created by: Lev Serebryakov <lev@serebryakov.spb.ru>
-# $FreeBSD$
-
-PORTEPOCH=	1
-PKGNAMEPREFIX=	mingw32-
-
-MAINTAINER=	cyberbotx@cyberbotx.com
-COMMENT=	GNU Binutils for Windows cross-development
-
-MASTERDIR=	${.CURDIR}/../binutils
-PLIST=		${.CURDIR}/pkg-plist
-
-BUTARGET=	${PKGNAMEPREFIX:S/-$//}
-
-.include "${MASTERDIR}/Makefile"
Index: devel/mingw32-binutils/pkg-plist
===================================================================
--- devel/mingw32-binutils/pkg-plist
+++ devel/mingw32-binutils/pkg-plist
@@ -1,57 +0,0 @@
-bin/%%BUTARGET%%-addr2line
-bin/%%BUTARGET%%-ar
-bin/%%BUTARGET%%-as
-bin/%%BUTARGET%%-c++filt
-bin/%%BUTARGET%%-dlltool
-bin/%%BUTARGET%%-dllwrap
-bin/%%BUTARGET%%-elfedit
-bin/%%BUTARGET%%-gprof
-bin/%%BUTARGET%%-ld
-bin/%%BUTARGET%%-ld.bfd
-bin/%%BUTARGET%%-nm
-bin/%%BUTARGET%%-objcopy
-bin/%%BUTARGET%%-objdump
-bin/%%BUTARGET%%-ranlib
-bin/%%BUTARGET%%-readelf
-bin/%%BUTARGET%%-size
-bin/%%BUTARGET%%-strings
-bin/%%BUTARGET%%-strip
-bin/%%BUTARGET%%-windmc
-bin/%%BUTARGET%%-windres
-man/man1/%%BUTARGET%%-addr2line.1.gz
-man/man1/%%BUTARGET%%-ar.1.gz
-man/man1/%%BUTARGET%%-as.1.gz
-man/man1/%%BUTARGET%%-c++filt.1.gz
-man/man1/%%BUTARGET%%-dlltool.1.gz
-man/man1/%%BUTARGET%%-elfedit.1.gz
-man/man1/%%BUTARGET%%-gprof.1.gz
-man/man1/%%BUTARGET%%-ld.1.gz
-man/man1/%%BUTARGET%%-nm.1.gz
-man/man1/%%BUTARGET%%-objcopy.1.gz
-man/man1/%%BUTARGET%%-objdump.1.gz
-man/man1/%%BUTARGET%%-ranlib.1.gz
-man/man1/%%BUTARGET%%-readelf.1.gz
-man/man1/%%BUTARGET%%-size.1.gz
-man/man1/%%BUTARGET%%-strings.1.gz
-man/man1/%%BUTARGET%%-strip.1.gz
-man/man1/%%BUTARGET%%-windmc.1.gz
-man/man1/%%BUTARGET%%-windres.1.gz
-%%BUTARGET%%/bin/ar
-%%BUTARGET%%/bin/as
-%%BUTARGET%%/bin/dlltool
-%%BUTARGET%%/bin/ld
-%%BUTARGET%%/bin/ld.bfd
-%%BUTARGET%%/bin/nm
-%%BUTARGET%%/bin/objcopy
-%%BUTARGET%%/bin/objdump
-%%BUTARGET%%/bin/ranlib
-%%BUTARGET%%/bin/readelf
-%%BUTARGET%%/bin/size
-%%BUTARGET%%/bin/strip
-%%BUTARGET%%/lib/ldscripts/i386pe.x
-%%BUTARGET%%/lib/ldscripts/i386pe.xa
-%%BUTARGET%%/lib/ldscripts/i386pe.xbn
-%%BUTARGET%%/lib/ldscripts/i386pe.xe
-%%BUTARGET%%/lib/ldscripts/i386pe.xn
-%%BUTARGET%%/lib/ldscripts/i386pe.xr
-%%BUTARGET%%/lib/ldscripts/i386pe.xu
Index: devel/mingw32-gcc/Makefile
===================================================================
--- devel/mingw32-gcc/Makefile
+++ devel/mingw32-gcc/Makefile
@@ -15,9 +15,9 @@
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}as:devel/${PKGNAMEPREFIX}binutils \
+BUILD_DEPENDS=	${PKGNAMEPREFIX}as:devel/binutils@${PKGNAMEPREFIX:C/-$//} \
 		mingwm10.dll:devel/${PKGNAMEPREFIX}bin-msvcrt
-RUN_DEPENDS=	${PKGNAMEPREFIX}as:devel/${PKGNAMEPREFIX}binutils
+RUN_DEPENDS=	${PKGNAMEPREFIX}as:devel/binutils@${PKGNAMEPREFIX:C/-$//}
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
Index: devel/mips-binutils/Makefile
===================================================================
--- devel/mips-binutils/Makefile
+++ devel/mips-binutils/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-COMMENT=	GNU binutils for mips cross-development
-PKGNAMEPREFIX=	mips-
-PLIST=	${.CURDIR}/pkg-plist
-
-MASTERDIR=	${.CURDIR}/../binutils
-
-.include "${MASTERDIR}/Makefile"
Index: devel/mips-binutils/pkg-plist
===================================================================
--- devel/mips-binutils/pkg-plist
+++ devel/mips-binutils/pkg-plist
@@ -1,309 +0,0 @@
-bin/%%BUTARGET%%-addr2line
-bin/%%BUTARGET%%-ar
-bin/%%BUTARGET%%-as
-bin/%%BUTARGET%%-c++filt
-bin/%%BUTARGET%%-elfedit
-bin/%%BUTARGET%%-gprof
-bin/%%BUTARGET%%-ld
-bin/%%BUTARGET%%-ld.bfd
-bin/%%BUTARGET%%-nm
-bin/%%BUTARGET%%-objcopy
-bin/%%BUTARGET%%-objdump
-bin/%%BUTARGET%%-ranlib
-bin/%%BUTARGET%%-readelf
-bin/%%BUTARGET%%-size
-bin/%%BUTARGET%%-strings
-bin/%%BUTARGET%%-strip
-man/man1/%%BUTARGET%%-addr2line.1.gz
-man/man1/%%BUTARGET%%-ar.1.gz
-man/man1/%%BUTARGET%%-as.1.gz
-man/man1/%%BUTARGET%%-c++filt.1.gz
-man/man1/%%BUTARGET%%-dlltool.1.gz
-man/man1/%%BUTARGET%%-elfedit.1.gz
-man/man1/%%BUTARGET%%-gprof.1.gz
-man/man1/%%BUTARGET%%-ld.1.gz
-man/man1/%%BUTARGET%%-nm.1.gz
-man/man1/%%BUTARGET%%-objcopy.1.gz
-man/man1/%%BUTARGET%%-objdump.1.gz
-man/man1/%%BUTARGET%%-ranlib.1.gz
-man/man1/%%BUTARGET%%-readelf.1.gz
-man/man1/%%BUTARGET%%-size.1.gz
-man/man1/%%BUTARGET%%-strings.1.gz
-man/man1/%%BUTARGET%%-strip.1.gz
-man/man1/%%BUTARGET%%-windmc.1.gz
-man/man1/%%BUTARGET%%-windres.1.gz
-%%BUTARGET%%/bin/ar
-%%BUTARGET%%/bin/as
-%%BUTARGET%%/bin/ld
-%%BUTARGET%%/bin/ld.bfd
-%%BUTARGET%%/bin/nm
-%%BUTARGET%%/bin/objcopy
-%%BUTARGET%%/bin/objdump
-%%BUTARGET%%/bin/ranlib
-%%BUTARGET%%/bin/readelf
-%%BUTARGET%%/bin/size
-%%BUTARGET%%/bin/strip
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.x
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xbn
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xc
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xce
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xd
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xdc
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xdce
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xde
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xdw
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xe
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xn
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xr
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xs
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xsc
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xsce
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xse
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xsw
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xswe
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xu
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xw
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xwe
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.x
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xbn
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xc
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xce
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xd
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xdc
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xdce
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xde
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xdw
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xn
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xr
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xs
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xsc
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xsce
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xse
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xsw
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xswe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xu
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xw
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xwe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.x
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xbn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xd
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xdc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xdce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xde
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xdw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xr
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xs
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xsc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xsce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xse
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xsw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xswe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xu
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.x
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xbn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xd
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xdc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xdce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xde
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xdw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xr
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xs
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xsc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xsce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xse
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xsw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xswe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xu
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.x
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xbn
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xc
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xce
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xd
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xdc
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xdce
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xde
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xdw
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xdwe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xn
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xr
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xs
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xsc
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xsce
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xse
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xsw
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xswe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xu
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xw
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xwe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.x
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xbn
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xc
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xce
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xd
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xdc
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xdce
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xde
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xdw
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xdwe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xn
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xr
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xs
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xsc
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xsce
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xse
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xsw
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xswe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xu
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xw
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xwe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xwe
Index: devel/mips64-binutils/Makefile
===================================================================
--- devel/mips64-binutils/Makefile
+++ devel/mips64-binutils/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-COMMENT=	GNU binutils for mips64 cross-development
-PKGNAMEPREFIX=	mips64-
-PLIST=	${.CURDIR}/pkg-plist
-
-MASTERDIR=	${.CURDIR}/../binutils
-
-.include "${MASTERDIR}/Makefile"
Index: devel/mips64-binutils/pkg-plist
===================================================================
--- devel/mips64-binutils/pkg-plist
+++ devel/mips64-binutils/pkg-plist
@@ -1,309 +0,0 @@
-bin/%%BUTARGET%%-addr2line
-bin/%%BUTARGET%%-ar
-bin/%%BUTARGET%%-as
-bin/%%BUTARGET%%-c++filt
-bin/%%BUTARGET%%-elfedit
-bin/%%BUTARGET%%-gprof
-bin/%%BUTARGET%%-ld
-bin/%%BUTARGET%%-ld.bfd
-bin/%%BUTARGET%%-nm
-bin/%%BUTARGET%%-objcopy
-bin/%%BUTARGET%%-objdump
-bin/%%BUTARGET%%-ranlib
-bin/%%BUTARGET%%-readelf
-bin/%%BUTARGET%%-size
-bin/%%BUTARGET%%-strings
-bin/%%BUTARGET%%-strip
-man/man1/%%BUTARGET%%-addr2line.1.gz
-man/man1/%%BUTARGET%%-ar.1.gz
-man/man1/%%BUTARGET%%-as.1.gz
-man/man1/%%BUTARGET%%-c++filt.1.gz
-man/man1/%%BUTARGET%%-dlltool.1.gz
-man/man1/%%BUTARGET%%-elfedit.1.gz
-man/man1/%%BUTARGET%%-gprof.1.gz
-man/man1/%%BUTARGET%%-ld.1.gz
-man/man1/%%BUTARGET%%-nm.1.gz
-man/man1/%%BUTARGET%%-objcopy.1.gz
-man/man1/%%BUTARGET%%-objdump.1.gz
-man/man1/%%BUTARGET%%-ranlib.1.gz
-man/man1/%%BUTARGET%%-readelf.1.gz
-man/man1/%%BUTARGET%%-size.1.gz
-man/man1/%%BUTARGET%%-strings.1.gz
-man/man1/%%BUTARGET%%-strip.1.gz
-man/man1/%%BUTARGET%%-windmc.1.gz
-man/man1/%%BUTARGET%%-windres.1.gz
-%%BUTARGET%%/bin/ar
-%%BUTARGET%%/bin/as
-%%BUTARGET%%/bin/ld
-%%BUTARGET%%/bin/ld.bfd
-%%BUTARGET%%/bin/nm
-%%BUTARGET%%/bin/objcopy
-%%BUTARGET%%/bin/objdump
-%%BUTARGET%%/bin/ranlib
-%%BUTARGET%%/bin/readelf
-%%BUTARGET%%/bin/size
-%%BUTARGET%%/bin/strip
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.x
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xbn
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xc
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xce
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xd
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xdc
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xdce
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xde
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xdw
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xe
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xn
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xr
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xs
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xsc
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xsce
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xse
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xsw
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xswe
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xu
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xw
-%%BUTARGET%%/lib/ldscripts/elf32btsmip.xwe
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf32btsmip_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.x
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xbn
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xc
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xce
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xd
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xdc
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xdce
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xde
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xdw
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xn
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xr
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xs
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xsc
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xsce
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xse
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xsw
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xswe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xu
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xw
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32.xwe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf32btsmipn32_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.x
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xbn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xd
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xdc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xdce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xde
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xdw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xr
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xs
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xsc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xsce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xse
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xsw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xswe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xu
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip.xwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmip_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.x
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xbn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xd
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xdc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xdce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xde
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xdw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xr
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xs
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xsc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xsce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xse
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xsw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xswe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xu
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32.xwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf32ltsmipn32_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.x
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xbn
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xc
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xce
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xd
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xdc
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xdce
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xde
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xdw
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xdwe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xn
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xr
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xs
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xsc
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xsce
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xse
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xsw
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xswe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xu
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xw
-%%BUTARGET%%/lib/ldscripts/elf64btsmip.xwe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf64btsmip_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.x
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xbn
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xc
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xce
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xd
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xdc
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xdce
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xde
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xdw
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xdwe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xn
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xr
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xs
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xsc
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xsce
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xse
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xsw
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xswe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xu
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xw
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip.xwe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf64ltsmip_fbsd.xwe
Index: devel/powerpc64-binutils/Makefile
===================================================================
--- devel/powerpc64-binutils/Makefile
+++ devel/powerpc64-binutils/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-COMMENT=	GNU binutils for powerpc64 cross-development
-PKGNAMEPREFIX=	powerpc64-
-PLIST=	${.CURDIR}/pkg-plist
-
-MASTERDIR=	${.CURDIR}/../binutils
-
-.include "${MASTERDIR}/Makefile"
Index: devel/powerpc64-binutils/pkg-plist
===================================================================
--- devel/powerpc64-binutils/pkg-plist
+++ devel/powerpc64-binutils/pkg-plist
@@ -1,133 +0,0 @@
-bin/%%BUTARGET%%-addr2line
-bin/%%BUTARGET%%-ar
-bin/%%BUTARGET%%-as
-bin/%%BUTARGET%%-c++filt
-bin/%%BUTARGET%%-elfedit
-bin/%%BUTARGET%%-gprof
-bin/%%BUTARGET%%-ld
-bin/%%BUTARGET%%-ld.bfd
-bin/%%BUTARGET%%-nm
-bin/%%BUTARGET%%-objcopy
-bin/%%BUTARGET%%-objdump
-bin/%%BUTARGET%%-ranlib
-bin/%%BUTARGET%%-readelf
-bin/%%BUTARGET%%-size
-bin/%%BUTARGET%%-strings
-bin/%%BUTARGET%%-strip
-man/man1/%%BUTARGET%%-addr2line.1.gz
-man/man1/%%BUTARGET%%-ar.1.gz
-man/man1/%%BUTARGET%%-as.1.gz
-man/man1/%%BUTARGET%%-c++filt.1.gz
-man/man1/%%BUTARGET%%-dlltool.1.gz
-man/man1/%%BUTARGET%%-elfedit.1.gz
-man/man1/%%BUTARGET%%-gprof.1.gz
-man/man1/%%BUTARGET%%-ld.1.gz
-man/man1/%%BUTARGET%%-nm.1.gz
-man/man1/%%BUTARGET%%-objcopy.1.gz
-man/man1/%%BUTARGET%%-objdump.1.gz
-man/man1/%%BUTARGET%%-ranlib.1.gz
-man/man1/%%BUTARGET%%-readelf.1.gz
-man/man1/%%BUTARGET%%-size.1.gz
-man/man1/%%BUTARGET%%-strings.1.gz
-man/man1/%%BUTARGET%%-strip.1.gz
-man/man1/%%BUTARGET%%-windmc.1.gz
-man/man1/%%BUTARGET%%-windres.1.gz
-%%BUTARGET%%/bin/ar
-%%BUTARGET%%/bin/as
-%%BUTARGET%%/bin/ld
-%%BUTARGET%%/bin/ld.bfd
-%%BUTARGET%%/bin/nm
-%%BUTARGET%%/bin/objcopy
-%%BUTARGET%%/bin/objdump
-%%BUTARGET%%/bin/ranlib
-%%BUTARGET%%/bin/readelf
-%%BUTARGET%%/bin/size
-%%BUTARGET%%/bin/strip
-%%BUTARGET%%/lib/ldscripts/elf32ppc.x
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xbn
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xc
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xce
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xd
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xdc
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xdce
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xde
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xdw
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xe
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xn
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xr
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xs
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xsc
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xsce
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xse
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xsw
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xswe
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xu
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xw
-%%BUTARGET%%/lib/ldscripts/elf32ppc.xwe
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf32ppc_fbsd.xwe
-%%BUTARGET%%/lib/ldscripts/elf64ppc.x
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xbn
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xc
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xce
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xd
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xdc
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xdce
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xde
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xdw
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xdwe
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xe
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xn
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xr
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xs
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xsc
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xsce
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xse
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xsw
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xswe
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xu
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xw
-%%BUTARGET%%/lib/ldscripts/elf64ppc.xwe
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf64ppc_fbsd.xwe
Index: devel/powerpc64-gcc/Makefile
===================================================================
--- devel/powerpc64-gcc/Makefile
+++ devel/powerpc64-gcc/Makefile
@@ -16,8 +16,8 @@
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
-BUILD_DEPENDS=	${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils
-RUN_DEPENDS=	${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils
+BUILD_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g}
+RUN_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${PKGNAMEPREFIX:C/-$//:C/-/_/g}
 
 USES=	gmake iconv libtool tar:xz makeinfo compiler:c++11-lang
 PLIST_SUB=	TARGETARCH=${PKGNAMEPREFIX:C/-//g} \
Index: devel/riscv64-binutils/Makefile
===================================================================
--- devel/riscv64-binutils/Makefile
+++ devel/riscv64-binutils/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-COMMENT=	GNU binutils for RISC-V cross-development
-PKGNAMEPREFIX=	riscv64-
-PLIST=	${.CURDIR}/pkg-plist
-
-MASTERDIR=	${.CURDIR}/../binutils
-
-.include "${MASTERDIR}/Makefile"
Index: devel/riscv64-binutils/pkg-plist
===================================================================
--- devel/riscv64-binutils/pkg-plist
+++ devel/riscv64-binutils/pkg-plist
@@ -1,89 +0,0 @@
-bin/%%BUTARGET%%-addr2line
-bin/%%BUTARGET%%-ar
-bin/%%BUTARGET%%-as
-bin/%%BUTARGET%%-c++filt
-bin/%%BUTARGET%%-elfedit
-bin/%%BUTARGET%%-gprof
-bin/%%BUTARGET%%-ld
-bin/%%BUTARGET%%-ld.bfd
-bin/%%BUTARGET%%-nm
-bin/%%BUTARGET%%-objcopy
-bin/%%BUTARGET%%-objdump
-bin/%%BUTARGET%%-ranlib
-bin/%%BUTARGET%%-readelf
-bin/%%BUTARGET%%-size
-bin/%%BUTARGET%%-strings
-bin/%%BUTARGET%%-strip
-man/man1/%%BUTARGET%%-addr2line.1.gz
-man/man1/%%BUTARGET%%-ar.1.gz
-man/man1/%%BUTARGET%%-as.1.gz
-man/man1/%%BUTARGET%%-c++filt.1.gz
-man/man1/%%BUTARGET%%-dlltool.1.gz
-man/man1/%%BUTARGET%%-elfedit.1.gz
-man/man1/%%BUTARGET%%-gprof.1.gz
-man/man1/%%BUTARGET%%-ld.1.gz
-man/man1/%%BUTARGET%%-nm.1.gz
-man/man1/%%BUTARGET%%-objcopy.1.gz
-man/man1/%%BUTARGET%%-objdump.1.gz
-man/man1/%%BUTARGET%%-ranlib.1.gz
-man/man1/%%BUTARGET%%-readelf.1.gz
-man/man1/%%BUTARGET%%-size.1.gz
-man/man1/%%BUTARGET%%-strings.1.gz
-man/man1/%%BUTARGET%%-strip.1.gz
-man/man1/%%BUTARGET%%-windmc.1.gz
-man/man1/%%BUTARGET%%-windres.1.gz
-%%BUTARGET%%/bin/ar
-%%BUTARGET%%/bin/as
-%%BUTARGET%%/bin/ld
-%%BUTARGET%%/bin/ld.bfd
-%%BUTARGET%%/bin/nm
-%%BUTARGET%%/bin/objcopy
-%%BUTARGET%%/bin/objdump
-%%BUTARGET%%/bin/ranlib
-%%BUTARGET%%/bin/readelf
-%%BUTARGET%%/bin/size
-%%BUTARGET%%/bin/strip
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.x
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xbn
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xc
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xce
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xd
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdc
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdce
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xde
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdw
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xe
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xn
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xr
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xs
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xsc
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xsce
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xse
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xsw
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xswe
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xu
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xw
-%%BUTARGET%%/lib/ldscripts/elf32lriscv.xwe
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.x
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xbn
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xc
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xce
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xd
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdc
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdce
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xde
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdw
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xdwe
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xe
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xn
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xr
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xs
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xsc
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xsce
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xse
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xsw
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xswe
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xu
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xw
-%%BUTARGET%%/lib/ldscripts/elf64lriscv.xwe
Index: devel/riscv64-gcc/Makefile
===================================================================
--- devel/riscv64-gcc/Makefile
+++ devel/riscv64-gcc/Makefile
@@ -12,8 +12,8 @@
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}binutils>0:devel/${PKGNAMEPREFIX}binutils
-RUN_DEPENDS=	${PKGNAMEPREFIX}binutils>0:devel/${PKGNAMEPREFIX}binutils
+BUILD_DEPENDS=	${PKGNAMEPREFIX}binutils>0:devel/binutils@${PKGNAMEPREFIX:C/-$//}
+RUN_DEPENDS=	${PKGNAMEPREFIX}binutils>0:devel/binutils@${PKGNAMEPREFIX:C/-$//}
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
Index: devel/s390x-binutils/Makefile
===================================================================
--- devel/s390x-binutils/Makefile
+++ devel/s390x-binutils/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-COMMENT=	GNU binutils for s390x cross-development
-PKGNAMEPREFIX=	s390x-
-PLIST=	${.CURDIR}/pkg-plist
-
-MASTERDIR=	${.CURDIR}/../binutils
-
-.include "${MASTERDIR}/Makefile"
Index: devel/s390x-binutils/pkg-plist
===================================================================
--- devel/s390x-binutils/pkg-plist
+++ devel/s390x-binutils/pkg-plist
@@ -1,101 +0,0 @@
-bin/%%BUTARGET%%-addr2line
-bin/%%BUTARGET%%-ar
-bin/%%BUTARGET%%-as
-bin/%%BUTARGET%%-c++filt
-bin/%%BUTARGET%%-elfedit
-bin/%%BUTARGET%%-gprof
-bin/%%BUTARGET%%-ld
-bin/%%BUTARGET%%-ld.bfd
-bin/%%BUTARGET%%-nm
-bin/%%BUTARGET%%-objcopy
-bin/%%BUTARGET%%-objdump
-bin/%%BUTARGET%%-ranlib
-bin/%%BUTARGET%%-readelf
-bin/%%BUTARGET%%-size
-bin/%%BUTARGET%%-strings
-bin/%%BUTARGET%%-strip
-man/man1/%%BUTARGET%%-addr2line.1.gz
-man/man1/%%BUTARGET%%-ar.1.gz
-man/man1/%%BUTARGET%%-as.1.gz
-man/man1/%%BUTARGET%%-c++filt.1.gz
-man/man1/%%BUTARGET%%-dlltool.1.gz
-man/man1/%%BUTARGET%%-elfedit.1.gz
-man/man1/%%BUTARGET%%-gprof.1.gz
-man/man1/%%BUTARGET%%-ld.1.gz
-man/man1/%%BUTARGET%%-nm.1.gz
-man/man1/%%BUTARGET%%-objcopy.1.gz
-man/man1/%%BUTARGET%%-objdump.1.gz
-man/man1/%%BUTARGET%%-ranlib.1.gz
-man/man1/%%BUTARGET%%-readelf.1.gz
-man/man1/%%BUTARGET%%-size.1.gz
-man/man1/%%BUTARGET%%-strings.1.gz
-man/man1/%%BUTARGET%%-strip.1.gz
-man/man1/%%BUTARGET%%-windmc.1.gz
-man/man1/%%BUTARGET%%-windres.1.gz
-%%BUTARGET%%/bin/ar
-%%BUTARGET%%/bin/as
-%%BUTARGET%%/bin/ld
-%%BUTARGET%%/bin/ld.bfd
-%%BUTARGET%%/bin/nm
-%%BUTARGET%%/bin/objcopy
-%%BUTARGET%%/bin/objdump
-%%BUTARGET%%/bin/ranlib
-%%BUTARGET%%/bin/readelf
-%%BUTARGET%%/bin/size
-%%BUTARGET%%/bin/strip
-%%BUTARGET%%/lib/ldscripts/elf_s390.x
-%%BUTARGET%%/lib/ldscripts/elf_s390.xbn
-%%BUTARGET%%/lib/ldscripts/elf_s390.xc
-%%BUTARGET%%/lib/ldscripts/elf_s390.xce
-%%BUTARGET%%/lib/ldscripts/elf_s390.xd
-%%BUTARGET%%/lib/ldscripts/elf_s390.xdc
-%%BUTARGET%%/lib/ldscripts/elf_s390.xdce
-%%BUTARGET%%/lib/ldscripts/elf_s390.xde
-%%BUTARGET%%/lib/ldscripts/elf_s390.xdw
-%%BUTARGET%%/lib/ldscripts/elf_s390.xdwe
-%%BUTARGET%%/lib/ldscripts/elf_s390.xe
-%%BUTARGET%%/lib/ldscripts/elf_s390.xn
-%%BUTARGET%%/lib/ldscripts/elf_s390.xr
-%%BUTARGET%%/lib/ldscripts/elf_s390.xs
-%%BUTARGET%%/lib/ldscripts/elf_s390.xsc
-%%BUTARGET%%/lib/ldscripts/elf_s390.xsce
-%%BUTARGET%%/lib/ldscripts/elf_s390.xse
-%%BUTARGET%%/lib/ldscripts/elf_s390.xsw
-%%BUTARGET%%/lib/ldscripts/elf_s390.xswe
-%%BUTARGET%%/lib/ldscripts/elf_s390.xu
-%%BUTARGET%%/lib/ldscripts/elf_s390.xw
-%%BUTARGET%%/lib/ldscripts/elf_s390.xwe
-%%BUTARGET%%/lib/ldscripts/elf64_s390.x
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xbn
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xc
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xce
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xceo
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xco
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xd
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xdc
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xdce
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xdceo
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xdco
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xde
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xdeo
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xdo
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xdw
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xdwe
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xe
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xeo
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xn
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xo
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xr
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xs
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xsc
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xsce
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xsceo
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xsco
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xse
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xseo
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xso
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xsw
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xswe
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xu
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xw
-%%BUTARGET%%/lib/ldscripts/elf64_s390.xwe
Index: devel/sope4/Makefile
===================================================================
--- devel/sope4/Makefile
+++ devel/sope4/Makefile
@@ -32,7 +32,7 @@
 USE_LDCONFIG=		${GNUSTEP_LOCAL_LIBRARIES}
 LLD_UNSAFE=		yes # PR 230608
 
-CONFLICTS=		sope2-[0-9]* sope3-[0-9]*
+#CONFLICTS=		sope2-[0-9]* sope3-[0-9]*
 
 SUB_LIST+=		GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \
 			GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES}
Index: devel/sparc64-binutils/Makefile
===================================================================
--- devel/sparc64-binutils/Makefile
+++ devel/sparc64-binutils/Makefile
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-COMMENT=	GNU binutils for sparc64 cross-development
-PKGNAMEPREFIX=	sparc64-
-PLIST=	${.CURDIR}/pkg-plist
-
-MASTERDIR=	${.CURDIR}/../binutils
-
-.include "${MASTERDIR}/Makefile"
Index: devel/sparc64-binutils/pkg-plist
===================================================================
--- devel/sparc64-binutils/pkg-plist
+++ devel/sparc64-binutils/pkg-plist
@@ -1,111 +0,0 @@
-bin/%%BUTARGET%%-addr2line
-bin/%%BUTARGET%%-ar
-bin/%%BUTARGET%%-as
-bin/%%BUTARGET%%-c++filt
-bin/%%BUTARGET%%-elfedit
-bin/%%BUTARGET%%-gprof
-bin/%%BUTARGET%%-ld
-bin/%%BUTARGET%%-ld.bfd
-bin/%%BUTARGET%%-nm
-bin/%%BUTARGET%%-objcopy
-bin/%%BUTARGET%%-objdump
-bin/%%BUTARGET%%-ranlib
-bin/%%BUTARGET%%-readelf
-bin/%%BUTARGET%%-size
-bin/%%BUTARGET%%-strings
-bin/%%BUTARGET%%-strip
-man/man1/%%BUTARGET%%-addr2line.1.gz
-man/man1/%%BUTARGET%%-ar.1.gz
-man/man1/%%BUTARGET%%-as.1.gz
-man/man1/%%BUTARGET%%-c++filt.1.gz
-man/man1/%%BUTARGET%%-dlltool.1.gz
-man/man1/%%BUTARGET%%-elfedit.1.gz
-man/man1/%%BUTARGET%%-gprof.1.gz
-man/man1/%%BUTARGET%%-ld.1.gz
-man/man1/%%BUTARGET%%-nm.1.gz
-man/man1/%%BUTARGET%%-objcopy.1.gz
-man/man1/%%BUTARGET%%-objdump.1.gz
-man/man1/%%BUTARGET%%-ranlib.1.gz
-man/man1/%%BUTARGET%%-readelf.1.gz
-man/man1/%%BUTARGET%%-size.1.gz
-man/man1/%%BUTARGET%%-strings.1.gz
-man/man1/%%BUTARGET%%-strip.1.gz
-man/man1/%%BUTARGET%%-windmc.1.gz
-man/man1/%%BUTARGET%%-windres.1.gz
-%%BUTARGET%%/bin/ar
-%%BUTARGET%%/bin/as
-%%BUTARGET%%/bin/ld
-%%BUTARGET%%/bin/ld.bfd
-%%BUTARGET%%/bin/nm
-%%BUTARGET%%/bin/objcopy
-%%BUTARGET%%/bin/objdump
-%%BUTARGET%%/bin/ranlib
-%%BUTARGET%%/bin/readelf
-%%BUTARGET%%/bin/size
-%%BUTARGET%%/bin/strip
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.x
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xbn
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xc
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xce
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xd
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xdc
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xdce
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xde
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xdw
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xdwe
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xe
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xn
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xr
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xs
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xsc
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xsce
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xse
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xsw
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xswe
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xu
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xw
-%%BUTARGET%%/lib/ldscripts/elf32_sparc.xwe
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.x
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xbn
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xc
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xce
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xd
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xdc
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xdce
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xde
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xdw
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xdwe
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xe
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xn
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xr
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xs
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xsc
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xsce
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xse
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xsw
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xswe
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xu
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xw
-%%BUTARGET%%/lib/ldscripts/elf64_sparc.xwe
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.x
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xbn
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xc
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xce
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xd
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xdc
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xdce
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xde
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xdw
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xdwe
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xe
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xn
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xr
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xs
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xsc
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xsce
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xse
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xsw
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xswe
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xu
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xw
-%%BUTARGET%%/lib/ldscripts/elf64_sparc_fbsd.xwe