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.5
details: https://anonhg.NetBSD.org/pkgsrc/rev/97896e192ec1
branches: trunk
changeset: 498972:97896e192ec1
user: tonio <tonio%pkgsrc.org@localhost>
date: Tue Sep 06 18:15:32 2005 +0000
description:
Update lang/kaffe to 1.1.5
regenerate buildlink3
approved by wiz@
diffstat:
lang/kaffe/MESSAGE | 6 +-
lang/kaffe/Makefile | 6 +-
lang/kaffe/Makefile.common | 14 ++-
lang/kaffe/PLIST | 22 ++++--
lang/kaffe/buildlink3.mk | 9 +-
lang/kaffe/distinfo | 15 ++--
lang/kaffe/patches/patch-aa | 44 ++++++++-----
lang/kaffe/patches/patch-ab | 85 +++++++++++++++++++++++++++
lang/kaffe/patches/patch-ac | 33 +++-------
lang/kaffe/patches/patch-ad | 35 +++++++++++
lang/kaffe/patches/patch-ae | 134 --------------------------------------------
11 files changed, 197 insertions(+), 206 deletions(-)
diffs (truncated from 560 to 300 lines):
diff -r cc850ef0fa50 -r 97896e192ec1 lang/kaffe/MESSAGE
--- a/lang/kaffe/MESSAGE Tue Sep 06 17:58:56 2005 +0000
+++ b/lang/kaffe/MESSAGE Tue Sep 06 18:15:32 2005 +0000
@@ -1,9 +1,9 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/09/22 03:04:16 jschauma Exp $
+$NetBSD: MESSAGE,v 1.5 2005/09/06 18:15:32 tonio Exp $
Before running Kaffe it is necessary to configure the environment.
- PATH=$PATH:${PREFIX}/bin
- CLASSPATH=${PREFIX}/jre/lib/rt.jar:.
+ PATH=$PATH:${JAVA_HOME}/bin
+ CLASSPATH=${JAVA_HOME}/jre/lib/rt.jar:.
===========================================================================
diff -r cc850ef0fa50 -r 97896e192ec1 lang/kaffe/Makefile
--- a/lang/kaffe/Makefile Tue Sep 06 17:58:56 2005 +0000
+++ b/lang/kaffe/Makefile Tue Sep 06 18:15:32 2005 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2005/08/20 19:16:23 jlam Exp $
+# $NetBSD: Makefile,v 1.61 2005/09/06 18:15:32 tonio Exp $
#
.include "Makefile.common"
-PKGREVISION= 7
-
CONFLICTS+= kaffe-nox11-[0-9]*
JAVA_WRAPPERS= appletviewer jar java javac javadoc javah javakey \
@@ -21,6 +19,6 @@
post-install:
${INSTALL_DATA} ${WRKSRC}/license.terms ${JAVA_HOME}
-.include "../../devel/libltdl/convenience.mk"
+.include "../../devel/libltdl/buildlink3.mk"
.include "../../mk/java-env.mk"
.include "../../mk/bsd.pkg.mk"
diff -r cc850ef0fa50 -r 97896e192ec1 lang/kaffe/Makefile.common
--- a/lang/kaffe/Makefile.common Tue Sep 06 17:58:56 2005 +0000
+++ b/lang/kaffe/Makefile.common Tue Sep 06 18:15:32 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:10 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/09/06 18:15:32 tonio Exp $
-DISTNAME= kaffe-1.1.4
+DISTNAME= kaffe-1.1.5
CATEGORIES= lang java
MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
@@ -8,6 +8,10 @@
HOMEPAGE= http://www.kaffe.org/
COMMENT= Virtual machine capable of running Java(tm) code
+BUILD_DEPENDS= unzip-[0-9]*:../../archivers/unzip
+BUILD_DEPENDS= zip-[0-9]*:../../archivers/zip
+DEPENDS+= jikes>=1.22:../../lang/jikes
+
GNU_CONFIGURE_PREFIX= ${JAVA_HOME}
JAVA_HOME= ${PREFIX}/java/kaffe
JAVA_NAME= kaffe
@@ -15,7 +19,6 @@
USE_PKGINSTALL= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
TEST_TARGET= check
ONLY_FOR_PLATFORM= *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k *-*-mips* \
@@ -30,7 +33,8 @@
CONFIGURE_ARGS+= --without-alsa
CONFIGURE_ARGS+= --without-esd
-CONFIGURE_ARGS+= --without-awt
+CONFIGURE_ARGS+= --disable-esdtest
+CONFIGURE_ARGS+= --disable-native-awt
.include "../../mk/bsd.prefs.mk"
@@ -42,7 +46,7 @@
CONFIGURE_ENV+= VM_LIBS="-lc"
.endif
-.if (${OPSYS} == "NetBSD") && (${MACHINE_ARCH} == "alpha")
+.if ((${OPSYS} == "NetBSD") && (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "powerpc"))
# On these systems, jit3 is not working.
CONFIGURE_ARGS+= --with-engine=intrp
.endif
diff -r cc850ef0fa50 -r 97896e192ec1 lang/kaffe/PLIST
--- a/lang/kaffe/PLIST Tue Sep 06 17:58:56 2005 +0000
+++ b/lang/kaffe/PLIST Tue Sep 06 18:15:32 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/09/22 08:09:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/09/06 18:15:32 tonio Exp $
bin/kaffe-appletviewer
bin/kaffe-jar
bin/kaffe-java
@@ -18,17 +18,15 @@
java/kaffe/bin/javac
java/kaffe/bin/javadoc
java/kaffe/bin/javah
-java/kaffe/bin/javakey
java/kaffe/bin/javap
-java/kaffe/bin/jdb
java/kaffe/bin/kaffe
java/kaffe/bin/kaffeh
-java/kaffe/bin/kjc
-java/kaffe/bin/kopi
java/kaffe/bin/native2ascii
java/kaffe/bin/rmic
java/kaffe/bin/rmiregistry
java/kaffe/bin/serialver
+java/kaffe/include/jawt.h
+java/kaffe/include/jawt_md.h
java/kaffe/include/jni.h
java/kaffe/include/jni_cpp.h
java/kaffe/include/jvmpi.h
@@ -40,27 +38,35 @@
java/kaffe/include/kaffe/java_lang_Throwable.h
java/kaffe/include/kaffe/java_lang_VMThrowable.h
java/kaffe/include/kaffe/jmalloc.h
-java/kaffe/include/kaffe/jtypes.h
+java/kaffe/include/kaffe/jni_md.h
+java/kaffe/include/kaffe_jni.h
java/kaffe/jre/bin/java
java/kaffe/jre/bin/kaffe
java/kaffe/jre/bin/kaffe-bin
java/kaffe/jre/bin/rmiregistry
+java/kaffe/jre/lib/${MACHINE_ARCH}/libclasspath.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libio.la
+java/kaffe/jre/lib/${MACHINE_ARCH}/libkaffegc.la
+java/kaffe/jre/lib/${MACHINE_ARCH}/libkaffeverifier.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libkaffevm.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libmanagement.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libmath.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libnative.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libnet.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libnio.la
+java/kaffe/jre/lib/${MACHINE_ARCH}/libreplace.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libsecurity.la
java/kaffe/jre/lib/${MACHINE_ARCH}/libzip.la
+java/kaffe/jre/lib/gmpjavamath.jar
+java/kaffe/jre/lib/logging.properties
java/kaffe/jre/lib/rt.jar
-java/kaffe/jre/lib/security/java.security.default
-java/kaffe/lib/kjc.jar
+java/kaffe/jre/lib/security/java.security
+java/kaffe/jre/lib/tools.jar
java/kaffe/license.terms
java/kaffe/man/man1/kaffe.1
@dirrm java/kaffe/man/man1
@dirrm java/kaffe/man
+@exec ${MKDIR} %D/java/kaffe/lib
@dirrm java/kaffe/lib
@dirrm java/kaffe/jre/lib/security
@dirrm java/kaffe/jre/lib/${MACHINE_ARCH}
diff -r cc850ef0fa50 -r 97896e192ec1 lang/kaffe/buildlink3.mk
--- a/lang/kaffe/buildlink3.mk Tue Sep 06 17:58:56 2005 +0000
+++ b/lang/kaffe/buildlink3.mk Tue Sep 06 18:15:32 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:15:01 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2005/09/06 18:15:32 tonio Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KAFFE_BUILDLINK3_MK:= ${KAFFE_BUILDLINK3_MK}+
@@ -11,16 +11,13 @@
BUILDLINK_PACKAGES+= kaffe
.if !empty(KAFFE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kaffe+= kaffe>=1.1.4nb2
-BUILDLINK_RECOMMENDED.kaffe+= kaffe>=1.1.4nb4
+BUILDLINK_DEPENDS.kaffe+= kaffe>=1.1.5
BUILDLINK_PKGSRCDIR.kaffe?= ../../lang/kaffe
BUILDLINK_JAVA_PREFIX.kaffe= ${PREFIX}/java/kaffe
-
-BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_JAVA_PREFIX.kaffe}
+.endif # KAFFE_BUILDLINK3_MK
BUILDLINK_CPPFLAGS.kaffe= \
-I${BUILDLINK_JAVA_PREFIX.kaffe}/include \
-I${BUILDLINK_JAVA_PREFIX.kaffe}/include/kaffe
-.endif # KAFFE_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r cc850ef0fa50 -r 97896e192ec1 lang/kaffe/distinfo
--- a/lang/kaffe/distinfo Tue Sep 06 17:58:56 2005 +0000
+++ b/lang/kaffe/distinfo Tue Sep 06 18:15:32 2005 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 09:03:08 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/09/06 18:15:32 tonio Exp $
-SHA1 (kaffe-1.1.4.tar.gz) = fb7a6ac27d82e1854de07422c46ce5e17beda58b
-RMD160 (kaffe-1.1.4.tar.gz) = 5bb8b0c9a338a3bd05f9fdc2a3f94c297489a7db
-Size (kaffe-1.1.4.tar.gz) = 8891220 bytes
-SHA1 (patch-aa) = 7b5dde8d984e8ee2d474d4e54d064562a5535533
-SHA1 (patch-ac) = 5a4cd4ee913b7d4277cc10c38a7c4a810ba258f1
-SHA1 (patch-ae) = f7d6ff1e9356f6ba00c23c2ab0a1682aa9ccc003
+SHA1 (kaffe-1.1.5.tar.gz) = ebd8da490783ed189fb25fad0d674f384194e2f3
+RMD160 (kaffe-1.1.5.tar.gz) = 516b5dbaa13efed099f59ff9b7121700ef6ad13b
+Size (kaffe-1.1.5.tar.gz) = 9796278 bytes
+SHA1 (patch-aa) = 951e719e59e03e1e656c63d1a989d1bae3ab9984
+SHA1 (patch-ab) = 21202b63143330175fcc0dbbf029e6d66375ce2e
+SHA1 (patch-ac) = 7c16de2815a2bca67e042efb367d7ec751aa0ea8
+SHA1 (patch-ad) = d00ce5cafeaffe97347f6952c81d1971b0a11b94
diff -r cc850ef0fa50 -r 97896e192ec1 lang/kaffe/patches/patch-aa
--- a/lang/kaffe/patches/patch-aa Tue Sep 06 17:58:56 2005 +0000
+++ b/lang/kaffe/patches/patch-aa Tue Sep 06 18:15:32 2005 +0000
@@ -1,18 +1,28 @@
-$NetBSD: patch-aa,v 1.12 2003/09/22 03:04:17 jschauma Exp $
+$NetBSD: patch-aa,v 1.13 2005/09/06 18:15:32 tonio Exp $
---- 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 __mpz_get_d ();
- int
- main ()
- {
--mpz_get_d ();
-+__mpz_get_d ();
- ;
- return 0;
- }
+--- config/i386/netbsd1/md.h.orig 2005-04-24 19:53:29.000000000 +0200
++++ config/i386/netbsd1/md.h 2005-04-24 19:58:35.000000000 +0200
+@@ -17,6 +17,7 @@
+
+ #include "i386/common.h"
+ #include "i386/threads.h"
++#include <sys/ucontext.h>
+
+ #if defined(HAVE_SYS_RESOURCE_H)
+ #include <sys/resource.h>
+@@ -31,11 +32,11 @@
+ #undef SP_OFFSET
+ #define SP_OFFSET 2
+
+-#define SIGNAL_ARGS(sig, sc) int sig, int __code, struct sigcontext *sc
+-#define SIGNAL_CONTEXT_POINTER(scp) struct sigcontext *scp
++#define SIGNAL_ARGS(sig, sc) int sig, int __code, struct __ucontext *sc
++#define SIGNAL_CONTEXT_POINTER(scp) struct __ucontext *scp
+ #define GET_SIGNAL_CONTEXT_POINTER(sc) (sc)
+-#define SIGNAL_PC(scp) (scp)->sc_pc
+-#define STACK_POINTER(scp) (scp)->sc_sp
++#define SIGNAL_PC(scp) ((scp)->uc_mcontext.__gregs[_REG_EIP])
++#define STACK_POINTER(scp) ((scp)->uc_mcontext.__gregs[_REG_ESP])
+
+ #if defined(TRANSLATOR)
+ #include "jit-md.h"
diff -r cc850ef0fa50 -r 97896e192ec1 lang/kaffe/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/kaffe/patches/patch-ab Tue Sep 06 18:15:32 2005 +0000
@@ -0,0 +1,85 @@
+$NetBSD: patch-ab,v 1.9 2005/09/06 18:15:32 tonio Exp $
+
+--- ./kaffe/kaffevm/systems/unix-pthreads/signal.c.orig 2005-04-24 19:46:52.000000000 +0200
++++ ./kaffe/kaffevm/systems/unix-pthreads/signal.c 2005-04-24 19:50:12.000000000 +0200
+@@ -47,8 +47,6 @@
+ #define SIG_T void*
+ #endif
+
+-static void nullException(SIGNAL_ARGS(sig, sc));
+-static void floatingException(EXCEPTIONPROTO);
+ static void ignoreSignal(int sig);
+
+ static exchandler_t nullHandler;
+@@ -56,35 +54,6 @@
+ static exchandler_t stackOverflowHandler;
+
+ /*
+- * Setup the internal exceptions.
+- */
+-void
+-jthread_initexceptions(exchandler_t _nullHandler,
+- exchandler_t _floatingHandler,
+- exchandler_t _stackOverflowHandler)
+-{
+- nullHandler = _nullHandler;
+- floatingHandler = _floatingHandler;
+- stackOverflowHandler = _stackOverflowHandler;
+-
+- if (DBGEXPR(EXCEPTION, false, true)) {
+- /* Catch signals we need to convert to exceptions */
+-#if defined(SIGSEGV)
+- registerSyncSignalHandler(SIGSEGV, nullException);
+-#endif
+-#if defined(SIGBUS)
+- registerSyncSignalHandler(SIGBUS, nullException);
+-#endif
+-#if defined(SIGFPE)
+- registerSyncSignalHandler(SIGFPE, floatingException);
+-#endif
+-#if defined(SIGPIPE)
+- ignoreSignal(SIGPIPE);
+-#endif
Home |
Main Index |
Thread Index |
Old Index