aboutsummaryrefslogtreecommitdiff
path: root/java/cacao
diff options
context:
space:
mode:
authorTilman Keskinoz <arved@FreeBSD.org>2007-06-06 18:24:42 +0000
committerTilman Keskinoz <arved@FreeBSD.org>2007-06-06 18:24:42 +0000
commitad29258c4a4d22fc892b87ad68ebdcb786608155 (patch)
treece37b4ff39ce79a0c7d49490b5b6df2953eb1204 /java/cacao
parente868096dc2ff478473b82fe974a869b49a8c50e1 (diff)
downloadports-ad29258c4a4d22fc892b87ad68ebdcb786608155.tar.gz
ports-ad29258c4a4d22fc892b87ad68ebdcb786608155.zip
Notes
Diffstat (limited to 'java/cacao')
-rw-r--r--java/cacao/Makefile4
-rw-r--r--java/cacao/distinfo6
-rw-r--r--java/cacao/files/patch-boehm-gc-dbg_ml.c2
-rw-r--r--java/cacao/files/patch-boehm-gc-dyn_load.c2
-rw-r--r--java/cacao/files/patch-boehm-gc-include-gc.h2
-rw-r--r--java/cacao/files/patch-boehm-gc-include-private-gcconfig.h2
-rw-r--r--java/cacao/files/patch-boehm-gc-os_dep.c2
-rw-r--r--java/cacao/files/patch-src-Makefile.in24
-rw-r--r--java/cacao/files/patch-src-vm-jit-x86_64-md.c71
-rw-r--r--java/cacao/pkg-plist2
10 files changed, 23 insertions, 94 deletions
diff --git a/java/cacao/Makefile b/java/cacao/Makefile
index b1a13da2ce3b..1cb2d816f559 100644
--- a/java/cacao/Makefile
+++ b/java/cacao/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= cacao
-PORTVERSION= 0.97
-PORTREVISION= 2
+PORTVERSION= 0.98
CATEGORIES= java devel
MASTER_SITES= http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PORTVERSION}/
@@ -15,6 +14,7 @@ COMMENT= JIT compiler for JAVA
BUILD_DEPENDS= ${LOCALBASE}/share/classpath/glibj.zip:${PORTSDIR}/java/classpath
+USE_BZIP2= yes
USE_AUTOTOOLS= libltdl
USE_JAVA= yes
JAVA_VERSION= 1.4+
diff --git a/java/cacao/distinfo b/java/cacao/distinfo
index 7e8285f98522..1cda6475f2ef 100644
--- a/java/cacao/distinfo
+++ b/java/cacao/distinfo
@@ -1,3 +1,3 @@
-MD5 (cacao-0.97.tar.gz) = 36a6a3cfb2914d483bd28f276b8dd93d
-SHA256 (cacao-0.97.tar.gz) = 24c8c23dcb3214d6617cf1638c355d10dd166db1265e873225e6f9164e8487b3
-SIZE (cacao-0.97.tar.gz) = 2873069
+MD5 (cacao-0.98.tar.bz2) = 8b8907c8b925761c9410bcadb9705346
+SHA256 (cacao-0.98.tar.bz2) = cb9363add825cedf77764fc49a223aaf43f0a9f485b711ba8c92f16b13fff188
+SIZE (cacao-0.98.tar.bz2) = 2393690
diff --git a/java/cacao/files/patch-boehm-gc-dbg_ml.c b/java/cacao/files/patch-boehm-gc-dbg_ml.c
index af6de67db9ce..6af1b9490cbe 100644
--- a/java/cacao/files/patch-boehm-gc-dbg_ml.c
+++ b/java/cacao/files/patch-boehm-gc-dbg_ml.c
@@ -1,5 +1,5 @@
--- src/boehm-gc/dbg_mlc.c.orig Tue May 13 16:59:49 2003
-+++ src/boehm-gc/dbg_mlc.c Wed May 12 20:13:19 2004
++++ src/mm/boehm-gc/dbg_mlc.c Wed May 12 20:13:19 2004
@@ -414,6 +414,23 @@
GC_register_displacement((word)sizeof(oh) + offset);
}
diff --git a/java/cacao/files/patch-boehm-gc-dyn_load.c b/java/cacao/files/patch-boehm-gc-dyn_load.c
index 963504ca9809..f9d834e8f59e 100644
--- a/java/cacao/files/patch-boehm-gc-dyn_load.c
+++ b/java/cacao/files/patch-boehm-gc-dyn_load.c
@@ -1,5 +1,5 @@
--- src/boehm-gc/dyn_load.c.orig Thu May 6 08:03:06 2004
-+++ src/boehm-gc/dyn_load.c Sun Oct 31 01:53:01 2004
++++ src/mm/boehm-gc/dyn_load.c Sun Oct 31 01:53:01 2004
@@ -97,6 +97,12 @@
# else
# define ElfW(type) Elf64_##type
diff --git a/java/cacao/files/patch-boehm-gc-include-gc.h b/java/cacao/files/patch-boehm-gc-include-gc.h
index af60c7729324..0e1cc9c18294 100644
--- a/java/cacao/files/patch-boehm-gc-include-gc.h
+++ b/java/cacao/files/patch-boehm-gc-include-gc.h
@@ -1,5 +1,5 @@
--- src/boehm-gc/include/gc.h.orig Wed Jun 4 17:07:33 2003
-+++ src/boehm-gc/include/gc.h Wed May 12 20:03:22 2004
++++ src/mm/boehm-gc/include/gc.h Wed May 12 20:03:22 2004
@@ -487,6 +487,7 @@
/* gcc knows how to retrieve return address, but we don't know */
/* how to generate call stacks. */
diff --git a/java/cacao/files/patch-boehm-gc-include-private-gcconfig.h b/java/cacao/files/patch-boehm-gc-include-private-gcconfig.h
index 44e757247e14..5c70445450c8 100644
--- a/java/cacao/files/patch-boehm-gc-include-private-gcconfig.h
+++ b/java/cacao/files/patch-boehm-gc-include-private-gcconfig.h
@@ -1,5 +1,5 @@
--- src/boehm-gc/include/private/gcconfig.h.rorig Sat Oct 15 16:40:25 2005
-+++ src/boehm-gc/include/private/gcconfig.h Sat Oct 15 16:42:43 2005
++++ src/mm/boehm-gc/include/private/gcconfig.h Sat Oct 15 16:42:43 2005
@@ -62,7 +62,7 @@
/* Determine the machine type: */
# if defined(__arm__) || defined(__thumb__)
diff --git a/java/cacao/files/patch-boehm-gc-os_dep.c b/java/cacao/files/patch-boehm-gc-os_dep.c
index b9de5e8d3e07..657ac9500dd5 100644
--- a/java/cacao/files/patch-boehm-gc-os_dep.c
+++ b/java/cacao/files/patch-boehm-gc-os_dep.c
@@ -1,5 +1,5 @@
--- src/boehm-gc/os_dep.c.orig Thu May 19 20:48:49 2005
-+++ src/boehm-gc/os_dep.c Fri Jun 17 21:28:07 2005
++++ src/mm/boehm-gc/os_dep.c Fri Jun 17 21:28:07 2005
@@ -699,7 +699,7 @@
|| defined(HURD) || defined(NETBSD)
static struct sigaction old_segv_act;
diff --git a/java/cacao/files/patch-src-Makefile.in b/java/cacao/files/patch-src-Makefile.in
index 1d73af70b2cc..818a94ef0ec5 100644
--- a/java/cacao/files/patch-src-Makefile.in
+++ b/java/cacao/files/patch-src-Makefile.in
@@ -1,16 +1,16 @@
---- src/Makefile.in.orig Sun Feb 4 20:06:59 2007
-+++ src/Makefile.in Sun Feb 4 20:07:09 2007
-@@ -243,7 +243,6 @@
- cacaoh \
- native \
- cacao \
-- scripts
-
- @DISABLE_GC_FALSE@BOEHM = boehm-gc
- @DISABLE_GC_TRUE@BOEHM =
-@@ -260,7 +259,6 @@
- cacaoh \
+--- src/Makefile.in.orig Wed Jun 6 16:32:20 2007
++++ src/Makefile.in Wed Jun 6 16:32:35 2007
+@@ -271,7 +271,6 @@
+ lib \
+ mm \
native \
+- scripts \
+ threads \
+ toolbox \
+ vm \
+@@ -299,7 +298,6 @@
+ $(THREADS_DIR) \
+ vm \
cacao \
- scripts
diff --git a/java/cacao/files/patch-src-vm-jit-x86_64-md.c b/java/cacao/files/patch-src-vm-jit-x86_64-md.c
deleted file mode 100644
index e2e01941c4c4..000000000000
--- a/java/cacao/files/patch-src-vm-jit-x86_64-md.c
+++ /dev/null
@@ -1,71 +0,0 @@
---- src/vm/jit/x86_64/md.c.orig Sun Feb 4 15:42:05 2007
-+++ src/vm/jit/x86_64/md.c Sun Feb 4 15:45:32 2007
-@@ -91,8 +91,8 @@
- /* ATTENTION: Don't use CACAO's internal REG_* defines as they are
- different to the ones in <ucontext.h>. */
-
-- sp = (u1 *) _mc->gregs[REG_RSP];
-- xpc = (u1 *) _mc->gregs[REG_RIP];
-+ sp = (u1 *) _mc->mc_rsp;
-+ xpc = (u1 *) _mc->mc_rip;
- ra = xpc; /* return address is equal to xpc */
-
- #if 0
-@@ -101,11 +101,11 @@
- threads_check_stackoverflow(sp);
- #endif
-
-- _mc->gregs[REG_RAX] =
-+ _mc->mc_rax =
- (ptrint) stacktrace_hardware_nullpointerexception(NULL, sp, ra, xpc);
-
-- _mc->gregs[REG_R10] = (ptrint) xpc; /* REG_ITMP2_XPC */
-- _mc->gregs[REG_RIP] = (ptrint) asm_handle_exception;
-+ _mc->mc_r10 = (ptrint) xpc; /* REG_ITMP2_XPC */
-+ _mc->mc_rip = (ptrint) asm_handle_exception;
- }
-
-
-@@ -130,15 +130,15 @@
- /* ATTENTION: Don't use CACAO's internal REG_* defines as they are
- different to the ones in <ucontext.h>. */
-
-- sp = (u1 *) _mc->gregs[REG_RSP];
-- xpc = (u1 *) _mc->gregs[REG_RIP];
-+ sp = (u1 *) _mc->mc_rsp;
-+ xpc = (u1 *) _mc->mc_rip;
- ra = xpc; /* return address is equal to xpc */
-
-- _mc->gregs[REG_RAX] =
-+ _mc->mc_rax =
- (ptrint) stacktrace_hardware_arithmeticexception(NULL, sp, ra, xpc);
-
-- _mc->gregs[REG_R10] = (ptrint) xpc; /* REG_ITMP2_XPC */
-- _mc->gregs[REG_RIP] = (ptrint) asm_handle_exception;
-+ _mc->mc_r10 = (ptrint) xpc; /* REG_ITMP2_XPC */
-+ _mc->mc_rip = (ptrint) asm_handle_exception;
- }
-
-
-@@ -164,7 +164,7 @@
- /* ATTENTION: Don't use CACAO's internal REG_* defines as they are
- different to the ones in <ucontext.h>. */
-
-- pc = (u1 *) _mc->gregs[REG_RIP];
-+ pc = (u1 *) _mc->mc_rip;
-
- t->pc = pc;
- }
-@@ -179,10 +179,10 @@
-
- _mc = &_uc->uc_mcontext;
-
-- pc = critical_find_restart_point((void *) _mc->gregs[REG_RIP]);
-+ pc = critical_find_restart_point((void *) _mc->mc_rip);
-
- if (pc != NULL)
-- _mc->gregs[REG_RIP] = (ptrint) pc;
-+ _mc->mc_rip = (ptrint) pc;
- }
- #endif
-
diff --git a/java/cacao/pkg-plist b/java/cacao/pkg-plist
index c2dad12c19c8..01a3b1a51278 100644
--- a/java/cacao/pkg-plist
+++ b/java/cacao/pkg-plist
@@ -1,6 +1,6 @@
bin/cacao
lib/libjvm.la
lib/libjvm.so
-lib/libjvm-0.97.so
+lib/libjvm-0.98.so
share/cacao/vm.zip
@dirrm share/cacao