4 files changed, 103 insertions, 18 deletions

diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile
index 18143b531621..ae13314ce5cb 100644
--- a/devel/avr-binutils/Makefile
+++ b/devel/avr-binutils/Makefile
@@ -6,10 +6,14 @@
 #
 
 PORTNAME=	binutils
-PORTVERSION=	2.11
+PORTVERSION=	020701
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	binutils/releases
+#MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
+#MASTER_SITE_SUBDIR=	binutils/releases
+# old snapshots are deleted too frequently here :(
+#MASTER_SITES=	ftp://sources.redhat.com/%SUBDIR%/
+#MASTER_SITE_SUBDIR=	pub/binutils/snapshots
+MASTER_SITES=	http://people.freebsd.org/~joerg/
 PKGNAMEPREFIX=	avr-
 
 MAINTAINER=	joerg@freebsd.org
@@ -29,14 +33,17 @@ MAN1=	\
 		avr-ar.1 \
 		avr-as.1 \
 		avr-c++filt.1 \
+		avr-dlltool.1 \
 		avr-ld.1 \
 		avr-nlmconv.1 \
 		avr-nm.1 \
 		avr-objcopy.1 \
 		avr-objdump.1 \
 		avr-ranlib.1 \
+		avr-readelf.1 \
 		avr-size.1 \
 		avr-strings.1 \
-		avr-strip.1
+		avr-strip.1 \
+		avr-windres.1
 
 .include <bsd.port.mk>
diff --git a/devel/avr-binutils/distinfo b/devel/avr-binutils/distinfo
index 4803237d1f65..3b89ece7a163 100644
--- a/devel/avr-binutils/distinfo
+++ b/devel/avr-binutils/distinfo
@@ -1 +1 @@
-MD5 (binutils-2.11.tar.bz2) = 51fed4d711f0ceabff40cb7050fb1ca7
+MD5 (binutils-020701.tar.bz2) = e3d6ff588a3c1010b0d7580e99de21c1
diff --git a/devel/avr-binutils/files/patch-aa b/devel/avr-binutils/files/patch-aa
index 36bebf94b336..dec1d7957ba5 100644
--- a/devel/avr-binutils/files/patch-aa
+++ b/devel/avr-binutils/files/patch-aa
@@ -1,7 +1,7 @@
---- libiberty/Makefile.in.orig	Sat Dec  9 17:10:41 2000
-+++ libiberty/Makefile.in	Tue May 15 20:58:52 2001
-@@ -152,7 +152,8 @@
- 	$(RANLIB) $(TARGETLIB)
+--- libiberty/Makefile.in.orig	Mon Mar  4 23:01:26 2002
++++ libiberty/Makefile.in	Tue Jun  4 15:57:42 2002
+@@ -253,7 +253,8 @@
+ @MAINT@	echo stamp > stamp-functions
  
  INSTALL_DEST = @INSTALL_DEST@
 -install: install_to_$(INSTALL_DEST) install-subdir
@@ -10,27 +10,39 @@
  
  install_to_libdir: all
  	$(INSTALL_DATA) $(TARGETLIB) $(libdir)$(MULTISUBDIR)/$(TARGETLIB)n
---- bfd/Makefile.in.orig	Mon Jan 22 10:41:40 2001
-+++ bfd/Makefile.in	Tue May 15 21:02:37 2001
-@@ -564,7 +564,8 @@
+--- bfd/Makefile.in.orig	Fri May 31 04:59:46 2002
++++ bfd/Makefile.in	Tue Jun  4 15:58:06 2002
+@@ -1047,7 +1047,8 @@
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 -install: install-recursive
 +#install: install-recursive
 +install:
- uninstall-am: uninstall-libLTLIBRARIES
+ uninstall-am: uninstall-bfdlibLTLIBRARIES
  uninstall: uninstall-recursive
  all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) config.h
---- opcodes/Makefile.in.orig	Thu Jan 11 22:20:19 2001
-+++ opcodes/Makefile.in	Tue May 15 21:03:33 2001
-@@ -663,7 +663,8 @@
+--- opcodes/Makefile.in.orig	Tue Jun  4 15:59:05 2002
++++ opcodes/Makefile.in	Tue Jun  4 15:58:47 2002
+@@ -702,7 +702,8 @@
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 -install: install-recursive
 +#install: install-recursive
 +install:
- uninstall-am: uninstall-libLTLIBRARIES
+ uninstall-am: uninstall-bfdlibLTLIBRARIES
  uninstall: uninstall-recursive
  all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) config.h
+--- etc/Makefile.in.orig	Sat Jan 26 22:35:45 2002
++++ etc/Makefile.in	Tue Jun  4 16:50:05 2002
+@@ -52,7 +52,8 @@
+ all:
+ 
+ # We want install to imply install-info as per GNU standards.
+-install: install-info
++#install: install-info
++install:
+ 
+ uninstall:
+ 
diff --git a/devel/avr-binutils/pkg-plist b/devel/avr-binutils/pkg-plist
index 5426ae5882ac..c33d1eb600f6 100644
--- a/devel/avr-binutils/pkg-plist
+++ b/devel/avr-binutils/pkg-plist
@@ -4,16 +4,36 @@ avr/bin/ld
 avr/bin/nm
 avr/bin/ranlib
 avr/bin/strip
+avr/lib/ldscripts/avr1.x
+avr/lib/ldscripts/avr1.xbn
+avr/lib/ldscripts/avr1.xn
+avr/lib/ldscripts/avr1.xr
+avr/lib/ldscripts/avr1.xu
 avr/lib/ldscripts/avr1200.x
 avr/lib/ldscripts/avr1200.xbn
 avr/lib/ldscripts/avr1200.xn
 avr/lib/ldscripts/avr1200.xr
 avr/lib/ldscripts/avr1200.xu
+avr/lib/ldscripts/avr2.x
+avr/lib/ldscripts/avr2.xbn
+avr/lib/ldscripts/avr2.xn
+avr/lib/ldscripts/avr2.xr
+avr/lib/ldscripts/avr2.xu
 avr/lib/ldscripts/avr23xx.x
 avr/lib/ldscripts/avr23xx.xbn
 avr/lib/ldscripts/avr23xx.xn
 avr/lib/ldscripts/avr23xx.xr
 avr/lib/ldscripts/avr23xx.xu
+avr/lib/ldscripts/avr3.x
+avr/lib/ldscripts/avr3.xbn
+avr/lib/ldscripts/avr3.xn
+avr/lib/ldscripts/avr3.xr
+avr/lib/ldscripts/avr3.xu
+avr/lib/ldscripts/avr4.x
+avr/lib/ldscripts/avr4.xbn
+avr/lib/ldscripts/avr4.xn
+avr/lib/ldscripts/avr4.xr
+avr/lib/ldscripts/avr4.xu
 avr/lib/ldscripts/avr4433.x
 avr/lib/ldscripts/avr4433.xbn
 avr/lib/ldscripts/avr4433.xn
@@ -24,6 +44,11 @@ avr/lib/ldscripts/avr44x4.xbn
 avr/lib/ldscripts/avr44x4.xn
 avr/lib/ldscripts/avr44x4.xr
 avr/lib/ldscripts/avr44x4.xu
+avr/lib/ldscripts/avr5.x
+avr/lib/ldscripts/avr5.xbn
+avr/lib/ldscripts/avr5.xn
+avr/lib/ldscripts/avr5.xr
+avr/lib/ldscripts/avr5.xu
 avr/lib/ldscripts/avr85xx.x
 avr/lib/ldscripts/avr85xx.xbn
 avr/lib/ldscripts/avr85xx.xn
@@ -48,7 +73,6 @@ bin/avr-addr2line
 bin/avr-ar
 bin/avr-as
 bin/avr-c++filt
-bin/avr-gasp
 bin/avr-ld
 bin/avr-nm
 bin/avr-objcopy
@@ -58,7 +82,49 @@ bin/avr-readelf
 bin/avr-size
 bin/avr-strings
 bin/avr-strip
+@unexec install-info --delete %D/info/as.info %D/info/dir
+@unexec install-info --delete %D/info/binutils.info %D/info/dir
+@unexec install-info --delete %D/info/ld.info %D/info/dir
+info/as.info
+info/as.info-1
+info/as.info-10
+info/as.info-11
+info/as.info-2
+info/as.info-3
+info/as.info-4
+info/as.info-5
+info/as.info-6
+info/as.info-7
+info/as.info-8
+info/as.info-9
+info/binutils.info
+info/binutils.info-1
+info/binutils.info-2
+info/binutils.info-3
+info/ld.info
+info/ld.info-1
+info/ld.info-2
+info/ld.info-3
+info/ld.info-4
+info/ld.info-5
+info/ld.info-6
+@exec install-info %D/info/as.info %D/info/dir
+@exec install-info %D/info/binutils.info %D/info/dir
+@exec install-info %D/info/ld.info %D/info/dir
+share/locale/es/LC_MESSAGES/binutils.mo
+share/locale/es/LC_MESSAGES/gas.mo
+share/locale/es/LC_MESSAGES/ld.mo
+share/locale/fr/LC_MESSAGES/binutils.mo
+share/locale/fr/LC_MESSAGES/gas.mo
+share/locale/fr/LC_MESSAGES/ld.mo
+share/locale/ja/LC_MESSAGES/binutils.mo
+share/locale/sv/LC_MESSAGES/binutils.mo
+share/locale/sv/LC_MESSAGES/ld.mo
+share/locale/tr/LC_MESSAGES/binutils.mo
+share/locale/tr/LC_MESSAGES/gas.mo
+share/locale/tr/LC_MESSAGES/ld.mo
 @dirrm avr/lib/ldscripts
 @dirrm avr/lib
 @dirrm avr/bin
+@dirrm avr/include
 @dirrm avr