update to gpasm-0.9.7

many improvements such as:

1.  The i++ and i-- operators are now implemented.  Note: the variable is a
label and must appear in column 1.

2.  +=, -=, *=, /=, %=, <<=, >>=, &=, |=, and ^= have all been implemented.

additional processor support and more.

Also, many bug fixes.  See the ChangeLog in the distfile for a complete list
of changes (quite long).

4 files changed, 16 insertions, 102 deletions

diff --git a/devel/gpasm/Makefile b/devel/gpasm/Makefile
index e978d950ea4..e3b5903eea8 100644
--- a/devel/gpasm/Makefile
+++ b/devel/gpasm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/24 13:22:36 wulf Exp $
+# $NetBSD: Makefile,v 1.2 2001/07/05 14:32:33 dmcmahill Exp $
 
-DISTNAME=	gpasm-0.9.4
+DISTNAME=	gpasm-0.9.7
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.sourceforge.net/pub/sourceforge/gpasm/
 
diff --git a/devel/gpasm/distinfo b/devel/gpasm/distinfo
index ac1562afafb..7ad06eff480 100644
--- a/devel/gpasm/distinfo
+++ b/devel/gpasm/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/05/07 16:05:07 dmcmahill Exp $
+$NetBSD: distinfo,v 1.3 2001/07/05 14:32:33 dmcmahill Exp $
 
-SHA1 (gpasm-0.9.4.tar.gz) = f5bf7d82f6da7f58d36664fe14a6fc55cd7add93
-Size (gpasm-0.9.4.tar.gz) = 294672 bytes
-SHA1 (patch-aa) = c0b971bb2921436646b6de89cf3e00b2ea17aac1
+SHA1 (gpasm-0.9.7.tar.gz) = 60fc3c68d96477c0fe5430458c4f9648f9d3371d
+Size (gpasm-0.9.7.tar.gz) = 322273 bytes
+SHA1 (patch-aa) = 5480da829fb5f5d05c9695e41c1300b3f0de1a1b
diff --git a/devel/gpasm/patches/patch-aa b/devel/gpasm/patches/patch-aa
index dc82b7f31b3..53674e4d971 100644
--- a/devel/gpasm/patches/patch-aa
+++ b/devel/gpasm/patches/patch-aa
@@ -1,97 +1,11 @@
-$NetBSD: patch-aa,v 1.1 2001/05/07 16:05:08 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2001/07/05 14:32:34 dmcmahill Exp $
 
---- gpasm/opcode.c.orig	Sun Apr 22 13:12:54 2001
-+++ gpasm/opcode.c	Mon May  7 09:18:28 2001
-@@ -94,5 +94,5 @@
- struct insn {
-   char *name;
--  int mask;
-+  long int mask;
-   enum insn_class class;
-   int attribs;
-@@ -2672,46 +2672,46 @@
+--- gpvc/dump.c.orig	Wed May  9 02:19:51 2001
++++ gpvc/dump.c	Thu Jul  5 07:18:01 2001
+@@ -41,5 +41,5 @@
+ {
  
- static struct insn  op_0[] = {
--  { "constant", (int)do_constant, INSN_CLASS_FUNC,	0 },
--  { "else",	(int)do_else, 	INSN_CLASS_FUNC,	ATTRIB_COND },
--  { "endif",	(int)do_endif,	INSN_CLASS_FUNC,	ATTRIB_COND },
--  { "endm",	(int)do_endm,	INSN_CLASS_FUNC,	0 },
--  { "endw",	(int)do_endw,	INSN_CLASS_FUNC,	0 },
--  { "equ",	(int)do_equ,  	INSN_CLASS_FUNC,	0 },
--  { "error",	(int)do_error, 	INSN_CLASS_FUNC,	0 },
--  { "expand",	(int)do_expand, INSN_CLASS_FUNC,	0 },
--  { "errorlevel", (int)do_errlvl, INSN_CLASS_FUNC,	0 },
--  { "if",	(int)do_if,   	INSN_CLASS_FUNC,	ATTRIB_COND },
--  { "ifdef",	(int)do_ifdef, 	INSN_CLASS_FUNC,	ATTRIB_COND },
--  { "ifndef",	(int)do_ifndef,	INSN_CLASS_FUNC,	ATTRIB_COND },
--  { "list",	(int)do_list, 	INSN_CLASS_FUNC,	0 },
--  { "local",	(int)do_local, 	INSN_CLASS_FUNC,	0 },
--  { "macro",	(int)do_macro,	INSN_CLASS_FUNC,	0 },
--  { "messg",	(int)do_messg,	INSN_CLASS_FUNC,	0 },
--  { "noexpand", (int)do_noexpand, INSN_CLASS_FUNC,	0 },
--  { "nolist",	(int)do_nolist, INSN_CLASS_FUNC,	0 },
--  { "page",	(int)do_page,   INSN_CLASS_FUNC,	0 },
--  { "processor",(int)do_processor,INSN_CLASS_FUNC,	0 },
--  { "radix",	(int)do_radix, 	INSN_CLASS_FUNC,	0 },
--  { "set",	(int)do_set, 	INSN_CLASS_FUNC,	0 },
--  { "variable", (int)do_variable, INSN_CLASS_FUNC,	0 },
--  { "while",	(int)do_while, 	INSN_CLASS_FUNC,	0 },
-+  { "constant", (long int)do_constant, INSN_CLASS_FUNC,	0 },
-+  { "else",	(long int)do_else, 	INSN_CLASS_FUNC,	ATTRIB_COND },
-+  { "endif",	(long int)do_endif,	INSN_CLASS_FUNC,	ATTRIB_COND },
-+  { "endm",	(long int)do_endm,	INSN_CLASS_FUNC,	0 },
-+  { "endw",	(long int)do_endw,	INSN_CLASS_FUNC,	0 },
-+  { "equ",	(long int)do_equ,  	INSN_CLASS_FUNC,	0 },
-+  { "error",	(long int)do_error, 	INSN_CLASS_FUNC,	0 },
-+  { "expand",	(long int)do_expand, INSN_CLASS_FUNC,	0 },
-+  { "errorlevel", (long int)do_errlvl, INSN_CLASS_FUNC,	0 },
-+  { "if",	(long int)do_if,   	INSN_CLASS_FUNC,	ATTRIB_COND },
-+  { "ifdef",	(long int)do_ifdef, 	INSN_CLASS_FUNC,	ATTRIB_COND },
-+  { "ifndef",	(long int)do_ifndef,	INSN_CLASS_FUNC,	ATTRIB_COND },
-+  { "list",	(long int)do_list, 	INSN_CLASS_FUNC,	0 },
-+  { "local",	(long int)do_local, 	INSN_CLASS_FUNC,	0 },
-+  { "macro",	(long int)do_macro,	INSN_CLASS_FUNC,	0 },
-+  { "messg",	(long int)do_messg,	INSN_CLASS_FUNC,	0 },
-+  { "noexpand", (long int)do_noexpand, INSN_CLASS_FUNC,	0 },
-+  { "nolist",	(long int)do_nolist, INSN_CLASS_FUNC,	0 },
-+  { "page",	(long int)do_page,   INSN_CLASS_FUNC,	0 },
-+  { "processor",(long int)do_processor,INSN_CLASS_FUNC,	0 },
-+  { "radix",	(long int)do_radix, 	INSN_CLASS_FUNC,	0 },
-+  { "set",	(long int)do_set, 	INSN_CLASS_FUNC,	0 },
-+  { "variable", (long int)do_variable, INSN_CLASS_FUNC,	0 },
-+  { "while",	(long int)do_while, 	INSN_CLASS_FUNC,	0 },
- };
- 
- static struct insn  op_1[] = {
--  { "__badram", (int)do_badram, INSN_CLASS_FUNC,	0 },
--  { "__config", (int)do_config, INSN_CLASS_FUNC,	0 },
--  { "__fuses",  (int)do_config, INSN_CLASS_FUNC,	0 },
--  { "__idlocs", (int)do_idlocs, INSN_CLASS_FUNC,	0 },
--  { "__maxram", (int)do_maxram, INSN_CLASS_FUNC,	0 },
--  { "data",     (int)do_data, 	INSN_CLASS_FUNC,	0 },
--  { "da",       (int)do_da, 	INSN_CLASS_FUNC,	0 },
--  { "db",       (int)do_db, 	INSN_CLASS_FUNC,	0 },
--  { "de",       (int)do_de, 	INSN_CLASS_FUNC,	0 },
--  { "dt",       (int)do_dt, 	INSN_CLASS_FUNC,	0 },
--  { "dw",       (int)do_dw, 	INSN_CLASS_FUNC,	0 },
--  { "fill",	(int)do_fill,  	INSN_CLASS_FUNC,	0 },
--  { "org",	(int)do_org,    INSN_CLASS_FUNC,	0 },
--  { "res",	(int)do_res,    INSN_CLASS_FUNC,	0 },
--  { "space",	(int)do_space,  INSN_CLASS_FUNC,	0 }
-+  { "__badram", (long int)do_badram, INSN_CLASS_FUNC,	0 },
-+  { "__config", (long int)do_config, INSN_CLASS_FUNC,	0 },
-+  { "__fuses",  (long int)do_config, INSN_CLASS_FUNC,	0 },
-+  { "__idlocs", (long int)do_idlocs, INSN_CLASS_FUNC,	0 },
-+  { "__maxram", (long int)do_maxram, INSN_CLASS_FUNC,	0 },
-+  { "data",     (long int)do_data, 	INSN_CLASS_FUNC,	0 },
-+  { "da",       (long int)do_da, 	INSN_CLASS_FUNC,	0 },
-+  { "db",       (long int)do_db, 	INSN_CLASS_FUNC,	0 },
-+  { "de",       (long int)do_de, 	INSN_CLASS_FUNC,	0 },
-+  { "dt",       (long int)do_dt, 	INSN_CLASS_FUNC,	0 },
-+  { "dw",       (long int)do_dw, 	INSN_CLASS_FUNC,	0 },
-+  { "fill",	(long int)do_fill,  	INSN_CLASS_FUNC,	0 },
-+  { "org",	(long int)do_org,    INSN_CLASS_FUNC,	0 },
-+  { "res",	(long int)do_res,    INSN_CLASS_FUNC,	0 },
-+  { "space",	(long int)do_space,  INSN_CLASS_FUNC,	0 }
- };
+-  return(  ( (int)a) - ((int)b) );
++  return(  ( (long int)a) - ((long int)b) );
  
+ }
diff --git a/devel/gpasm/pkg/PLIST b/devel/gpasm/pkg/PLIST
index 8cb79a55de5..7fd4cb9abd7 100644
--- a/devel/gpasm/pkg/PLIST
+++ b/devel/gpasm/pkg/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/04/24 13:22:37 wulf Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/05 14:32:34 dmcmahill Exp $
 bin/gpasm
 bin/gpdasm
 bin/gpvc
+bin/gpvo
 share/doc/gpasm/gpasm.lyx
 share/doc/gpasm/gpasm.pdf
 share/doc/gpasm/gpasm.ps
-share/gpasm/special.inc
 share/gpasm/header/memory.inc
 share/gpasm/header/p12c508.inc
 share/gpasm/header/p12c508a.inc