9 files changed, 36 insertions, 21 deletions
diff --git a/cross/avrdude/Makefile b/cross/avrdude/Makefile
index fccf9801f1f..cef124620c2 100644
--- a/cross/avrdude/Makefile
+++ b/cross/avrdude/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.27 2010/01/20 03:31:58 jakllsch Exp $
+# $NetBSD: Makefile,v 1.28 2010/01/26 02:01:47 jakllsch Exp $
 
 DISTNAME=		avrdude-5.8
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		cross
 MASTER_SITES=		http://download.savannah.gnu.org/releases/avrdude/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.bsdhome.com/avrdude/
 COMMENT=		Downloader/uploader for Atmel AVR 8-bit RISC microcontrollers
+LICENSE=		gnu-gpl-v2
 
 BUILD_DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
 
diff --git a/cross/avrdude/distinfo b/cross/avrdude/distinfo
index db6e664edde..4bda99cb883 100644
--- a/cross/avrdude/distinfo
+++ b/cross/avrdude/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.6 2009/08/27 15:34:48 hasso Exp $
+$NetBSD: distinfo,v 1.7 2010/01/26 02:01:47 jakllsch Exp $
 
 SHA1 (avrdude-5.8.tar.gz) = 77198df91a7176bbdab19ef4a4caf0bdc5862c94
 RMD160 (avrdude-5.8.tar.gz) = c8eb0675f84477d6b58f0e8dc0438e16ac0714db
 Size (avrdude-5.8.tar.gz) = 488771 bytes
-SHA1 (patch-aa) = 737aa805981a611a735ae15988260f7b1c3fc5bf
-SHA1 (patch-ab) = b6163aa766de472e423910af25333a26d262a82c
-SHA1 (patch-ac) = a949a288b261791beed2f422a1a7c606d3ad8c2c
-SHA1 (patch-ad) = 03201bc7caced3f28edbbe3040cb2bac01c41dc0
-SHA1 (patch-ae) = 42f4a9cb106a49d341954f6802a15153986b00dd
-SHA1 (patch-af) = ad73e9975f708fc81e4ad8e08379ecc78afc6053
+SHA1 (patch-aa) = b7923399ec747cefca29e7fabf0997a9b1075d9e
+SHA1 (patch-ab) = d49e5988a83385471f863dd0ccb50db96f1c1783
+SHA1 (patch-ac) = f5281a525f0e61517c507db91f9abe71d2f02ae4
+SHA1 (patch-ad) = a91b4576d49953148054a7a1522690d1e4a2d9da
+SHA1 (patch-ae) = 9ff949785562d7d96bc80ea3d9cf55fd4bfd7be6
+SHA1 (patch-af) = 4c652ede19d0dbd3bfb9654cc9dba3728c97def8
+SHA1 (patch-ag) = 4b7640d91dd7784ed14c48e40bc4f07f79ad443c
diff --git a/cross/avrdude/patches/patch-aa b/cross/avrdude/patches/patch-aa
index d132afe78ee..ee8d091c189 100644
--- a/cross/avrdude/patches/patch-aa
+++ b/cross/avrdude/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2009/08/27 15:34:48 hasso Exp $
+$NetBSD: patch-aa,v 1.5 2010/01/26 02:01:47 jakllsch Exp $
 
 - Fix the SUBDIRS stuff so it actually works right with multiple automake
   versions.
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.4 2009/08/27 15:34:48 hasso Exp $
   egconfdir instead of hacking the configure script and Makefile.in directly.
 
 
---- Makefile.am.orig	2009-03-06 21:09:11 +0100
+--- Makefile.am.orig	2009-03-06 20:09:11.000000000 +0000
 +++ Makefile.am
 @@ -151,7 +151,8 @@ avrdude_SOURCES = \
  
diff --git a/cross/avrdude/patches/patch-ab b/cross/avrdude/patches/patch-ab
index ae1fead3c7f..f33870feda4 100644
--- a/cross/avrdude/patches/patch-ab
+++ b/cross/avrdude/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2009/08/27 15:34:48 hasso Exp $
+$NetBSD: patch-ab,v 1.4 2010/01/26 02:01:47 jakllsch Exp $
 
---- freebsd_ppi.h.orig	2009-03-06 21:09:11 +0100
+--- freebsd_ppi.h.orig	2009-03-06 20:09:11.000000000 +0000
 +++ freebsd_ppi.h
 @@ -22,7 +22,11 @@
  #ifndef freebsd_ppi_h
diff --git a/cross/avrdude/patches/patch-ac b/cross/avrdude/patches/patch-ac
index 6da2f568407..c13ce12443d 100644
--- a/cross/avrdude/patches/patch-ac
+++ b/cross/avrdude/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2009/08/27 15:34:48 hasso Exp $
+$NetBSD: patch-ac,v 1.5 2010/01/26 02:01:47 jakllsch Exp $
 
 the builtin [ on at least solaris doesn't understand -e
 
---- doc/Makefile.am.orig	2009-03-06 21:09:08 +0100
+--- doc/Makefile.am.orig	2009-03-06 20:09:08.000000000 +0000
 +++ doc/Makefile.am
 @@ -33,7 +33,7 @@ html: avrdude-html/avrdude.html
  
diff --git a/cross/avrdude/patches/patch-ad b/cross/avrdude/patches/patch-ad
index 059a4d62d32..4378e8005eb 100644
--- a/cross/avrdude/patches/patch-ad
+++ b/cross/avrdude/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2009/08/27 15:34:48 hasso Exp $
+$NetBSD: patch-ad,v 1.5 2010/01/26 02:01:47 jakllsch Exp $
 
 regen
 
---- doc/Makefile.in.orig	2009-07-11 00:52:12 +0200
+--- doc/Makefile.in.orig	2009-07-10 22:52:12.000000000 +0000
 +++ doc/Makefile.in
 @@ -617,7 +617,7 @@ html: avrdude-html/avrdude.html
  
diff --git a/cross/avrdude/patches/patch-ae b/cross/avrdude/patches/patch-ae
index a6c4310a714..1c58635e90a 100644
--- a/cross/avrdude/patches/patch-ae
+++ b/cross/avrdude/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.4 2009/08/27 15:34:48 hasso Exp $
+$NetBSD: patch-ae,v 1.5 2010/01/26 02:01:47 jakllsch Exp $
 
 - add missing AM_PROG_CC_C_O that automake wants for the yacc
   sources.
@@ -8,7 +8,7 @@ $NetBSD: patch-ae,v 1.4 2009/08/27 15:34:48 hasso Exp $
   platforms available and they're not the same for different
   MACHINE_ARCH's in NetBSD).
 
---- configure.ac.orig	2009-07-11 00:52:03 +0200
+--- configure.ac.orig	2009-07-10 22:52:03.000000000 +0000
 +++ configure.ac
 @@ -74,6 +74,7 @@ AC_CHECK_HEADERS([ddk/hidsdi.h],,,[#incl
  
diff --git a/cross/avrdude/patches/patch-af b/cross/avrdude/patches/patch-af
index 9e9d6618018..416e5ad4b2e 100644
--- a/cross/avrdude/patches/patch-af
+++ b/cross/avrdude/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.3 2009/08/27 15:34:48 hasso Exp $
+$NetBSD: patch-af,v 1.4 2010/01/26 02:01:47 jakllsch Exp $
 
---- ppi.c.orig	2009-03-06 21:09:11 +0100
+--- ppi.c.orig	2009-03-06 20:09:11.000000000 +0000
 +++ ppi.c
 @@ -33,7 +33,7 @@
  #include <unistd.h>
diff --git a/cross/avrdude/patches/patch-ag b/cross/avrdude/patches/patch-ag
new file mode 100644
index 00000000000..f0e82863b3b
--- /dev/null
+++ b/cross/avrdude/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2010/01/26 02:01:47 jakllsch Exp $
+Work around AVRISP mkII sync stalls on NetBSD.
+--- stk500v2.c.orig	2009-07-10 22:39:37.000000000 +0000
++++ stk500v2.c
+@@ -635,6 +635,8 @@ retry:
+   // send the sync command and see if we can get there
+   buf[0] = CMD_SIGN_ON;
+   stk500v2_send(pgm, buf, 1);
++  stk500v2_drain(pgm, 0);
++  stk500v2_send(pgm, buf, 1);
+ 
+   // try to get the response back and see where we got
+   status = stk500v2_recv(pgm, resp, sizeof(resp));