diff --git a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_classes_sun_awt_image_GifImageDecoder_java b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_classes_sun_awt_image_GifImageDecoder_java
index dab5d87044e..165887b22d4 100644
--- a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_classes_sun_awt_image_GifImageDecoder_java
+++ b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_classes_sun_awt_image_GifImageDecoder_java
@@ -1,7 +1,7 @@
-$OpenBSD: patch-j2sdk1_3_1_src_share_classes_sun_awt_image_GifImageDecoder_java,v 1.1 2007/01/28 04:46:48 kurt Exp $
---- j2sdk1.3.1/src/share/classes/sun/awt/image/GifImageDecoder.java.orig	Sat Jan 27 17:18:05 2007
-+++ j2sdk1.3.1/src/share/classes/sun/awt/image/GifImageDecoder.java	Sat Jan 27 17:18:55 2007
-@@ -499,6 +499,14 @@ public class GifImageDecoder extends Ima
+$OpenBSD: patch-j2sdk1_3_1_src_share_classes_sun_awt_image_GifImageDecoder_java,v 1.2 2007/07/18 14:19:27 kurt Exp $
+--- j2sdk1.3.1/src/share/classes/sun/awt/image/GifImageDecoder.java.orig	Sun May  6 08:08:27 2001
++++ j2sdk1.3.1/src/share/classes/sun/awt/image/GifImageDecoder.java	Wed Jul 18 09:36:14 2007
+@@ -499,6 +499,14 @@ public class GifImageDecoder extends ImageDecoder {
  	int y = ExtractWord(block, 2);
  	int width = ExtractWord(block, 4);
  	int height = ExtractWord(block, 6);
diff --git a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_hpi_include_hpi_impl_h b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_hpi_include_hpi_impl_h
index 0a34d42ed04..03699c7773b 100644
--- a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_hpi_include_hpi_impl_h
+++ b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_hpi_include_hpi_impl_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-j2sdk1_3_1_src_share_hpi_include_hpi_impl_h,v 1.1 2006/01/18 15:12:55 kurt Exp $
---- j2sdk1.3.1/src/share/hpi/include/hpi_impl.h.orig	Tue Jan 17 21:31:02 2006
-+++ j2sdk1.3.1/src/share/hpi/include/hpi_impl.h	Tue Jan 17 21:37:27 2006
-@@ -123,10 +123,10 @@ int sysConnect(int fd, struct sockaddr *
+$OpenBSD: patch-j2sdk1_3_1_src_share_hpi_include_hpi_impl_h,v 1.2 2007/07/18 14:19:27 kurt Exp $
+--- j2sdk1.3.1/src/share/hpi/include/hpi_impl.h.orig	Sun May  6 08:18:04 2001
++++ j2sdk1.3.1/src/share/hpi/include/hpi_impl.h	Wed Jul 18 09:36:14 2007
+@@ -123,10 +123,10 @@ int sysConnect(int fd, struct sockaddr *him, int len);
  int sysBind(int fd, struct sockaddr *him, int len);
  int sysAccept(int fd, struct sockaddr *him, int *len);
  int sysGetSockName(int fd, struct sockaddr *him, int *len);
diff --git a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_javavm_runtime_jni_c b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_javavm_runtime_jni_c
index e37c28ed716..773e08b4bf5 100644
--- a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_javavm_runtime_jni_c
+++ b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_javavm_runtime_jni_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-j2sdk1_3_1_src_share_javavm_runtime_jni_c,v 1.1 2005/06/03 17:27:54 kurt Exp $
+$OpenBSD: patch-j2sdk1_3_1_src_share_javavm_runtime_jni_c,v 1.2 2007/07/18 14:19:27 kurt Exp $
 --- j2sdk1.3.1/src/share/javavm/runtime/jni.c.orig	Sun May  6 08:18:43 2001
-+++ j2sdk1.3.1/src/share/javavm/runtime/jni.c	Mon May 23 23:50:35 2005
-@@ -570,20 +570,17 @@ jni_FindMethodBlock(JNIEnv *env, jclass 
++++ j2sdk1.3.1/src/share/javavm/runtime/jni.c	Wed Jul 18 09:36:14 2007
+@@ -570,20 +570,17 @@ jni_FindMethodBlock(JNIEnv *env, jclass cls, const cha
  
  typedef char*
  (*JNI_PushArguments_t)(JNIEnv *env, char *terse_signature,
@@ -25,7 +25,7 @@ $OpenBSD: patch-j2sdk1_3_1_src_share_javavm_runtime_jni_c,v 1.1 2005/06/03 17:27
  
      while (1) {
          switch (*p++) {
-@@ -592,7 +589,7 @@ jni_PushArgumentsVararg(JNIEnv *env, cha
+@@ -592,7 +589,7 @@ jni_PushArgumentsVararg(JNIEnv *env, char *terse_signa
  	case TERSE_SIG_BYTE:
  	case TERSE_SIG_CHAR:
  	case TERSE_SIG_INT:
@@ -34,7 +34,7 @@ $OpenBSD: patch-j2sdk1_3_1_src_share_javavm_runtime_jni_c,v 1.1 2005/06/03 17:27
              continue;
  	case TERSE_SIG_FLOAT:
  	    (current_frame->optop++)->f = (float)va_arg(args, double);
-@@ -621,49 +618,45 @@ jni_PushArgumentsVararg(JNIEnv *env, cha
+@@ -621,49 +618,45 @@ jni_PushArgumentsVararg(JNIEnv *env, char *terse_signa
  
  static char*
  jni_PushArgumentsArray(JNIEnv *env, char *terse_signature,
diff --git a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_native_java_util_zip_zlib-1_1_3_inftrees_c b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_native_java_util_zip_zlib-1_1_3_inftrees_c
index d3b2f7cf1c1..4486b3add3d 100644
--- a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_native_java_util_zip_zlib-1_1_3_inftrees_c
+++ b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_native_java_util_zip_zlib-1_1_3_inftrees_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-j2sdk1_3_1_src_share_native_java_util_zip_zlib-1_1_3_inftrees_c,v 1.1 2005/08/10 22:36:27 kurt Exp $
+$OpenBSD: patch-j2sdk1_3_1_src_share_native_java_util_zip_zlib-1_1_3_inftrees_c,v 1.2 2007/07/18 14:19:27 kurt Exp $
 --- j2sdk1.3.1/src/share/native/java/util/zip/zlib-1.1.3/inftrees.c.orig	Sun May  6 08:20:30 2001
-+++ j2sdk1.3.1/src/share/native/java/util/zip/zlib-1.1.3/inftrees.c	Tue Aug  9 18:20:33 2005
-@@ -214,7 +214,7 @@ uIntf *v;               /* working area:
++++ j2sdk1.3.1/src/share/native/java/util/zip/zlib-1.1.3/inftrees.c	Wed Jul 18 09:36:14 2007
+@@ -214,7 +214,7 @@ uIntf *v;               /* working area: values in ord
  
          /* compute minimum size table less than or equal to l bits */
          z = g - w;
diff --git a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_native_sun_awt_image_gif_gifdecoder_c b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_native_sun_awt_image_gif_gifdecoder_c
index 2f276661084..cd6ea16ec62 100644
--- a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_native_sun_awt_image_gif_gifdecoder_c
+++ b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_share_native_sun_awt_image_gif_gifdecoder_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-j2sdk1_3_1_src_share_native_sun_awt_image_gif_gifdecoder_c,v 1.1 2007/01/28 04:46:48 kurt Exp $
---- j2sdk1.3.1/src/share/native/sun/awt/image/gif/gifdecoder.c.orig	Sat Jan 27 17:17:07 2007
-+++ j2sdk1.3.1/src/share/native/sun/awt/image/gif/gifdecoder.c	Sat Jan 27 17:17:44 2007
-@@ -369,7 +369,7 @@ Java_sun_awt_image_GifImageDecoder_parse
+$OpenBSD: patch-j2sdk1_3_1_src_share_native_sun_awt_image_gif_gifdecoder_c,v 1.2 2007/07/18 14:19:27 kurt Exp $
+--- j2sdk1.3.1/src/share/native/sun/awt/image/gif/gifdecoder.c.orig	Sun May  6 08:22:09 2001
++++ j2sdk1.3.1/src/share/native/sun/awt/image/gif/gifdecoder.c	Wed Jul 18 09:36:14 2007
+@@ -369,7 +369,7 @@ Java_sun_awt_image_GifImageDecoder_parseImage(JNIEnv *
  	 * been stacked LIFO, so deal with it that way...
  	 */
  	len = OUTCODELENGTH - outCount;
diff --git a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_include_context_md_bsd_h b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_include_context_md_bsd_h
index 4b18e3bb905..a0ab04bc131 100644
--- a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_include_context_md_bsd_h
+++ b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_include_context_md_bsd_h
@@ -1,6 +1,6 @@
-$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_include_context_md_bsd_h,v 1.3 2006/03/20 14:40:25 kurt Exp $
---- j2sdk1.3.1/src/solaris/hpi/green_threads/include/context_md_bsd.h.orig	Thu Mar 16 16:42:43 2006
-+++ j2sdk1.3.1/src/solaris/hpi/green_threads/include/context_md_bsd.h	Fri Mar 17 12:39:53 2006
+$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_include_context_md_bsd_h,v 1.4 2007/07/18 14:19:27 kurt Exp $
+--- j2sdk1.3.1/src/solaris/hpi/green_threads/include/context_md_bsd.h.orig	Wed Jul 18 09:36:12 2007
++++ j2sdk1.3.1/src/solaris/hpi/green_threads/include/context_md_bsd.h	Wed Jul 18 09:36:14 2007
 @@ -26,6 +26,9 @@ typedef struct lj_ucontext {
  	context_jmpbuf_t	jmpbuf;
  #if defined(i386)
@@ -48,7 +48,7 @@ $OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_include_context_md_bsd_
      void *current_sp;
  #endif
      inner_ucontext_t lj_ucontext;
-@@ -200,6 +217,21 @@ extern int netbsd_siglongjmp(sigjmp_buf 
+@@ -200,6 +217,21 @@ extern int netbsd_siglongjmp(sigjmp_buf env, int val);
          (contextp)->unix_errno = errno;					\
          reschedule();							\
      }									\
diff --git a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_context_c b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_context_c
index 07268fd71d8..ff2fa9f2077 100644
--- a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_context_c
+++ b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_context_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_context_c,v 1.3 2006/03/20 14:40:25 kurt Exp $
---- j2sdk1.3.1/src/solaris/hpi/green_threads/src/context.c.orig	Fri Mar 17 13:49:52 2006
-+++ j2sdk1.3.1/src/solaris/hpi/green_threads/src/context.c	Fri Mar 17 15:06:04 2006
+$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_context_c,v 1.4 2007/07/18 14:19:27 kurt Exp $
+--- j2sdk1.3.1/src/solaris/hpi/green_threads/src/context.c.orig	Wed Jul 18 09:36:12 2007
++++ j2sdk1.3.1/src/solaris/hpi/green_threads/src/context.c	Wed Jul 18 09:36:14 2007
 @@ -183,7 +183,7 @@ currentStackPointer(sys_thread_t *tp)
  #if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
      context_t *context = &tp->mdcontext;
@@ -10,7 +10,7 @@ $OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_context_c,v 1.3 200
      return (void *)CONTEXT(tp)->current_sp;
  #elif defined(__NetBSD__) || defined(__OpenBSD__)
      return (void *)(uc->jmpbuf[BSD_STACK_POINTER]);
-@@ -579,7 +579,60 @@ initContext(lj_ucontext_t *uc, gstack_t 
+@@ -579,7 +579,60 @@ initContext(lj_ucontext_t *uc, gstack_t *stack, unsign
      uc->jmpbuf->_sjb[35] = (long)0xACEDBADD;	/* magic number for longjmp */
  }
  
diff --git a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_iomgr_c b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_iomgr_c
index 3f961179629..bb817c85566 100644
--- a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_iomgr_c
+++ b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_iomgr_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_iomgr_c,v 1.1.1.1 2004/01/29 22:02:20 pvalchev Exp $
---- j2sdk1.3.1/src/solaris/hpi/green_threads/src/iomgr.c.orig	2003-12-20 19:52:06.000000000 -0500
-+++ j2sdk1.3.1/src/solaris/hpi/green_threads/src/iomgr.c	2003-12-20 19:53:04.000000000 -0500
-@@ -1830,10 +1830,8 @@ putmsg(int fd, const struct strbuf *ctlp
+$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_iomgr_c,v 1.2 2007/07/18 14:19:27 kurt Exp $
+--- j2sdk1.3.1/src/solaris/hpi/green_threads/src/iomgr.c.orig	Wed Jul 18 09:36:12 2007
++++ j2sdk1.3.1/src/solaris/hpi/green_threads/src/iomgr.c	Wed Jul 18 09:36:14 2007
+@@ -1830,10 +1830,8 @@ putmsg(int fd, const struct strbuf *ctlptr,
  int
  #if defined(__FreeBSD__)
  poll(struct pollfd *fds, unsigned int nfds, int timeout)
diff --git a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_signals_c b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_signals_c
index de9dacfb577..40e1ac04c4d 100644
--- a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_signals_c
+++ b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_signals_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_signals_c,v 1.2 2005/10/21 22:36:30 kurt Exp $
---- j2sdk1.3.1/src/solaris/hpi/green_threads/src/signals.c.orig	Fri Oct 21 17:26:08 2005
-+++ j2sdk1.3.1/src/solaris/hpi/green_threads/src/signals.c	Fri Oct 21 17:35:14 2005
+$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_signals_c,v 1.3 2007/07/18 14:19:27 kurt Exp $
+--- j2sdk1.3.1/src/solaris/hpi/green_threads/src/signals.c.orig	Wed Jul 18 09:36:12 2007
++++ j2sdk1.3.1/src/solaris/hpi/green_threads/src/signals.c	Wed Jul 18 09:36:14 2007
 @@ -29,7 +29,6 @@
  #include "schedule.h"
  #include "signals.h"
@@ -17,7 +17,7 @@ $OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_signals_c,v 1.2 200
  
  /*
   * The following functions, interposed in front of sigprocmask and
-@@ -595,7 +595,7 @@ green_sigprocmask(int how, const sigset_
+@@ -595,7 +595,7 @@ green_sigprocmask(int how, const sigset_t *set, sigset
  
      if (func == NULL) {
  #ifndef RTLD_NEXT
@@ -26,7 +26,7 @@ $OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_signals_c,v 1.2 200
          void *dlMain = dlopen("libc.so", RTLD_LAZY);
  	func = (fn_t *)dlsym(dlMain, 
  #if defined(__NetBSD__)
-@@ -608,6 +608,9 @@ green_sigprocmask(int how, const sigset_
+@@ -608,6 +608,9 @@ green_sigprocmask(int how, const sigset_t *set, sigset
          dlMain = dlopen("/lib/libc.so.6", RTLD_LAZY);
          func = (fn_t *)dlsym(dlMain, BSD_C_SYM("__sigprocmask"));
  #endif
diff --git a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_threads_md_c b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_threads_md_c
index af664f4cd3e..4fb904441f5 100644
--- a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_threads_md_c
+++ b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_threads_md_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_threads_md_c,v 1.3 2006/03/20 14:40:25 kurt Exp $
---- j2sdk1.3.1/src/solaris/hpi/green_threads/src/threads_md.c.orig	Fri Mar 17 13:49:52 2006
-+++ j2sdk1.3.1/src/solaris/hpi/green_threads/src/threads_md.c	Fri Mar 17 15:07:37 2006
+$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_threads_md_c,v 1.4 2007/07/18 14:19:27 kurt Exp $
+--- j2sdk1.3.1/src/solaris/hpi/green_threads/src/threads_md.c.orig	Wed Jul 18 09:36:12 2007
++++ j2sdk1.3.1/src/solaris/hpi/green_threads/src/threads_md.c	Wed Jul 18 09:36:14 2007
 @@ -80,8 +80,11 @@ sysThreadCheckStack() 
  {
      sys_thread_t *tid = greenThreadSelf();
@@ -14,7 +14,7 @@ $OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_green_threads_src_threads_md_c,v 1.3
  	    tid->stack.size) {
  	return 1;
      } else {
-@@ -327,17 +330,21 @@ start_func(void (*func)(int), start_args
+@@ -327,17 +330,21 @@ start_func(void (*func)(int), start_args *args)
  
  #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
  static void
diff --git a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_src_memory_md_c b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_src_memory_md_c
index 57f7129ae59..67b807b034b 100644
--- a/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_src_memory_md_c
+++ b/devel/jdk/1.3/patches/patch-j2sdk1_3_1_src_solaris_hpi_src_memory_md_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_src_memory_md_c,v 1.2 2005/06/03 17:27:54 kurt Exp $
---- j2sdk1.3.1/src/solaris/hpi/src/memory_md.c.orig	Wed Apr 20 13:23:19 2005
-+++ j2sdk1.3.1/src/solaris/hpi/src/memory_md.c	Wed Apr 20 13:25:51 2005
+$OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_src_memory_md_c,v 1.3 2007/07/18 14:19:27 kurt Exp $
+--- j2sdk1.3.1/src/solaris/hpi/src/memory_md.c.orig	Wed Jul 18 09:36:12 2007
++++ j2sdk1.3.1/src/solaris/hpi/src/memory_md.c	Wed Jul 18 09:36:14 2007
 @@ -110,7 +110,9 @@ InitializeMem(void)
  #endif
      }
@@ -41,7 +41,7 @@ $OpenBSD: patch-j2sdk1_3_1_src_solaris_hpi_src_memory_md_c,v 1.2 2005/06/03 17:2
                          devZeroFD, (off_t) 0);
  #endif
      return (ret == MAP_FAILED ? 0 : ret);
-@@ -204,7 +210,7 @@ mapChunkNoreserve(char *addr, long lengt
+@@ -204,7 +210,7 @@ mapChunkNoreserve(char *addr, long length)
                           -1, (off_t) 0);
  #else
      ret = (char *) mmap(addr, length, PROT_ALL,