Update to 1.22 (provided by Joe Talbott in private mail, with some

changes by me).

pkgsrc changes: install man page.

Changes in 1.22:
Several updates for ATmega (new devices, extended I/O etc.)
Fixed problem with .db 00

5 files changed, 18 insertions, 31 deletions

diff --git a/devel/tavrasm/Makefile b/devel/tavrasm/Makefile
index ffa022f329d..ef2c0efbd84 100644
--- a/devel/tavrasm/Makefile
+++ b/devel/tavrasm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/09/09 02:41:58 obache Exp $
+# $NetBSD: Makefile,v 1.14 2006/10/01 21:03:36 dillo Exp $
 #
 
 DISTNAME=	tavrasm
-PKGNAME=	${DISTNAME}-1.20
+PKGNAME=	${DISTNAME}-1.22
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tavrasm.org/
 
@@ -12,19 +12,20 @@ COMMENT=	Assembler for the Atmel AVR series of microcontrollers
 
 BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 
-WRKSRCTOP=	${WRKDIR}/${PKGNAME_NOREV:S/.//:S/-/./}
-WRKSRC=		${WRKSRCTOP}/src
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:S/.//:S/-/./}
+BUILD_DIRS=	src
 USE_TOOLS+=	lex
 MAKE_FILE=	makefile
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 ONLY_FOR_COMPILER=	gcc
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tavrasm
-	${INSTALL_DATA} ${WRKSRCTOP}/README ${PREFIX}/share/doc/tavrasm/README
-	${INSTALL_PROGRAM} ${WRKSRC}/tavrasm ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tavrasm/README
+	${INSTALL_PROGRAM} ${WRKSRC}/src/tavrasm ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/tavrasm.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/tavrasm/PLIST b/devel/tavrasm/PLIST
index 7dcd840a5ce..a128c806eeb 100644
--- a/devel/tavrasm/PLIST
+++ b/devel/tavrasm/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:26:59 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/10/01 21:03:36 dillo Exp $
 bin/tavrasm
+man/man1/tavrasm.1
 share/doc/tavrasm/README
 @dirrm share/doc/tavrasm
diff --git a/devel/tavrasm/distinfo b/devel/tavrasm/distinfo
index 35b866c55eb..eb9d3899138 100644
--- a/devel/tavrasm/distinfo
+++ b/devel/tavrasm/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.8 2006/01/03 10:08:51 joerg Exp $
+$NetBSD: distinfo,v 1.9 2006/10/01 21:03:36 dillo Exp $
 
-SHA1 (tavrasm-1.20/tavrasm.tar.gz) = 9aaa1725f4468a47a29484b64c227596f5dccf1f
-RMD160 (tavrasm-1.20/tavrasm.tar.gz) = aa423d9872ab805e97f34bb133eb0d168741527d
-Size (tavrasm-1.20/tavrasm.tar.gz) = 62047 bytes
-SHA1 (patch-aa) = 22024df9375acc24663db6cc625893140e3bf6ac
-SHA1 (patch-ab) = b6c78ef76b03b27317f4bea888b20e5b47479eaa
-SHA1 (patch-ac) = a9ffaaaca09d8541d0f0ddc856152484f843f0b3
+SHA1 (tavrasm-1.22/tavrasm.tar.gz) = 9d19035b9fcc460a33a85338010541824633c417
+RMD160 (tavrasm-1.22/tavrasm.tar.gz) = 1e0f4553be660ebcfa44b2a9d81b3936997492e2
+Size (tavrasm-1.22/tavrasm.tar.gz) = 65685 bytes
+SHA1 (patch-aa) = 45442e39cee3daaf08361811ec8607b59c223a2c
diff --git a/devel/tavrasm/patches/patch-aa b/devel/tavrasm/patches/patch-aa
index 11ba9697b7d..811e5a36494 100644
--- a/devel/tavrasm/patches/patch-aa
+++ b/devel/tavrasm/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2003/09/11 18:08:45 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2006/10/01 21:03:36 dillo Exp $
 
---- makefile.orig	2003-03-12 01:56:02.000000000 +0100
-+++ makefile
+--- src/makefile.orig	2003-03-12 01:56:02.000000000 +0100
++++ src/makefile
 @@ -24,12 +24,14 @@ VERSION		= 117
  
  ### Compiler options #########################################################
diff --git a/devel/tavrasm/patches/patch-ac b/devel/tavrasm/patches/patch-ac
deleted file mode 100644
index fe4c900202a..00000000000
--- a/devel/tavrasm/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/01/03 10:08:51 joerg Exp $
-
---- symbol.cc.orig	2006-01-03 10:03:43.000000000 +0000
-+++ symbol.cc
-@@ -140,7 +140,7 @@ int symbolTable::init(int cs, unsigned i
- 
-   // Allocate mew symbol-table
- 
--  if(size && (symtab = new (symbolTableEntry*)[size]))
-+  if(size && (symtab = new symbolTableEntry *[size]))
-   {
-     // Clear hash-table
-