Update to binutils-2.22, mostly from wip/binutils.

Changes since binutils-2.17 are too numerous to mention, see the various
NEWS files for details.

Tested on NetBSD 6.0_BETA2 and SmartOS.

14 files changed, 105 insertions, 237 deletions

diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index bb8bfad9f67..ddb0d72324d 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.42 2012/06/02 11:54:38 cheusov Exp $
+# $NetBSD: Makefile,v 1.43 2012/07/23 12:24:34 jperkin Exp $
 
-DISTNAME=	binutils-2.17
-PKGREVISION=	2
+DISTNAME=	binutils-2.22
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=binutils/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://directory.fsf.org/project/binutils/
 COMMENT=	GNU binary utilities
-LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
+LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
+EXTRACT_SUFX=	.tar.bz2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -19,13 +19,15 @@ NOT_FOR_PLATFORM=	Darwin-*-* Interix-*-*
 USE_PKGLOCALEDIR=	yes
 REPLACE_LOCALEDIR_PATTERNS+=	Make-in
 
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+
 USE_TOOLS+=		makeinfo
 TEXINFO_REQD=		4.0
 MAKEFLAGS+=		TEXINFO_LOCALE=no
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-lib-path='/lib:/usr/lib'
-CONFIGURE_ARGS+=	--disable-werror # pkg/45541
 CONFIGURE_ARGS+=	--program-prefix=g
 BINUTILS_PREFIX=	${PREFIX}/${MACHINE_GNU_PLATFORM}
 
@@ -50,29 +52,31 @@ CFLAGS+=	-Wno-unused-value -Wno-format-security \
 		-Wno-uninitialized -Wno-format
 .endif
 
-# Prevent the need to run texi2pod.pl and pod2man hence
-# the need for perl as build dependency.
-#
+# Prevent the need to run texi2pod.pl and pod2man which would
+# require perl as a build dependency.
 post-configure:
 .for f in ld/ldver.texi ld/ld.1 gas/doc/gasver.texi gas/doc/as.1
 	set -e; \
 	if [ -f ${WRKSRC}/${f} ]; then					\
-		touch ${WRKSRC}/${f};					\
+		${TOUCH} ${WRKSRC}/${f};				\
 	fi
 .endfor
 
 post-install:
-	cd ${DESTDIR}${PREFIX} && find ${MACHINE_GNU_PLATFORM}/lib/ldscripts -type f -print	\
-		| sort -r						\
-		> ${WRKDIR}/PLIST_DYNAMIC
-.for f in addr2line ar as c++filt dlltool gprof ld nlmconv nm objcopy objdump ranlib \
-          readelf size strings strip windres
+	cd ${DESTDIR}${PREFIX} &&					\
+	    find ${MACHINE_GNU_PLATFORM}/lib/ldscripts -type f -print	\
+	    | sort -r							\
+	    > ${WRKDIR}/PLIST_DYNAMIC
+.for f in addr2line ar as c++filt dlltool elfedit gprof ld ld.bfd	\
+	  nlmconv nm objcopy objdump ranlib readelf size strings strip	\
+	  windmc windres
 	set -e; \
-	if ${TEST} -f ${DESTDIR}${PREFIX}/bin/g${f:Q}; then \
-	   ${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/gnu/bin/${f}; \
+	if [ -f ${DESTDIR}${PREFIX}/bin/g${f:Q} ]; then \
+	    ${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/gnu/bin/${f}; \
 	fi
-	if ${TEST} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/g${f:Q}.1; then \
-	   ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/gnu/man/man1/${f}.1; \
+	if [ -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/g${f:Q}.1 ]; then \
+	    ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 \
+	              ${DESTDIR}${PREFIX}/gnu/man/man1/${f}.1; \
 	fi
 .endfor
 
diff --git a/devel/binutils/PLIST.common b/devel/binutils/PLIST.common
index 8d5aacae243..c411a6fa3c7 100644
--- a/devel/binutils/PLIST.common
+++ b/devel/binutils/PLIST.common
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST.common,v 1.16 2012/06/02 11:54:38 cheusov Exp $
+@comment $NetBSD: PLIST.common,v 1.17 2012/07/23 12:24:34 jperkin Exp $
 ${MACHINE_GNU_PLATFORM}/bin/ar
 ${MACHINE_GNU_PLATFORM}/bin/as
 ${MACHINE_GNU_PLATFORM}/bin/ld
+${MACHINE_GNU_PLATFORM}/bin/ld.bfd
 ${MACHINE_GNU_PLATFORM}/bin/nm
+${MACHINE_GNU_PLATFORM}/bin/objcopy
 ${MACHINE_GNU_PLATFORM}/bin/objdump
 ${MACHINE_GNU_PLATFORM}/bin/ranlib
 ${MACHINE_GNU_PLATFORM}/bin/strip
@@ -11,7 +13,9 @@ bin/gar
 bin/gas
 bin/gc++filt
 ${PLIST.gprof}bin/ggprof
+bin/gelfedit
 bin/gld
+bin/gld.bfd
 bin/gnm
 bin/gobjcopy
 bin/gobjdump
@@ -25,7 +29,9 @@ gnu/bin/ar
 gnu/bin/as
 gnu/bin/c++filt
 ${PLIST.gprof}gnu/bin/gprof
+gnu/bin/elfedit
 gnu/bin/ld
+gnu/bin/ld.bfd
 gnu/bin/nm
 gnu/bin/objcopy
 gnu/bin/objdump
@@ -41,6 +47,7 @@ gnu/man/man1/c++filt.1
 gnu/man/man1/dlltool.1
 ${PLIST.gprof}gnu/man/man1/gprof.1
 gnu/man/man1/ld.1
+gnu/man/man1/elfedit.1
 gnu/man/man1/nlmconv.1
 gnu/man/man1/nm.1
 gnu/man/man1/objcopy.1
@@ -50,6 +57,7 @@ gnu/man/man1/readelf.1
 gnu/man/man1/size.1
 gnu/man/man1/strings.1
 gnu/man/man1/strip.1
+gnu/man/man1/windmc.1
 gnu/man/man1/windres.1
 include/ansidecl.h
 include/bfd.h
@@ -71,6 +79,7 @@ man/man1/gc++filt.1
 man/man1/gdlltool.1
 ${PLIST.gprof}man/man1/ggprof.1
 man/man1/gld.1
+man/man1/gelfedit.1
 man/man1/gnlmconv.1
 man/man1/gnm.1
 man/man1/gobjcopy.1
@@ -80,7 +89,11 @@ man/man1/greadelf.1
 man/man1/gsize.1
 man/man1/gstrings.1
 man/man1/gstrip.1
+man/man1/gwindmc.1
 man/man1/gwindres.1
+share/locale/bg/LC_MESSAGES/binutils.mo
+${PLIST.gprof}share/locale/bg/LC_MESSAGES/gprof.mo
+share/locale/bg/LC_MESSAGES/ld.mo
 share/locale/da/LC_MESSAGES/bfd.mo
 share/locale/da/LC_MESSAGES/binutils.mo
 ${PLIST.gprof}share/locale/da/LC_MESSAGES/gprof.mo
@@ -88,13 +101,18 @@ share/locale/da/LC_MESSAGES/ld.mo
 share/locale/da/LC_MESSAGES/opcodes.mo
 ${PLIST.gprof}share/locale/de/LC_MESSAGES/gprof.mo
 share/locale/de/LC_MESSAGES/opcodes.mo
+${PLIST.gprof}share/locale/eo/LC_MESSAGES/gprof.mo
 share/locale/es/LC_MESSAGES/bfd.mo
 share/locale/es/LC_MESSAGES/binutils.mo
 share/locale/es/LC_MESSAGES/gas.mo
 ${PLIST.gprof}share/locale/es/LC_MESSAGES/gprof.mo
 share/locale/es/LC_MESSAGES/ld.mo
 share/locale/es/LC_MESSAGES/opcodes.mo
+share/locale/fi/LC_MESSAGES/bfd.mo
 share/locale/fi/LC_MESSAGES/binutils.mo
+share/locale/fi/LC_MESSAGES/gas.mo
+${PLIST.gprof}share/locale/fi/LC_MESSAGES/gprof.mo
+share/locale/fi/LC_MESSAGES/ld.mo
 share/locale/fi/LC_MESSAGES/opcodes.mo
 share/locale/fr/LC_MESSAGES/bfd.mo
 share/locale/fr/LC_MESSAGES/binutils.mo
@@ -103,22 +121,35 @@ ${PLIST.gprof}share/locale/fr/LC_MESSAGES/gprof.mo
 share/locale/fr/LC_MESSAGES/ld.mo
 share/locale/fr/LC_MESSAGES/opcodes.mo
 ${PLIST.gprof}share/locale/ga/LC_MESSAGES/gprof.mo
+share/locale/ga/LC_MESSAGES/ld.mo
 share/locale/ga/LC_MESSAGES/opcodes.mo
 ${PLIST.gprof}share/locale/id/LC_MESSAGES/gprof.mo
+share/locale/id/LC_MESSAGES/bfd.mo
+share/locale/id/LC_MESSAGES/binutils.mo
+share/locale/id/LC_MESSAGES/gas.mo
+share/locale/id/LC_MESSAGES/ld.mo
 share/locale/id/LC_MESSAGES/opcodes.mo
 share/locale/ja/LC_MESSAGES/bfd.mo
 share/locale/ja/LC_MESSAGES/binutils.mo
+share/locale/ja/LC_MESSAGES/ld.mo
+${PLIST.gprof}share/locale/ms/LC_MESSAGES/gprof.mo
+${PLIST.gprof}share/locale/nl/LC_MESSAGES/gprof.mo
 share/locale/nl/LC_MESSAGES/opcodes.mo
 ${PLIST.gprof}share/locale/pt_BR/LC_MESSAGES/gprof.mo
 share/locale/pt_BR/LC_MESSAGES/opcodes.mo
 share/locale/ro/LC_MESSAGES/bfd.mo
 share/locale/ro/LC_MESSAGES/binutils.mo
+${PLIST.gprof}share/locale/ro/LC_MESSAGES/gprof.mo
 share/locale/ro/LC_MESSAGES/opcodes.mo
+share/locale/ru/LC_MESSAGES/bfd.mo
 share/locale/ru/LC_MESSAGES/binutils.mo
+share/locale/ru/LC_MESSAGES/gas.mo
+${PLIST.gprof}share/locale/ru/LC_MESSAGES/gprof.mo
 share/locale/rw/LC_MESSAGES/bfd.mo
 share/locale/rw/LC_MESSAGES/binutils.mo
 share/locale/rw/LC_MESSAGES/gas.mo
 ${PLIST.gprof}share/locale/rw/LC_MESSAGES/gprof.mo
+share/locale/sk/LC_MESSAGES/binutils.mo
 share/locale/sv/LC_MESSAGES/bfd.mo
 share/locale/sv/LC_MESSAGES/binutils.mo
 ${PLIST.gprof}share/locale/sv/LC_MESSAGES/gprof.mo
@@ -130,6 +161,7 @@ share/locale/tr/LC_MESSAGES/gas.mo
 ${PLIST.gprof}share/locale/tr/LC_MESSAGES/gprof.mo
 share/locale/tr/LC_MESSAGES/ld.mo
 share/locale/tr/LC_MESSAGES/opcodes.mo
+share/locale/uk/LC_MESSAGES/binutils.mo
 share/locale/vi/LC_MESSAGES/bfd.mo
 share/locale/vi/LC_MESSAGES/binutils.mo
 share/locale/vi/LC_MESSAGES/ld.mo
@@ -140,3 +172,4 @@ share/locale/zh_CN/LC_MESSAGES/ld.mo
 share/locale/zh_CN/LC_MESSAGES/opcodes.mo
 ${PLIST.gprof}share/locale/vi/LC_MESSAGES/gprof.mo
 share/locale/zh_TW/LC_MESSAGES/binutils.mo
+share/locale/zh_TW/LC_MESSAGES/ld.mo
diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index 2c09efc8722..dcc4431a410 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:24:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2012/07/23 12:24:34 jperkin Exp $
 
 BUILDLINK_TREE+=	binutils
 
 .if !defined(BINUTILS_BUILDLINK3_MK)
 BINUTILS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.binutils+=	binutils>=2.17
+BUILDLINK_API_DEPENDS.binutils+=	binutils>=2.22
 BUILDLINK_PKGSRCDIR.binutils?=	../../devel/binutils
 BUILDLINK_DEPMETHOD.binutils?=	build
 .endif # BINUTILS_BUILDLINK3_MK
diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo
index e8678ff8811..cfba036a768 100644
--- a/devel/binutils/distinfo
+++ b/devel/binutils/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.10 2011/08/22 08:51:46 wiz Exp $
+$NetBSD: distinfo,v 1.11 2012/07/23 12:24:34 jperkin Exp $
 
-SHA1 (binutils-2.17.tar.gz) = a9ac9ac4e918568b297033cdc44a38beef8f9f6a
-RMD160 (binutils-2.17.tar.gz) = bc5e8b23457f0e2e91f70b93eff00134e2d50434
-Size (binutils-2.17.tar.gz) = 18196360 bytes
-SHA1 (patch-aa) = dd97a5afea4b5ae07863301426b71acc61b9a4b6
-SHA1 (patch-ab) = 9d8a52de59f73cce90a1e8fff5d20849724ceb26
-SHA1 (patch-ac) = 8165e2adb19eca4ec9b6e7fd3b52c6614910fa65
-SHA1 (patch-ad) = 4aa005a473d1c4af052eaee84b98b1c0aff90bf1
-SHA1 (patch-ae) = 8aa22782397a59c17801c791dddaefdf757d824e
-SHA1 (patch-af) = f4566c63dd8e7267d96ea65527fd2593b210c241
-SHA1 (patch-gas_app.c) = c7fb59d4c2d9450618818d7e9f5d6e7e8efdbda3
+SHA1 (binutils-2.22.tar.bz2) = 65b304a0b9a53a686ce50a01173d1f40f8efe404
+RMD160 (binutils-2.22.tar.bz2) = 34cebe4cdca9480d5dc6f6b00b052c48c8ac30dc
+Size (binutils-2.22.tar.bz2) = 19973532 bytes
+SHA1 (patch-aa) = 1a127f82c807cbd1ac6fee073c618f3fb48667f6
+SHA1 (patch-configure.ac) = 7bd7b90e57d850705286f2cc6464ecc45e0657c0
+SHA1 (patch-libiberty_Makefile.in) = 380a24a9b6b583002a7cf7b2490e3373e50c6282
diff --git a/devel/binutils/override-as.mk b/devel/binutils/override-as.mk
index 4310ceb44b6..70f1a3431b4 100644
--- a/devel/binutils/override-as.mk
+++ b/devel/binutils/override-as.mk
@@ -1,4 +1,4 @@
-# $NetBSD: override-as.mk,v 1.4 2012/06/16 22:22:54 wiz Exp $
+# $NetBSD: override-as.mk,v 1.5 2012/07/23 12:24:34 jperkin Exp $
 
 # This Makefile fragment can be included by packages that wish to
 # override the default selection of as(1) and use the one from devel/binutils
@@ -20,4 +20,5 @@ ${SPECS_AS}:
 
 _WRAP_EXTRA_ARGS.CC+=	-specs ${SPECS_AS}
 _WRAP_EXTRA_ARGS.CXX+=	-specs ${SPECS_AS}
+
 .endif
diff --git a/devel/binutils/patches/patch-aa b/devel/binutils/patches/patch-aa
index 555854cdbe4..abece8c31a7 100644
--- a/devel/binutils/patches/patch-aa
+++ b/devel/binutils/patches/patch-aa
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.4 2007/05/29 12:25:03 martti Exp $
+$NetBSD: patch-aa,v 1.5 2012/07/23 12:24:34 jperkin Exp $
 
---- configure.orig	2006-04-07 00:49:25.000000000 +0300
-+++ configure	2007-05-29 14:25:14.000000000 +0300
-@@ -899,7 +899,7 @@
- # know that we are building the simulator.
+Remove etc
+
+--- configure.orig	2011-08-14 21:28:15.000000000 +0900
++++ configure	2012-02-13 10:34:04.000000000 +0900
+@@ -2667,7 +2667,7 @@
  # binutils, gas and ld appear in that order because it makes sense to run
  # "make check" in that particular order.
--host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
-+host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
+ # If --enable-gold is used, "gold" may replace "ld".
+-host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools"
++host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof expect dejagnu m4 utils guile fastjar gnattools"
  
  # libgcj represents the runtime libraries only used by gcj.
  libgcj="target-libffi \
diff --git a/devel/binutils/patches/patch-ab b/devel/binutils/patches/patch-ab
deleted file mode 100644
index d7082d05c48..00000000000
--- a/devel/binutils/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/05/29 12:25:04 martti Exp $
-
---- bfd/configure.orig	2006-06-23 21:17:03.000000000 +0300
-+++ bfd/configure	2007-05-29 14:36:21.000000000 +0300
-@@ -11499,7 +11499,7 @@
- 	COREFILE=trad-core.lo
- 	TRAD_HEADER='"hosts/i386bsd.h"'
- 	;;
--  i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu)
-+  i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu | i[3-7]86-*-dragonfly*)
- 	COREFILE=''
- 	TRAD_HEADER='"hosts/i386bsd.h"'
- 	;;
-@@ -13097,6 +13097,7 @@
-     bfd_elf32_hppa_vec)		tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
-     bfd_elf32_i370_vec)		tb="$tb elf32-i370.lo elf32.lo $elf" ;;
-     bfd_elf32_i386_freebsd_vec)	tb="$tb elf32-i386.lo elf-vxworks.lo elf32.lo $elf" ;;
-+    bfd_elf32_i386_dragonfly_vec) tb="$tb elf32-i386.lo elf-vxworks.lo elf32.lo $elf" ;;
-     bfd_elf32_i386_vxworks_vec)	tb="$tb elf32-i386.lo elf-vxworks.lo elf32.lo $elf" ;;
-     bfd_elf32_i386_vec)		tb="$tb elf32-i386.lo elf-vxworks.lo elf32.lo $elf" ;;
-     bfd_elf32_i860_little_vec)	tb="$tb elf32-i860.lo elf32.lo $elf" ;;
-@@ -13218,6 +13219,7 @@
-     i386coff_vec)		tb="$tb coff-i386.lo cofflink.lo" ;;
-     i386dynix_vec)		tb="$tb i386dynix.lo aout32.lo" ;;
-     i386freebsd_vec)		tb="$tb i386freebsd.lo aout32.lo" ;;
-+    i386dragonfly_vec)		tb="$tb i386freebsd.lo aout32.lo" ;;
-     i386linux_vec)		tb="$tb i386linux.lo aout32.lo" ;;
-     i386lynx_aout_vec)		tb="$tb i386lynx.lo lynx-core.lo aout32.lo" ;;
-     i386lynx_coff_vec)		tb="$tb cf-i386lynx.lo cofflink.lo lynx-core.lo" ;;
diff --git a/devel/binutils/patches/patch-ac b/devel/binutils/patches/patch-ac
deleted file mode 100644
index 74a27ffe3b9..00000000000
--- a/devel/binutils/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2007/05/29 12:25:04 martti Exp $
-
---- bfd/config.bfd.orig	2006-04-05 15:41:57.000000000 +0300
-+++ bfd/config.bfd	2007-05-29 14:31:45.000000000 +0300
-@@ -503,7 +503,7 @@
-     targ_selvecs=i386bsd_vec
-     targ_underscore=yes
-     ;;
--  i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu)
-+  i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu | i[3-7]86-*-dragonfly*)
-     targ_defvec=bfd_elf32_i386_freebsd_vec
-     targ_selvecs=i386coff_vec
-     # FreeBSD <= 4.0 supports only the old nonstandard way of ABI labelling.
diff --git a/devel/binutils/patches/patch-ad b/devel/binutils/patches/patch-ad
deleted file mode 100644
index ba43874558b..00000000000
--- a/devel/binutils/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2007/05/29 12:25:04 martti Exp $
-
---- gas/configure.tgt.orig	2006-04-05 15:41:57.000000000 +0300
-+++ gas/configure.tgt	2007-05-29 14:42:07.000000000 +0300
-@@ -191,7 +191,7 @@
-   i386-*-freebsdaout*)			fmt=aout em=386bsd ;;
-   i386-*-freebsd[12].*)			fmt=aout em=386bsd ;;
-   i386-*-freebsd[12])			fmt=aout em=386bsd ;;
--  i386-*-freebsd* | i386-*-kfreebsd*-gnu)
-+  i386-*-freebsd* | i386-*-kfreebsd*-gnu | i386-*-dragonfly*)
- 				    	fmt=elf em=freebsd ;;
-   i386-*-sysv*)				fmt=coff ;;
-   i386-*-sco3.2v5*coff)			fmt=coff ;;
-@@ -382,6 +382,7 @@
- 
-   *-*-aout | *-*-scout)			fmt=aout ;;
-   *-*-freebsd* | *-*-kfreebsd*-gnu)	fmt=elf em=freebsd ;;
-+  *-*-dragonfly*)			fmt=elf em=freebsd ;;
-   *-*-bsd*)				fmt=aout em=sun3 ;;
-   *-*-generic)				fmt=generic ;;
-   *-*-xray | *-*-hms)			fmt=coff ;;
diff --git a/devel/binutils/patches/patch-ae b/devel/binutils/patches/patch-ae
deleted file mode 100644
index 2cb6ceddd42..00000000000
--- a/devel/binutils/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2007/05/29 12:25:04 martti Exp $
-
---- ld/configure.tgt.orig	2006-04-05 15:41:57.000000000 +0300
-+++ ld/configure.tgt	2007-05-29 14:32:32.000000000 +0300
-@@ -194,7 +194,7 @@
- i[3-7]86-*-kaos*)	targ_emul=elf_i386 ;;
- i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | i[3-7]86-*-freebsd[12])
- 			targ_emul=i386bsd ;;
--i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu)
-+i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu | i[3-7]86-*-dragonfly*)
- 		        targ_emul=elf_i386_fbsd
- 			targ_extra_emuls="elf_i386 i386bsd" ;;
- x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
-@@ -585,6 +585,10 @@
-   NATIVE_LIB_DIRS='/lib /usr/lib /usr/local/lib'
-   ;;
- 
-+*-*-dragonfly*)
-+  NATIVE_LIB_DIRS='/lib /usr/lib'
-+  ;;
-+
- hppa*64*-*-hpux11*)
-   NATIVE_LIB_DIRS=/usr/lib/pa20_64
-   ;;
diff --git a/devel/binutils/patches/patch-af b/devel/binutils/patches/patch-af
deleted file mode 100644
index c680b7b259b..00000000000
--- a/devel/binutils/patches/patch-af
+++ /dev/null
@@ -1,94 +0,0 @@
-$NetBSD: patch-af,v 1.2 2011/08/22 08:51:46 wiz Exp $
-
---- gas/read.c.orig	2005-11-17 07:29:28.000000000 +0000
-+++ gas/read.c
-@@ -1279,7 +1279,7 @@ s_align (int arg, int bytes_p)
-   unsigned int align_limit = ALIGN_LIMIT;
-   unsigned int align;
-   char *stop = NULL;
--  char stopc;
-+  char stopc = '\0';
-   offsetT fill = 0;
-   int max;
-   int fill_p;
-@@ -1423,7 +1423,7 @@ s_comm_internal (int param,
-   offsetT temp, size;
-   symbolS *symbolP = NULL;
-   char *stop = NULL;
--  char stopc;
-+  char stopc = '\0'; /* XXX: gcc -Wuninitialized */
-   expressionS exp;
- 
-   if (flag_mri)
-@@ -1538,7 +1538,7 @@ s_mri_common (int small ATTRIBUTE_UNUSED
-   symbolS *sym;
-   offsetT align;
-   char *stop = NULL;
--  char stopc;
-+  char stopc = '\0';
- 
-   if (!flag_mri)
-     {
-@@ -1807,7 +1807,7 @@ s_fail (int ignore ATTRIBUTE_UNUSED)
- {
-   offsetT temp;
-   char *stop = NULL;
--  char stopc;
-+  char stopc = '\0';
- 
-   if (flag_mri)
-     stop = mri_comment_field (&stopc);
-@@ -1929,7 +1929,7 @@ s_globl (int ignore ATTRIBUTE_UNUSED)
-   int c;
-   symbolS *symbolP;
-   char *stop = NULL;
--  char stopc;
-+  char stopc = '\0';
- 
-   if (flag_mri)
-     stop = mri_comment_field (&stopc);
-@@ -2881,7 +2881,7 @@ s_space (int mult)
-   expressionS val;
-   char *p = 0;
-   char *stop = NULL;
--  char stopc;
-+  char stopc = '\0';
-   int bytes;
- 
- #ifdef md_flush_pending_output
-@@ -3057,7 +3057,7 @@ s_float_space (int float_type)
-   int flen;
-   char temp[MAXIMUM_NUMBER_OF_CHARS_FOR_FLOAT];
-   char *stop = NULL;
--  char stopc;
-+  char stopc = '\0';
- 
-   if (flag_mri)
-     stop = mri_comment_field (&stopc);
-@@ -3134,7 +3134,7 @@ void
- s_struct (int ignore ATTRIBUTE_UNUSED)
- {
-   char *stop = NULL;
--  char stopc;
-+  char stopc = '\0';
- 
-   if (flag_mri)
-     stop = mri_comment_field (&stopc);
-@@ -3514,7 +3514,7 @@ cons_worker (register int nbytes,	/* 1=.
-   int c;
-   expressionS exp;
-   char *stop = NULL;
--  char stopc;
-+  char stopc = '\0';
- 
- #ifdef md_flush_pending_output
-   md_flush_pending_output ();
-@@ -5010,7 +5010,7 @@ void
- equals (char *sym_name, int reassign)
- {
-   char *stop = NULL;
--  char stopc;
-+  char stopc = '\0';
- 
-   input_line_pointer++;
-   if (*input_line_pointer == '=')
diff --git a/devel/binutils/patches/patch-configure.ac b/devel/binutils/patches/patch-configure.ac
new file mode 100644
index 00000000000..a2725dc076b
--- /dev/null
+++ b/devel/binutils/patches/patch-configure.ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.ac,v 1.1 2012/07/23 12:24:34 jperkin Exp $
+
+Remove etc
+
+--- configure.ac.orig	2011-11-21 20:58:27.000000000 +0900
++++ configure.ac	2012-02-13 10:34:17.000000000 +0900
+@@ -140,7 +140,7 @@
+ # binutils, gas and ld appear in that order because it makes sense to run
+ # "make check" in that particular order.
+ # If --enable-gold is used, "gold" may replace "ld".
+-host_tools="flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools"
++host_tools="flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof expect dejagnu m4 utils guile fastjar gnattools"
+ 
+ # libgcj represents the runtime libraries only used by gcj.
+ libgcj="target-libffi \
diff --git a/devel/binutils/patches/patch-gas_app.c b/devel/binutils/patches/patch-gas_app.c
deleted file mode 100644
index b7df268cc15..00000000000
--- a/devel/binutils/patches/patch-gas_app.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-gas_app.c,v 1.1 2011/08/22 08:51:46 wiz Exp $
-
-Fix build with gcc-4.5.
-
---- gas/app.c.orig	2006-03-10 10:57:18.000000000 +0000
-+++ gas/app.c
-@@ -563,7 +563,8 @@ do_scrub_chars (int (*get) (char *, int)
- 	    {
- 	      as_warn (_("end of file in string; '%c' inserted"), quotechar);
- 	      state = old_state;
--	      UNGET ('\n');
-+              if (from > input_buffer)
-+	          UNGET ('\n');
- 	      PUT (quotechar);
- 	    }
- 	  else if (ch == quotechar)
diff --git a/devel/binutils/patches/patch-libiberty_Makefile.in b/devel/binutils/patches/patch-libiberty_Makefile.in
new file mode 100644
index 00000000000..35d66f61f7c
--- /dev/null
+++ b/devel/binutils/patches/patch-libiberty_Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-libiberty_Makefile.in,v 1.1 2012/07/23 12:24:34 jperkin Exp $
+
+Disable multilib.
+
+--- libiberty/Makefile.in.orig	2011-07-22 14:37:58.000000000 +0000
++++ libiberty/Makefile.in
+@@ -350,7 +350,6 @@ install-strip: install
+ # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
+ # default multilib, so we have to take CFLAGS into account as well,
+ # since it will be passed the multilib flags.
+-MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
+ install_to_libdir: all
+ 	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
+ 	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n