summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrueauf <frueauf@pkgsrc.org>1998-07-16 13:02:34 +0000
committerfrueauf <frueauf@pkgsrc.org>1998-07-16 13:02:34 +0000
commit2f95952eb7b191a8f28a3da70b6ab0129aacefa2 (patch)
treeb6ae62002561c2deb333deca1906e93e38bff78b
parent470dd4c51267a05616c912540df9c5725c87eb46 (diff)
downloadpkgsrc-2f95952eb7b191a8f28a3da70b6ab0129aacefa2.tar.gz
Update kaffe to the first release of "Kaffe OpenVM" version 1.0.b1.
This version does no longer use any code from Javasoft(tm). XXX although the authors claim it works on several NetBSD architektures XXX I suspect it currently only works on i386, because they insist on XXX having a trampoline.c which is only present for i386. XXX I did set "ONLY_FOR_ARCHS=i386 sparc alpha m68k mips arm32" to give XXX people a try to feedback if it works or not.
-rw-r--r--lang/kaffe/Makefile28
-rw-r--r--lang/kaffe/files/classes.zip.1.02.md51
-rw-r--r--lang/kaffe/files/md53
-rw-r--r--lang/kaffe/patches/patch-aa22
-rw-r--r--lang/kaffe/patches/patch-ab31
-rw-r--r--lang/kaffe/pkg/COMMENT2
-rw-r--r--lang/kaffe/pkg/DESCR25
-rw-r--r--lang/kaffe/pkg/PLIST65
8 files changed, 79 insertions, 98 deletions
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index 6cb462ef5fa..63aac6f0770 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.8 1998/07/15 11:48:29 agc Exp $
-# FreeBSD Id: Makefile,v 1.30 1997/12/08 09:37:16 obrien Exp
+# $NetBSD: Makefile,v 1.9 1998/07/16 13:02:34 frueauf Exp $
#
-DISTNAME= kaffe-0.9.2
+DISTNAME= kaffe-1.0.b1
CATEGORIES= lang
-MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/ \
- ftp://ftp.cs.columbia.edu/pub/kaffe/ \
- http://www.webcity.co.jp/info/andoh/java/kaffe/
-EXTRACT_SUFX= .tgz
-DISTFILES= ${DISTNAME}.tgz kaffe-0.9.2-package-javasoft.com.tgz \
+MASTER_SITES= ftp://ftp.transvirtual.com/pub/kaffe/
-MAINTAINER= xaa@stack.nl
+MAINTAINER= packages@netbsd.org
-RESTRICTED= 'No redistribution of the Java(tm) Development Kit'
-NO_PACKAGE= ${RESTRICTED}
-MIRROR_DISTFILE= no
-ONLY_FOR_ARCHS= i386
+DEPENDS+= jpeg-6b:../../graphics/jpeg
+
+CONFLICTS= kaffe-0.9.2
+
+ONLY_FOR_ARCHS= i386 sparc alpha m68k mips arm32
GNU_CONFIGURE= yes
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
+CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
post-install:
${MKDIR} ${PREFIX}/share/kaffe
- ${INSTALL_DATA} ${WRKSRC}/ENVIRONMENT ${WRKSRC}/license.terms ${PREFIX}/share/kaffe
+ ${INSTALL_DATA} ${WRKSRC}/ENVIRONMENT ${WRKSRC}/license.terms \
+ ${PREFIX}/share/kaffe
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/kaffe/files/classes.zip.1.02.md5 b/lang/kaffe/files/classes.zip.1.02.md5
deleted file mode 100644
index 12359f3f1b0..00000000000
--- a/lang/kaffe/files/classes.zip.1.02.md5
+++ /dev/null
@@ -1 +0,0 @@
-5739d02d3067288dccd74fd9d72ce8eb
diff --git a/lang/kaffe/files/md5 b/lang/kaffe/files/md5
index b041a6d9462..ff3f10ce9ee 100644
--- a/lang/kaffe/files/md5
+++ b/lang/kaffe/files/md5
@@ -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/lang/kaffe/patches/patch-aa b/lang/kaffe/patches/patch-aa
new file mode 100644
index 00000000000..02136a502a6
--- /dev/null
+++ b/lang/kaffe/patches/patch-aa
@@ -0,0 +1,22 @@
+--- configure.orig Tue Jul 14 08:54:26 1998
++++ configure Wed Jul 15 13:08:19 1998
+@@ -2587,7 +2587,7 @@
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-ljpeg $LIBS"
++LIBS="-ljpeg -L$libdir $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2593 "configure"
+ #include "confdefs.h"
+@@ -2615,8 +2615,8 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- JPEG_LIBRARIES="-ljpeg $JPEG_LIBRARIES";
+- LIBS="-ljpeg $LIBS"
++ JPEG_LIBRARIES="-ljpeg -L$libdir $JPEG_LIBRARIES";
++ LIBS="-ljpeg -L$libdir $LIBS"
+ ac_tr_lib=HAVE_LIB`echo jpeg | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ cat >> confdefs.h <<EOF
+ #define $ac_tr_lib 1
diff --git a/lang/kaffe/patches/patch-ab b/lang/kaffe/patches/patch-ab
deleted file mode 100644
index bc86b527f6c..00000000000
--- a/lang/kaffe/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
---- kaffe/kaffeh/main.c Sat Oct 4 03:26:55 1997
-+++ kaffe/kaffeh/main.c Wed Jan 21 12:35:44 1998
-@@ -130,11 +130,13 @@
- strcpy(tmpName, stubName);
- strcpy(stubName, directoryName);
- stubName[dirLen] = PATH_SEP_CHAR;
-+ stubName[dirLen + 1] = 0;
- strcat(stubName, tmpName);
-
- strcpy(tmpName, includeName);
- strcpy(includeName, directoryName);
- includeName[dirLen] = PATH_SEP_CHAR;
-+ includeName[dirLen + 1] = 0;
- strcat(includeName, tmpName);
- }
-
---- config/i386/netbsd1/md.h 1998/02/03 14:29:01 1.1
-+++ config/i386/netbsd1/md.h 1998/02/03 14:30:48
-@@ -16,6 +16,12 @@
- #include "i386/common.h"
- #include "i386/threads.h"
-
-+/*
-+ * Redefine stack pointer offset.
-+ */
-+#undef SP_OFFSET
-+#define SP_OFFSET 2
-+
- #if defined(TRANSLATOR)
- #include "jit-md.h"
- #endif
diff --git a/lang/kaffe/pkg/COMMENT b/lang/kaffe/pkg/COMMENT
index dd0ac39455e..551d7f09af2 100644
--- a/lang/kaffe/pkg/COMMENT
+++ b/lang/kaffe/pkg/COMMENT
@@ -1 +1 @@
-Virtual machine capable of running Java(tm) code (incl. awt-package)
+Virtual machine capable of running Java(tm) code.
diff --git a/lang/kaffe/pkg/DESCR b/lang/kaffe/pkg/DESCR
index 2b4dcebec04..22f5daf4561 100644
--- a/lang/kaffe/pkg/DESCR
+++ b/lang/kaffe/pkg/DESCR
@@ -1,24 +1,25 @@
-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.
+This is the first release of "Kaffe OpenVM", a complete virtual machine
+and class library set which allows the execution of Java code without any
+code from Javasoft. It comes with a virtual machine and a set of class
+libraries including beans, and the all important AWT graphics system.
Running Kaffe
=============
Before running Kaffe it is necessary to configure the environment.
-This requires the setting of CLASSPATH, KAFFEHOME and LD_LIBRARY_PATH.
+This requires the setting of PATH and LD_LIBRARY_PATH.
For the standard installation these would be defined as follows:
- CLASSPATH=.:${PREFIX}/share/kaffe/classes.zip
- KAFFEHOME=${PREFIX}/share/kaffe
- LD_LIBRARY_PATH=/usr/lib:${PREFIX}/lib
+ PATH=$PATH:/${PREFIX}/bin
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${PREFIX}/lib
You can run "sh ${PREFIX}/share/kaffe/ENVIRONMENT" to have these set for
you.
+Note that you don't have to setup the CLASSPATH - if you do then that's
+fine, but if you don't Kaffe will cosntruct a classpath from the Jar and Zip
+files it finds in the standard places (the default would be to include all
+files in ${PREFIX}/share/kaffe).
+
The value ${PREFIX} above is whatever LOCALBASE is set to in the
environment, or in /etc/mk.conf, when the package was installed on
NetBSD. By default this is /usr/pkg.
@@ -29,3 +30,5 @@ What's in there
For further info see the file README that comes with the distribution.
----
* Java and Javasoft are registered trademark of Sun Microsystems, Inc.
+* Kaffe, and Kaffe OpenVM are registered trademarks of Transvirtual
+ Technologies, Inc.
diff --git a/lang/kaffe/pkg/PLIST b/lang/kaffe/pkg/PLIST
index 4edb09fdcd3..852485296ef 100644
--- a/lang/kaffe/pkg/PLIST
+++ b/lang/kaffe/pkg/PLIST
@@ -1,62 +1,51 @@
-@comment $NetBSD: PLIST,v 1.6 1998/07/15 11:48:29 agc Exp $
-bin/kaffe
-bin/kaffeh
+@comment $NetBSD: PLIST,v 1.7 1998/07/16 13:02:35 frueauf Exp $
+bin/Kaffe
bin/appletviewer
+bin/install-jar
bin/jar
+bin/java
bin/javac
bin/javadoc
bin/javakey
bin/javap
bin/jdb
+bin/kaffe
+bin/kaffeh
bin/native2ascii
+bin/pizza
+bin/pizzadoc
bin/report-kaffe-bug
bin/rmic
bin/rmiregistry
bin/serialver
-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
+include/kaffe/java_lang_Throwable.h
+include/kaffe/jmalloc.h
+include/kaffe/jsyscall.h
+include/kaffe/jtypes.h
+include/kaffe/native.h
+lib/libawt.so
+lib/libawt.so.1.00
+lib/libkaffevm.so
+lib/libkaffevm.so.1.00
+lib/libmanagement.so
+lib/libmanagement.so.1.00
+lib/libmath.so
+lib/libmath.so.1.00
lib/libnative.so
-lib/libnet.so.0.92
+lib/libnative.so.1.00
lib/libnet.so
-lib/libagent.so.0.92
-lib/libagent.so
-lib/libzip.so.0.92
+lib/libnet.so.1.00
lib/libzip.so
-lib/libkaffevm.so.0.92
-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
+lib/libzip.so.1.00
+man/man1/kaffe.1
share/kaffe/ENVIRONMENT
+share/kaffe/Klasses.jar
share/kaffe/license.terms
+share/kaffe/pizza.jar
@dirrm include/kaffe
-@dirrm share/kaffe/lib/security
-@dirrm share/kaffe/lib
@dirrm share/kaffe