30 files changed, 14 insertions, 322 deletions

diff --git a/devel/aarch64-binutils/Makefile b/devel/aarch64-binutils/Makefile
index 0b2084c8dafb..0e42263024cb 100644
--- a/devel/aarch64-binutils/Makefile
+++ b/devel/aarch64-binutils/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-PORTREVISION=	1
 COMMENT=	GNU binutils for AArch64 cross-development
 PKGNAMEPREFIX=	aarch64-
 PLIST=	${.CURDIR}/pkg-plist
 
 MASTERDIR=	${.CURDIR}/../binutils/
+BROKEN=		Patchset for aarch64 not up to date for binutils 2.25
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/amd64-binutils/Makefile b/devel/amd64-binutils/Makefile
index db0802bf0c0a..ea45900fcc1b 100644
--- a/devel/amd64-binutils/Makefile
+++ b/devel/amd64-binutils/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PORTREVISION=	3
 COMMENT=	GNU binutils for amd64 cross-development
 PKGNAMEPREFIX=	amd64-
 PLIST=	${.CURDIR}/pkg-plist
diff --git a/devel/arm-gnueabi-binutils/Makefile b/devel/arm-gnueabi-binutils/Makefile
index d1343bd335e2..4ae4892eda52 100644
--- a/devel/arm-gnueabi-binutils/Makefile
+++ b/devel/arm-gnueabi-binutils/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PORTREVISION=	2
 COMMENT=	GNU binutils for arm cross-development
 PKGNAMEPREFIX=	arm-gnueabi-
 PLIST=	${.CURDIR}/pkg-plist
diff --git a/devel/arm-none-eabi-binutils/Makefile b/devel/arm-none-eabi-binutils/Makefile
index f1a11d503ffa..5b0799f6356e 100644
--- a/devel/arm-none-eabi-binutils/Makefile
+++ b/devel/arm-none-eabi-binutils/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PORTREVISION=	2
 COMMENT=	GNU binutils for bare metal arm cross-development
 PKGNAMEPREFIX=	arm-none-eabi-
 BUTARGET=	arm-none-eabi
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index dd7953f70879..d347904bdf4c 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	binutils
-PORTVERSION=	2.24
-PORTREVISION?=	1
+PORTVERSION=	2.25
+PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	binutils/releases
@@ -41,10 +41,8 @@ CONFIGURE_ARGS+=	--with-system-zlib \
 			--with-mpfr=${LOCALBASE}
 INFO=		as \
 		binutils \
-		standards \
 		gprof \
 		bfd \
-		configure \
 		ld
 .endif
 
diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo
index 642e3ea78d48..f2e3d1adbb94 100644
--- a/devel/binutils/distinfo
+++ b/devel/binutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (binutils-2.24.tar.bz2) = e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
-SIZE (binutils-2.24.tar.bz2) = 22716802
+SHA256 (binutils-2.25.tar.bz2) = 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
+SIZE (binutils-2.25.tar.bz2) = 24049133
diff --git a/devel/binutils/files/patch-aarch64.diff b/devel/binutils/files/patch-aarch64.diff
index 7c4a6e16f651..e6346e015d82 100644
--- a/devel/binutils/files/patch-aarch64.diff
+++ b/devel/binutils/files/patch-aarch64.diff
@@ -70,15 +70,15 @@ index 5968668..5ffb2a4 100644
 @@ -1524,6 +1526,14 @@ eaarch64elf32b.c: $(srcdir)/emulparams/aarch64elf32b.sh $(srcdir)/emulparams/aar
    $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
- 	${GENSCRIPTS} aarch64elf32b "$(tdir_aarch64elf32b)"
+
 +eaarch64fbsd.c: $(srcdir)/emulparams/aarch64fbsd.sh \
 +  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
 +  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} aarch64fbsd "$(tdir_aarch64fbsd)"
++
 +eaarch64fbsdb.c: $(srcdir)/emulparams/aarch64fbsdb.sh $(srcdir)/emulparams/aarch64fbsd.sh \
 +  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
 +  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} aarch64fbsdb "$(tdir_aarch64fbsdb)"
++
  eaarch64linux.c: $(srcdir)/emulparams/aarch64linux.sh \
    $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -107,15 +107,15 @@ index 59cba73..0ed674f 100644
 @@ -2956,6 +2960,14 @@ eaarch64elf32b.c: $(srcdir)/emulparams/aarch64elf32b.sh $(srcdir)/emulparams/aar
    $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
- 	${GENSCRIPTS} aarch64elf32b "$(tdir_aarch64elf32b)"
+
 +eaarch64fbsd.c: $(srcdir)/emulparams/aarch64fbsd.sh \
 +  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
 +  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} aarch64fbsd "$(tdir_aarch64fbsd)"
++
 +eaarch64fbsdb.c: $(srcdir)/emulparams/aarch64fbsdb.sh $(srcdir)/emulparams/aarch64fbsd.sh \
 +  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
 +  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} aarch64fbsdb "$(tdir_aarch64fbsdb)"
++
  eaarch64linux.c: $(srcdir)/emulparams/aarch64linux.sh \
    $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
diff --git a/devel/binutils/files/patch-bfd-config.bfd b/devel/binutils/files/patch-bfd-config.bfd
deleted file mode 100644
index 30774a485c1d..000000000000
--- a/devel/binutils/files/patch-bfd-config.bfd
+++ /dev/null
@@ -1,20 +0,0 @@
---- bfd/config.bfd.orig	1970-01-01 00:07:43.000000000 +0000
-+++ bfd/config.bfd	1970-01-01 00:09:21.000000000 +0000
-@@ -323,7 +323,7 @@
-     targ_defvec=bfd_elf32_littlearm_vec
-     targ_selvecs=bfd_elf32_bigarm_vec
-     ;;
--  armeb-*-elf | arm*b-*-linux-*)
-+  armeb-*-elf | arm*b-*-freebsd* | arm*b-*-linux-*)
-     targ_defvec=bfd_elf32_bigarm_vec
-     targ_selvecs=bfd_elf32_littlearm_vec
-     ;;
-@@ -331,7 +331,7 @@
-     targ_defvec=bfd_elf32_littlearm_vec
-     targ_selvecs=bfd_elf32_bigarm_vec
-     ;;
--  arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
-+  arm-*-elf | arm*-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
-   arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
-   arm*-*-eabi* )
-     targ_defvec=bfd_elf32_littlearm_vec
diff --git a/devel/binutils/files/patch-gas-Makefile.am b/devel/binutils/files/patch-gas-Makefile.am
deleted file mode 100644
index db2d3e8783ed..000000000000
--- a/devel/binutils/files/patch-gas-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- gas/Makefile.am.orig	1970-01-01 00:12:34.000000000 +0000
-+++ gas/Makefile.am	1970-01-01 00:13:11.000000000 +0000
-@@ -296,6 +296,8 @@
- 	config/te-386bsd.h \
- 	config/te-aix5.h \
- 	config/te-armeabi.h \
-+	config/te-armfbsddeabi.h \
-+	config/te-armfbsdvfp.h \
- 	config/te-armlinuxeabi.h \
- 	config/te-dynix.h \
- 	config/te-epoc-pe.h \
diff --git a/devel/binutils/files/patch-gas-Makefile.in b/devel/binutils/files/patch-gas-Makefile.in
deleted file mode 100644
index b4fc3ce9110d..000000000000
--- a/devel/binutils/files/patch-gas-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gas/Makefile.in.orig	1970-01-01 00:12:39.000000000 +0000
-+++ gas/Makefile.in	1970-01-01 00:13:39.000000000 +0000
-@@ -565,6 +565,8 @@
- 	config/te-386bsd.h \
- 	config/te-aix5.h \
- 	config/te-armeabi.h \
-+	config/te-armfbsddeabi.h \
-+	config/te-armfbsdvfp.h \
- 	config/te-armlinuxeabi.h \
- 	config/te-dynix.h \
- 	config/te-epoc-pe.h \
diff --git a/devel/binutils/files/patch-gas-config-te-armfbsdeabi.h b/devel/binutils/files/patch-gas-config-te-armfbsdeabi.h
deleted file mode 100644
index 8f84a6ce32ac..000000000000
--- a/devel/binutils/files/patch-gas-config-te-armfbsdeabi.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- gas/config/te-armfbsdeabi.h.orig	1970-01-01 00:14:12.000000000 +0000
-+++ gas/config/te-armfbsdeabi.h	1970-01-01 00:14:37.000000000 +0000
-@@ -0,0 +1,22 @@
-+/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
-+
-+   This file is part of GAS, the GNU Assembler.
-+
-+   GAS is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 3,
-+   or (at your option) any later version.
-+
-+   GAS is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-+   the GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with GAS; see the file COPYING.  If not, write to the Free
-+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
-+   02110-1301, USA.  */
-+
-+#include "te-freebsd.h"
-+
-+#define EABI_DEFAULT EF_ARM_EABI_VER5
diff --git a/devel/binutils/files/patch-gas-config-te-armfbsdvfp.h b/devel/binutils/files/patch-gas-config-te-armfbsdvfp.h
deleted file mode 100644
index d439b5e6dd8b..000000000000
--- a/devel/binutils/files/patch-gas-config-te-armfbsdvfp.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- gas/config/te-armfbsdvfp.h.orig	1970-01-01 00:14:52.000000000 +0000
-+++ gas/config/te-armfbsdvfp.h	1970-01-01 00:14:41.000000000 +0000
-@@ -0,0 +1,22 @@
-+/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
-+
-+   This file is part of GAS, the GNU Assembler.
-+
-+   GAS is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as
-+   published by the Free Software Foundation; either version 3,
-+   or (at your option) any later version.
-+
-+   GAS is distributed in the hope that it will be useful, but
-+   WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-+   the GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with GAS; see the file COPYING.  If not, write to the Free
-+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
-+   02110-1301, USA.  */
-+
-+#include "te-armfbsdeabi.h"
-+
-+#define FPU_DEFAULT FPU_ARCH_VFP
diff --git a/devel/binutils/files/patch-gas-configure.tgt b/devel/binutils/files/patch-gas-configure.tgt
deleted file mode 100644
index f48d1f8805b7..000000000000
--- a/devel/binutils/files/patch-gas-configure.tgt
+++ /dev/null
@@ -1,12 +0,0 @@
---- gas/configure.tgt.orig	1970-01-01 00:15:16.000000000 +0000
-+++ gas/configure.tgt	1970-01-01 00:16:31.000000000 +0000
-@@ -136,6 +136,9 @@
-   arm-*-symbianelf*)			fmt=elf em=symbian ;;
-   arm-*-kaos*)				fmt=elf ;;
-   arm-*-conix*)				fmt=elf ;;
-+  arm-*-freebsd9* | armeb-*-freebsd9*)	fmt=elf  em=freebsd ;;
-+  arm-*-freebsd* | armeb-*-freebsd*)	fmt=elf  em=armfbsdeabi ;;
-+  arm*-*-freebsd*)			fmt=elf  em=armfbsdvfp ;;
-   arm-*-linux*aout*)			fmt=aout em=linux ;;
-   arm-*-linux-*eabi*)			fmt=elf  em=armlinuxeabi ;;
-   arm-*-linux-*)			fmt=elf  em=linux ;;
diff --git a/devel/binutils/files/patch-gold_Makefile.in b/devel/binutils/files/patch-gold_Makefile.in
deleted file mode 100644
index d35f7f470093..000000000000
--- a/devel/binutils/files/patch-gold_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gold/Makefile.in.orig	2013-11-04 16:33:39.000000000 +0100
-+++ gold/Makefile.in	2013-12-13 17:15:03.279391312 +0100
-@@ -419,7 +419,7 @@
- 	-DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@
- 
- LIBIBERTY = ../libiberty/libiberty.a
--@PLUGINS_TRUE@LIBDL = @DLOPEN_LIBS@
-+@PLUGINS_TRUE@LIBDL = 
- @THREADS_TRUE@THREADSLIB = -lpthread
- AM_YFLAGS = -d
- 
diff --git a/devel/binutils/files/patch-gold_config.in b/devel/binutils/files/patch-gold_config.in
deleted file mode 100644
index debd4523b821..000000000000
--- a/devel/binutils/files/patch-gold_config.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- gold/config.in.orig	2012-09-11 11:20:40.000000000 +0200
-+++ gold/config.in	2013-06-22 20:44:46.000000000 +0200
-@@ -190,6 +190,12 @@
- /* Define to 1 if you have the <windows.h> header file. */
- #undef HAVE_WINDOWS_H
- 
-+/* Define to 1 if you have the <unordered_map> header file. */
-+#undef HAVE_UNORDERED_MAP
-+
-+/* Define to 1 if you have the <unordered_set> header file. */
-+#undef HAVE_UNORDERED_SET
-+
- /* Define to 1 if you have the <zlib.h> header file. */
- #undef HAVE_ZLIB_H
- 
diff --git a/devel/binutils/files/patch-gold_configure b/devel/binutils/files/patch-gold_configure
deleted file mode 100644
index 24de55fb5215..000000000000
--- a/devel/binutils/files/patch-gold_configure
+++ /dev/null
@@ -1,23 +0,0 @@
---- gold/configure.orig	2013-11-08 11:13:48.000000000 +0100
-+++ gold/configure	2013-12-14 13:03:48.000000000 +0100
-@@ -7133,6 +7133,20 @@
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
- 
-+for ac_header in unordered_set unordered_map
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
- for ac_header in tr1/unordered_set tr1/unordered_map
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/devel/binutils/files/patch-gold_script.cc b/devel/binutils/files/patch-gold_script.cc
deleted file mode 100644
index db1e3fa005a9..000000000000
--- a/devel/binutils/files/patch-gold_script.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- gold/script.cc.dist	2012-09-01 19:52:34.000000000 -0500
-+++ gold/script.cc	2012-09-01 19:53:22.000000000 -0500
-@@ -2534,8 +2534,6 @@
-     fprintf(f, "      }\n");
- }
- 
--} // End namespace gold.
--
- // The remaining functions are extern "C", so it's clearer to not put
- // them in namespace gold.
- 
-@@ -3391,3 +3389,5 @@
- 
-   return length;
- }
-+
-+} // End namespace gold.
diff --git a/devel/binutils/files/patch-gold_stringpool.cc b/devel/binutils/files/patch-gold_stringpool.cc
deleted file mode 100644
index c2033ee99379..000000000000
--- a/devel/binutils/files/patch-gold_stringpool.cc
+++ /dev/null
@@ -1,23 +0,0 @@
---- gold/stringpool.cc.orig	2010-08-25 10:36:54.000000000 +0200
-+++ gold/stringpool.cc	2013-06-22 21:09:24.000000000 +0200
-@@ -73,7 +73,10 @@ Stringpool_template<Stringpool_char>::re
- {
-   this->key_to_offset_.reserve(n);
- 
--#if defined(HAVE_TR1_UNORDERED_MAP)
-+#if defined(HAVE_UNORDERED_MAP)
-+  this->string_set_.rehash(this->string_set_.size() + n);
-+  return;
-+#elif defined(HAVE_TR1_UNORDERED_MAP)
-   // rehash() implementation is broken in gcc 4.0.3's stl
-   //this->string_set_.rehash(this->string_set_.size() + n);
-   //return;
-@@ -503,7 +506,7 @@ template<typename Stringpool_char>
- void
- Stringpool_template<Stringpool_char>::print_stats(const char* name) const
- {
--#if defined(HAVE_TR1_UNORDERED_MAP) || defined(HAVE_EXT_HASH_MAP)
-+#if defined(HAVE_UNORDERED_MAP) || defined(HAVE_TR1_UNORDERED_MAP) || defined(HAVE_EXT_HASH_MAP)
-   fprintf(stderr, _("%s: %s entries: %zu; buckets: %zu\n"),
- 	  program_name, name, this->string_set_.size(),
- 	  this->string_set_.bucket_count());
diff --git a/devel/binutils/files/patch-gold_system.h b/devel/binutils/files/patch-gold_system.h
deleted file mode 100644
index fd1289e1c437..000000000000
--- a/devel/binutils/files/patch-gold_system.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- gold/system.h.orig	2013-11-04 16:33:39.000000000 +0100
-+++ gold/system.h	2013-12-14 12:51:17.000000000 +0100
-@@ -57,7 +57,20 @@
- 
- // Figure out how to get a hash set and a hash map.
- 
--#if defined(HAVE_TR1_UNORDERED_SET) && defined(HAVE_TR1_UNORDERED_MAP) \
-+#if defined(HAVE_UNORDERED_SET) && defined(HAVE_UNORDERED_MAP)
-+
-+#include <unordered_set>
-+#include <unordered_map>
-+
-+// We need a template typedef here.
-+
-+#define Unordered_set std::unordered_set
-+#define Unordered_map std::unordered_map
-+#define Unordered_multimap std::unordered_multimap
-+
-+#define reserve_unordered_map(map, n) ((map)->rehash(n))
-+
-+#elif defined(HAVE_TR1_UNORDERED_SET) && defined(HAVE_TR1_UNORDERED_MAP) \
-     && defined(HAVE_TR1_UNORDERED_MAP_REHASH)
- 
- #include <tr1/unordered_set>
diff --git a/devel/binutils/files/patch-ld-Makefile.am b/devel/binutils/files/patch-ld-Makefile.am
deleted file mode 100644
index 91e6936d64bf..000000000000
--- a/devel/binutils/files/patch-ld-Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
---- ld/Makefile.am.orig	1970-01-01 00:20:49.000000000 +0000
-+++ ld/Makefile.am	1970-01-01 00:30:34.000000000 +0000
-@@ -165,6 +165,7 @@
- 	earmelf_nbsd.c \
- 	earmelf_vxworks.c \
- 	earmelfb.c \
-+	earmelfb_fbsd.c \
- 	earmelfb_linux.c \
- 	earmelfb_linux_eabi.c \
- 	earmelfb_nacl.c \
-@@ -765,6 +766,11 @@
-   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
-   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
- 	${GENSCRIPTS} armelfb "$(tdir_armelfb)"
-+earmelfb_fbsd.c: $(srcdir)/emulparams/armelfb_fbsd.sh \
-+  $(srcdir)/emulparams/armelf_fbsd.sh \
-+  $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
-+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} armelfb_fbsd "$(tdir_armelfb_fbsd)"
- earmelfb_linux.c: $(srcdir)/emulparams/armelfb_linux.sh \
-   $(srcdir)/emulparams/armelf_linux.sh \
-   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
diff --git a/devel/binutils/files/patch-ld-Makefile.in b/devel/binutils/files/patch-ld-Makefile.in
deleted file mode 100644
index e827b6edf8ad..000000000000
--- a/devel/binutils/files/patch-ld-Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- ld/Makefile.in.orig	2013-11-26 11:37:33.000000000 +0000
-+++ ld/Makefile.in	2014-05-15 23:42:02.000000000 +0000
-@@ -473,6 +473,7 @@
- 	earmelf_nbsd.c \
- 	earmelf_vxworks.c \
- 	earmelfb.c \
-+	earmelfb_fbsd.c \
- 	earmelfb_linux.c \
- 	earmelfb_linux_eabi.c \
- 	earmelfb_nacl.c \
-@@ -1109,6 +1110,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_nbsd.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_vxworks.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_fbsd.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_linux.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_linux_eabi.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_nacl.Po@am__quote@
-@@ -2249,6 +2251,11 @@
-   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
-   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
- 	${GENSCRIPTS} armelfb "$(tdir_armelfb)"
-+earmelfb_fbsd.c: $(srcdir)/emulparams/armelfb_fbsd.sh \
-+  $(srcdir)/emulparams/armelf_fbsd.sh \
-+  $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
-+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
-+	${GENSCRIPTS} armelfb_fbsd "$(tdir_armelfb_fbsd)"
- earmelfb_linux.c: $(srcdir)/emulparams/armelfb_linux.sh \
-   $(srcdir)/emulparams/armelf_linux.sh \
-   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
diff --git a/devel/binutils/files/patch-ld-configure.tgt b/devel/binutils/files/patch-ld-configure.tgt
deleted file mode 100644
index 938cdef3040e..000000000000
--- a/devel/binutils/files/patch-ld-configure.tgt
+++ /dev/null
@@ -1,16 +0,0 @@
---- ld/configure.tgt.orig	1970-01-01 00:26:50.000000000 +0000
-+++ ld/configure.tgt	1970-01-01 00:29:22.000000000 +0000
-@@ -81,9 +81,11 @@
- arm-*-aout | armel-*-aout) targ_emul=armaoutl ;;
- armeb-*-aout)		targ_emul=armaoutb ;;
- arm-*-coff)		targ_emul=armcoff ;;
--arm-*-freebsd* | arm-*-kfreebsd*-gnu)
-+arm*b-*-freebsd*)	targ_emul=armelfb_fbsd
-+			targ_extra_emuls="armelf_fbsd armelf" ;;
-+arm*-*-freebsd* | arm-*-kfreebsd*-gnu)
- 	       		targ_emul=armelf_fbsd
--			targ_extra_emuls="armelf" ;;
-+			targ_extra_emuls="armelfb_fbsd armelf" ;;
- armeb-*-netbsdelf*)	targ_emul=armelfb_nbsd;
- 			targ_extra_emuls="armelf_nbsd armelf armnbsd" ;;
- arm-*-netbsdelf*)	targ_emul=armelf_nbsd;
diff --git a/devel/binutils/files/patch-ld-emulparams-armelf_fbsd.sh b/devel/binutils/files/patch-ld-emulparams-armelf_fbsd.sh
deleted file mode 100644
index c3a5510acdaf..000000000000
--- a/devel/binutils/files/patch-ld-emulparams-armelf_fbsd.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ld/emulparams/armelf_fbsd.sh.orig	1970-01-01 00:21:26.000000000 +0000
-+++ ld/emulparams/armelf_fbsd.sh	1970-01-01 00:25:53.000000000 +0000
-@@ -1,3 +1,8 @@
- . ${srcdir}/emulparams/armelf.sh
- . ${srcdir}/emulparams/elf_fbsd.sh
- TARGET2_TYPE=got-rel
-+MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
-+GENERATE_PIE_SCRIPT=yes
-+
-+unset STACK_ADDR
-+unset EMBEDDED
diff --git a/devel/binutils/files/patch-ld-emulparams-armelfb_fbsd.sh b/devel/binutils/files/patch-ld-emulparams-armelfb_fbsd.sh
deleted file mode 100644
index 6b8a07b6eff8..000000000000
--- a/devel/binutils/files/patch-ld-emulparams-armelfb_fbsd.sh
+++ /dev/null
@@ -1,5 +0,0 @@
---- ld/emulparams/armelfb_fbsd.sh.orig	1970-01-01 00:21:38.000000000 +0000
-+++ ld/emulparams/armelfb_fbsd.sh	1970-01-01 00:25:49.000000000 +0000
-@@ -0,0 +1,2 @@
-+. ${srcdir}/emulparams/armelf_fbsd.sh
-+OUTPUT_FORMAT="elf32-bigarm"
diff --git a/devel/binutils/pkg-plist b/devel/binutils/pkg-plist
index 6ad776272b99..963296d84751 100644
--- a/devel/binutils/pkg-plist
+++ b/devel/binutils/pkg-plist
@@ -77,6 +77,7 @@ man/man1/windres.1.gz
 %%NLS%%share/locale/ga/LC_MESSAGES/ld.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/opcodes.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/binutils.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/gprof.mo
 %%NLS%%share/locale/id/LC_MESSAGES/gprof.mo
 %%NLS%%share/locale/id/LC_MESSAGES/opcodes.mo
 %%NLS%%share/locale/id/LC_MESSAGES/bfd.mo
@@ -113,6 +114,7 @@ man/man1/windres.1.gz
 %%NLS%%share/locale/rw/LC_MESSAGES/gprof.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/binutils.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/gprof.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/binutils.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/bfd.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/binutils.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gprof.mo
@@ -126,6 +128,7 @@ man/man1/windres.1.gz
 %%NLS%%share/locale/tr/LC_MESSAGES/opcodes.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/bfd.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/binutils.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/gas.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/gprof.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/ld.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/opcodes.mo
diff --git a/devel/i386-linux-binutils/Makefile b/devel/i386-linux-binutils/Makefile
index 6476d4881b64..1055f444f120 100644
--- a/devel/i386-linux-binutils/Makefile
+++ b/devel/i386-linux-binutils/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PORTREVISION=	2
 COMMENT=	GNU binutils for linux i386 cross-development
 PKGNAMEPREFIX=	i386-linux-
 BUTARGET=	i386-pc-linux-gnu
diff --git a/devel/mips-binutils/Makefile b/devel/mips-binutils/Makefile
index 31658045d6f9..2a1ece4dc6b1 100644
--- a/devel/mips-binutils/Makefile
+++ b/devel/mips-binutils/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PORTREVISION=	2
 COMMENT=	GNU binutils for mips64 cross-development
 PKGNAMEPREFIX=	mips-
 PLIST=	${.CURDIR}/pkg-plist
diff --git a/devel/mips64-binutils/Makefile b/devel/mips64-binutils/Makefile
index 9101705cc710..30687d7d11fa 100644
--- a/devel/mips64-binutils/Makefile
+++ b/devel/mips64-binutils/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PORTREVISION=	2
 COMMENT=	GNU binutils for mips64 cross-development
 PKGNAMEPREFIX=	mips64-
 PLIST=	${.CURDIR}/pkg-plist
diff --git a/devel/powerpc64-binutils/Makefile b/devel/powerpc64-binutils/Makefile
index 11ea6f2d2bb6..6e5ce10c2432 100644
--- a/devel/powerpc64-binutils/Makefile
+++ b/devel/powerpc64-binutils/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PORTREVISION=	2
 COMMENT=	GNU binutils for powerpc64 cross-development
 PKGNAMEPREFIX=	powerpc64-
 PLIST=	${.CURDIR}/pkg-plist
diff --git a/devel/sparc64-binutils/Makefile b/devel/sparc64-binutils/Makefile
index e9d34b0e6778..22623a0457c0 100644
--- a/devel/sparc64-binutils/Makefile
+++ b/devel/sparc64-binutils/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PORTREVISION=	3
 COMMENT=	GNU binutils for sparc64 cross-development
 PKGNAMEPREFIX=	sparc64-
 PLIST=	${.CURDIR}/pkg-plist