Update to avrdude-5.10.

pkgsrc changes:
Rework AVRISP mkII stall workaround.

summary of upstream changes since 5.8:
- Fix problem with loading intel hex rom files that exceed 0x10000 bytes.
- Fix FreeBSD default serial port name.
- jtagmkII.c: If entering JTAG mode fails with a bad JTAG ID message,
  retry with external reset applied (in case the target is in sleep
  mode or has asserted the JTD bit).
- Fix build for GNU/kFreeBSD.

4 files changed, 38 insertions, 29 deletions

diff --git a/cross/avrdude/patches/patch-aa b/cross/avrdude/patches/patch-aa
index ee8d091c189..b3507e76c61 100644
--- a/cross/avrdude/patches/patch-aa
+++ b/cross/avrdude/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2010/01/26 02:01:47 jakllsch Exp $
+$NetBSD: patch-aa,v 1.6 2010/02/08 01:47:14 jakllsch Exp $
 
 - Fix the SUBDIRS stuff so it actually works right with multiple automake
   versions.
@@ -7,9 +7,9 @@ $NetBSD: patch-aa,v 1.5 2010/01/26 02:01:47 jakllsch Exp $
   egconfdir instead of hacking the configure script and Makefile.in directly.
 
 
---- Makefile.am.orig	2009-03-06 20:09:11.000000000 +0000
+--- Makefile.am.orig	2010-01-19 10:39:11.000000000 +0000
 +++ Makefile.am
-@@ -151,7 +151,8 @@ avrdude_SOURCES = \
+@@ -153,7 +153,8 @@ avrdude_SOURCES = \
  
  man_MANS = avrdude.1
  
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.5 2010/01/26 02:01:47 jakllsch Exp $
  
  install-exec-local: backup-avrdude-conf
  
-@@ -160,8 +161,6 @@ distclean-local:
+@@ -162,8 +163,6 @@ distclean-local:
  
  # This will get run before the config file is installed.
  backup-avrdude-conf:
diff --git a/cross/avrdude/patches/patch-ae b/cross/avrdude/patches/patch-ae
index 1c58635e90a..5531be6dae4 100644
--- a/cross/avrdude/patches/patch-ae
+++ b/cross/avrdude/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.5 2010/01/26 02:01:47 jakllsch Exp $
+$NetBSD: patch-ae,v 1.6 2010/02/08 01:47:14 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.5 2010/01/26 02:01:47 jakllsch Exp $
   platforms available and they're not the same for different
   MACHINE_ARCH's in NetBSD).
 
---- configure.ac.orig	2009-07-10 22:52:03.000000000 +0000
+--- configure.ac.orig	2010-01-19 10:39:11.000000000 +0000
 +++ configure.ac
 @@ -74,6 +74,7 @@ AC_CHECK_HEADERS([ddk/hidsdi.h],,,[#incl
  
@@ -37,21 +37,21 @@ $NetBSD: patch-ae,v 1.5 2010/01/26 02:01:47 jakllsch Exp $
 +		DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"}
 +		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/ttyS0"}
  		;;
- 	i[[3456]]86-*-freebsd*|amd64-*-freebsd*)
+ 	i[[3456]]86-*-*freebsd*|amd64-*-*freebsd*)
 -		DEFAULT_PAR_PORT="/dev/ppi0"
--		DEFAULT_SER_PORT="/dev/cuaa0"
+-		DEFAULT_SER_PORT="/dev/cuad0"
 +		DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"/dev/ppi0"}
-+		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuaa0"}
++		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuad0"}
  		;;
- 	*-*-freebsd*)
+ 	*-*-*freebsd*)
 -		DEFAULT_PAR_PORT="unknown"
--		DEFAULT_SER_PORT="/dev/cuaa0"
+-		DEFAULT_SER_PORT="/dev/cuad0"
 +		DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"}
-+		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuaa0"}
++		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuad0"}
 +		;;
 +	*-*-dragonfly*)
 +		DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"/dev/ppi0"}
-+		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuaa0"}
++		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuad0"}
 +		;;
 +	*-*-netbsd*)
 +		DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"}
diff --git a/cross/avrdude/patches/patch-af b/cross/avrdude/patches/patch-af
index 416e5ad4b2e..f00e5b83609 100644
--- a/cross/avrdude/patches/patch-af
+++ b/cross/avrdude/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.4 2010/01/26 02:01:47 jakllsch Exp $
+$NetBSD: patch-af,v 1.5 2010/02/08 01:47:14 jakllsch Exp $
 
---- ppi.c.orig	2009-03-06 20:09:11.000000000 +0000
+--- ppi.c.orig	2010-01-19 10:39:11.000000000 +0000
 +++ ppi.c
 @@ -33,7 +33,7 @@
  #include <unistd.h>
  #include <errno.h>
  
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
  # include "freebsd_ppi.h"
  #elif defined(__linux__)
  # include "linux_ppdev.h"
diff --git a/cross/avrdude/patches/patch-ag b/cross/avrdude/patches/patch-ag
index f0e82863b3b..3d27c228949 100644
--- a/cross/avrdude/patches/patch-ag
+++ b/cross/avrdude/patches/patch-ag
@@ -1,13 +1,22 @@
-$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);
+$NetBSD: patch-ag,v 1.4 2010/02/08 01:47:14 jakllsch Exp $
+Work around AVRISP mkII initial sync stalls on NetBSD.
+--- usb_libusb.c.orig	2010-01-19 10:39:11.000000000 +0000
++++ usb_libusb.c
+@@ -237,6 +237,17 @@ static void usbdev_close(union filedescr
+ {
+   usb_dev_handle *udev = (usb_dev_handle *)fd->usb.handle;
  
-   // try to get the response back and see where we got
-   status = stk500v2_recv(pgm, resp, sizeof(resp));
++#if defined(__NetBSD__)
++#define USB_FEAT_ENDPOINT_HALT 0
++  /*
++   * Clear Feature Endpoint Halt to reset device's data toggle to DATA0.
++   * This way, when we reopen expecting DATA0, things don't time out.
++   */
++  usb_control_msg(udev, USB_TYPE_STANDARD | USB_RECIP_ENDPOINT,
++		  USB_REQ_CLEAR_FEATURE, USB_FEAT_ENDPOINT_HALT,
++		  fd->usb.ep & 0xf, NULL, 0, 100);
++#endif
++
+   (void)usb_release_interface(udev, usb_interface);
+ 
+ #if !( defined(__FreeBSD__) ) // || ( defined(__APPLE__) && defined(__MACH__) ) )