Fix html manual generation with texi2html,

and depend on latest version, since it causes PLIST changes. Adapt PLIST.
Bump PKGREVISION.

5 files changed, 42 insertions, 7 deletions

diff --git a/cross/avrdude/Makefile b/cross/avrdude/Makefile
index 9e7dfcb3504..569dad81fb8 100644
--- a/cross/avrdude/Makefile
+++ b/cross/avrdude/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2004/10/18 04:15:14 rumble Exp $
-# FreeBSD Id: ports/devel/avrdude/Makefile,v 1.4 2003/04/19 14:13:25 bsd Exp
+# $NetBSD: Makefile,v 1.7 2005/03/02 13:20:39 wiz Exp $
 
 DISTNAME=	avrdude-4.1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	cross
 MASTER_SITES=	http://savannah.nongnu.org/download/avrdude/stable.pkg/4.1.0/
 
@@ -13,10 +12,12 @@ COMMENT=	Downloader/uploader for Atmel AVR 8-bit RISC microcontrollers
 USE_BUILDLINK3=		YES
 USE_GNU_READLINE=	YES
 
-BUILD_DEPENDS=	teTeX>=1.0:../../print/teTeX
+BUILD_DEPENDS+=	teTeX>=1.0:../../print/teTeX
+BUILD_DEPENDS+=	texi2html>=1.76:../../textproc/texi2html
 
 GNU_CONFIGURE=	yes
 INFO_FILES=	avrdude.info
+USE_MAKEINFO=	yes
 
 CONFIGURE_ARGS=	--disable-versioned-doc
 
diff --git a/cross/avrdude/PLIST b/cross/avrdude/PLIST
index 0a549b592c0..bf453cb5ee1 100644
--- a/cross/avrdude/PLIST
+++ b/cross/avrdude/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2004/01/13 17:48:37 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/03/02 13:20:39 wiz Exp $
 bin/avrdude
 etc/avrdude.conf
 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_ovr.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
diff --git a/cross/avrdude/distinfo b/cross/avrdude/distinfo
index 979b281865c..fad8c11d802 100644
--- a/cross/avrdude/distinfo
+++ b/cross/avrdude/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 10:16:52 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/03/02 13:20:40 wiz Exp $
 
 SHA1 (avrdude-4.1.0.tar.gz) = e3d88668ae06713a4d5576c982f32ff909903525
 RMD160 (avrdude-4.1.0.tar.gz) = be1984a1d1cd7aa5c2b33403bc24ae853c7cb74b
@@ -9,3 +9,5 @@ SHA1 (patch-ac) = 9fc1969e2db8a04a400ed62292d7da1666e64918
 SHA1 (patch-ad) = 7e3ce331afbf08e9db6a03178c247410e79d820e
 SHA1 (patch-ae) = 96be79ab7aeb1539f175a0e775cf8a536513028e
 SHA1 (patch-af) = 089decf6d74803cfad5a8a5848709f0ab747e03e
+SHA1 (patch-ag) = a24cd88f049aea4dd6246f28d281e82a93114316
+SHA1 (patch-ah) = 664cc6be38bd01934113483eb561c386828696b9
diff --git a/cross/avrdude/patches/patch-ag b/cross/avrdude/patches/patch-ag
new file mode 100644
index 00000000000..a1b5c43f4fc
--- /dev/null
+++ b/cross/avrdude/patches/patch-ag
@@ -0,0 +1,18 @@
+$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
new file mode 100644
index 00000000000..ef6bffe33d1
--- /dev/null
+++ b/cross/avrdude/patches/patch-ah
@@ -0,0 +1,15 @@
+$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