Update to 1.7. Notable changes:

Added support for 68hc08, 6809, AVR ATmega8,
16f627, 16f628, 12f629, 12f675, 16f818, 16f819, c166.

Sped up INCBIN for those processors that have it.

Fixed bug in register aliasing where memcpy was being called
instead of memmove (needed to handle overlapping cases).

Fixed ordering of bytes when using DW with AVR processors.

Fixed bug in Z80's CPDR instruction generation.

4 files changed, 25 insertions, 22 deletions

diff --git a/devel/tpasm/Makefile b/devel/tpasm/Makefile
index 83d09aacd0d..04645e1ff2d 100644
--- a/devel/tpasm/Makefile
+++ b/devel/tpasm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2012/10/31 11:19:51 asau Exp $
+# $NetBSD: Makefile,v 1.19 2012/11/15 16:44:56 shattered Exp $
 #
 
-DISTNAME=	tpasm1.0r
-PKGNAME=	tpasm-1.0r
-PKGREVISION=	1
+DISTNAME=	tpasm1.7
+PKGNAME=	tpasm-1.7
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.ct0.com/pub/
 EXTRACT_SUFX=	.tgz
@@ -12,7 +11,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.sqt.com/
 COMMENT=	Assembler for 6805, 68HC11, 6502, Surplus, 8051, Z80, PIC, and AVR
 
-WRKSRC=		${WRKDIR}/tpasm
 USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake
 
diff --git a/devel/tpasm/PLIST b/devel/tpasm/PLIST
index e946ee170a6..2850a7d76ea 100644
--- a/devel/tpasm/PLIST
+++ b/devel/tpasm/PLIST
@@ -1,7 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:49:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/11/15 16:44:56 shattered Exp $
 bin/tpasm
-share/doc/tpasm/MANUAL.TXT
 libdata/tpasm/8051.inc
+libdata/tpasm/8052.inc
 libdata/tpasm/80c390.inc
+libdata/tpasm/avr.inc
 libdata/tpasm/p16c505.inc
 libdata/tpasm/picmacros.inc
+libdata/tpasm/reg_167.inc
+libdata/tpasm/reg_xe167xm.inc
+share/doc/tpasm/MANUAL.TXT
+
diff --git a/devel/tpasm/distinfo b/devel/tpasm/distinfo
index f4b45070573..631f9e31287 100644
--- a/devel/tpasm/distinfo
+++ b/devel/tpasm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 22:24:35 agc Exp $
+$NetBSD: distinfo,v 1.5 2012/11/15 16:44:56 shattered Exp $
 
-SHA1 (tpasm1.0r.tgz) = 16b88a548681de2dd8409630a079bdefa84957c4
-RMD160 (tpasm1.0r.tgz) = 19d7400bae54551cedd2d963d09b9cc7dbbc3af6
-Size (tpasm1.0r.tgz) = 137634 bytes
-SHA1 (patch-aa) = 9898d05cab53475622e8350617d2fea1b77e56c4
+SHA1 (tpasm1.7.tgz) = 77d06de9d8e29092f2e5cde43930c505c6deb89e
+RMD160 (tpasm1.7.tgz) = 62f0105c5af78083b82d09f90e4ff023d4480286
+Size (tpasm1.7.tgz) = 190597 bytes
+SHA1 (patch-aa) = 12c5787528df98e7ce5b6ce5d217633057a17f81
diff --git a/devel/tpasm/patches/patch-aa b/devel/tpasm/patches/patch-aa
index 178ed1906d0..23206a89b11 100644
--- a/devel/tpasm/patches/patch-aa
+++ b/devel/tpasm/patches/patch-aa
@@ -1,26 +1,26 @@
-$NetBSD: patch-aa,v 1.3 2003/12/02 17:59:45 sketch Exp $
+$NetBSD: patch-aa,v 1.4 2012/11/15 16:44:56 shattered Exp $
 
---- Makefile.orig	2003-12-02 17:09:48.000000000 +0000
-+++ Makefile	2003-12-02 17:12:02.000000000 +0000
-@@ -16,7 +16,7 @@
- INCLUDES=-I.
- 
- OPTIONS=-O2 -Wall -x c++
+--- Makefile.orig	2007-06-12 19:42:03.000000000 +0000
++++ Makefile
+@@ -18,7 +18,7 @@ INCLUDES=-I.
+ # new gnu compilers have a really annoying default behavior of wrapping
+ # error message lines. The default should be NO-WRAPPING.
+ OPTIONS=-O2 -Wall -x c++ -fmessage-length=0 -fno-exceptions
 -CFLAGS=$(INCLUDES) $(OPTIONS)
 +CFLAGS += $(INCLUDES)
  
  OBJECTS = \
  	globals.o \
-@@ -65,7 +65,7 @@
+@@ -44,7 +44,7 @@ OBJECTS = \
  all : tpasm
  
  tpasm : $(OBJECTS)
--	$(CC) -O $(OBJECTS) -o tpasm
+-	$(CC) -O $(OBJECTS) -lstdc++ -o tpasm
 +	$(CXX) $(CFLAGS) $(OBJECTS) -o tpasm
  
  clean :
  	rm -f *.o
-@@ -79,5 +79,5 @@
+@@ -58,5 +58,5 @@ install :
  # suffix rules (this makes sure that the ".o" files
  # end up in their respective directories on all systems)
  .c.o: