5 files changed, 74 insertions, 11 deletions

diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index 1d65473446b3..6e69293f1d70 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -6,27 +6,31 @@
 #
 
 PORTNAME=	avr-libc
-PORTVERSION=	20020630
+PORTVERSION=	2002.09.01
 CATEGORIES=	devel
+# There are currently no official master sites for it.  Everything is
+# in savannah.gnu.org's CVS only.
 #MASTER_SITES=	http://www.amelek.gda.pl/avr/libc/
-MASTER_SITES=	http://www.amelek.gda.pl/avr/test/ \
-		http://www.enteract.com/~rneswold/avr/:libdoc
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PDFDOC}:libdoc
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	http://people.freebsd.org/~joerg/
 
 MAINTAINER=	joerg@freebsd.org
 
 BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
 		avr-ld:${PORTSDIR}/devel/avr-binutils \
 		avr-gcc:${PORTSDIR}/devel/avr-gcc \
-		${GMAKE}:${PORTSDIR}/devel/gmake
+		${GMAKE}:${PORTSDIR}/devel/gmake \
+		doxygen:${PORTSDIR}/devel/doxygen \
+		latex:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
 		avr-ld:${PORTSDIR}/devel/avr-binutils \
 		avr-gcc:${PORTSDIR}/devel/avr-gcc
 
+USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	CC=avr-gcc PREFIX=${PREFIX}
 CONFIGURE_SCRIPT= doconf
+# get rid of that silly -mcpu=pentiumpro -current is so fond of. :-(
+MAKE_ENV=	CPUTYPE=foo
 
 PDFDOC=		avr-tools.pdf
 
@@ -49,6 +53,5 @@ do-install:
 			${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/examples/$$f \
 				${PREFIX}/share/doc/avr-libc/examples; \
 		done
-		${INSTALL_DATA} ${DISTDIR}/${PDFDOC} ${PREFIX}/share/doc/avr-libc/avr-tools.pdf
 
 .include <bsd.port.mk>
diff --git a/devel/avr-libc/distinfo b/devel/avr-libc/distinfo
index 3dc1f52d4524..6e55df7f6474 100644
--- a/devel/avr-libc/distinfo
+++ b/devel/avr-libc/distinfo
@@ -1,2 +1 @@
-MD5 (avr-libc-20020630.tar.gz) = 111ca5283f70a4bd27aa57d3ca7610fa
-MD5 (avr-tools.pdf) = 608234de73631c8dae02155f5770fdb0
+MD5 (avr-libc-2002.09.01.tar.bz2) = 2f013fae2fb9a81675259ea17a971323
diff --git a/devel/avr-libc/files/patch-doc::api::Makefile.in b/devel/avr-libc/files/patch-doc::api::Makefile.in
new file mode 100644
index 000000000000..4fcda4178eef
--- /dev/null
+++ b/devel/avr-libc/files/patch-doc::api::Makefile.in
@@ -0,0 +1,11 @@
+--- doc/api/Makefile.in.orig	Sun Sep  1 21:42:07 2002
++++ doc/api/Makefile.in	Sun Sep  1 22:58:39 2002
+@@ -130,7 +130,7 @@
+ 
+ SUFFIXES = .pdf
+ 
+-DOC_INST_DIR = $(DESTDIR)$(datadir)/doc/avr-libc-$(VERSION)
++DOC_INST_DIR = $(DESTDIR)$(datadir)/doc/avr-libc
+ 
+ USER_MANUAL = @AVR_LIBC_USER_MANUAL@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/devel/avr-libc/pkg-descr b/devel/avr-libc/pkg-descr
index fc11c22920a6..cd2c1a1f91b6 100644
--- a/devel/avr-libc/pkg-descr
+++ b/devel/avr-libc/pkg-descr
@@ -7,4 +7,13 @@ EEPROM etc.), as well as a 32-bit floating point math library (-lm).
 Everything is designed and implemented to cooperate with avr-gcc and
 avr-binutils.
 
-WWW: http://www.amelek.gda.pl/avr/libc/
+Please note that this is currently work-in-progress.  Documentation
+is becoming embedded into the source code which will hopefully get
+it more complete and up-to-date.  Some parts of the current library
+have proven to be not all that useful (e. g. timer_enable_int())
+so they might be removed in a future version.
+
+For the time being, some older documentation (more complete but
+somewhat out of date) is being installed as well.
+
+WWW: http://savannah.gnu.org/projects/avr-libc
diff --git a/devel/avr-libc/pkg-plist b/devel/avr-libc/pkg-plist
index ba985dc3a6ae..ff54a89eef40 100644
--- a/devel/avr-libc/pkg-plist
+++ b/devel/avr-libc/pkg-plist
@@ -19,7 +19,9 @@ avr/include/avr/ioat94k.h
 avr/include/avr/iom103.h
 avr/include/avr/iom128.h
 avr/include/avr/iom161.h
+avr/include/avr/iom162.h
 avr/include/avr/iom163.h
+avr/include/avr/iom169.h
 avr/include/avr/iom323.h
 avr/include/avr/iom8.h
 avr/include/avr/iotn11.h
@@ -60,7 +62,9 @@ avr/lib/avr4/libm.a
 avr/lib/avr5/crtat94k.o
 avr/lib/avr5/crtm128.o
 avr/lib/avr5/crtm161.o
+avr/lib/avr5/crtm162.o
 avr/lib/avr5/crtm163.o
+avr/lib/avr5/crtm169.o
 avr/lib/avr5/crtm323.o
 avr/lib/avr5/libc.a
 avr/lib/avr5/libm.a
@@ -85,7 +89,43 @@ avr/lib/libm.a
 share/doc/avr-libc/AUTHORS
 share/doc/avr-libc/LICENSE
 share/doc/avr-libc/avr-libc-reference.html
-share/doc/avr-libc/avr-tools.pdf
+share/doc/avr-libc/avr-libc-user-manual.pdf
+share/doc/avr-libc/avr-libc-user-manual.ps
+share/doc/avr-libc/avr-libc-user-manual/FAQ.html
+share/doc/avr-libc/avr-libc-user-manual/acks.html
+share/doc/avr-libc/avr-libc-user-manual/dox.css
+share/doc/avr-libc/avr-libc-user-manual/doxygen.png
+share/doc/avr-libc/avr-libc-user-manual/form_0.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2blank.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2doc.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2folderclosed.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2folderopen.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2lastnode.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2link.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2mlastnode.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2mnode.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2node.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2plastnode.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2pnode.png
+share/doc/avr-libc/avr-libc-user-manual/ftv2vertline.png
+share/doc/avr-libc/avr-libc-user-manual/group__avr__eeprom.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__interrupts.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__inttypes.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__io.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__pgmspace.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__sfr.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__sfr__notes.html
+share/doc/avr-libc/avr-libc-user-manual/group__avr__string.html
+share/doc/avr-libc/avr-libc-user-manual/index.html
+share/doc/avr-libc/avr-libc-user-manual/inline_asm.html
+share/doc/avr-libc/avr-libc-user-manual/install_tools.html
+share/doc/avr-libc/avr-libc-user-manual/main.html
+share/doc/avr-libc/avr-libc-user-manual/mem_sections.html
+share/doc/avr-libc/avr-libc-user-manual/modules.html
+share/doc/avr-libc/avr-libc-user-manual/pages.html
+share/doc/avr-libc/avr-libc-user-manual/tree.html
+share/doc/avr-libc/avr-libc-user-manual/tree.js
+share/doc/avr-libc/avr-libc-user-manual/treeview.js
 share/doc/avr-libc/examples/avr-recv.c
 share/doc/avr-libc/examples/io.c
 share/doc/avr-libc/examples/prg
@@ -98,5 +138,6 @@ share/doc/avr-libc/register-usage.txt
 @dirrm avr/lib/avr3
 @dirrm avr/lib/avr4
 @dirrm avr/lib/avr5
+@dirrm share/doc/avr-libc/avr-libc-user-manual
 @dirrm share/doc/avr-libc/examples
 @dirrm share/doc/avr-libc