diff options
Diffstat (limited to 'lang')
-rw-r--r-- | lang/kaffe/Makefile | 12 | ||||
-rw-r--r-- | lang/kaffe/PLIST | 187 | ||||
-rw-r--r-- | lang/kaffe/distinfo | 10 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-aa | 19 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ab | 23 |
5 files changed, 116 insertions, 135 deletions
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile index dc5023cece2..2ae1392c23a 100644 --- a/lang/kaffe/Makefile +++ b/lang/kaffe/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.38 2002/06/23 05:13:10 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2002/07/27 21:26:21 jschauma Exp $ # -DISTNAME= kaffe-1.0.6 -PKGREVISION= 2 +DISTNAME= kaffe-1.0.7 CATEGORIES= lang -MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/ +MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.0.x-production/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.kaffe.org/ @@ -18,7 +17,7 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig ONLY_FOR_PLATFORM= *-*-arm32 *-*-i386 *-*-m68k *-*-mips* *-*-sparc GNU_CONFIGURE= yes -GNU_CONFIGURE_PREFIX= ${PREFIX}/kaffe +GNU_CONFIGURE_PREFIX= ${PREFIX}/java/kaffe CONFIGURE_ARGS+= --with-includes="" CONFIGURE_ARGS+= --with-libraries="" CPPFLAGS+= -Dunix @@ -33,9 +32,10 @@ CPPFLAGS+= -Dunix CONFIGURE_ENV+= VM_LIBS="-lc" .endif + post-install: ${INSTALL_DATA} ${WRKSRC}/license.terms \ - ${PREFIX}/kaffe/share + ${PREFIX}/java/kaffe/share test: @cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} check diff --git a/lang/kaffe/PLIST b/lang/kaffe/PLIST index f9a730e79ed..43bf4556cd4 100644 --- a/lang/kaffe/PLIST +++ b/lang/kaffe/PLIST @@ -1,99 +1,88 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:56 zuntum Exp $ -kaffe/bin/appletviewer -kaffe/bin/install-jar -kaffe/bin/jar -kaffe/bin/java -kaffe/bin/javac -kaffe/bin/javadoc -kaffe/bin/javakey -kaffe/bin/javap -kaffe/bin/jdb -kaffe/bin/kaffe -kaffe/bin/kaffeh -kaffe/bin/kjc -kaffe/bin/kopi -kaffe/bin/native2ascii -kaffe/bin/rmic -kaffe/bin/rmiregistry -kaffe/bin/serialver -kaffe/include/kaffe/Arrays.h -kaffe/include/kaffe/errors.h -kaffe/include/kaffe/java_lang_Object.h -kaffe/include/kaffe/java_lang_String.h -kaffe/include/kaffe/java_lang_Thread.h -kaffe/include/kaffe/java_lang_ThreadGroup.h -kaffe/include/kaffe/java_lang_Throwable.h -kaffe/include/kaffe/jmalloc.h -kaffe/include/kaffe/jni.h -kaffe/include/kaffe/jni_cpp.h -kaffe/include/kaffe/jsyscall.h -kaffe/include/kaffe/jtypes.h -kaffe/include/kaffe/native.h -kaffe/lib/kaffe/libawt-1.0.6.so -kaffe/lib/kaffe/libawt.a -kaffe/lib/kaffe/libawt.la -kaffe/lib/kaffe/libawt.so -kaffe/lib/kaffe/libio-1.0.6.so -kaffe/lib/kaffe/libio.a -kaffe/lib/kaffe/libio.la -kaffe/lib/kaffe/libio.so -kaffe/lib/kaffe/libmanagement-1.0.6.so -kaffe/lib/kaffe/libmanagement.a -kaffe/lib/kaffe/libmanagement.la -kaffe/lib/kaffe/libmanagement.so -kaffe/lib/kaffe/libmath-1.0.6.so -kaffe/lib/kaffe/libmath.a -kaffe/lib/kaffe/libmath.la -kaffe/lib/kaffe/libmath.so -kaffe/lib/kaffe/libmicrosoft-1.0.6.so -kaffe/lib/kaffe/libmicrosoft.a -kaffe/lib/kaffe/libmicrosoft.la -kaffe/lib/kaffe/libmicrosoft.so -kaffe/lib/kaffe/libnative-1.0.6.so -kaffe/lib/kaffe/libnative.a -kaffe/lib/kaffe/libnative.la -kaffe/lib/kaffe/libnative.so -kaffe/lib/kaffe/libnet-1.0.6.so -kaffe/lib/kaffe/libnet.a -kaffe/lib/kaffe/libnet.la -kaffe/lib/kaffe/libnet.so -kaffe/lib/kaffe/libsecurity-1.0.6.so -kaffe/lib/kaffe/libsecurity.a -kaffe/lib/kaffe/libsecurity.la -kaffe/lib/kaffe/libsecurity.so -kaffe/lib/kaffe/libzip-1.0.6.so -kaffe/lib/kaffe/libzip.a -kaffe/lib/kaffe/libzip.la -kaffe/lib/kaffe/libzip.so -kaffe/lib/kaffe/security/java.security -kaffe/lib/libkaffevm-1.0.6.so -kaffe/lib/libkaffevm.a -kaffe/lib/libkaffevm.la -kaffe/lib/libkaffevm.so -kaffe/lib/libkaffexprof-1.0.6.so -kaffe/lib/libkaffexprof.a -kaffe/lib/libkaffexprof.la -kaffe/lib/libkaffexprof.so -kaffe/libexec/Kaffe -kaffe/man/man1/kaffe.1 -kaffe/share/kaffe/Klasses.jar -kaffe/share/kaffe/comm.jar -kaffe/share/kaffe/kjc.jar -kaffe/share/kaffe/microsoft.jar -kaffe/share/kaffe/pjava.jar -kaffe/share/kaffe/rmi.jar -kaffe/share/kaffe/servlet.jar -kaffe/share/kaffe/tools.jar -kaffe/share/license.terms -@dirrm kaffe/share/kaffe -@dirrm kaffe/share -@dirrm kaffe/man/man1 -@dirrm kaffe/man -@dirrm kaffe/libexec -@dirrm kaffe/lib/kaffe/security -@dirrm kaffe/lib/kaffe -@dirrm kaffe/lib -@dirrm kaffe/include/kaffe -@dirrm kaffe/include -@dirrm kaffe/bin -@dirrm kaffe +@comment $NetBSD: PLIST,v 1.2 2002/07/27 21:26:21 jschauma Exp $ +java/kaffe/include/jni.h +java/kaffe/include/kaffe/java_lang_Object.h +java/kaffe/include/kaffe/java_lang_String.h +java/kaffe/include/kaffe/java_lang_Thread.h +java/kaffe/include/kaffe/java_lang_ThreadGroup.h +java/kaffe/include/kaffe/java_lang_Throwable.h +java/kaffe/include/kaffe/Arrays.h +java/kaffe/include/kaffe/errors.h +java/kaffe/include/kaffe/jmalloc.h +java/kaffe/include/kaffe/jni_cpp.h +java/kaffe/include/kaffe/jsyscall.h +java/kaffe/include/kaffe/jtypes.h +java/kaffe/include/kaffe/native.h +java/kaffe/lib/kjc.jar +java/kaffe/lib/tools.jar +java/kaffe/jre/lib/i386/libnative-1.0.7.so +java/kaffe/jre/lib/i386/libnative.so +java/kaffe/jre/lib/i386/libnative.la +java/kaffe/jre/lib/i386/libio-1.0.7.so +java/kaffe/jre/lib/i386/libio.so +java/kaffe/jre/lib/i386/libio.la +java/kaffe/jre/lib/i386/libnet-1.0.7.so +java/kaffe/jre/lib/i386/libnet.so +java/kaffe/jre/lib/i386/libnet.la +java/kaffe/jre/lib/i386/libzip-1.0.7.so +java/kaffe/jre/lib/i386/libzip.so +java/kaffe/jre/lib/i386/libzip.la +java/kaffe/jre/lib/i386/libmath-1.0.7.so +java/kaffe/jre/lib/i386/libmath.so +java/kaffe/jre/lib/i386/libmath.la +java/kaffe/jre/lib/i386/libsecurity-1.0.7.so +java/kaffe/jre/lib/i386/libsecurity.so +java/kaffe/jre/lib/i386/libsecurity.la +java/kaffe/jre/lib/i386/libmanagement-1.0.7.so +java/kaffe/jre/lib/i386/libmanagement.so +java/kaffe/jre/lib/i386/libmanagement.la +java/kaffe/jre/lib/i386/libawt-1.0.7.so +java/kaffe/jre/lib/i386/libawt.so +java/kaffe/jre/lib/i386/libawt.la +java/kaffe/jre/lib/i386/libmicrosoft-1.0.7.so +java/kaffe/jre/lib/i386/libmicrosoft.so +java/kaffe/jre/lib/i386/libmicrosoft.la +java/kaffe/jre/lib/i386/libkaffevm-1.0.7.so +java/kaffe/jre/lib/i386/libkaffevm.so +java/kaffe/jre/lib/i386/libkaffevm.la +java/kaffe/jre/lib/security/java.security +java/kaffe/jre/lib/rt.jar +java/kaffe/jre/lib/comm.jar +java/kaffe/jre/lib/pjava.jar +java/kaffe/jre/lib/servlet.jar +java/kaffe/jre/lib/microsoft.jar +java/kaffe/jre/lib/rmi.jar +java/kaffe/jre/bin/kaffe-bin +java/kaffe/jre/bin/java +java/kaffe/jre/bin/kaffe +java/kaffe/jre/bin/rmiregistry +java/kaffe/bin/kaffeh +java/kaffe/bin/appletviewer +java/kaffe/bin/javac +java/kaffe/bin/javadoc +java/kaffe/bin/java +java/kaffe/bin/kjc +java/kaffe/bin/kopi +java/kaffe/bin/jar +java/kaffe/bin/javakey +java/kaffe/bin/javap +java/kaffe/bin/jdb +java/kaffe/bin/native2ascii +java/kaffe/bin/rmic +java/kaffe/bin/serialver +java/kaffe/bin/install-jar +java/kaffe/bin/kaffe +java/kaffe/bin/rmiregistry +java/kaffe/man/man1/kaffe.1 +java/kaffe/share +@dirrm java/kaffe/bin +@dirrm java/kaffe/man/man1 +@dirrm java/kaffe/man +@dirrm java/kaffe/jre/lib/security +@dirrm java/kaffe/jre/lib/i386 +@dirrm java/kaffe/jre/lib +@dirrm java/kaffe/jre/bin +@dirrm java/kaffe/jre +@dirrm java/kaffe/lib +@dirrm java/kaffe/include/kaffe +@dirrm java/kaffe/include +@dirrm java/kaffe diff --git a/lang/kaffe/distinfo b/lang/kaffe/distinfo index 01c3e6e5250..24f3307ad48 100644 --- a/lang/kaffe/distinfo +++ b/lang/kaffe/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2002/02/27 03:02:35 tv Exp $ +$NetBSD: distinfo,v 1.5 2002/07/27 21:26:21 jschauma Exp $ -SHA1 (kaffe-1.0.6.tar.gz) = aa9028f1108a664b624ab9f1f4022801aea7e5bd -Size (kaffe-1.0.6.tar.gz) = 3586207 bytes -SHA1 (patch-aa) = 1cd8c028615009a485ec40317456ccb0574a25b0 -SHA1 (patch-ab) = 5012e6e54662cc4a061a80def732dc030fe86961 +SHA1 (kaffe-1.0.7.tar.gz) = 4f839362b9e1fbdb6c7af8f69663e5b0bf922e8e +Size (kaffe-1.0.7.tar.gz) = 4248252 bytes +SHA1 (patch-aa) = 66da985c6ba6891adca4c73351f990081e24e4e4 +SHA1 (patch-ab) = 5b68b671ed1a455cbe76bc316d9ea278fdf67349 diff --git a/lang/kaffe/patches/patch-aa b/lang/kaffe/patches/patch-aa index fa2052953f0..5a7f7d58689 100644 --- a/lang/kaffe/patches/patch-aa +++ b/lang/kaffe/patches/patch-aa @@ -1,17 +1,8 @@ -$NetBSD: patch-aa,v 1.10 2002/02/27 01:34:56 tv Exp $ +$NetBSD: patch-aa,v 1.11 2002/07/27 21:26:22 jschauma Exp $ ---- configure.orig Mon Jul 24 15:47:29 2000 -+++ configure Thu Feb 7 19:45:02 2002 -@@ -3608,7 +3608,7 @@ - - - case "$Khost_os" in --freebsd2|netbsd1|oskit) -+freebsd2|oskit) - KSAVE_LIBS="$LIBS" - LIBS="$VM_LIBS $KSAVE_LIBS" - echo $ac_n "checking for __moddi3 in -lgcc""... $ac_c" 1>&6 -@@ -4045,10 +4045,10 @@ +--- configure.orig Tue Jul 23 17:01:03 2002 ++++ configure Tue Jul 23 17:02:51 2002 +@@ -7197,10 +7197,10 @@ /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -23,4 +14,4 @@ $NetBSD: patch-aa,v 1.10 2002/02/27 01:34:56 tv Exp $ +__gmpz_get_d() ; return 0; } EOF - if { (eval echo configure:4055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + if { (eval echo configure:7207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then diff --git a/lang/kaffe/patches/patch-ab b/lang/kaffe/patches/patch-ab index 9738e9ec601..31ce6de0655 100644 --- a/lang/kaffe/patches/patch-ab +++ b/lang/kaffe/patches/patch-ab @@ -1,12 +1,13 @@ -$NetBSD: patch-ab,v 1.6 2001/04/24 12:41:01 skrll Exp $ +$NetBSD: patch-ab,v 1.7 2002/07/27 21:26:22 jschauma Exp $ ---- test/regression/Makefile.in.orig Tue Apr 24 13:27:42 2001 -+++ test/regression/Makefile.in -@@ -160,7 +160,6 @@ - ThreadState.java \ - UncaughtException.java \ - IllegalWait.java \ -- Preempt.java \ - ReflectInterfaces.java \ - TestSerializable.java \ - TestSerializable2.java \ +--- test/regression/Makefile.in.orig Tue Jul 23 17:04:49 2002 ++++ test/regression/Makefile.in Tue Jul 23 17:05:20 2002 +@@ -137,7 +137,7 @@ + + TESTS_ENVIRONMENT = $(SETUP_ENVIRONMENT) $(SHELL) TestScript + +-ALWAYS_TESTS = HelloWorldApp.class.save HelloWorldApp.java TestIntLong.java TestFloatDouble.java DoubleCvt.java DoubleNeg.java DoubleConst.java DoublePrint.java DoubleComp.java ModuloTest.java LongNeg.java FPUStack.java divtest.java Str.java Str2.java InternHog.java IndexTest.java StackDump.java tname.java ttest.java ThreadInterrupt.java ThreadState.java UncaughtException.java IllegalWait.java Preempt.java ReflectInterfaces.java InnerTest.java SerialUID.java TestSerializable.java TestSerializable2.java TestCasts.java Alias.java NullPointerTest.java NullInvoke.java TableSwitch.java LostFrame.java ConstructorTest.java burford.java IllegalInterface.java GetInterfaces.java IntfTest.java SignedShort.java CharCvt.java BadFloatTest.java ProcessTest.java UDPTest.java SoTimeout.java wc.java FileTest.java FileChecks.java finalexc.java finaltest.java finaltest2.java forNameTest.java LoaderTest.java ArrayForName.java KaffeVerifyBug.java Schtum.java Reflect.java MethodBug.java Bean.java SortTest.java HashTest.java MapTest.java URLTest.java PropertiesTest.java ReaderTest.java CharArrayReaderTest.java LineNumberReaderTest.java BufferedReaderTest.java ReaderReadVoidTest.java PipeTest.java GetField.java ReflectInvoke.java InvTarExcTest.java SystemLoaderTest.java CLTest.java CLTestConc.java CLTestJLock.java CLTestLie.java CLTestFindLoaded.java ClassDeadLock.java ExceptionTest.java ExceptionTestClassLoader.java ExceptionTestClassLoader2.java TestClassRef.java ClassGC.java GCTest.java ThreadLocalTest.java BeanBug.java BitSetTest.java ExceptionInInitializerTest.java InitTest.java ProcessClassTest.java ProcessClassInst.java ProcessClassStop.java FindSystemClass.java ProcessClassLockTest.java DoubleBug.java TestUnlock.java MarkResetTest.java HashtableTest1.java ReflectMultiArray.java ExecTest.java CatchDeath.java ThreadStop.java DeadThread.java tthrd1.java SoInterrupt.java sysdepCallMethod.java DosTimeVerify.java ZipVerify.java ZipTest.java TruncatedClass.java TestNative.java ++ALWAYS_TESTS = HelloWorldApp.class.save HelloWorldApp.java TestIntLong.java TestFloatDouble.java DoubleCvt.java DoubleNeg.java DoubleConst.java DoublePrint.java DoubleComp.java ModuloTest.java LongNeg.java FPUStack.java divtest.java Str.java Str2.java InternHog.java IndexTest.java StackDump.java tname.java ttest.java ThreadInterrupt.java ThreadState.java UncaughtException.java IllegalWait.java ReflectInterfaces.java InnerTest.java SerialUID.java TestSerializable.java TestSerializable2.java TestCasts.java Alias.java NullPointerTest.java NullInvoke.java TableSwitch.java LostFrame.java ConstructorTest.java burford.java IllegalInterface.java GetInterfaces.java IntfTest.java SignedShort.java CharCvt.java BadFloatTest.java ProcessTest.java UDPTest.java SoTimeout.java wc.java FileTest.java FileChecks.java finalexc.java finaltest.java finaltest2.java forNameTest.java LoaderTest.java ArrayForName.java KaffeVerifyBug.java Schtum.java Reflect.java MethodBug.java Bean.java SortTest.java HashTest.java MapTest.java URLTest.java PropertiesTest.java ReaderTest.java CharArrayReaderTest.java LineNumberReaderTest.java BufferedReaderTest.java ReaderReadVoidTest.java PipeTest.java GetField.java ReflectInvoke.java InvTarExcTest.java SystemLoaderTest.java CLTest.java CLTestConc.java CLTestJLock.java CLTestLie.java CLTestFindLoaded.java ClassDeadLock.java ExceptionTest.java ExceptionTestClassLoader.java ExceptionTestClassLoader2.java TestClassRef.java ClassGC.java GCTest.java ThreadLocalTest.java BeanBug.java BitSetTest.java ExceptionInInitializerTest.java InitTest.java ProcessClassTest.java ProcessClassInst.java ProcessClassStop.java FindSystemClass.java ProcessClassLockTest.java DoubleBug.java TestUnlock.java MarkResetTest.java HashtableTest1.java ReflectMultiArray.java ExecTest.java CatchDeath.java ThreadStop.java DeadThread.java tthrd1.java SoInterrupt.java sysdepCallMethod.java DosTimeVerify.java ZipVerify.java ZipTest.java TruncatedClass.java TestNative.java + + + TEST_Overflow = Overflow.java |