5 files changed, 7 insertions, 73 deletions

diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index fae5f6f38f96..89d56c21f946 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@@ -26,7 +25,7 @@ RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 WRKSRC=		${WRKDIR}/j2sdk1.3.1/make
 
 JDK_VERSION=	1.3.1
-JDK_PATCHSET_VERSION=	4
+JDK_PATCHSET_VERSION=	5
 
 JDK13DIR?=	${LOCALBASE}/linux-jdk${JDK_VERSION}
 
@@ -68,7 +67,11 @@ IGNORE=You must manually fetch the source distribution and FreeBSD patches (${DI
 .endfor
 
 pre-patch:
-	@cd ${WRKDIR} && ${PATCH} < ${WRKDIR}/jdk131.patches
+	@cd ${WRKDIR} &&  \
+		${MKDIR} -p j2sdk1.3.1/ext/plugin/oji-plugin/include/bsd/jdk12 && \
+		${MKDIR} -p j2sdk1.3.1/ext/plugin/oji-plugin/include/solaris/navig5/private && \
+		${MKDIR} -p j2sdk1.3.1/src/bsd/doc/man && \
+			${PATCH} < ${WRKDIR}/jdk131.patches
 
 .if !defined(NODEBUG)
 pre-install:
diff --git a/java/jdk16/distinfo b/java/jdk16/distinfo
index faa546d015d2..83fe691178ed 100644
--- a/java/jdk16/distinfo
+++ b/java/jdk16/distinfo
@@ -1,2 +1,2 @@
 MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57
-MD5 (bsd-jdk131-patches-4.tar.gz) = ec4725aad2b59f6237372f2e97889183
+MD5 (bsd-jdk131-patches-5.tar.gz) = 7a7ddb0f86f4796fe8b46286d8865dcb
diff --git a/java/jdk16/files/patch-..::src::solaris::bin::java_wrapper_bsd.sh b/java/jdk16/files/patch-..::src::solaris::bin::java_wrapper_bsd.sh
deleted file mode 100644
index d3371e11b6f5..000000000000
--- a/java/jdk16/files/patch-..::src::solaris::bin::java_wrapper_bsd.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ../src/solaris/bin/java_wrapper_bsd.sh.orig	Mon Sep 10 12:20:57 2001
-+++ ../src/solaris/bin/java_wrapper_bsd.sh	Mon Sep 10 14:23:56 2001
-@@ -121,13 +121,17 @@
-     export _JVM_THREADS_TYPE
- fi
- 
--# Set LD_LIBRARY_PATH for hotspot VM.
--#j=`$jre/bin/realpath $jre`
--ld="${jre}/lib/${proc}/${ttype}:${jre}/lib/${proc}/${vmtype}:${jre}/lib/${proc}"
-+# If jre is in a jre subdir, include parent dir libraries in lib path.  This
-+# needs to be cleaned up because -Xrun libraries are the ones that need it.
-+if [ "${jre}" = "${JREHOME}" ]; then
-+    JAVA_LIBRARY_PATH=":${jre}/../lib/${proc}"
-+fi
-+# Set LD_LIBRARY_PATH for thread type, VM type and standard native libraries.
-+JAVA_LIBRARY_PATH="${jre}/lib/${proc}/${ttype}:${jre}/lib/${proc}/${vmtype}:${jre}/lib/${proc}${JAVA_LIBRARY_PATH}"
- if [ -z "$LD_LIBRARY_PATH" ]; then
--    LD_LIBRARY_PATH="$ld"
-+    LD_LIBRARY_PATH="${JAVA_LIBRARY_PATH}"
- else
--    LD_LIBRARY_PATH="$ld:$LD_LIBRARY_PATH"
-+    LD_LIBRARY_PATH="${JAVA_LIBRARY_PATH}:$LD_LIBRARY_PATH"
- fi
- export LD_LIBRARY_PATH
- 
diff --git a/java/jdk16/files/patch-..::src::solaris::hpi::green_threads::src::iomgr.c b/java/jdk16/files/patch-..::src::solaris::hpi::green_threads::src::iomgr.c
deleted file mode 100644
index 04b106d7778b..000000000000
--- a/java/jdk16/files/patch-..::src::solaris::hpi::green_threads::src::iomgr.c
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ../src/solaris/hpi/green_threads/src/iomgr.c.orig	Wed Sep 12 12:39:31 2001
-+++ ../src/solaris/hpi/green_threads/src/iomgr.c	Wed Sep 12 12:39:43 2001
-@@ -716,6 +716,22 @@
-     WRAPFUNC(read);
-     WRAPFUNC(write);
-     WRAPFUNC(fcntl);
-+#if __FreeBSD__ >= 5
-+    WRAPFUNC(writev);
-+    WRAPFUNC(readv);
-+    WRAPFUNC(poll);
-+    WRAPFUNC(sendto);
-+    WRAPFUNC(dup);
-+    WRAPFUNC(accept);
-+    WRAPFUNC(recvfrom);
-+    WRAPFUNC(socket);
-+    WRAPFUNC(connect);
-+    WRAPFUNC(select);
-+    WRAPFUNC(pipe);
-+    WRAPFUNC(creat);
-+    WRAPFUNC(recv);
-+    WRAPFUNC(send);
-+#endif
-     __dummy();
- }
- #else
diff --git a/java/jdk16/files/patch-..::src::solaris::native::sun::awt::awt_util.c b/java/jdk16/files/patch-..::src::solaris::native::sun::awt::awt_util.c
deleted file mode 100644
index 29c54c966355..000000000000
--- a/java/jdk16/files/patch-..::src::solaris::native::sun::awt::awt_util.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- ../src/solaris/native/sun/awt/awt_util.c	2001/08/27 10:49:30	1.1
-+++ ../src/solaris/native/sun/awt/awt_util.c	2001/08/27 10:49:41
-@@ -27,7 +27,6 @@
- #include <Xm/Form.h>
- #include <Xm/RowColumn.h>
- #include <Xm/MwmUtil.h>
--#include <Xm/BaseClassI.h>
- 
- 
- #include <jni.h>