8 files changed, 21 insertions, 128 deletions
diff --git a/java/jdk16/files/cacerts b/java/jdk16/files/cacerts
deleted file mode 100644
index 23c0c87b2859..000000000000
--- a/java/jdk16/files/cacerts
+++ /dev/null
diff --git a/java/jdk16/files/disable-ipv6.patch b/java/jdk16/files/disable-ipv6.patch
deleted file mode 100644
index 00ecbef516f5..000000000000
--- a/java/jdk16/files/disable-ipv6.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/src/solaris/native/java/net/net_util_md.c.orig	Tue Jan 27 17:31:03 2004
-+++ ../../j2se/src/solaris/native/java/net/net_util_md.c	Tue Jan 27 17:31:38 2004
-@@ -166,6 +166,10 @@
-     int fd;
-     void *ipv6_fn;
-
-+#ifdef __FreeBSD__
-+    return JNI_FALSE;
-+#endif
-+
-     fd = JVM_Socket(AF_INET6, SOCK_STREAM, 0) ;
-     if (fd < 0) {
-	/*
diff --git a/java/jdk16/files/patch-control::common::Defs-bsd.gmk b/java/jdk16/files/patch-control::common::Defs-bsd.gmk
index f9e45f642fa1..e5701664bcbc 100644
--- a/java/jdk16/files/patch-control::common::Defs-bsd.gmk
+++ b/java/jdk16/files/patch-control::common::Defs-bsd.gmk
@@ -1,8 +1,8 @@
 $FreeBSD$
 
---- ../../control/make/common/Defs-bsd.gmk.orig	Wed Nov 12 16:52:22 2003
-+++ ../../control/make/common/Defs-bsd.gmk	Wed Nov 12 16:51:41 2003
-@@ -212,7 +212,7 @@
+--- ../../control/make/common/Defs-bsd.gmk.orig	Thu Jan 13 02:01:40 2005
++++ ../../control/make/common/Defs-bsd.gmk	Thu Jan 13 02:01:54 2005
+@@ -200,7 +200,7 @@
  ifeq ($(TRUE_PLATFORM), NetBSD)
  DEVTOOLS_PATH = /usr/pkg/bin/
  else
diff --git a/java/jdk16/files/patch-common::Defs-bsd.gmk b/java/jdk16/files/patch-j2se::common::Defs-bsd.gmk
index aa4acca2b93f..dbe49c5c86bc 100644
--- a/java/jdk16/files/patch-common::Defs-bsd.gmk
+++ b/java/jdk16/files/patch-j2se::common::Defs-bsd.gmk
@@ -1,8 +1,8 @@
 $FreeBSD$
 
---- ../../j2se/make/common/Defs-bsd.gmk.orig	Fri Oct 10 09:50:48 2003
-+++ ../../j2se/make/common/Defs-bsd.gmk	Fri Oct 10 09:54:35 2003
-@@ -162,7 +162,7 @@
+--- ../../j2se/make/common/Defs-bsd.gmk.orig	Thu Jan 13 02:03:20 2005
++++ ../../j2se/make/common/Defs-bsd.gmk	Thu Jan 13 02:03:38 2005
+@@ -172,7 +172,7 @@
  ifeq ($(TRUE_PLATFORM), NetBSD)
  DEVTOOLS_PATH = /usr/pkg/bin/
  else
diff --git a/java/jdk16/files/patch-j2se::instrument::Makefile b/java/jdk16/files/patch-j2se::instrument::Makefile
new file mode 100644
index 000000000000..8934bfc11fe3
--- /dev/null
+++ b/java/jdk16/files/patch-j2se::instrument::Makefile
@@ -0,0 +1,15 @@
+$FreeBSD$
+
+--- ../../j2se/make/java/instrument/Makefile.orig	Thu Jan 13 02:04:44 2005
++++ ../../j2se/make/java/instrument/Makefile	Thu Jan 13 02:05:03 2005
+@@ -72,8 +72,8 @@
+ else
+ ifeq ($(PLATFORM), bsd)
+   ifneq ($(TRUE_PLATFORM), NetBSD)
+-    OTHER_INCLUDES += -I/usr/local/include
+-    OTHER_LDLIBS += -L/usr/local/lib -liconv
++    OTHER_INCLUDES += -I${LOCALBASE}/include
++    OTHER_LDLIBS += -L${LOCALBASE}/lib -liconv
+   endif
+ else
+   OTHER_LDLIBS = -lnsl -ldl
diff --git a/java/jdk16/files/patch-plugin::common::config.gmk b/java/jdk16/files/patch-plugin::common::config.gmk
deleted file mode 100644
index fd995e3c063b..000000000000
--- a/java/jdk16/files/patch-plugin::common::config.gmk
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/make/plugin/common/config.gmk.orig	Wed Nov 12 16:53:30 2003
-+++ ../../deploy/make/plugin/common/config.gmk	Wed Nov 12 16:53:43 2003
-@@ -57,7 +57,7 @@
- 
-   # include search paths
-   # XXXBSD: these should be defined in other place
--  CPPFLAGS1 += -I/usr/X11R6/include -I/usr/local/include
-+  CPPFLAGS1 += -I/usr/X11R6/include -I${LOCALBASE}/include
- 
-   ifeq ($(TRUE_PLATFORM), FreeSBD)
-     ifeq ($(FREEBSD_4STABLE), true)
diff --git a/java/jdk16/files/patch-plugin::ns6::Makefile b/java/jdk16/files/patch-plugin::ns6::Makefile
deleted file mode 100644
index ad15676d1b7d..000000000000
--- a/java/jdk16/files/patch-plugin::ns6::Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../deploy/make/plugin/ns6/Makefile.orig	Wed Jan 14 11:10:30 2004
-+++ ../../deploy/make/plugin/ns6/Makefile	Wed Jan 14 11:12:11 2004
-@@ -46,7 +46,7 @@
- ifeq ($(TRUE_PLATFORM), FreeBSD)
- # XXXBSD: is there any differences between nspr for ns610 and ns4
- # XXXBSD: direct /usr/local/include/nspr path is used!!!
--EXTRA_CPPFLAGS += -I/usr/local/include/nspr
-+EXTRA_CPPFLAGS += -I${LOCALBASE}/include/nspr
- endif
- ifeq ($(TRUE_PLATFORM), NetBSD)
- EXTRA_CPPFLAGS += -I/usr/pkg/include/mozilla/nspr
diff --git a/java/jdk16/files/testos.c b/java/jdk16/files/testos.c
deleted file mode 100644
index d1e77573e86b..000000000000
--- a/java/jdk16/files/testos.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * Copyright (c) 2003 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Test pthreads primitives for required functionality in order to run
- * native FreeBSD JDK1.4.2 port.
- *
- * Returns:
- *    0 - test passed
- *    1 - general failure
- *  200 - tests failed
- *
- * $FreeBSD$
- */
-
-#include <stdio.h>
-#include <pthread.h>
-#include <pthread_np.h>
-
-#define TRY(call) {							\
-  if ((call) != 0) {							\
-    printf("LIBC_R TEST: Unexpected error.  Report to MAINTAINER\n");	\
-    exit(200);								\
-  }									\
-}
-
-void *
-doit(void *data)
-{
-	pthread_attr_t attr;
-	void *mystack = NULL;
-
-	TRY(pthread_attr_init(&attr));
-	TRY(pthread_attr_get_np(pthread_self(), &attr));
-	TRY(pthread_attr_getstackaddr(&attr, &mystack));
-
-	if (mystack == NULL) {
-		printf("LIBC_R TEST FAILED: libc_r update required\n");
-		exit(1);
-	}
-
-	printf("LIBC_R TEST PASSED: All Ok\n");
-	return(NULL);
-}
-
-int
-main()
-{
-	pthread_t tid;
-	pthread_attr_t attr;
-
-	int sz = 128*1024;
-
-	TRY(pthread_attr_init(&attr));
-	TRY(pthread_attr_setstacksize(&attr, sz));
-	TRY(pthread_create(&tid, &attr, doit, NULL));
-	TRY(pthread_join(tid, NULL));
-
-	exit(0);
-}