--- ports/java/jdk16/files/patch-hotspot-vm-escape.cpp	2007-08-10 17:49:13.000000000 -0400
+++ ports/java/jdk16/files/patch-hotspot-vm-escape.cpp	2007-08-10 17:51:05.000000000 -0400
@@ -0,0 +1,27 @@
+--- ../../hotspot/src/share/vm/opto/escape.cpp	21 Jul 2006 17:22:54 -0000	1.1.1.2
++++ ../../hotspot/src/share/vm/opto/escape.cpp	9 Aug 2007 16:24:59 -0000	1.3
+@@ -35,21 +35,21 @@
+ }
+ 
+ #ifndef PRODUCT
+-static char *node_type_names[] = {
++static const char *node_type_names[] = {
+   "UnknownType",
+   "JavaObject",
+   "LocalVar",
+   "Field"
+ };
+ 
+-static char *esc_names[] = {
++static const char *esc_names[] = {
+   "UnknownEscape",
+   "NoEscape     ",
+   "ArgEscape    ",
+   "GlobalEscape "
+ };
+ 
+-static char *edge_type_suffix[] = {
++static const char *edge_type_suffix[] = {
+  "?", // UnknownEdge
+  "P", // PointsToEdge
+  "D", // DeferredEdge
--- ports/java/jdk16/files/patch-hotspot-vm-jvm_bsd.cpp	2007-08-10 17:49:13.000000000 -0400
+++ ports/java/jdk16/files/patch-hotspot-vm-jvm_bsd.cpp	2007-08-10 17:50:51.000000000 -0400
@@ -0,0 +1,13 @@
+--- ../../hotspot/src/os/bsd/vm/jvm_bsd.cpp	28 Mar 2007 04:52:29 -0000	1.1
++++ ../../hotspot/src/os/bsd/vm/jvm_bsd.cpp	9 Aug 2007 16:12:56 -0000	1.3
+@@ -116,8 +116,8 @@
+ */
+ 
+ struct siglabel {
+-  char *name;
+-  int   number;
++  const char *name;
++  int	number;
+ };
+ 
+ struct siglabel siglabels[] =
--- ports/java/jdk16/files/patch-hotspot-vm-vmError_bsd.cpp	2007-08-10 17:55:00.000000000 -0400
+++ ports/java/jdk16/files/patch-hotspot-vm-vmError_bsd.cpp	2007-08-10 17:51:01.000000000 -0400
@@ -0,0 +1,11 @@
+--- ../../hotspot/src/os/bsd/vm/vmError_bsd.cpp	28 Mar 2007 04:52:29 -0000	1.1
++++ ../../hotspot/src/os/bsd/vm/vmError_bsd.cpp	9 Aug 2007 15:52:44 -0000	1.3
+@@ -30,7 +30,7 @@
+ // Unlike system(), this function can be called from signal handler. It
+ // doesn't block SIGINT et al.
+ int VMError::fork_and_exec(char* cmd) {
+-  char * argv[4];
++  const char *argv[4];
+   argv[0] = "sh";
+   argv[1] = "-c";
+   argv[2] = cmd;