Upgrade, 0.5.5 -> 0.6.1.

Submitted by:	xaa@stack.nl

4 files changed, 49 insertions, 40 deletions

diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index d355a21eb5aa..ba1c17e8d370 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    kaffe
-# Version required:     0.5p4
-# Date created:         18 September 1996
-# Whom:                 Mark Huizer <xaa@stack.urc.tue.nl>
+# Version required:     0.6.1
+# Date created:         25 December 1996
+# Whom:                 Mark Huizer <xaa@stack.nl>
 #
-# $Id: Makefile,v 1.11 1996/11/18 11:41:12 asami Exp $
+# $Id$
 #
 
-DISTNAME=	kaffe-0.5.5
-PKGNAME=	kaffe-0.5.5
+DISTNAME=	kaffe-0.6.1
+PKGNAME=	kaffe-0.6.1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.sarc.city.ac.uk/pub/kaffe/ \
-		ftp://alterego.stack.urc.tue.nl/pub/kaffe/
+		ftp://alterego.stack.nl/pub/kaffe/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	xaa@stack.nl
diff --git a/java/kaffe/distinfo b/java/kaffe/distinfo
index fbc4615a7872..0dbae0e126da 100644
--- a/java/kaffe/distinfo
+++ b/java/kaffe/distinfo
@@ -1 +1 @@
-MD5 (kaffe-0.5.5.tgz) = fed96ef9aa7169b527ed2caeec0bcc5d
+MD5 (kaffe-0.6.1.tgz) = fa71c14a7702836441d9badd56682fdf
diff --git a/java/kaffe/pkg-descr b/java/kaffe/pkg-descr
index 277b4539bec9..d3a307e9a350 100644
--- a/java/kaffe/pkg-descr
+++ b/java/kaffe/pkg-descr
@@ -1,4 +1,4 @@
-KAFFE v0.5.5 - A JIT and interpreting virtual machine to run Java(tm)* code
+KAFFE v0.6.1 - A JIT and interpreting virtual machine to run Java(tm)* code
 ===========================================================================
 
 This is Kaffe, a virtual machine design to execute Java bytecode.
@@ -9,22 +9,6 @@ the host machine's native code.  This will ultimately allow execution of
 Java code at the same speed as standard compiled code but while maintaining
 the advantages and flexibility of code independence.
 
-Running Kaffe
-=============
-
-This version of Kaffe is not supplied with a copy of Sun's class library.
-This can be obtained from Sun's JDK package (from http://www.javasoft.com) or
-pre-prepaired in kaffe-0.5.5-sun.tgz (from the usual Kaffe ftp sites).
-This version of Kaffe uses the class library from JDK 1.0.2.
-
-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/java/classes.zip
-	KAFFEHOME=/usr/local/share/kaffe
-	LD_LIBRARY_PATH=/usr/lib:/usr/local/lib
-
 Who can use Kaffe
 =================
 
@@ -32,21 +16,14 @@ This version of Kaffe is distributed under a Berkeley style license.
 Essentially you can use Kaffe for both personal and commerical purpose, on
 its own or as part of another package (see license.terms for full details).
 
-Kaffe Web and FTP sites
-=======================
-
-Kaffe is available from various sites.  The primary site is:
-
-        ftp://ftp.sarc.city.ac.uk/pub/kaffe/
-
 Kaffe mailing lists
 ===================
 
 A couple of mailing lists are available for information and discussion of
 the Kaffe project.  There lists are:
   
-        kaffe@sarc.city.ac.uk			- General discussions
-        kaffe-announce@sarc.city.ac.uk		- Announcements
+        kaffe@sarc.city.ac.uk                   - General discussions
+        kaffe-announce@sarc.city.ac.uk          - Announcements
   
 To subscribe to these lists send a message containing the word "subscribe"
 to either:
@@ -58,7 +35,39 @@ depending what you are interested in.
 
 You can also check out the Kaffe related web pages at:
 
-	http://www.sarc.city.ac.uk/~tim/kaffe
+        http://www.tjwassoc.demon.co.uk/kaffe/kaffe.htm
+
+Running Kaffe
+=============
+
+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
+
+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 source comes with a test program "HelloWorldApp" which can be found
+in the test directory in the distribution.  After installation, run this
+program from the test directory by typing the following:
+
+        cd <java source directory>/test
+        kaffe HelloWorldApp
+
+This should load and execute the HelloWorld application.  If all is well
+it will print "Hello World!".   As a further test you might like to try
+compiling the HelloWorldApp source.  To do this type the following:
+
+        javac HelloWorldApp.java
+
+"javac" is a shell script which has been provided to invoke Kaffe on
+the standard Java compiler.  If all is well, the application should compile
+without incident.
 
 The state of play
 =================
@@ -79,8 +88,8 @@ Awt
 ---
 One major missing component from Kaffe is an implementation of AWT.  Work
 on this is being done by others, and their current implementation can be found
-at ftp://slhp1.epfl.ch/pub/sawt-0.1.tar.gz.  I don't know what the current
-status of this work.
+at ftp://slhp1.epfl.ch/pub/sawt-0.4.1.tar.gz.  I don't know what the current
+status of this work but you can check at http://slhp1.epfl.ch/sawt.html.
 
 Java.lang & Java.io
 -------------------
diff --git a/java/kaffe/pkg-plist b/java/kaffe/pkg-plist
index 828f11ef45e0..d85b637ee1ee 100644
--- a/java/kaffe/pkg-plist
+++ b/java/kaffe/pkg-plist
@@ -7,10 +7,10 @@ include/kaffe/native.h
 include/kaffe/StubPreamble.h
 man/man1/kaffe.1.gz
 share/kaffe/license.terms
-lib/libkaffe_native.so.0.55
+lib/libkaffe_native.so.0.61
 lib/libkaffe_native.so
-lib/libkaffe_vm.so.0.55
+lib/libkaffe_vm.so.0.61
 lib/libkaffe_vm.so
-lib/libkaffe_net.so.0.55
+lib/libkaffe_net.so.0.61
 lib/libkaffe_net.so
 @exec /sbin/ldconfig -m %B