Update to 5.8. Upstream changelog is obviously too massive to paste it

here. All hard update work done by Simon 'corecode' Schubert and minor
modifications by me.

9 files changed, 85 insertions, 77 deletions

diff --git a/cross/avrdude/Makefile b/cross/avrdude/Makefile
index 7bcfd135c09..aa485de025a 100644
--- a/cross/avrdude/Makefile
+++ b/cross/avrdude/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2009/05/20 00:58:09 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2009/08/27 15:34:48 hasso Exp $
 
-DISTNAME=		avrdude-5.2
-PKGREVISION=		2
+DISTNAME=		avrdude-5.8
 CATEGORIES=		cross
 MASTER_SITES=		http://download.savannah.gnu.org/releases/avrdude/
 
@@ -20,7 +19,7 @@ TEX_ACCEPTED=		teTeX3
 .include "../../mk/bsd.prefs.mk"
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		autoconf automake makeinfo texi2html yacc lex
+USE_TOOLS+=		autoconf automake autoreconf makeinfo texi2html yacc lex
 INFO_FILES=		yes
 EGDIR=			${PREFIX}/share/examples/avrdude
 CONF_FILES=		${EGDIR}/avrdude.conf ${PKG_SYSCONFDIR}/avrdude.conf
@@ -35,9 +34,12 @@ PLIST_SUBST+=		DISTNAME=${DISTNAME:Q}
 # The autotools used by this pkg are older than what's in pkgsrc
 # currently.  This makes the diffs huge.
 pre-configure:
-	cd ${WRKSRC} && aclocal
-	cd ${WRKSRC} && automake --add-missing
-	cd ${WRKSRC} && autoconf
+	cd ${WRKSRC} && autoreconf -vif
+
+# DragonFly has stripped makeinfo in the base - without texi2dvi.
+.if ${OPSYS} == "DragonFly"
+BUILD_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
+.endif
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/tex.buildlink3.mk"
diff --git a/cross/avrdude/PLIST b/cross/avrdude/PLIST
index 059abaa7211..e6e92d98df7 100644
--- a/cross/avrdude/PLIST
+++ b/cross/avrdude/PLIST
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:39:53 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/08/27 15:34:48 hasso Exp $
 bin/avrdude
 info/avrdude.info
 man/man1/avrdude.1
 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
@@ -15,7 +13,10 @@ 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_18.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_19.html
 share/doc/${DISTNAME}/avrdude-html/avrdude_2.html
+share/doc/${DISTNAME}/avrdude-html/avrdude_20.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
@@ -23,5 +24,7 @@ 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_abt.html
 share/doc/${DISTNAME}/avrdude-html/avrdude_toc.html
+share/doc/${DISTNAME}/avrdude.pdf
 share/doc/${DISTNAME}/avrdude.ps
diff --git a/cross/avrdude/distinfo b/cross/avrdude/distinfo
index 24ee594d358..db6e664edde 100644
--- a/cross/avrdude/distinfo
+++ b/cross/avrdude/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.5 2007/09/28 21:11:49 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2009/08/27 15:34:48 hasso Exp $
 
-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) = 2cad04c6e27c5c00df2364dbadd61cc0996ac07f
-SHA1 (patch-ac) = 035322d7ace5d0a0b1026afe2291ee9c000efe97
-SHA1 (patch-ad) = da95addf23d2675d05ab374216c8426185797a69
-SHA1 (patch-ae) = bfff132d3275e4016d5ac423609f39d8a5ff63a9
+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
diff --git a/cross/avrdude/patches/patch-aa b/cross/avrdude/patches/patch-aa
index 1828b082ec7..d132afe78ee 100644
--- a/cross/avrdude/patches/patch-aa
+++ b/cross/avrdude/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2007/09/28 21:11:49 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 2009/08/27 15:34:48 hasso Exp $
 
 - Fix the SUBDIRS stuff so it actually works right with multiple automake
   versions.
@@ -7,21 +7,10 @@ $NetBSD: patch-aa,v 1.3 2007/09/28 21:11:49 dmcmahill Exp $
   egconfdir instead of hacking the configure script and Makefile.in directly.
 
 
---- Makefile.am.orig	2006-09-21 03:18:44.000000000 -0400
-+++ Makefile.am	2007-09-28 12:54:35.406518000 -0400
-@@ -36,9 +36,6 @@
- 	lexer.c
+--- Makefile.am.orig	2009-03-06 21:09:11 +0100
++++ Makefile.am
+@@ -151,7 +151,8 @@ avrdude_SOURCES = \
  
--#SUBDIRS      = doc @WINDOWS_DIRS@
--#DIST_SUBDIRS = doc windows
--
--SUBDIRS = @SUBDIRS_AC@
--DIST_SUBDIRS = @DIST_SUBDIRS_AC@
-+SUBDIRS      = @DOC_DIR@ @WINDOWS_DIRS@
-+DIST_SUBDIRS = doc windows
- 
- AM_YFLAGS    = -d
-@@ -133,5 +130,6 @@
  man_MANS = avrdude.1
  
 -sysconf_DATA = avrdude.conf
@@ -29,7 +18,9 @@ $NetBSD: patch-aa,v 1.3 2007/09/28 21:11:49 dmcmahill Exp $
 +egconf_DATA = avrdude.conf
  
  install-exec-local: backup-avrdude-conf
-@@ -142,7 +140,5 @@
+ 
+@@ -160,8 +161,6 @@ distclean-local:
+ 
  # This will get run before the config file is installed.
  backup-avrdude-conf:
 -	@echo "Backing up avrdude.conf in ${DESTDIR}${sysconfdir}"
diff --git a/cross/avrdude/patches/patch-ab b/cross/avrdude/patches/patch-ab
new file mode 100644
index 00000000000..ae1fead3c7f
--- /dev/null
+++ b/cross/avrdude/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.3 2009/08/27 15:34:48 hasso Exp $
+
+--- freebsd_ppi.h.orig	2009-03-06 21:09:11 +0100
++++ freebsd_ppi.h
+@@ -22,7 +22,11 @@
+ #ifndef freebsd_ppi_h
+ #define freebsd_ppi_h
+ 
++#ifdef __FreeBSD__
+ #include <dev/ppbus/ppi.h>
++#else
++#include <dev/misc/ppi/ppi.h>
++#endif
+ 
+ #define ppi_claim(fd) {}
+ 
diff --git a/cross/avrdude/patches/patch-ac b/cross/avrdude/patches/patch-ac
index ce82071353e..6da2f568407 100644
--- a/cross/avrdude/patches/patch-ac
+++ b/cross/avrdude/patches/patch-ac
@@ -1,13 +1,15 @@
-$NetBSD: patch-ac,v 1.3 2007/09/28 21:11:49 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.4 2009/08/27 15:34:48 hasso Exp $
 
 the builtin [ on at least solaris doesn't understand -e
 
---- doc/Makefile.am.orig	2005-09-26 07:38:24.000000000 -0400
-+++ doc/Makefile.am	2007-09-28 07:13:20.202430000 -0400
-@@ -34,5 +34,5 @@
+--- doc/Makefile.am.orig	2009-03-06 21:09:08 +0100
++++ doc/Makefile.am
+@@ -33,7 +33,7 @@ html: avrdude-html/avrdude.html
+ 
  avrdude-html/avrdude.html: $(srcdir)/$(info_TEXINFOS)
  	texi2html -split_node $(srcdir)/$(info_TEXINFOS)
 -	if [ -e ./avrdude.html -o -e ./avrdude_1.html ]; then \
 +	if [ -f ./avrdude.html -o -f ./avrdude_1.html ]; then \
  	 mkdir -p avrdude-html ; \
  	 mv -f *.html avrdude-html ; \
+ 	else \
diff --git a/cross/avrdude/patches/patch-ad b/cross/avrdude/patches/patch-ad
index cd3f3d48ced..059a4d62d32 100644
--- a/cross/avrdude/patches/patch-ad
+++ b/cross/avrdude/patches/patch-ad
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.3 2007/09/28 21:11:50 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.4 2009/08/27 15:34:48 hasso Exp $
 
 regen
 
---- doc/Makefile.in.orig	2006-10-09 10:48:11.000000000 -0400
-+++ doc/Makefile.in	2007-09-28 07:13:38.829348000 -0400
-@@ -504,5 +504,5 @@
+--- doc/Makefile.in.orig	2009-07-11 00:52:12 +0200
++++ doc/Makefile.in
+@@ -617,7 +617,7 @@ html: avrdude-html/avrdude.html
+ 
  avrdude-html/avrdude.html: $(srcdir)/$(info_TEXINFOS)
  	texi2html -split_node $(srcdir)/$(info_TEXINFOS)
 -	if [ -e ./avrdude.html -o -e ./avrdude_1.html ]; then \
 +	if [ -f ./avrdude.html -o -f ./avrdude_1.html ]; then \
  	 mkdir -p avrdude-html ; \
  	 mv -f *.html avrdude-html ; \
+ 	else \
diff --git a/cross/avrdude/patches/patch-ae b/cross/avrdude/patches/patch-ae
index b217719af52..a6c4310a714 100644
--- a/cross/avrdude/patches/patch-ae
+++ b/cross/avrdude/patches/patch-ae
@@ -1,9 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2007/09/28 21:11:50 dmcmahill Exp $
-
-- add missing checks for -lnsl and -lsocket needed by at least
-  SunOS-5.9 and possibly others.
-
-- Fix the SUBDIRS stuff to work correctly.
+$NetBSD: patch-ae,v 1.4 2009/08/27 15:34:48 hasso Exp $
 
 - add missing AM_PROG_CC_C_O that automake wants for the yacc
   sources.
@@ -13,40 +8,17 @@ $NetBSD: patch-ae,v 1.3 2007/09/28 21:11:50 dmcmahill Exp $
   platforms available and they're not the same for different
   MACHINE_ARCH's in NetBSD).
 
---- configure.ac.orig	2006-10-09 10:47:29.000000000 -0400
-+++ configure.ac	2007-09-28 12:55:21.429495000 -0400
-@@ -45,4 +45,6 @@
- AC_CHECK_LIB([ncurses], [tputs])
- AC_CHECK_LIB([readline], [readline])
-+AC_CHECK_LIB([nsl], [gethostbyname])
-+AC_CHECK_LIB([socket], [socket])
- AH_TEMPLATE([HAVE_LIBUSB],
-             [Define if USB support is enabled via libusb])
-@@ -67,4 +69,5 @@
+--- configure.ac.orig	2009-07-11 00:52:03 +0200
++++ configure.ac
+@@ -74,6 +74,7 @@ AC_CHECK_HEADERS([ddk/hidsdi.h],,,[#incl
+ 
  # Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
 +AM_PROG_CC_C_O
  AC_HEADER_TIME
  
-@@ -119,48 +122,48 @@
- 
- if test "$enabled_doc" = "yes"; then
--
--SUBDIRS_AC='doc @WINDOWS_DIRS@'
--DIST_SUBDIRS_AC='doc windows'
-+	DOC_DIR="doc"
- else
--
--SUBDIRS_AC='@WINDOWS_DIRS@'
--DIST_SUBDIRS_AC='windows'
-+	DOC_DIR=""
- fi
- 
- AC_SUBST(DOC_INST_DIR, $DOC_INST_DIR)
--AC_SUBST(SUBDIRS_AC, $SUBDIRS_AC)
--AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_AC)
--
-+AC_SUBST(DOC_DIR, $DOC_DIR)
+ # Checks for library functions.
+@@ -187,34 +188,44 @@ AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_
  
  # Find the parallel serial device files based on target system
  # If a system doesn't have a PC style parallel, mark it as unknown.
@@ -77,6 +49,10 @@ $NetBSD: patch-ae,v 1.3 2007/09/28 21:11:50 dmcmahill Exp $
 +		DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"}
 +		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuaa0"}
 +		;;
++	*-*-dragonfly*)
++		DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"/dev/ppi0"}
++		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuaa0"}
++		;;
 +	*-*-netbsd*)
 +		DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"}
 +		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/tty00"}
@@ -100,3 +76,4 @@ $NetBSD: patch-ae,v 1.3 2007/09/28 21:11:50 dmcmahill Exp $
 +		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"unknown"}
  		;;
  esac
+ 
diff --git a/cross/avrdude/patches/patch-af b/cross/avrdude/patches/patch-af
new file mode 100644
index 00000000000..9e9d6618018
--- /dev/null
+++ b/cross/avrdude/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.3 2009/08/27 15:34:48 hasso Exp $
+
+--- ppi.c.orig	2009-03-06 21:09:11 +0100
++++ ppi.c
+@@ -33,7 +33,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ # include "freebsd_ppi.h"
+ #elif defined(__linux__)
+ # include "linux_ppdev.h"