(pkgsrc)

patches/patch-aa
 (was not to install libiberty) .. removed
patches/patch-ac
 (was not to install-recursive under opcodes) .. removed
patches/patch-a[bdefghij]
 Added comments (all are as 'Avoid installing info').
Makefile
 Added installing libbfd.so libbfd.a bfd.h for simulavr.
 Installs libiberty.a as avr/lib/libiberty.a
 Installs ansidecl.h and symcat.h for simulavr

(upstream)
Bump Version 2.19.1 to 2.23.2
(From binutils-2.23.2/binutils/NEWS)
---------------------------
Changes in 2.23:

* Add support for the VLE extension to the PowerPC architecture.
* Add support for x64 Windows target of the delayed-load-library.
* Add support for the Renesas RL78 architecture.

Changes in 2.22:

* Add support for displaying the contents of .debug.macro sections.
* Add --preprocessor-arg option to windres to specify additional options
  passed to preprocessor.
* Add --dwarf-start and --dwarf-end to readelf and objdump.  These are used by
  the new Emacs mode, see dwarf-mode.el.
* Add support for the Tilera TILEPro and TILE-Gx architectures.

changes in 2.21:

* Add --interleave-width option to objcopy to allowing copying a range of
  bytes from the input to the output with the --interleave option.
* Add support for the TMS320C6000 (TI C6X) processor family.
* Readelf can now display ARM unwind tables (.ARM.exidx / .ARM.extab) using
  the -u / --unwind option.
* Add --dyn-syms to readelf to dump dynamic symbol table.
* A new tool - elfedit - has been added to directly manipulate ELF format
  binaries.
* Add to dlltool .def file feature of aliasing PE internal symbol name by
  '== <ID>' option.
* Add a new command line option -a / --addresses to addr2line to display the
  address before function name or source filename.
* Add a new command line option -p / --pretty-print to addr2line to have
  a more human readable output.
* The hppa/som targets can now be compiled on any host.

Changes in 2.20:

* Add support for delay importing to dlltool.  Use the --output-delaylib <file>
  switch to create a delay-import library.  The resulting app will load the dll
  as soon as the first function is called.  It will link to __delayLoadHelper2()
  from the static delayimp library, which will import LoadLibraryA and
  GetProcAddress from kernel32.

* Add a new command line option, --insn-width=WIDTH, to objdump to specify
  number of bytes to be displayed on a single line when disassembling
  instructions.

* Readelf can now display the relocated contents of a section as a sequence
  of bytes via the --relocated-dump=<name|number> command line option.

* The gprof program has been given a new command line option:
  --external-symbols-table=<filename> which reads in symbols from a specified
  file.

* The plugin target has been added to bfd. It can load the same shared objects
  used by gold and uses them to provide basic support for new file formats.

* The verilog memory hex dump file format is now supported as an output format
  for objcopy.

* Add --file-alignment, --heap, --image-base, --section-alignment,
  --stack and --subsystem command line options to objcopy, which will
  set PE optional header.

* Option --dwarf/-W of objdump is now as flexible as readelf --debug-dump/-w.

* --as-needed now links in a dynamic library if it satisfies undefined
  symbols in regular objects, or in other dynamic libraries.  In the
  latter case the library is not linked if it is found in a DT_NEEDED
  entry of one of the libraries already linked.

* Added --prefix=PREFIX and --prefix-strip=LEVEL switches to objdump to
  add absolute paths for -S.

* Add new option --use-nul-prefixed-import-tables to dlltool to allow fall-
  back to old import table generation with null element prefix.

* Added --identify-strict switch to cause --identify <implib> to
  report an error when the import library is associated with
  multiple DLLs.

* Added --identify <implib> option to dlltool, which determines the
  name of the DLL associated with the specified <implib>.

* Support for PowerPC booke64 instructions has been removed.  The assembler no
  longer accepts -mbooke32 or -mbooke64 and the disassembler no longer accepts
  -Mbooke32 or -Mbooke64.  Instead, -mbooke and -Mbooke should be used.

13 files changed, 169 insertions, 110 deletions

diff --git a/cross/avr-binutils/Makefile b/cross/avr-binutils/Makefile
index ef701f40498..40ee52cc0b1 100644
--- a/cross/avr-binutils/Makefile
+++ b/cross/avr-binutils/Makefile
@@ -1,30 +1,62 @@
-# $NetBSD: Makefile,v 1.19 2013/05/31 12:39:46 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2013/08/07 02:41:30 mef Exp $
 
-DISTNAME=		binutils-2.19.1
-PKGNAME=		avr-binutils-2.19.1
-PKGREVISION=		2
+DISTNAME=		binutils-2.23.2
+PKGNAME=		${DISTNAME:S/^/avr-/}
 CATEGORIES=		cross
 MASTER_SITES=		${MASTER_SITE_GNU:=binutils/}
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		GNU binutils for Atmel AVR 8-bit RISC microcontrollers
+LICENSE=		gnu-gpl-v3
 
-USE_BZIP2=		yes
 USE_TOOLS+=		gmake makeinfo
+USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GNU_CONFIGURE_HOST=	no
 
-CONFIGURE_ARGS+=	--disable-werror --target=avr
+CONFIGURE_ARGS+=	--disable-werror --target=avr --disable-nls
+
+AUTO_MKDIRS=		yes
 
 # Prevent the need to run texi2pod.pl and pod2man hence
 # the need for perl as build dependency.
 post-configure:
+	set -e;							\
 	cd ${WRKSRC};						\
 	for f in ld/ldver.texi ld/ld.1 gas/doc/gasver.texi	\
 	  gas/doc/as.1; do					\
 		${TOUCH} $${f};					\
 	done
 
-.include "../../devel/zlib/buildlink3.mk"
+# emulator/simulavr wants libbfd.so or libbfd.a and bfd.h
+#  --with-bfd=path  location of AVR-binutils version of libbfd install
+#  where include/bfd.h and lib/libbfd.a are found (from binutils)
+post-build:
+	set -e;							\
+	(cd ${WRKSRC}/bfd; ${GMAKE} all libbfd.a);
+
+post-install:
+	# Emulator/simulvar needs library files
+	(cd ${WRKSRC}/bfd; 					\
+	${GMAKE} install-exec install-data; 			\
+	${LIBTOOL} --mode install ${INSTALL_DATA} libbfd.la ${DESTDIR}${PREFIX}/avr/lib;	\
+	${INSTALL_DATA} bfd.h ${DESTDIR}${PREFIX}/avr/include;	\
+	)
+	# Rename to avoid conflict to native and other cross assembler.
+	# and clang differs its path so, (the same as h8300-elf-binutils).
+	(cd ${DESTDIR}${PREFIX};				\
+	for d in ${MACHINE_ARCH}/libiberty.a libiberty.a;	\
+	  do if [ -f lib/$$d ]; then				\
+		${MV}	lib/$$d	 avr/lib/libiberty.a;		\
+		break;						\
+	     fi;						\
+	  done;	)
+	# emulator/simulavr wants following header files
+	(cd ${WRKSRC}/include;					\
+	for f in ansidecl.h symcat.h; do			\
+	  ${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/avr/include;	\
+	done;	\
+	)
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/avr-binutils/PLIST b/cross/avr-binutils/PLIST
index 1cfc4a5f3d1..77356fbefe3 100644
--- a/cross/avr-binutils/PLIST
+++ b/cross/avr-binutils/PLIST
@@ -1,12 +1,16 @@
-@comment $NetBSD: PLIST,v 1.6 2009/08/27 15:26:41 hasso Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/08/07 02:41:30 mef Exp $
 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/strip
+avr/include/bfd.h
+avr/include/ansidecl.h
+avr/include/symcat.h
 avr/lib/ldscripts/avr1.x
 avr/lib/ldscripts/avr1.xbn
 avr/lib/ldscripts/avr1.xn
@@ -57,12 +61,51 @@ avr/lib/ldscripts/avr6.xbn
 avr/lib/ldscripts/avr6.xn
 avr/lib/ldscripts/avr6.xr
 avr/lib/ldscripts/avr6.xu
+avr/lib/ldscripts/avrxmega1.x
+avr/lib/ldscripts/avrxmega1.xbn
+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.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.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.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.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.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.xn
+avr/lib/ldscripts/avrxmega7.xr
+avr/lib/ldscripts/avrxmega7.xu
+avr/lib/libbfd.la
+avr/lib/libiberty.a
 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
@@ -76,6 +119,7 @@ man/man1/avr-ar.1
 man/man1/avr-as.1
 man/man1/avr-c++filt.1
 man/man1/avr-dlltool.1
+man/man1/avr-elfedit.1
 man/man1/avr-gprof.1
 man/man1/avr-ld.1
 man/man1/avr-nlmconv.1
diff --git a/cross/avr-binutils/distinfo b/cross/avr-binutils/distinfo
index e5dc740d724..c062aa9f342 100644
--- a/cross/avr-binutils/distinfo
+++ b/cross/avr-binutils/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.5 2009/08/27 15:26:41 hasso Exp $
+$NetBSD: distinfo,v 1.6 2013/08/07 02:41:30 mef Exp $
 
-SHA1 (binutils-2.19.1.tar.gz) = 7e930435c47991c4070b1c74b010350e4669011f
-RMD160 (binutils-2.19.1.tar.gz) = 98916f371f647864997bb00084a5e7a0fd46d982
-Size (binutils-2.19.1.tar.gz) = 21601735 bytes
-SHA1 (patch-aa) = a298657340e6db5a77b45a09d98f84c2220d45bb
-SHA1 (patch-ab) = 0e71dc9932c42c1dcc6df2890cb0358e0aec1e55
-SHA1 (patch-ac) = f05dec7809fc38ebed5873b21981f62dcd8a1636
-SHA1 (patch-ad) = b933a733e355127c197e80e1c49a105469913280
-SHA1 (patch-ae) = 4b1505364d4176e8e374b576d62e1ca8e3d20e27
-SHA1 (patch-af) = 1bea903e88ad254339486e0de80112275966092a
-SHA1 (patch-ag) = 05501ffcafcda086b2e3d234e558c625f137b122
-SHA1 (patch-ah) = 2e7fbb530a915accd0ad3ee3626faed1b494c241
-SHA1 (patch-ai) = 6646c38cbd86d0dd3e3fbdc1c8e265d49e258ebc
-SHA1 (patch-aj) = 94d1ef1b49c7b0bd64ee9dba6139ee86cb50f8fc
+SHA1 (binutils-2.23.2.tar.bz2) = 042c51073205ebaf88c272d6168f9deb71984b56
+RMD160 (binutils-2.23.2.tar.bz2) = 9788e2a8c4a7c74360919347c3bc72040e87b898
+Size (binutils-2.23.2.tar.bz2) = 21440347 bytes
+SHA1 (patch-ab) = e2bc22866d8e04b0d670509f3295da5f0e535ac8
+SHA1 (patch-ad) = 6d1acfd834c692abcc4f454db5f5107b7f77e34e
+SHA1 (patch-ae) = fff6693a610b26aa60e1d96ad634d15d11afbe05
+SHA1 (patch-af) = 5fa08da0b31da042eb30cce683f7b7b1feb3196b
+SHA1 (patch-ag) = e778ddd88f34e264e6b2d6d31a56a02be565e916
+SHA1 (patch-ah) = b6e91279475c41bc78b3df227938a91948fc377c
+SHA1 (patch-ai) = 3cd298ac0364f913c1261fc87f7f474281bae9cf
+SHA1 (patch-aj) = fd2a66979f68350a53960defdaf5e9e5018ec59a
diff --git a/cross/avr-binutils/patches/patch-aa b/cross/avr-binutils/patches/patch-aa
deleted file mode 100644
index e59ba3b8ce1..00000000000
--- a/cross/avr-binutils/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/08/27 15:26:41 hasso Exp $
-
---- libiberty/Makefile.in.orig	2008-07-24 15:51:49 +0200
-+++ libiberty/Makefile.in
-@@ -346,7 +346,8 @@ libiberty.html : $(srcdir)/libiberty.tex
- @MAINT@	echo stamp > stamp-functions
- 
- INSTALL_DEST = @INSTALL_DEST@
--install: install_to_$(INSTALL_DEST) install-subdir
-+#install: install_to_$(INSTALL_DEST) install-subdir
-+install:
- 
- # This is tricky.  Even though CC in the Makefile contains
- # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
diff --git a/cross/avr-binutils/patches/patch-ab b/cross/avr-binutils/patches/patch-ab
index bf5bba17761..bc15af90fbb 100644
--- a/cross/avr-binutils/patches/patch-ab
+++ b/cross/avr-binutils/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.2 2009/08/27 15:26:41 hasso Exp $
+$NetBSD: patch-ab,v 1.3 2013/08/07 02:41:30 mef Exp $
 
---- bfd/Makefile.in.orig	2009-02-02 11:44:39 +0100
-+++ bfd/Makefile.in
-@@ -1222,7 +1222,8 @@ installdirs-am:
- 	for dir in "$(DESTDIR)$(bfdlibdir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+Avoid installing info file.
+
+--- bfd/Makefile.in.orig	2011-11-21 20:55:49.000000000 +0900
++++ bfd/Makefile.in	2012-02-06 22:14:51.000000000 +0900
+@@ -1713,7 +1713,6 @@
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
--install: install-recursive
-+#install: install-recursive
-+install:
+ install: $(BUILT_SOURCES)
+-	$(MAKE) $(AM_MAKEFLAGS) install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
  uninstall: uninstall-recursive
diff --git a/cross/avr-binutils/patches/patch-ac b/cross/avr-binutils/patches/patch-ac
deleted file mode 100644
index 4fead6d343d..00000000000
--- a/cross/avr-binutils/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2009/08/27 15:26:41 hasso Exp $
-
---- opcodes/Makefile.in.orig	2008-09-09 10:02:19 +0200
-+++ opcodes/Makefile.in
-@@ -879,7 +879,8 @@ installdirs-am:
- 	for dir in "$(DESTDIR)$(bfdlibdir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
--install: install-recursive
-+#install: install-recursive
-+install:
- install-exec: install-exec-recursive
- install-data: install-data-recursive
- uninstall: uninstall-recursive
diff --git a/cross/avr-binutils/patches/patch-ad b/cross/avr-binutils/patches/patch-ad
index e80cb69488c..9739329b6fb 100644
--- a/cross/avr-binutils/patches/patch-ad
+++ b/cross/avr-binutils/patches/patch-ad
@@ -1,14 +1,15 @@
-$NetBSD: patch-ad,v 1.2 2009/08/27 15:26:41 hasso Exp $
+$NetBSD: patch-ad,v 1.3 2013/08/07 02:41:30 mef Exp $
 
---- etc/Makefile.in.orig	2007-03-27 20:09:32 +0200
-+++ etc/Makefile.in
-@@ -64,7 +64,8 @@ PDFFILES = standards.pdf configure.pdf
+Avoid installing info (which duplicates with other CPU)
+
+--- etc/Makefile.in.orig	2010-11-21 04:37:57.000000000 +0900
++++ etc/Makefile.in	2012-02-06 21:50:04.000000000 +0900
+@@ -64,7 +64,7 @@
  HTMLFILES = standards.html configure.html
  
  all: info
--install: install-info
-+#install: install-info
-+install:
+-install install-strip: install-info
++install install-strip:
  
  uninstall:
  
diff --git a/cross/avr-binutils/patches/patch-ae b/cross/avr-binutils/patches/patch-ae
index 8280eecd4c8..f4c2ffa9d6b 100644
--- a/cross/avr-binutils/patches/patch-ae
+++ b/cross/avr-binutils/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2009/08/27 15:26:41 hasso Exp $
+$NetBSD: patch-ae,v 1.3 2013/08/07 02:41:30 mef Exp $
+
+Avoid installing info (which duplicates with other CPU)
 
 --- binutils/doc/Makefile.in.orig	2008-08-15 10:31:47 +0200
 +++ binutils/doc/Makefile.in
diff --git a/cross/avr-binutils/patches/patch-af b/cross/avr-binutils/patches/patch-af
index 3c6c0420148..dbce0ebad6c 100644
--- a/cross/avr-binutils/patches/patch-af
+++ b/cross/avr-binutils/patches/patch-af
@@ -1,4 +1,6 @@
-$NetBSD: patch-af,v 1.2 2009/08/27 15:26:41 hasso Exp $
+$NetBSD: patch-af,v 1.3 2013/08/07 02:41:30 mef Exp $
+
+Avoid installing info (which duplicates with other CPU)
 
 --- gas/doc/Makefile.in.orig	2008-08-15 10:31:50 +0200
 +++ gas/doc/Makefile.in
diff --git a/cross/avr-binutils/patches/patch-ag b/cross/avr-binutils/patches/patch-ag
index 438e2a17ed9..9f2ff06eb69 100644
--- a/cross/avr-binutils/patches/patch-ag
+++ b/cross/avr-binutils/patches/patch-ag
@@ -1,22 +1,24 @@
-$NetBSD: patch-ag,v 1.3 2009/08/27 15:26:41 hasso Exp $
+$NetBSD: patch-ag,v 1.4 2013/08/07 02:41:30 mef Exp $
 
---- ld/Makefile.in.orig	2008-12-23 14:54:52 +0100
-+++ ld/Makefile.in
-@@ -102,7 +102,7 @@ LTYACCCOMPILE = $(LIBTOOL) --mode=compil
- 	$(AM_YFLAGS)
- YLWRAP = $(top_srcdir)/../ylwrap
- SOURCES = $(ld_new_SOURCES) $(EXTRA_ld_new_SOURCES)
+Avoid installing info (which duplicates with other CPU)
+
+--- ld/Makefile.in.orig	2012-09-04 21:53:47.000000000 +0900
++++ ld/Makefile.in	2013-01-27 07:19:44.000000000 +0900
+@@ -118,7 +118,7 @@ LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLF
+ 	--mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
+ SOURCES = $(libldtestplug_la_SOURCES) $(ld_new_SOURCES) \
+ 	$(EXTRA_ld_new_SOURCES)
 -INFO_DEPS = ld.info
 +INFO_DEPS =
- TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/../texinfo
+ am__TEXINFO_TEX_DIR = $(srcdir)/../texinfo
  DVIS = ld.dvi
-@@ -283,7 +283,7 @@ target_vendor = @target_vendor@
- use_sysroot = @use_sysroot@
- AUTOMAKE_OPTIONS = cygnus dejagnu
+ PDFS = ld.pdf
+@@ -345,7 +345,7 @@ use_sysroot = @use_sysroot@
+ AUTOMAKE_OPTIONS = dejagnu no-texinfo.tex no-dist foreign
  ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+ TEXINFO_TEX = ../texinfo/texinfo.tex
 -SUBDIRS = po
 +SUBDIRS =
  tooldir = $(exec_prefix)/$(target_alias)
- YFLAGS = -d
- AM_CFLAGS = $(WARN_CFLAGS)
+ 
+ # Automake 1.10+ disables lex and yacc output file regeneration if
diff --git a/cross/avr-binutils/patches/patch-ah b/cross/avr-binutils/patches/patch-ah
index 61ccce15dc3..ccb8446503c 100644
--- a/cross/avr-binutils/patches/patch-ah
+++ b/cross/avr-binutils/patches/patch-ah
@@ -1,13 +1,15 @@
-$NetBSD: patch-ah,v 1.2 2009/08/27 15:26:41 hasso Exp $
+$NetBSD: patch-ah,v 1.3 2013/08/07 02:41:30 mef Exp $
 
---- binutils/Makefile.in.orig	2008-08-25 06:38:13 +0200
-+++ binutils/Makefile.in
-@@ -358,7 +358,7 @@ target_os = @target_os@
- target_vendor = @target_vendor@
- AUTOMAKE_OPTIONS = cygnus dejagnu
+Avoid installing po (nls) files
+
+--- binutils/Makefile.in.orig	2011-08-08 09:27:15.000000000 +0900
++++ binutils/Makefile.in	2012-02-06 21:51:20.000000000 +0900
+@@ -405,7 +405,7 @@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = dejagnu no-dist foreign
  ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
 -SUBDIRS = doc po
 +SUBDIRS = doc
  tooldir = $(exec_prefix)/$(target_alias)
- YFLAGS = -d
- AM_CFLAGS = $(WARN_CFLAGS)
+ 
+ # Automake 1.10+ disables lex and yacc output file regeneration if
diff --git a/cross/avr-binutils/patches/patch-ai b/cross/avr-binutils/patches/patch-ai
index fd5d363dc61..4a367b1bfcc 100644
--- a/cross/avr-binutils/patches/patch-ai
+++ b/cross/avr-binutils/patches/patch-ai
@@ -1,13 +1,15 @@
-$NetBSD: patch-ai,v 1.2 2009/08/27 15:26:41 hasso Exp $
+$NetBSD: patch-ai,v 1.3 2013/08/07 02:41:30 mef Exp $
 
---- gas/Makefile.in.orig	2009-01-14 09:50:17 +0100
-+++ gas/Makefile.in
-@@ -262,7 +262,7 @@ target_vendor = @target_vendor@
- te_file = @te_file@
- AUTOMAKE_OPTIONS = 1.8 cygnus dejagnu
+Avoid installing po (nls) files
+
+--- gas/Makefile.in.orig	2011-06-14 00:18:47.000000000 +0900
++++ gas/Makefile.in	2012-02-06 21:51:43.000000000 +0900
+@@ -281,7 +281,7 @@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.11 dejagnu foreign no-dist
  ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
 -SUBDIRS = doc po
 +SUBDIRS = doc
- # Automake should figure this out on its own.  It doesn't, because
- # of the "cygnus" option.  But distclean still wants it.
- DIST_SUBDIRS = $(SUBDIRS)
+ tooldir = $(exec_prefix)/$(target_alias)
+ 
+ # Automake 1.10+ disables lex and yacc output file regeneration if
diff --git a/cross/avr-binutils/patches/patch-aj b/cross/avr-binutils/patches/patch-aj
index d5becfcec39..e260ac87a66 100644
--- a/cross/avr-binutils/patches/patch-aj
+++ b/cross/avr-binutils/patches/patch-aj
@@ -1,19 +1,21 @@
-$NetBSD: patch-aj,v 1.1 2009/08/27 15:26:41 hasso Exp $
+$NetBSD: patch-aj,v 1.2 2013/08/07 02:41:30 mef Exp $
 
---- gprof/Makefile.in.orig	2008-08-25 06:38:45 +0200
-+++ gprof/Makefile.in
-@@ -94,7 +94,7 @@ CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+Avoid installing info and po (nls) files
+
+--- gprof/Makefile.in.orig	2012-06-02 19:19:23.000000000 +0900
++++ gprof/Makefile.in	2013-01-27 07:21:40.000000000 +0900
+@@ -93,7 +93,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
  SOURCES = $(gprof_SOURCES)
 -INFO_DEPS = gprof.info
-+INFO_DEPS =
- TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/../texinfo
++INFO_DEPS = 
+ am__TEXINFO_TEX_DIR = $(srcdir)/../texinfo
  DVIS = gprof.dvi
-@@ -244,7 +244,7 @@ target_vendor = @target_vendor@
- AUTOMAKE_OPTIONS = cygnus
+ PDFS = gprof.pdf
+@@ -279,7 +279,7 @@ AUTOMAKE_OPTIONS = 1.11 foreign no-dist 
  ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
+ TEXINFO_TEX = ../texinfo/texinfo.tex
  SUFFIXES = .m
 -SUBDIRS = po
 +SUBDIRS =