Update to version 0.2.

Changes:
	Add a A- directory with sources that fix several bugs in the
	original code.   Keep A+ to allow students to compare results

Corrections and A- tree from mark P Sullivan (msulliva at stevens-tech dot edu)
Corrections sent to the original author, but no response.

Synch PLIST with reality.

4 files changed, 60 insertions, 7 deletions

diff --git a/lang/joos/Makefile b/lang/joos/Makefile
index 7d52ae8c5a7..bf6a05a44c2 100644
--- a/lang/joos/Makefile
+++ b/lang/joos/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/08/07 20:16:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/04 16:39:40 jschauma Exp $
 #
 
-DISTNAME=	joos-0.1
+DISTNAME=	joos-0.2
 CATEGORIES=     lang
 MASTER_SITES=	ftp://netbsd.stevens-tech.edu/pub/NetBSD/packages/distfiles/
 EXTRACT_SUFX=	.tar.bz2
@@ -15,6 +15,7 @@ PKG_JVM=	sun-jdk
 
 do-install:
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/joos
-	cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}/joos
+	cd ${WRKSRC} && ${PAX} -s ,^./.*orig,, -rw . ${PREFIX}/joos
+	cd ${PREFIX}/joos/Bin && ${LN} -s joos.a- joos
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/joos/PLIST b/lang/joos/PLIST
index 5818b85a63c..8413782dc1d 100644
--- a/lang/joos/PLIST
+++ b/lang/joos/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2002/05/08 15:42:01 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/10/04 16:39:41 jschauma Exp $
 joos/A+/Makefile
 joos/A+/code.c
 joos/A+/code.h
@@ -25,6 +25,32 @@ joos/A+/type.c
 joos/A+/type.h
 joos/A+/weed.c
 joos/A+/weed.h
+joos/A-/Makefile
+joos/A-/code.c
+joos/A-/code.h
+joos/A-/defasn.c
+joos/A-/defasn.h
+joos/A-/emit.c
+joos/A-/emit.h
+joos/A-/error.c
+joos/A-/error.h
+joos/A-/joos.l
+joos/A-/joos.y
+joos/A-/main.c
+joos/A-/memory.c
+joos/A-/memory.h
+joos/A-/optimize.c
+joos/A-/optimize.h
+joos/A-/resource.c
+joos/A-/resource.h
+joos/A-/symbol.c
+joos/A-/symbol.h
+joos/A-/tree.c
+joos/A-/tree.h
+joos/A-/type.c
+joos/A-/type.h
+joos/A-/weed.c
+joos/A-/weed.h
 joos/Bin/D-Java
 joos/Bin/README
 joos/Bin/dejava
@@ -35,6 +61,8 @@ joos/Bin/jjava
 joos/Bin/jjavac
 joos/Bin/jjavap
 joos/Bin/jjoosc
+joos/Bin/joos.a+
+joos/Bin/joos.a-
 joos/Bin/joos
 joos/Bin/joosc
 joos/D-Java/Makefile
@@ -371,4 +399,5 @@ joos/Progs/WIGapplets/images/not.gif
 @dirrm joos/D-Java
 @dirrm joos/Bin
 @dirrm joos/A+
+@dirrm joos/A-
 @dirrm joos
diff --git a/lang/joos/distinfo b/lang/joos/distinfo
index 0cef495a3f2..ae30559d534 100644
--- a/lang/joos/distinfo
+++ b/lang/joos/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.1 2002/05/08 15:42:01 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2002/10/04 16:39:41 jschauma Exp $
 
-SHA1 (joos-0.1.tar.bz2) = 003f2b788a559d4245b44eeb43e58f200854dc41
-Size (joos-0.1.tar.bz2) = 265075 bytes
+SHA1 (joos-0.2.tar.bz2) = ffc3a53908353f6ae4f1150f7e03086bfff787c7
+Size (joos-0.2.tar.bz2) = 285084 bytes
 SHA1 (patch-aa) = 20598bcc16b3c31246f618720909281e679693de
 SHA1 (patch-ab) = 80959321809481f229bc61c2f8230aa9e4e980b0
 SHA1 (patch-ac) = 298f43d4e50bab0aa4cc8b01b514b69d0125d98b
 SHA1 (patch-ad) = 4bc69ab337ee2591fd5bca4ee5113d99ecebf499
+SHA1 (patch-ae) = 63ca5adc266bfa8823bece1d6b68647894275ef3
diff --git a/lang/joos/patches/patch-ae b/lang/joos/patches/patch-ae
new file mode 100644
index 00000000000..284bc5db4e6
--- /dev/null
+++ b/lang/joos/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2002/10/04 16:39:41 jschauma Exp $
+
+--- A-/Makefile.orig	Fri Oct  4 11:55:58 2002
++++ A-/Makefile	Fri Oct  4 11:57:53 2002
+@@ -1,13 +1,12 @@
+-CC = gcc
+-
+-CFLAGS = -Wall -ansi -pedantic
++YACC=			yacc
++FLEX=			flex
+ 
+ main:			y.tab.o lex.yy.o main.o tree.h tree.o error.h error.o memory.h memory.o weed.h weed.o symbol.h symbol.o type.h type.o defasn.h defasn.o resource.h resource.o code.h code.o optimize.h optimize.o emit.h emit.o
+ 			$(CC) lex.yy.o y.tab.o tree.o error.o memory.o weed.o symbol.o type.o defasn.o resource.o code.o optimize.o emit.o main.o -o joos -lfl
+ 
+ y.tab.c y.tab.h:	joos.y
+-			bison -y -d joos.y
++			${YACC} -d joos.y
+ 
+ lex.yy.c:		joos.l y.tab.h 
+-			flex joos.l
++			${FLEX} joos.l
+