4 files changed, 23 insertions, 26 deletions

diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index f7fac2af7054..0f8db56d4003 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -1,35 +1,23 @@
 # New ports collection makefile for:    kaffe
 # Version required:     0.8.4
-# Date created:         19 April 1997
+# Date created:         12 June 1997
 # Whom:                 Mark Huizer <xaa@stack.nl>
 #
-# $Id: Makefile,v 1.22 1997/04/21 11:58:57 tg Exp $
+# $Id: Makefile,v 1.23 1997/06/11 23:30:44 asami Exp $
 #
 
 DISTNAME=	kaffe-0.8.4
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.kaffe.org/pub/kaffe/
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}.tgz kaffe-0.8.4-package-biss-net.com.tgz
+DISTFILES=	${DISTNAME}.tgz kaffe-0.8.4-package-biss-net.com.tgz \
+		kaffe-0.8.4-package-javasoft.com.tgz
 
 MAINTAINER=	xaa@stack.nl
 
-RUN_DEPENDS=	${PREFIX}/share/java/classes.zip:${PORTSDIR}/lang/jdk
-
-BROKEN=		not compatible with latest jdk port
-
 GNU_CONFIGURE=	yes
 MAN1=		kaffe.1
 
-#do-configure:
-#		@(cd ${WRKSRC}; ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
-
-pre-install:
-	@( if test "`${MD5} ${PREFIX}/share/java/classes.zip | ${AWK} '{print $$4}'`" != "`cat ${FILESDIR}/classes.zip.1.02.md5`" ; then \
-	echo "kaffe REQUIRES the classes.zip file from ports/lang/jdk, version 1.02"; \
-	exit 1 ; \
-	fi)
-
 post-install:
 	${MKDIR} ${PREFIX}/share/kaffe
 	${INSTALL_DATA} ${WRKSRC}/ENVIRONMENT ${WRKSRC}/license.terms ${PREFIX}/share/kaffe
diff --git a/java/kaffe/distinfo b/java/kaffe/distinfo
index c7fc9d8fda61..40418af1e806 100644
--- a/java/kaffe/distinfo
+++ b/java/kaffe/distinfo
@@ -1,2 +1,3 @@
 MD5 (kaffe-0.8.4.tgz) = 0cbc33a43d9a930d33b354e4dc033dfc
 MD5 (kaffe-0.8.4-package-biss-net.com.tgz) = ac27c7cfd2dee6898e19ae7c327850e4
+MD5 (kaffe-0.8.4-package-javasoft.com.tgz) = d29c0efe6b8ac7d6a54837a6db968612
diff --git a/java/kaffe/pkg-descr b/java/kaffe/pkg-descr
index 9e806e0b909f..478628acdf0f 100644
--- a/java/kaffe/pkg-descr
+++ b/java/kaffe/pkg-descr
@@ -1,3 +1,8 @@
+*******************
+* NB: The section about the settings of the environment variables
+*     has changed! - Xaa
+*******************
+
 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
@@ -12,7 +17,7 @@ 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:/usr/local/share/kaffe/biss.zip
+ CLASSPATH=.:/usr/local/share/kaffe/classes.zip:/usr/local/share/kaffe/biss.zip
  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 df79f6b16108..b0344e57499a 100644
--- a/java/kaffe/pkg-plist
+++ b/java/kaffe/pkg-plist
@@ -8,21 +8,24 @@ include/kaffe/jtypes.h
 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
-share/kaffe/lib/biss.awt.kernel
 lib/libkaffe_agent.so
 lib/libkaffe_agent.so.0.84
 lib/libkaffe_bissawt.so
 lib/libkaffe_bissawt.so.0.87
 lib/libkaffe_native.so
 lib/libkaffe_native.so.0.84
-lib/libkaffe_vm.so
-lib/libkaffe_vm.so.0.84
 lib/libkaffe_net.so
 lib/libkaffe_net.so.0.84
+lib/libkaffe_vm.so
+lib/libkaffe_vm.so.0.84
+man/man1/kaffe.1.gz
+share/kaffe/biss.zip
+share/kaffe/classes.zip
+share/kaffe/lib/appletviewer.properties
+share/kaffe/lib/biss
+share/kaffe/lib/biss.awt
+share/kaffe/lib/biss.awt.kernel
+share/kaffe/lib/javac.properties
+share/kaffe/ENVIRONMENT
+share/kaffe/license.terms
 @exec /sbin/ldconfig -m %B