Update avrdude to version 5.2.

Significant enhancements in this version are:

o Support for JTAGICE MkII device

o New devices supported:
	- AT90CAN128 ...

o Support for STK500 Version 2 Protocol

(the latter being the principal reason for the update, as the recent
firmware on the STK500 development boards requires protocol version 2)

13 files changed, 180 insertions, 415 deletions

diff --git a/cross/avrdude/DESCR b/cross/avrdude/DESCR
index 528cb6bd51b..8783c05624c 100644
--- a/cross/avrdude/DESCR
+++ b/cross/avrdude/DESCR
@@ -1,5 +1,5 @@
 AVRDUDE - AVR Downloader/UploaDEr - is a program for updating the
 flash, eeprom, and fuse bit memories of Atmel AVR microcontrollers.
-
-This package currently only supports chip programmers that attach
-to the serial port (e. g. the STK500).
+Avrdude supports a wide variety of chip programmers (including the
+widely used STK500) that attach to the serial port, and, if supported
+by the underlying OS, to the parallel port.
diff --git a/cross/avrdude/Makefile b/cross/avrdude/Makefile
index bdb97fd4ba0..9c020475d67 100644
--- a/cross/avrdude/Makefile
+++ b/cross/avrdude/Makefile
@@ -1,29 +1,32 @@
-# $NetBSD: Makefile,v 1.17 2006/08/10 03:21:39 minskim Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/11 16:26:39 wennmach Exp $
 
-DISTNAME=	avrdude-4.1.0
-PKGREVISION=	3
-CATEGORIES=	cross
-MASTER_SITES=	http://savannah.nongnu.org/download/avrdude/stable.pkg/4.1.0/
+DISTNAME=		avrdude-5.2
+#PKGREVISION=		1
+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
+MAINTAINER=		pkgsrc-users@NetBSD.org
+HOMEPAGE=		http://www.bsdhome.com/avrdude/
+COMMENT=		Downloader/uploader for Atmel AVR 8-bit RISC microcontrollers
 
-USE_GNU_READLINE=	YES
+USE_GNU_READLINE=	yes
 TEX_DEPMETHOD=		build
 TEX_ACCEPTED=		teTeX3
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	makeinfo texi2html
-INFO_FILES=	# PLIST
+.include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=	--disable-versioned-doc
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		makeinfo texi2html
+INFO_FILES=		yes
+EGDIR=			${PREFIX}/share/examples/avrdude
+CONF_FILES=		${EGDIR}/avrdude.conf ${PKG_SYSCONFDIR}/avrdude.conf
+CONF_FILES_PERMS=	${EGDIR}/avrdude.conf ${PKG_SYSCONFDIR}/avrdude.conf \
+			${ROOT_USER} ${ROOT_GROUP} 644
 
-# Remove avrdude's buggy and outdated texinfo.tex that was breaking
-# modern etex.
-#
-post-extract:
-	${RM} -f ${WRKSRC}/doc/texinfo.tex
+CONFIGURE_ARGS+=	--enable-doc
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--egconfdir=${EGDIR:Q}
+PLIST_SUBST+=		DISTNAME=${DISTNAME:Q}
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/tex.buildlink3.mk"
diff --git a/cross/avrdude/PLIST b/cross/avrdude/PLIST
index 9f9b89ae0ff..17ea65cca72 100644
--- a/cross/avrdude/PLIST
+++ b/cross/avrdude/PLIST
@@ -1,49 +1,29 @@
-@comment $NetBSD: PLIST,v 1.5 2006/03/22 18:41:09 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/12/11 16:26:39 wennmach Exp $
 bin/avrdude
-etc/avrdude.conf
 info/avrdude.info
 man/man1/avrdude.1
-share/doc/avrdude/avrdude.pdf
-share/doc/avrdude/avrdude-html/avrdude.html
-share/doc/avrdude/avrdude-html/avrdude_abt.html
-share/doc/avrdude/avrdude-html/avrdude_1.html
-share/doc/avrdude/avrdude-html/avrdude_10.html
-share/doc/avrdude/avrdude-html/avrdude_11.html
-share/doc/avrdude/avrdude-html/avrdude_12.html
-share/doc/avrdude/avrdude-html/avrdude_13.html
-share/doc/avrdude/avrdude-html/avrdude_14.html
-share/doc/avrdude/avrdude-html/avrdude_15.html
-share/doc/avrdude/avrdude-html/avrdude_16.html
-share/doc/avrdude/avrdude-html/avrdude_17.html
-share/doc/avrdude/avrdude-html/avrdude_18.html
-share/doc/avrdude/avrdude-html/avrdude_19.html
-share/doc/avrdude/avrdude-html/avrdude_2.html
-share/doc/avrdude/avrdude-html/avrdude_20.html
-share/doc/avrdude/avrdude-html/avrdude_21.html
-share/doc/avrdude/avrdude-html/avrdude_22.html
-share/doc/avrdude/avrdude-html/avrdude_23.html
-share/doc/avrdude/avrdude-html/avrdude_24.html
-share/doc/avrdude/avrdude-html/avrdude_25.html
-share/doc/avrdude/avrdude-html/avrdude_26.html
-share/doc/avrdude/avrdude-html/avrdude_27.html
-share/doc/avrdude/avrdude-html/avrdude_28.html
-share/doc/avrdude/avrdude-html/avrdude_29.html
-share/doc/avrdude/avrdude-html/avrdude_3.html
-share/doc/avrdude/avrdude-html/avrdude_30.html
-share/doc/avrdude/avrdude-html/avrdude_31.html
-share/doc/avrdude/avrdude-html/avrdude_32.html
-share/doc/avrdude/avrdude-html/avrdude_33.html
-share/doc/avrdude/avrdude-html/avrdude_34.html
-share/doc/avrdude/avrdude-html/avrdude_35.html
-share/doc/avrdude/avrdude-html/avrdude_36.html
-share/doc/avrdude/avrdude-html/avrdude_37.html
-share/doc/avrdude/avrdude-html/avrdude_4.html
-share/doc/avrdude/avrdude-html/avrdude_5.html
-share/doc/avrdude/avrdude-html/avrdude_6.html
-share/doc/avrdude/avrdude-html/avrdude_7.html
-share/doc/avrdude/avrdude-html/avrdude_8.html
-share/doc/avrdude/avrdude-html/avrdude_9.html
-share/doc/avrdude/avrdude-html/avrdude_toc.html
-share/doc/avrdude/avrdude.ps
-@dirrm share/doc/avrdude/avrdude-html
-@dirrm share/doc/avrdude
+share/examples/avrdude/avrdude.conf
+share/doc/${DISTNAME}/avrdude.pdf
+share/doc/${DISTNAME}/avrdude-html/avrdude.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_abt.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_1.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_10.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_11.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_12.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_13.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_14.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_15.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_16.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_17.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_2.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_3.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_4.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_5.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_6.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_7.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_8.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_9.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_toc.html
+share/doc/${DISTNAME}/avrdude.ps
+@dirrm share/doc/${DISTNAME}/avrdude-html
+@dirrm share/doc/${DISTNAME}
diff --git a/cross/avrdude/distinfo b/cross/avrdude/distinfo
index fad8c11d802..58e71120a84 100644
--- a/cross/avrdude/distinfo
+++ b/cross/avrdude/distinfo
@@ -1,13 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/03/02 13:20:40 wiz Exp $
+$NetBSD: distinfo,v 1.4 2006/12/11 16:26:39 wennmach Exp $
 
-SHA1 (avrdude-4.1.0.tar.gz) = e3d88668ae06713a4d5576c982f32ff909903525
-RMD160 (avrdude-4.1.0.tar.gz) = be1984a1d1cd7aa5c2b33403bc24ae853c7cb74b
-Size (avrdude-4.1.0.tar.gz) = 327572 bytes
-SHA1 (patch-aa) = 1b7527e8590a098560042ad2dbb5798d162c1462
-SHA1 (patch-ab) = 620d791e8118aeabff5ca10d9e1bc5a2e794b2b6
-SHA1 (patch-ac) = 9fc1969e2db8a04a400ed62292d7da1666e64918
-SHA1 (patch-ad) = 7e3ce331afbf08e9db6a03178c247410e79d820e
-SHA1 (patch-ae) = 96be79ab7aeb1539f175a0e775cf8a536513028e
-SHA1 (patch-af) = 089decf6d74803cfad5a8a5848709f0ab747e03e
-SHA1 (patch-ag) = a24cd88f049aea4dd6246f28d281e82a93114316
-SHA1 (patch-ah) = 664cc6be38bd01934113483eb561c386828696b9
+SHA1 (avrdude-5.2.tar.gz) = 113689a10fb504e9e760e8bbf984d487ec3eff01
+RMD160 (avrdude-5.2.tar.gz) = 39e23f1cad78c8072062727838ff6de753e7ccba
+Size (avrdude-5.2.tar.gz) = 426800 bytes
+SHA1 (patch-aa) = 0d0b4de4d5ec3321afebbac8f14ece3241684534
+SHA1 (patch-ai) = ff10249ae4d6cb80667d622528a5e48a9bd2aaea
diff --git a/cross/avrdude/patches/patch-aa b/cross/avrdude/patches/patch-aa
index 2c9a3110c24..977401d81a6 100644
--- a/cross/avrdude/patches/patch-aa
+++ b/cross/avrdude/patches/patch-aa
@@ -1,30 +1,46 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/17 19:09:23 wennmach Exp $
+$NetBSD: patch-aa,v 1.2 2006/12/11 16:26:39 wennmach Exp $
 
---- Makefile.in.org	Tue Jul  8 10:04:00 2003
-+++ Makefile.in	Tue Jul  8 10:03:55 2003
-@@ -190,14 +190,9 @@
- 	lists.c \
- 	lists.h \
- 	main.c \
--	par.c \
--	par.h \
- 	pgm.c \
- 	pgm.h \
- 	pindefs.h \
--	ppi.c \
--	ppi.h \
--	ppiwin.c \
- 	serial.h \
- 	ser_posix.c \
- 	ser_win32.c \
-@@ -221,8 +216,8 @@
+--- Makefile.in.orig	2006-10-09 16:48:14.000000000 +0200
++++ Makefile.in	2006-12-11 17:05:32.000000000 +0100
+@@ -233,6 +233,7 @@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
++egconfdir = @egconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+@@ -962,12 +963,12 @@
+ 	done
+ install-sysconfDATA: $(sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
++	test -z "$(egconfdir)" || $(mkdir_p) "$(DESTDIR)$(egconfdir)"
+ 	@list='$(sysconf_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+-	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
+-	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
++	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(egconfdir)/$$f'"; \
++	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(egconfdir)/$$f"; \
+ 	done
  
- am_avrdude_OBJECTS = config_gram.$(OBJEXT) lexer.$(OBJEXT) avr.$(OBJEXT) \
- 	avr910.$(OBJEXT) config.$(OBJEXT) confwin.$(OBJEXT) \
--	fileio.$(OBJEXT) lists.$(OBJEXT) main.$(OBJEXT) par.$(OBJEXT) \
--	pgm.$(OBJEXT) ppi.$(OBJEXT) ppiwin.$(OBJEXT) \
-+	fileio.$(OBJEXT) lists.$(OBJEXT) main.$(OBJEXT) \
-+	pgm.$(OBJEXT) \
- 	ser_posix.$(OBJEXT) ser_win32.$(OBJEXT) stk500.$(OBJEXT) \
- 	term.$(OBJEXT)
- avrdude_OBJECTS = $(am_avrdude_OBJECTS)
+ uninstall-sysconfDATA:
+@@ -1378,11 +1379,12 @@
+ 
+ # This will get run before the config file is installed.
+ backup-avrdude-conf:
+-	@echo "Backing up avrdude.conf in ${DESTDIR}${sysconfdir}"
+-	@if test -e ${DESTDIR}${sysconfdir}/avrdude.conf; then \
+-		cp -pR ${DESTDIR}${sysconfdir}/avrdude.conf \
+-			${DESTDIR}${sysconfdir}/avrdude.conf.bak; \
+-	fi
++	@echo "No backup of avrdude.conf in ${DESTDIR}${sysconfdir} required"
++#	@echo "Backing up avrdude.conf in ${DESTDIR}${sysconfdir}"
++#	@if test -e ${DESTDIR}${sysconfdir}/avrdude.conf; then \
++#		cp -pR ${DESTDIR}${sysconfdir}/avrdude.conf \
++#			${DESTDIR}${sysconfdir}/avrdude.conf.bak; \
++#	fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/cross/avrdude/patches/patch-ab b/cross/avrdude/patches/patch-ab
deleted file mode 100644
index 45dbfa8b7f4..00000000000
--- a/cross/avrdude/patches/patch-ab
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/07/17 19:09:23 wennmach Exp $
-
---- config_gram.y.org	Tue Jul  8 10:06:16 2003
-+++ config_gram.y	Tue Jul  8 10:08:38 2003
-@@ -87,8 +87,6 @@
- %token K_MOSI
- %token K_NUM_PAGES
- %token K_PAGEL
--%token K_PAR
--%token K_PARALLEL
- %token K_PART
- %token K_PGMLED
- %token K_PROGRAMMER
-@@ -276,12 +274,6 @@
-     }
-   } |
- 
--  K_TYPE TKN_EQUAL K_PAR {
--    { 
--      par_initpgm(current_prog);
--    }
--  } |
--
-   K_TYPE TKN_EQUAL K_STK500 {
-     { 
-       stk500_initpgm(current_prog);
-@@ -388,9 +380,6 @@
-   K_DEDICATED | K_IO
- ;
- 
--parallel_modes :
--  yesno | K_PSEUDO
--;
- 
- retry_lines :
-   K_RESET | K_SCK
-@@ -473,24 +462,6 @@
-       free_token($3);
-     } |
- 
--  K_PARALLEL TKN_EQUAL parallel_modes
--    {
--      if ($3->primary == K_YES) {
--        current_part->flags |= AVRPART_PARALLELOK;
--        current_part->flags &= ~AVRPART_PSEUDOPARALLEL;
--      }
--      else if ($3->primary == K_NO) {
--        current_part->flags &= ~AVRPART_PARALLELOK;
--        current_part->flags &= ~AVRPART_PSEUDOPARALLEL;
--      }
--      else if ($3->primary == K_PSEUDO) {
--        current_part->flags |= AVRPART_PARALLELOK;
--        current_part->flags |= AVRPART_PSEUDOPARALLEL;
--      }
--
--
--      free_token($3);
--    } |
- 
-   K_RETRY_PULSE TKN_EQUAL retry_lines
-     {
diff --git a/cross/avrdude/patches/patch-ac b/cross/avrdude/patches/patch-ac
deleted file mode 100644
index 603bad7958a..00000000000
--- a/cross/avrdude/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/07/17 19:09:23 wennmach Exp $
-
---- lexer.l.org	Tue Jul  8 10:10:24 2003
-+++ lexer.l	Tue Jul  8 10:10:41 2003
-@@ -141,8 +141,6 @@
- page_size        { yylval=NULL; return K_PAGE_SIZE; }
- paged            { yylval=NULL; return K_PAGED; }
- pagel            { yylval=NULL; return K_PAGEL; }
--par              { yylval=NULL; return K_PAR; }
--parallel         { yylval=NULL; return K_PARALLEL; }
- part             { yylval=NULL; return K_PART; }
- pgmled           { yylval=NULL; return K_PGMLED; }
- programmer       { yylval=NULL; return K_PROGRAMMER; }
diff --git a/cross/avrdude/patches/patch-ad b/cross/avrdude/patches/patch-ad
deleted file mode 100644
index 4e5f5b03c44..00000000000
--- a/cross/avrdude/patches/patch-ad
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/07/17 19:09:23 wennmach Exp $
-
---- main.c.org	Tue Jul  8 10:15:01 2003
-+++ main.c	Tue Jul  8 10:16:28 2003
-@@ -103,8 +103,8 @@
-  */
- int getexitspecs(char *s, int *set, int *clr)
- {
-+  /*
-   char *cp;
--
-   while ((cp = strtok(s, ","))) {
-     if (strcmp(cp, "reset") == 0) {
-       *clr |= par_getpinmask(pgm->pinno[PIN_AVR_RESET]);
-@@ -123,10 +123,11 @@
-     else {
-       return -1;
-     }
--    s = 0; /* strtok() should be called with the actual string only once */
--  }
-+    s = 0; */ /* strtok() should be called with the actual string only once */
-+  /*  }
- 
--  return 0;
-+  return 0; */
-+  return -1;
- }
- 
-
- 
diff --git a/cross/avrdude/patches/patch-ae b/cross/avrdude/patches/patch-ae
deleted file mode 100644
index 390fa3f54d1..00000000000
--- a/cross/avrdude/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2003/07/17 19:09:23 wennmach Exp $
-
---- ser_posix.c.org	Tue Jul  8 11:11:06 2003
-+++ ser_posix.c	Tue Jul  8 11:11:22 2003
-@@ -120,7 +120,7 @@
-   /*
-    * open the serial port
-    */
--  fd = open(port, O_RDWR | O_NOCTTY /*| O_NONBLOCK*/);
-+  fd = open(port, O_RDWR | O_NOCTTY | O_NONBLOCK);
-   if (fd < 0) {
-     fprintf(stderr, "%s: serial_open(): can't open device \"%s\": %s\n",
-             progname, port, strerror(errno));
diff --git a/cross/avrdude/patches/patch-af b/cross/avrdude/patches/patch-af
deleted file mode 100644
index 5af7e47c74b..00000000000
--- a/cross/avrdude/patches/patch-af
+++ /dev/null
@@ -1,158 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2003/07/17 19:09:24 wennmach Exp $
-
---- avrdude.conf.in.org	2003-07-14 23:14:05.000000000 +0200
-+++ avrdude.conf.in	2003-07-14 23:15:04.000000000 +0200
-@@ -182,16 +182,16 @@
- # PROGRAMMER DEFINITIONS
- #
- 
--programmer
--  id    = "bsd";
--  desc  = "Brian Dean's Programmer";
--  type  = par;
--  vcc   = 2, 3, 4, 5;
--  reset = 7;
--  sck   = 8;
--  mosi  = 9;
--  miso  = 10;
--;
-+#programmer
-+#  id    = "bsd";
-+#  desc  = "Brian Dean's Programmer";
-+#  type  = par;
-+#  vcc   = 2, 3, 4, 5;
-+#  reset = 7;
-+#  sck   = 8;
-+#  mosi  = 9;
-+#  miso  = 10;
-+#;
- 
- programmer
-   id    = "avrisp";
-@@ -217,69 +217,69 @@
-   type  = avr910;
- ;
- 
--programmer
--  id    = "stk200";
--  desc  = "STK200";
--  type  = par;
--  buff  = 4, 5;
--  sck   = 6;
--  mosi  = 7;
--  reset = 9;
--  miso  = 10;
--;
-+#programmer
-+#  id    = "stk200";
-+#  desc  = "STK200";
-+#  type  = par;
-+#  buff  = 4, 5;
-+#  sck   = 6;
-+#  mosi  = 7;
-+#  reset = 9;
-+#  miso  = 10;
-+#;
- 
- # The programming dongle used by the popular Ponyprog
- # utility.  It is almost similar to the STK200 one,
- # except that there is a LED indicating that the
- # programming is currently in progress.
- 
--programmer
--  id    = "pony-stk200";
--  desc  = "Pony Prog STK200";
--  type  = par;
--  buff  = 4, 5;
--  sck   = 6;
--  mosi  = 7;
--  reset = 9;
--  miso  = 10;
--  pgmled = 8; 
--;
--
--programmer
--  id    = "dt006";
--  desc  = "Dontronics DT006";
--  type  = par;
--  reset = 4;
--  sck   = 5;
--  mosi  = 2;
--  miso  = 11;
--;
--
--programmer
--  id    = "bascom";
--  desc  = "Bascom SAMPLE programming cable";
--  type  = par;
--  reset = 4;
--  sck   = 5;
--  mosi  = 2;
--  miso  = 11;
--;
--
--programmer
--  id     = "alf";
--  desc   = "Tony Friebel's Programmer";
--  type   = par;
--  vcc    = 2, 3, 4, 5;
--  buff   = 6;
--  reset  = 7;
--  sck    = 8;
--  mosi   = 9;
--  miso   = 10;
--  errled = 1;
--  rdyled = 14;
--  pgmled = 16;
--  vfyled = 17;
--;
-+#programmer
-+#  id    = "pony-stk200";
-+#  desc  = "Pony Prog STK200";
-+#  type  = par;
-+#  buff  = 4, 5;
-+#  sck   = 6;
-+#  mosi  = 7;
-+#  reset = 9;
-+#  miso  = 10;
-+#  pgmled = 8; 
-+#;
-+
-+#programmer
-+#  id    = "dt006";
-+#  desc  = "Dontronics DT006";
-+#  type  = par;
-+#  reset = 4;
-+#  sck   = 5;
-+#  mosi  = 2;
-+#  miso  = 11;
-+#;
-+
-+#programmer
-+#  id    = "bascom";
-+#  desc  = "Bascom SAMPLE programming cable";
-+#  type  = par;
-+#  reset = 4;
-+#  sck   = 5;
-+#  mosi  = 2;
-+#  miso  = 11;
-+#;
-+
-+#programmer
-+#  id     = "alf";
-+#  desc   = "Tony Friebel's Programmer";
-+#  type   = par;
-+#  vcc    = 2, 3, 4, 5;
-+#  buff   = 6;
-+#  reset  = 7;
-+#  sck    = 8;
-+#  mosi   = 9;
-+#  miso   = 10;
-+#  errled = 1;
-+#  rdyled = 14;
-+#  pgmled = 16;
-+#  vfyled = 17;
-+#;
- 
- 
- 
diff --git a/cross/avrdude/patches/patch-ag b/cross/avrdude/patches/patch-ag
deleted file mode 100644
index a1b5c43f4fc..00000000000
--- a/cross/avrdude/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/03/02 13:20:40 wiz Exp $
-
---- doc/avrdude.texi.orig	2003-04-18 06:41:45.000000000 +0200
-+++ doc/avrdude.texi
-@@ -58,9 +58,11 @@ by the Free Software Foundation.
- @author by Brian S. Dean
- 
- @page
--@hfill (Send bugs and comments on AVRDUDE to @w{@email{avrdude-dev@@nongnu.org}}.)
-+@flushright
-+(Send bugs and comments on AVRDUDE to @w{@email{avrdude-dev@@nongnu.org}}.)
-+@end flushright
- 
--@vfill
-+@vskip 0pt plus 1filll
- 
- Copyright @copyright{} 2003 Brian S. Dean
- @sp 2
diff --git a/cross/avrdude/patches/patch-ah b/cross/avrdude/patches/patch-ah
deleted file mode 100644
index ef6bffe33d1..00000000000
--- a/cross/avrdude/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/03/02 13:20:40 wiz Exp $
-
---- doc/Makefile.in.orig	2003-04-19 06:59:56.000000000 +0200
-+++ doc/Makefile.in
-@@ -425,8 +425,8 @@ all-local: info html ps pdf
- 
- html: 
- 	mkdir -p avrdude-html
--	texi2html -split_node $(srcdir)/$(info_TEXINFOS)
--	mv *.html avrdude-html
-+	texi2html --split=node $(srcdir)/$(info_TEXINFOS)
-+	mv avrdude/*.html avrdude-html
- 
- clean-local:
- 	rm -rf avrdude-html *.info
diff --git a/cross/avrdude/patches/patch-ai b/cross/avrdude/patches/patch-ai
new file mode 100644
index 00000000000..e27f29b1b75
--- /dev/null
+++ b/cross/avrdude/patches/patch-ai
@@ -0,0 +1,80 @@
+$NetBSD: patch-ai,v 1.1 2006/12/11 16:26:39 wennmach Exp $
+
+--- configure.orig	2006-10-09 16:48:03.000000000 +0200
++++ configure	2006-12-11 14:04:49.000000000 +0100
+@@ -311,7 +311,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBUSB CPP EGREP LIBOBJS DOC_INST_DIR SUBDIRS_AC DIST_SUBDIRS_AC DEFAULT_PAR_PORT DEFAULT_SER_PORT WINDOWS_DIRS ENABLE_WARNINGS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir egconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBUSB CPP EGREP LIBOBJS DOC_INST_DIR SUBDIRS_AC DIST_SUBDIRS_AC DEFAULT_PAR_PORT DEFAULT_SER_PORT WINDOWS_DIRS ENABLE_WARNINGS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -344,6 +344,7 @@
+ libexecdir='${exec_prefix}/libexec'
+ datadir='${prefix}/share'
+ sysconfdir='${prefix}/etc'
++egconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+ libdir='${exec_prefix}/lib'
+@@ -574,6 +575,13 @@
+   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+     sysconfdir=$ac_optarg ;;
+ 
++  -egconfdir | --egconfdir | --egconfdi | --egconfd | --egconf \
++  | --egcon | --egco | --egc | --eg)
++    ac_prev=egconfdir ;;
++  -egconfdir=* | --egconfdir=* | --egconfdi=* | --egconfd=* | --egconf=* \
++  | --egcon=* | --egco=* | --egc=* | --eg=*)
++    egconfdir=$ac_optarg ;;
++
+   -target | --target | --targe | --targ | --tar | --ta | --t)
+     ac_prev=target_alias ;;
+   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+@@ -669,7 +677,7 @@
+ done
+ 
+ # Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
++for ac_var in bindir sbindir libexecdir datadir sysconfdir egconfdir sharedstatedir \
+ 	      localstatedir libdir includedir oldincludedir infodir mandir
+ do
+   eval ac_val=$`echo $ac_var`
+@@ -822,6 +830,7 @@
+   --libexecdir=DIR       program executables [EPREFIX/libexec]
+   --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
++  --egconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+   --libdir=DIR           object code libraries [EPREFIX/lib]
+@@ -4959,6 +4968,10 @@
+ 		DEFAULT_PAR_PORT="unknown"
+ 		DEFAULT_SER_PORT="/dev/cuaa0"
+ 		;;
++	*-*-netbsd*)
++		DEFAULT_PAR_PORT="unknown"
++		DEFAULT_SER_PORT="/dev/tty00"
++		;;
+ 	*-*-solaris*)
+ 		DEFAULT_PAR_PORT="/dev/printers/0"
+ 		DEFAULT_SER_PORT="/dev/term/a"
+@@ -5521,6 +5534,8 @@
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
+@@ -5669,6 +5684,7 @@
+ s,@libexecdir@,$libexecdir,;t t
+ s,@datadir@,$datadir,;t t
+ s,@sysconfdir@,$sysconfdir,;t t
++s,@egconfdir@,$egconfdir,;t t
+ s,@sharedstatedir@,$sharedstatedir,;t t
+ s,@localstatedir@,$localstatedir,;t t
+ s,@libdir@,$libdir,;t t