pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/kaffe Update lang/kaffe to 1.1.0, using patches p...
details: https://anonhg.NetBSD.org/pkgsrc/rev/fcd6a79b9d79
branches: trunk
changeset: 461811:fcd6a79b9d79
user: jschauma <jschauma%pkgsrc.org@localhost>
date: Mon Sep 22 03:04:16 2003 +0000
description:
Update lang/kaffe to 1.1.0, using patches provided in PR pkg/22155 by
M.Negovanovic. While this version is actually a ``development'' version,
it has been reported to be much more usable than the stable 1.0.7 version.
Changes to 1.0.7 are far too numerous to list here, see http://www.kaffe.org
and/or the ChangeLog in the tarball.
diffstat:
lang/kaffe/DESCR | 6 +---
lang/kaffe/MESSAGE | 11 +--------
lang/kaffe/Makefile | 11 +++++----
lang/kaffe/PLIST | 41 +++++++++++++++++++------------------
lang/kaffe/distinfo | 16 +++++---------
lang/kaffe/patches/patch-aa | 31 +++++++++++++++--------------
lang/kaffe/patches/patch-ab | 13 ------------
lang/kaffe/patches/patch-ac | 37 +++++++++++++++------------------
lang/kaffe/patches/patch-ad | 8 +++---
lang/kaffe/patches/patch-af | 48 ---------------------------------------------
lang/kaffe/patches/patch-ag | 47 --------------------------------------------
lang/kaffe/patches/patch-ak | 15 --------------
12 files changed, 74 insertions(+), 210 deletions(-)
diffs (truncated from 431 to 300 lines):
diff -r 09b34d8f6965 -r fcd6a79b9d79 lang/kaffe/DESCR
--- a/lang/kaffe/DESCR Mon Sep 22 01:18:38 2003 +0000
+++ b/lang/kaffe/DESCR Mon Sep 22 03:04:16 2003 +0000
@@ -1,4 +1,2 @@
-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.
+Kaffe is a clean room implementation of Java virtual machine plus associated
+class libraries needed to provide a Java runtime environment.
diff -r 09b34d8f6965 -r fcd6a79b9d79 lang/kaffe/MESSAGE
--- a/lang/kaffe/MESSAGE Mon Sep 22 01:18:38 2003 +0000
+++ b/lang/kaffe/MESSAGE Mon Sep 22 03:04:16 2003 +0000
@@ -1,16 +1,9 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/04/14 18:23:48 mason Exp $
+$NetBSD: MESSAGE,v 1.4 2003/09/22 03:04:16 jschauma Exp $
Before running Kaffe it is necessary to configure the environment.
-This requires the setting of PATH and LD_LIBRARY_PATH.
-For the standard installation these would be defined as follows:
PATH=$PATH:${PREFIX}/bin
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${PREFIX}/lib
-
-Note that you don't have to setup the CLASSPATH - if you do then that's
-fine, but if you don't Kaffe will construct 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).
+ CLASSPATH=${PREFIX}/jre/lib/rt.jar:.
===========================================================================
diff -r 09b34d8f6965 -r fcd6a79b9d79 lang/kaffe/Makefile
--- a/lang/kaffe/Makefile Mon Sep 22 01:18:38 2003 +0000
+++ b/lang/kaffe/Makefile Mon Sep 22 03:04:16 2003 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2003/08/23 15:14:01 jschauma Exp $
-#
+# $NetBSD: Makefile,v 1.49 2003/09/22 03:04:16 jschauma Exp $
-DISTNAME= kaffe-1.0.7
-PKGREVISION= 1
+DISTNAME= kaffe-1.1.0
CATEGORIES= lang java
-MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.0.x-production/
+MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
MAINTAINER= tech-pkg%NetBSD.org@localhost
HOMEPAGE= http://www.kaffe.org/
@@ -14,6 +12,7 @@
USE_PKGINSTALL= yes
USE_X11= yes
USE_LIBTOOL= yes
+USE_GMAKE= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
TEST_TARGET= check
@@ -27,6 +26,7 @@
NO_MTREE= yes # since we change PREFIX below
OWN_DIRS= ${PREFIX}
+OWN_DIRS+= ${PREFIX}/etc
OWN_DIRS+= ${PREFIX}/jre
OWN_DIRS+= ${PREFIX}/jre/lib
OWN_DIRS+= ${PREFIX}/jre/lib/security
@@ -46,6 +46,7 @@
post-install:
${INSTALL_DATA} ${WRKSRC}/license.terms ${PREFIX}
+.include "../../converters/libiconv/buildlink2.mk"
.include "../../devel/gmp/buildlink2.mk"
.include "../../devel/zlib/buildlink2.mk"
.include "../../graphics/jpeg/buildlink2.mk"
diff -r 09b34d8f6965 -r fcd6a79b9d79 lang/kaffe/PLIST
--- a/lang/kaffe/PLIST Mon Sep 22 01:18:38 2003 +0000
+++ b/lang/kaffe/PLIST Mon Sep 22 03:04:16 2003 +0000
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2003/01/29 10:58:50 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/09/22 03:04:16 jschauma Exp $
bin/appletviewer
bin/install-jar
bin/jar
bin/java
bin/javac
bin/javadoc
+bin/javah
bin/javakey
bin/javap
bin/jdb
@@ -29,56 +30,56 @@
include/kaffe/jsyscall.h
include/kaffe/jtypes.h
include/kaffe/native.h
+jre/.pkgsrc
jre/bin/java
jre/bin/kaffe
jre/bin/kaffe-bin
jre/bin/rmiregistry
-jre/lib/${MACHINE_ARCH}/libawt-1.0.7.so
+jre/lib/.pkgsrc
+jre/lib/${MACHINE_ARCH}/libawt-${PKGVERSION}.so
jre/lib/${MACHINE_ARCH}/libawt.la
jre/lib/${MACHINE_ARCH}/libawt.so
-jre/lib/${MACHINE_ARCH}/libio-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libio-${PKGVERSION}.so
jre/lib/${MACHINE_ARCH}/libio.la
jre/lib/${MACHINE_ARCH}/libio.so
-jre/lib/${MACHINE_ARCH}/libkaffevm-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libkaffevm-${PKGVERSION}.so
jre/lib/${MACHINE_ARCH}/libkaffevm.la
jre/lib/${MACHINE_ARCH}/libkaffevm.so
-jre/lib/${MACHINE_ARCH}/libmanagement-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libmanagement-${PKGVERSION}.so
jre/lib/${MACHINE_ARCH}/libmanagement.la
jre/lib/${MACHINE_ARCH}/libmanagement.so
-jre/lib/${MACHINE_ARCH}/libmath-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libmath-${PKGVERSION}.so
jre/lib/${MACHINE_ARCH}/libmath.la
jre/lib/${MACHINE_ARCH}/libmath.so
-jre/lib/${MACHINE_ARCH}/libmicrosoft-1.0.7.so
-jre/lib/${MACHINE_ARCH}/libmicrosoft.la
-jre/lib/${MACHINE_ARCH}/libmicrosoft.so
-jre/lib/${MACHINE_ARCH}/libnative-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libnative-${PKGVERSION}.so
jre/lib/${MACHINE_ARCH}/libnative.la
jre/lib/${MACHINE_ARCH}/libnative.so
-jre/lib/${MACHINE_ARCH}/libnet-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libnet-${PKGVERSION}.so
jre/lib/${MACHINE_ARCH}/libnet.la
jre/lib/${MACHINE_ARCH}/libnet.so
-jre/lib/${MACHINE_ARCH}/libsecurity-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libsecurity-${PKGVERSION}.so
jre/lib/${MACHINE_ARCH}/libsecurity.la
jre/lib/${MACHINE_ARCH}/libsecurity.so
-jre/lib/${MACHINE_ARCH}/libzip-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libtritonuscommon-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libtritonuscommon.la
+jre/lib/${MACHINE_ARCH}/libtritonuscommon.so
+jre/lib/${MACHINE_ARCH}/libzip-${PKGVERSION}.so
jre/lib/${MACHINE_ARCH}/libzip.la
jre/lib/${MACHINE_ARCH}/libzip.so
-jre/lib/comm.jar
-jre/lib/microsoft.jar
-jre/lib/pjava.jar
-jre/lib/rmi.jar
jre/lib/rt.jar
+jre/lib/security/.pkgsrc
jre/lib/security/java.security.default
-jre/lib/servlet.jar
lib/kjc.jar
-lib/tools.jar
license.terms
man/man1/kaffe.1
+@dirrm lib
@dirrm man/man1
@dirrm man
-@dirrm lib
+@dirrm jre/lib/security
@dirrm jre/lib/${MACHINE_ARCH}
+@dirrm jre/lib
@dirrm jre/bin
+@dirrm jre
@dirrm include/kaffe
@dirrm include
@dirrm bin
diff -r 09b34d8f6965 -r fcd6a79b9d79 lang/kaffe/distinfo
--- a/lang/kaffe/distinfo Mon Sep 22 01:18:38 2003 +0000
+++ b/lang/kaffe/distinfo Mon Sep 22 03:04:16 2003 +0000
@@ -1,15 +1,11 @@
-$NetBSD: distinfo,v 1.7 2003/09/16 20:15:29 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2003/09/22 03:04:17 jschauma Exp $
-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
-SHA1 (patch-ac) = 5947ff51d8db1988b57a609febf19c9d74d4c614
-SHA1 (patch-ad) = 9d8e61a6c3a73af6a50b20ac7e28911b63c2e566
+SHA1 (kaffe-1.1.0.tar.gz) = 3616a51fe667fee5837c6bfb41996fb877820547
+Size (kaffe-1.1.0.tar.gz) = 7713155 bytes
+SHA1 (patch-aa) = 7b5dde8d984e8ee2d474d4e54d064562a5535533
+SHA1 (patch-ac) = 4eefe6c31aaed295c5e62a9dae550b86a248cb57
+SHA1 (patch-ad) = 58289c46db00b5ac1c6f42d3f9e3c22c2b42deea
SHA1 (patch-ae) = f7d6ff1e9356f6ba00c23c2ab0a1682aa9ccc003
-SHA1 (patch-af) = 649f2c4c2f57331324e9c93bb1a2838476f49b77
-SHA1 (patch-ag) = 8a936289c45969e71f1bf475b0ccb6ec5701e202
SHA1 (patch-ah) = 63c7229616a63179cc7dcbdb0f03d555c3682b44
SHA1 (patch-ai) = 0533725771ab9bdfc4a922a41d3ac63e5facae9b
SHA1 (patch-aj) = b2c5604c4fddf54c381ccd627ec69259f7735d24
-SHA1 (patch-ak) = cec9b6745efde3388b49a82cfd4e5b570f4208fe
diff -r 09b34d8f6965 -r fcd6a79b9d79 lang/kaffe/patches/patch-aa
--- a/lang/kaffe/patches/patch-aa Mon Sep 22 01:18:38 2003 +0000
+++ b/lang/kaffe/patches/patch-aa Mon Sep 22 03:04:16 2003 +0000
@@ -1,17 +1,18 @@
-$NetBSD: patch-aa,v 1.11 2002/07/27 21:26:22 jschauma Exp $
+$NetBSD: patch-aa,v 1.12 2003/09/22 03:04:17 jschauma Exp $
---- 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. */
+--- configure.orig 2003-08-03 19:15:52.000000000 -0400
++++ configure 2003-09-21 18:22:14.000000000 -0400
+@@ -22916,11 +22916,11 @@
+ #endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char mpz_get_d();
-+char __gmpz_get_d();
-
- int main() {
--mpz_get_d()
-+__gmpz_get_d()
- ; return 0; }
- EOF
- if { (eval echo configure:7207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ builtin and then its argument prototype would still apply. */
+-char mpz_get_d ();
++char __mpz_get_d ();
+ int
+ main ()
+ {
+-mpz_get_d ();
++__mpz_get_d ();
+ ;
+ return 0;
+ }
diff -r 09b34d8f6965 -r fcd6a79b9d79 lang/kaffe/patches/patch-ab
--- a/lang/kaffe/patches/patch-ab Mon Sep 22 01:18:38 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2002/07/27 21:26:22 jschauma Exp $
-
---- 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
diff -r 09b34d8f6965 -r fcd6a79b9d79 lang/kaffe/patches/patch-ac
--- a/lang/kaffe/patches/patch-ac Mon Sep 22 01:18:38 2003 +0000
+++ b/lang/kaffe/patches/patch-ac Mon Sep 22 03:04:16 2003 +0000
@@ -1,28 +1,25 @@
-$NetBSD: patch-ac,v 1.3 2003/01/29 10:58:51 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2003/09/22 03:04:17 jschauma Exp $
---- libraries/clib/security/Makefile.in.orig Wed Jan 29 02:57:21 2003
-+++ libraries/clib/security/Makefile.in
-@@ -268,18 +268,18 @@ install-securityDATA: $(security_DATA)
- $(mkinstalldirs) $(DESTDIR)$(securitydir)
+--- libraries/clib/security/Makefile.in.orig 2003-08-03 19:15:38.000000000 -0400
++++ libraries/clib/security/Makefile.in 2003-09-21 18:27:11.000000000 -0400
+@@ -392,16 +392,16 @@
@list='$(security_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
-- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(securitydir)/$$p"; \
-- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(securitydir)/$$p; \
-+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(securitydir)/$$p.default"; \
-+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(securitydir)/$$p.default; \
- else if test -f $$p; then \
-- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(securitydir)/$$p"; \
-- $(INSTALL_DATA) $$p $(DESTDIR)$(securitydir)/$$p; \
-+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(securitydir)/$$p.default"; \
-+ $(INSTALL_DATA) $$p $(DESTDIR)$(securitydir)/$$p.default; \
- fi; fi; \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " $(securityDATA_INSTALL) $$d$$p $(DESTDIR)$(securitydir)/$$f"; \
+- $(securityDATA_INSTALL) $$d$$p $(DESTDIR)$(securitydir)/$$f; \
++ echo " $(securityDATA_INSTALL) $$d$$p $(DESTDIR)$(securitydir)/$$f.default"; \
++ $(securityDATA_INSTALL) $$d$$p $(DESTDIR)$(securitydir)/$$f.default; \
done
uninstall-securityDATA:
@$(NORMAL_UNINSTALL)
- list='$(security_DATA)'; for p in $$list; do \
-- rm -f $(DESTDIR)$(securitydir)/$$p; \
-+ rm -f $(DESTDIR)$(securitydir)/$$p.default; \
+ @list='$(security_DATA)'; for p in $$list; do \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+- echo " rm -f $(DESTDIR)$(securitydir)/$$f"; \
+- rm -f $(DESTDIR)$(securitydir)/$$f; \
++ echo " rm -f $(DESTDIR)$(securitydir)/$$f.default"; \
++ rm -f $(DESTDIR)$(securitydir)/$$f.default; \
done
- tags: TAGS
+ ETAGS = etags
diff -r 09b34d8f6965 -r fcd6a79b9d79 lang/kaffe/patches/patch-ad
--- a/lang/kaffe/patches/patch-ad Mon Sep 22 01:18:38 2003 +0000
+++ b/lang/kaffe/patches/patch-ad Mon Sep 22 03:04:16 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2003/09/16 20:15:31 jmmv Exp $
+$NetBSD: patch-ad,v 1.4 2003/09/22 03:04:17 jschauma Exp $
Home |
Main Index |
Thread Index |
Old Index