Upgrade to version 1.0.b1.

Submitted by:	maintainer

4 files changed, 34 insertions, 55 deletions

diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index 8d7111e1b68c..38a9715b1956 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -1,30 +1,26 @@
 # New ports collection makefile for:    kaffe
-# Version required:     0.9.2
+# Version required:     1.0.b1
 # Date created:         20 February 1995
 # Whom:                 Tim Wilkinson <tim@sarc.city.ac.uk>
 #
-# $Id: Makefile,v 1.30 1997/12/08 09:37:16 obrien Exp $
+# $Id: Makefile,v 1.31 1998/06/28 23:41:11 steve Exp $
 #
 
-DISTNAME=	kaffe-0.9.2
+DISTNAME=	kaffe-1.0.b1
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.cs.columbia.edu/pub/kaffe/ \
-		ftp://ftp.kaffe.org/pub/kaffe/ \
-		http://www.webcity.co.jp/info/andoh/java/kaffe/
+MASTER_SITES=	ftp://ftp.transvirtual.com/pub/kaffe/
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}.tgz kaffe-0.9.2-package-javasoft.com.tgz \
+DISTFILES=	${DISTNAME}.tar.gz
 
-MAINTAINER=	xaa@stack.nl
+MAINTAINER=	xaa@xaa.iae.nl
 
-RESTRICTED=	'No redistribution of the Java(tm) Development Kit'
-NO_PACKAGE=	${RESTRICTED}
+LIB_DEPENDS=	jpeg\\.9\\.0:${PORTSDIR}/graphics/jpeg
 
 GNU_CONFIGURE=	yes
 MAN1=		kaffe.1
 
 post-install:
-	${MKDIR} ${PREFIX}/share/kaffe
-	${INSTALL_DATA} ${WRKSRC}/ENVIRONMENT ${WRKSRC}/license.terms ${PREFIX}/share/kaffe
-	${LDCONFIG} -m ${PREFIX}/lib
+	${INSTALL_SCRIPT} ${WRKSRC}/ENVIRONMENT ${PREFIX}/share/kaffe
+	${INSTALL_DATA} ${WRKSRC}/license.terms ${PREFIX}/share/kaffe
 
 .include <bsd.port.mk>
diff --git a/java/kaffe/distinfo b/java/kaffe/distinfo
index b041a6d94622..ff3f10ce9ee2 100644
--- a/java/kaffe/distinfo
+++ b/java/kaffe/distinfo
@@ -1,2 +1 @@
-MD5 (kaffe-0.9.2.tgz) = 576762b44fda537a33dc33616062cf1a
-MD5 (kaffe-0.9.2-package-javasoft.com.tgz) = 0a6ce38b13cd747e2e865c4d1c0f9ab2
+MD5 (kaffe-1.0.b1.tar.gz) = 90cc0fe53f3dc9fea9c08181d8cba076
diff --git a/java/kaffe/pkg-descr b/java/kaffe/pkg-descr
index 97eda9730758..b87254bd9682 100644
--- a/java/kaffe/pkg-descr
+++ b/java/kaffe/pkg-descr
@@ -4,12 +4,8 @@
 *******************
 
 This is Kaffe, a virtual machine design to execute Java bytecode.
-This machine can be configured in two modes.  In one mode it operates as
-a pure bytecode interpreter (not unlike Javasoft's machine); in the second
-mode if performs "just-in-time" code conversion from the abstract code to
-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.
+Kaffe comes with an own implementation of the Java standard classes,
+including the Awt classes.
 
 Running Kaffe
 =============
@@ -17,7 +13,8 @@ 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
+ CLASSPATH=.:/usr/local/share/kaffe/Klasses.jar:\
+     /usr/local/share/kaffe/pizza.jar
  KAFFEHOME=/usr/local/share/kaffe
  LD_LIBRARY_PATH=/usr/lib:/usr/local/lib
 
diff --git a/java/kaffe/pkg-plist b/java/kaffe/pkg-plist
index 93971b3cd3f9..69be252a9673 100644
--- a/java/kaffe/pkg-plist
+++ b/java/kaffe/pkg-plist
@@ -1,5 +1,7 @@
-bin/kaffe
+bin/Kaffe
 bin/kaffeh
+bin/pizza
+bin/pizzadoc
 bin/appletviewer
 bin/jar
 bin/javac
@@ -12,52 +14,37 @@ bin/report-kaffe-bug
 bin/rmic
 bin/rmiregistry
 bin/serialver
+bin/install-jar
+bin/kaffe
+include/kaffe/jmalloc.h
+include/kaffe/jsyscall.h
 include/kaffe/jtypes.h
 include/kaffe/native.h
-include/kaffe/StubPreamble.h
 include/kaffe/Arrays.h
 include/kaffe/java_lang_Object.h
 include/kaffe/java_lang_String.h
 include/kaffe/java_lang_Throwable.h
 include/kaffe/java_lang_Thread.h
 include/kaffe/java_lang_ThreadGroup.h
-lib/libnative.so.0.92
+lib/libnative.so.1.00
 lib/libnative.so
-lib/libnet.so.0.92
+lib/libnet.so.1.00
 lib/libnet.so
-lib/libagent.so.0.92
-lib/libagent.so
-lib/libzip.so.0.92
+lib/libmath.so.1.00
+lib/libmath.so
+lib/libmanagement.so.1.00
+lib/libmanagement.so
+lib/libzip.so.1.00
 lib/libzip.so
-lib/libkaffevm.so.0.92
+lib/libawt.so.1.00
+lib/libawt.so
+lib/libkaffevm.so.1.00
 lib/libkaffevm.so
-man/man1/kaffe.1.gz
-share/kaffe/lib/security/java.security
-share/kaffe/lib/appletviewer.properties
-share/kaffe/lib/awt.properties
-share/kaffe/lib/content-types.properties
-share/kaffe/lib/font.properties
-share/kaffe/lib/rmic.properties
-share/kaffe/lib/serialver.properties
-share/kaffe/lib/font.properties.cs
-share/kaffe/lib/font.properties.el
-share/kaffe/lib/font.properties.hu
-share/kaffe/lib/font.properties.ja
-share/kaffe/lib/font.properties.ko
-share/kaffe/lib/font.properties.lt
-share/kaffe/lib/font.properties.lv
-share/kaffe/lib/font.properties.pl
-share/kaffe/lib/font.properties.ru
-share/kaffe/lib/font.properties.tr
-share/kaffe/lib/font.properties.zh
-share/kaffe/lib/font.properties.zh_TW
-share/kaffe/lib/psfont.properties.ja
-share/kaffe/classes.zip
 share/kaffe/ENVIRONMENT
+share/kaffe/Klasses.jar
 share/kaffe/license.terms
+share/kaffe/pizza.jar
+man/man1/kaffe.1.gz
 @exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
 @dirrm include/kaffe
-@dirrm share/kaffe/lib/security
-@dirrm share/kaffe/lib
 @dirrm share/kaffe