Upgrade to 0.8.1. Closes PR #2836.

Submitted by:	Mark Huizer <xaa@stack.nl>

Install ENVIRONMENT with correct CLASSPATH. Closes PR #2620.

5 files changed, 23 insertions, 22 deletions

diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index 7ec52cf85eeb..18e0600e8901 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -3,13 +3,14 @@
 # Date created:         10 February 1997
 # Whom:                 Mark Huizer <xaa@stack.nl>
 #
-# $Id: Makefile,v 1.17 1997/02/18 11:36:08 obrien Exp $
+# $Id: Makefile,v 1.18 1997/02/28 10:47:17 tg Exp $
 #
 
-DISTNAME=	kaffe-0.8.0
+DISTNAME=	kaffe-0.8.1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.sarc.city.ac.uk/pub/kaffe/
 EXTRACT_SUFX=	.tgz
+DISTFILES=	${DISTNAME}.tgz kaffe-0.8.1-package-biss-net.com.tgz
 
 MAINTAINER=	xaa@stack.nl
 
@@ -29,7 +30,7 @@ pre-install:
 
 post-install:
 	${MKDIR} ${PREFIX}/share/kaffe
-	${INSTALL_DATA} ${WRKSRC}/license.terms ${PREFIX}/share/kaffe
+	${INSTALL_DATA} ${WRKSRC}/ENVIRONMENT ${WRKSRC}/license.terms ${PREFIX}/share/kaffe
 	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/java/kaffe/distinfo b/java/kaffe/distinfo
index 4368b282a884..d3bcf7b273c9 100644
--- a/java/kaffe/distinfo
+++ b/java/kaffe/distinfo
@@ -1 +1,2 @@
-MD5 (kaffe-0.8.0.tgz) = 5c5ddd84953db24ade3062517be3fc48
+MD5 (kaffe-0.8.1.tgz) = e120b969f896ce5b99d21b643952dad9
+MD5 (kaffe-0.8.1-package-biss-net.com.tgz) = cbda1b62761bdac775c3901e782075b8
diff --git a/java/kaffe/pkg-comment b/java/kaffe/pkg-comment
index 414795b0f6de..9d110713256f 100644
--- a/java/kaffe/pkg-comment
+++ b/java/kaffe/pkg-comment
@@ -1 +1 @@
-A virtual machine capable of running Java(tm) code (except awt.*)
+A virtual machine capable of running Java(tm) code (including an awt-package)
diff --git a/java/kaffe/pkg-descr b/java/kaffe/pkg-descr
index 5831c2381cb4..0562c70b7aa4 100644
--- a/java/kaffe/pkg-descr
+++ b/java/kaffe/pkg-descr
@@ -13,24 +13,17 @@ Before running Kaffe it is necessary to configure the environment.
 This requires the setting of CLASSPATH, KAFFEHOME and LD_LIBRARY_PATH.
 For the standard installation these would be defined as follows:
 
-        CLASSPATH=.:/usr/local/share/kaffe/classes.zip
-        KAFFEHOME=/usr/local/share/kaffe
-        LD_LIBRARY_PATH=/usr/lib:/usr/local/lib
+ CLASSPATH=.:/usr/local/share/java/classes.zip:/usr/local/share/kaffe/biss.zip
+ KAFFEHOME=/usr/local/share/kaffe
+ LD_LIBRARY_PATH=/usr/lib:/usr/local/lib
 
 A file "ENVIRONMENT" is generated by the configure program which contains
 a /bin/sh environment setup.  This may help you to figure out what to
 set to what if you alter the standard installation point.
 
-The state of play
-=================
-Kaffe should run all non-graphical code which will run on a Java
-machine.  However there are still bugs and plenty of untested native
-library functions.  Some functions which are not currently implemented
-(most often because I don't understand exactly what they are suppose to
-do) will simply abort if called.  If you can help out on any of these
-then please do *BUT* remember, this is a clean-room implementation (I
-have never seen any of Sun's Java source code) and I cannot simply
-encorporate Javasoft's* code.
+What's in there
+===============
+This package includes BISS-awt, an AWT-package
 
 For further info see the file README that comes with the distribution.
 ----
diff --git a/java/kaffe/pkg-plist b/java/kaffe/pkg-plist
index 90ee0aa73f13..55deade54fb7 100644
--- a/java/kaffe/pkg-plist
+++ b/java/kaffe/pkg-plist
@@ -8,13 +8,19 @@ include/kaffe/native.h
 include/kaffe/StubPreamble.h
 include/kaffe/java_lang_String.h
 man/man1/kaffe.1.gz
+share/kaffe/ENVIRONMENT
 share/kaffe/license.terms
+share/kaffe/biss.zip
+share/kaffe/lib/biss
+share/kaffe/lib/biss.awt
 lib/libkaffe_agent.so
-lib/libkaffe_agent.so.0.80
+lib/libkaffe_agent.so.0.81
+lib/libkaffe_bissawt.so
+lib/libkaffe_bissawt.so.0.87
 lib/libkaffe_native.so
-lib/libkaffe_native.so.0.80
+lib/libkaffe_native.so.0.81
 lib/libkaffe_vm.so
-lib/libkaffe_vm.so.0.80
+lib/libkaffe_vm.so.0.81
 lib/libkaffe_net.so
-lib/libkaffe_net.so.0.80
+lib/libkaffe_net.so.0.81
 @exec /sbin/ldconfig -m %B