Clean out MarcusCom after the big import into ports.

Next stop, GNOME 2.17.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7799 df743ca5-7f9a-e211-a948-0013205c9059

24 files changed, 0 insertions, 614 deletions

diff --git a/java/jdk13/files/cacerts b/java/jdk13/files/cacerts
deleted file mode 100644
index bf8d91f32..000000000
--- a/java/jdk13/files/cacerts
+++ /dev/null
diff --git a/java/jdk13/files/patch-InetAddressImpl.c b/java/jdk13/files/patch-InetAddressImpl.c
deleted file mode 100644
index 0c043a04a..000000000
--- a/java/jdk13/files/patch-InetAddressImpl.c
+++ /dev/null
@@ -1,97 +0,0 @@
-$FreeBSD$
-
---- ../src/solaris/native/java/net/InetAddressImpl.c.orig	Wed Jul 19 01:28:19 2006
-+++ ../src/solaris/native/java/net/InetAddressImpl.c	Wed Jul 19 10:59:54 2006
-@@ -26,9 +26,14 @@
- #include "java_net_InetAddressImpl.h"
- 
- #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#include <sys/param.h>
-+#endif
-+
-+#if (defined(__FreeBSD__) && (__FreeBSD_version < 601103 || \
-+    (__FreeBSD_version >= 700000 && __FreeBSD_version < 700016))) || \
-+    defined(__NetBSD__) || defined(__OpenBSD__)
- /* reentrant BIND includes --billh */
- 
--#include <sys/param.h>
- #include <port_before.h>
- #include <port_after.h>
- 
-@@ -100,7 +105,9 @@ Java_java_net_InetAddressImpl_getLocalHo
- 	char buf2[HENT_BUF_SIZE];
- 	int h_error=0;
- 
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) || \
-+    (defined(__FreeBSD__) && (__FreeBSD_version >= 700016 || \
-+    (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103)))
- 	gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error);
- #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- 	hp = __j_gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
-@@ -108,7 +115,9 @@ Java_java_net_InetAddressImpl_getLocalHo
- 	hp = gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
- #endif
- 	if (hp) {
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) || \
-+    (defined(__FreeBSD__) && (__FreeBSD_version >= 700016 || \
-+    (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103)))
- 	    gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET,
- 			    &res2, buf2, sizeof(buf2), &hp, &h_error);
- #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -195,7 +204,9 @@ Java_java_net_InetAddressImpl_lookupAllH
-     hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE);
- 
-     /* Try once, with our static buffer. */
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) || \
-+    (defined(__FreeBSD__) && (__FreeBSD_version >= 700016 || \
-+    (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103)))
-     gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error);
- #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-     hp = __j_gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
-@@ -210,7 +221,9 @@ Java_java_net_InetAddressImpl_lookupAllH
-      */
-     if (hp == NULL && errno == ERANGE) {
- 	if ((tmp = (char*)malloc(BIG_HENT_BUF_SIZE))) {
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) || \
-+    (defined(__FreeBSD__) && (__FreeBSD_version >= 700016 || \
-+    (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103)))
- 	    gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE,
- 			    &hp, &h_error);
- #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -293,7 +306,9 @@ Java_java_net_InetAddressImpl_getHostByA
-      * 
-      */
-     addr = htonl(addr);
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) || \
-+    (defined(__FreeBSD__) && (__FreeBSD_version >= 700016 || \
-+    (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103)))
-     gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent,
- 		    buf, sizeof(buf), &hp, &h_error);
- #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -310,7 +325,9 @@ Java_java_net_InetAddressImpl_getHostByA
-      */
-     if (hp == NULL && errno == ERANGE) {
- 	if ((tmp = (char*)malloc(BIG_HENT_BUF_SIZE))) {
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) || \
-+    (defined(__FreeBSD__) && (__FreeBSD_version >= 700016 || \
-+    (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103)))
- 	    gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET,
- 			    &hent, tmp, BIG_HENT_BUF_SIZE, &hp, &h_error);
- #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -338,7 +355,9 @@ Java_java_net_InetAddressImpl_getHostByA
- 
- /* =============================== */
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if (defined(__FreeBSD__) && (__FreeBSD_version < 601103 || \
-+    (__FreeBSD_version >= 700000 && __FreeBSD_version < 700016))) || \
-+    defined(__NetBSD__) || defined(__OpenBSD__)
- 
- #if defined(LIBC_SCCS) && !defined(lint)
- static const char rcsid[] = "$Id: patch-InetAddressImpl.c,v 1.2 2006-10-10 20:22:13 mezz Exp $";
diff --git a/java/jdk13/files/patch-_pth.h b/java/jdk13/files/patch-_pth.h
deleted file mode 100644
index 850957f85..000000000
--- a/java/jdk13/files/patch-_pth.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../ext/plugin/oji-plugin/include/solaris/navig4/nspr/md/_pth.h	11 Jul 2001 21:45:07 -0000	1.1.1.1
-+++ ../ext/plugin/oji-plugin/include/solaris/navig4/nspr/md/_pth.h	22 Nov 2004 17:19:42 -0000
-@@ -52,7 +52,7 @@
- #define PTHREAD_MUTEXATTR_INIT        pthread_mutexattr_init

- #define PTHREAD_MUTEXATTR_DESTROY     pthread_mutexattr_destroy

- #define PTHREAD_MUTEX_INIT(m, a)      pthread_mutex_init(&(m), &(a))

--#define PTHREAD_MUTEX_IS_LOCKED(m)    (EBUSY == pthread_mutex_trylock(&(m)))

-+#define PTHREAD_MUTEX_IS_LOCKED(m)    (0 != pthread_mutex_trylock(&(m)))

- #define PTHREAD_CONDATTR_INIT         pthread_condattr_init

- #define PTHREAD_CONDATTR_DESTROY      pthread_condattr_destroy

- #define PTHREAD_COND_INIT(m, a)       pthread_cond_init(&(m), &(a))

diff --git a/java/jdk13/files/patch-adlc.make b/java/jdk13/files/patch-adlc.make
deleted file mode 100644
index ad02fde2c..000000000
--- a/java/jdk13/files/patch-adlc.make
+++ /dev/null
@@ -1,42 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/build/linux/makefiles/adlc.make	14 Jan 2002 12:49:49 -0000	1.2
-+++ ../../hotspot1.3.1/build/linux/makefiles/adlc.make	22 Nov 2004 17:19:42 -0000
-@@ -53,8 +53,8 @@
- #  /usr/dist/share/devpro/5.x-sparc/bin/CC
- #  man -M /usr/dist/share/devpro/5.x-sparc/man CC
- 
--CPP       = g++
--CPPFLAGS  = -DASSERT -g -o $@
-+CXX       ?= g++
-+CXXFLAGS  += -DASSERT -g -o $@
- # -o      object file-name
- # +w      Additional warnings: Nonportable, Likely mistakes or inefficient
- # -xwe    Treat all warnings as errors (skipped for now)
-@@ -64,7 +64,7 @@
- # $<      first component of target name
- # $@      target name
- 
--CPPFLAGS += ${SYSDEFS} ${INCLUDES}
-+CXXFLAGS += ${SYSDEFS} ${INCLUDES}
- 
- OBJECTNAMES = \
- 	adlparse.o \
-@@ -92,7 +92,7 @@
- 
- $(EXEC) : $(OBJECTS)
- 	@echo Making adlc
--	@$(CPP) $(DFLAGS) $(LFLAGS) $(OBJECTS) -o $(EXEC)
-+	@$(CXX) $(DFLAGS) $(LFLAGS) $(OBJECTS) -o $(EXEC)
- 
- # The source files refer to ostream.h, which sparcworks calls iostream.h
- $(OBJECTS): ostream.h
-@@ -164,7 +164,7 @@
- $(SOURCE.AD): $(SOURCES.AD)
- 	@cat $(SOURCES.AD) > $(SOURCE.AD)
- 
--COMPILE   = ${CPP} ${CPPFLAGS} ${CFLAGS}
-+COMPILE   = ${CXX} ${CXXFLAGS} ${CFLAGS}
- 
- COMPILE.o = ${COMPILE} -c
- COMPILE.i = ${COMPILE} -E
diff --git a/java/jdk13/files/patch-bytecodes.hpp b/java/jdk13/files/patch-bytecodes.hpp
deleted file mode 100644
index 003ab81d3..000000000
--- a/java/jdk13/files/patch-bytecodes.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/src/share/vm/interpreter/bytecodes.hpp	11 Jul 2001 21:33:21 -0000	1.1.1.1
-+++ ../../hotspot1.3.1/src/share/vm/interpreter/bytecodes.hpp	22 Nov 2004 17:19:42 -0000
-@@ -14,6 +14,7 @@
- 
- // CopyrightVersion 1.2
- 
-+#include <limits.h>
- 
- // Bytecodes specifies all bytecodes used in the VM and
- // provides utility functions to get bytecode attributes.
-@@ -279,7 +280,8 @@
-     // Platform specific JVM bytecodes
-     #include "incls/_bytecodes_pd.hpp.incl"
- 
--    number_of_codes
-+    number_of_codes,
-+    WIDTH_HINT = INT_MAX
-   };
- 
-  private:
diff --git a/java/jdk13/files/patch-common::Defs-bsd.gmk b/java/jdk13/files/patch-common::Defs-bsd.gmk
deleted file mode 100644
index 67e497d01..000000000
--- a/java/jdk13/files/patch-common::Defs-bsd.gmk
+++ /dev/null
@@ -1,39 +0,0 @@
-$FreeBSD$
-
---- common/Defs-bsd.gmk.orig	Thu Dec 18 22:33:22 2003
-+++ common/Defs-bsd.gmk	Thu Dec 18 22:36:46 2003
-@@ -32,9 +32,10 @@
- AR             = $(USRBIN_PATH)ar
- AS             = $(USRBIN_PATH)as
- CAT            = $(UNIXCOMMAND_PATH)cat
--CC             = $(COMPILER_PATH)gcc
--CPP            = $(COMPILER_PATH)gcc -E
--CXX            = $(COMPILER_PATH)g++
-+# Allow ports/pkgsrc infrastructure to override CC, CPP and CXX.
-+CC            ?= $(COMPILER_PATH)gcc
-+CPP           ?= $(COMPILER_PATH)gcc -E
-+CXX           ?= $(COMPILER_PATH)g++
- CD             = cd # intrinsic unix command
- CHMOD          = $(UNIXCOMMAND_PATH)chmod
- CMP            = $(USRBIN_PATH)cmp
-@@ -131,7 +132,7 @@
- ifeq ($(TRUE_PLATFORM), NetBSD)
- DEVTOOLS_PATH = /usr/pkg/bin/
- else
--DEVTOOLS_PATH = /usr/local/bin/
-+DEVTOOLS_PATH = $(LOCALBASE)/bin/
- endif
- # Allow the user to override the default value...
- ifdef ALT_DEVTOOLS_PATH
-@@ -266,9 +267,9 @@
- CFLAGS_COMMON  += -fsigned-char
- CXXFLAGS_COMMON+= -fsigned-char
- endif
--CFLAGS_OPT      = $(POPT)
-+CFLAGS_OPT      = $(POPT) $(SYS_CFLAGS)
- CFLAGS_DBG      = -g3 $(POPT)
--CXXFLAGS_OPT	= $(POPT)
-+CXXFLAGS_OPT	= $(POPT) $(SYS_CFLAGS)
- CXXFLAGS_DBG	= -g3 $(POPT)
- 
- CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \
diff --git a/java/jdk13/files/patch-gcc.make b/java/jdk13/files/patch-gcc.make
deleted file mode 100644
index daba5a107..000000000
--- a/java/jdk13/files/patch-gcc.make
+++ /dev/null
@@ -1,24 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/build/linux/makefiles/gcc.make	23 Apr 2003 18:04:37 -0000	1.6
-+++ ../../hotspot1.3.1/build/linux/makefiles/gcc.make	22 Nov 2004 17:19:42 -0000
-@@ -36,8 +36,6 @@
- 
- 
- #####
--#harmless
--OPT_CFLAGS += -fmemoize-lookups
- #unneeded
- #OPT_CFLAGS += -fpeephole
- #bad
-@@ -51,8 +49,8 @@
- # Set the environment variable HOTSPARC_HOTSPARC_GENERIC to "true"
- # to inhibit the effect of the previous line on CFLAGS.
- 
--CPP = g++
--CC  = gcc
-+CXX ?= g++
-+CC  ?= gcc
- 
- AOUT_FLAGS += -export-dynamic 
- DEBUG_CFLAGS += -g
diff --git a/java/jdk13/files/patch-gcc30.make b/java/jdk13/files/patch-gcc30.make
deleted file mode 100644
index bd0657f46..000000000
--- a/java/jdk13/files/patch-gcc30.make
+++ /dev/null
@@ -1,15 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/build/linux/makefiles/gcc30.make	12 Jul 2002 08:25:58 -0000	1.3
-+++ ../../hotspot1.3.1/build/linux/makefiles/gcc30.make	22 Nov 2004 17:19:42 -0000
-@@ -37,8 +37,8 @@
- # Set the environment variable HOTSPARC_HOTSPARC_GENERIC to "true"
- # to inhibit the effect of the previous line on CFLAGS.
- 
--CPP = g++30
--CC  = gcc30
-+CXX ?= g++30
-+CC  ?= gcc30
- 
- AOUT_FLAGS += -export-dynamic 
- DEBUG_CFLAGS += -g
diff --git a/java/jdk13/files/patch-gcc31.make b/java/jdk13/files/patch-gcc31.make
deleted file mode 100644
index 33d411015..000000000
--- a/java/jdk13/files/patch-gcc31.make
+++ /dev/null
@@ -1,24 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/build/linux/makefiles/gcc31.make	14 Jul 2002 00:07:59 -0000	1.1
-+++ ../../hotspot1.3.1/build/linux/makefiles/gcc31.make	22 Nov 2004 17:19:42 -0000
-@@ -108,8 +108,6 @@
- 
- 
- #####
--#harmless
--OPT_CFLAGS += -fmemoize-lookups
- #unneeded
- #OPT_CFLAGS += -fpeephole
- #bad
-@@ -123,8 +121,8 @@
- # Set the environment variable HOTSPARC_HOTSPARC_GENERIC to "true"
- # to inhibit the effect of the previous line on CFLAGS.
- 
--CPP = g++31
--CC  = gcc31
-+CXX ?= g++31
-+CC  ?= gcc31
- 
- AOUT_FLAGS += -export-dynamic 
- DEBUG_CFLAGS += -g
diff --git a/java/jdk13/files/patch-gcc32.make b/java/jdk13/files/patch-gcc32.make
deleted file mode 100644
index 408740c50..000000000
--- a/java/jdk13/files/patch-gcc32.make
+++ /dev/null
@@ -1,24 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/build/linux/makefiles/gcc32.make	16 Sep 2002 06:21:28 -0000	1.1
-+++ ../../hotspot1.3.1/build/linux/makefiles/gcc32.make	22 Nov 2004 17:19:42 -0000
-@@ -108,8 +108,6 @@
- 
- 
- #####
--#harmless
--OPT_CFLAGS += -fmemoize-lookups
- #unneeded
- #OPT_CFLAGS += -fpeephole
- #bad
-@@ -123,8 +121,8 @@
- # Set the environment variable HOTSPARC_HOTSPARC_GENERIC to "true"
- # to inhibit the effect of the previous line on CFLAGS.
- 
--CPP = g++32
--CC  = gcc32
-+CXX ?= g++32
-+CC  ?= gcc32
- 
- AOUT_FLAGS += -export-dynamic 
- DEBUG_CFLAGS += -g
diff --git a/java/jdk13/files/patch-iomgr.c b/java/jdk13/files/patch-iomgr.c
deleted file mode 100644
index a94c957ab..000000000
--- a/java/jdk13/files/patch-iomgr.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$FreeBSD$
-
---- ../src/solaris/hpi/green_threads/src/iomgr.c	Thu Mar 13 13:55:24 2003
-+++ ../src/solaris/hpi/green_threads/src/iomgr.c	Thu Mar 13 13:55:53 2003
-@@ -352,7 +352,6 @@
-      * Get the ttyname, so we can reopen it.
-      */
-     name = ttyname(fd);
--    sysAssert(name != NULL);
-     if (name == NULL)
- 	return FALSE;
-     
diff --git a/java/jdk13/files/patch-j2sdk1.3.1-jar-Main.java b/java/jdk13/files/patch-j2sdk1.3.1-jar-Main.java
deleted file mode 100644
index d5379adf6..000000000
--- a/java/jdk13/files/patch-j2sdk1.3.1-jar-Main.java
+++ /dev/null
@@ -1,58 +0,0 @@
-$FreeBSD$
-
---- ../src/share/classes/sun/tools/jar/Main.java	11 Jul 2001 21:39:05 -0000	1.1.1.1
-+++ ../src/share/classes/sun/tools/jar/Main.java	27 Apr 2005 05:07:30 -0000
-@@ -35,6 +35,7 @@
-     Hashtable filesTable = new Hashtable();
-     Vector paths = new Vector();
-     Vector v;
-+    String cwd;
-     CRC32 crc32 = new CRC32();
-     /* cflag: create
-      * uflag: update       
-@@ -671,6 +672,19 @@
-      * Extracts specified entries from JAR file.
-      */
-     void extract(InputStream in, String files[]) throws IOException {
-+    	// Current working directory
-+
-+	cwd = System.getProperty("user.dir");
-+	if (cwd == null) {
-+            fatalError(getMsg("error.no.cwd"));
-+	}
-+	cwd = (new File(cwd)).getCanonicalPath();
-+	if (!cwd.endsWith(File.separator)) {
-+	    cwd += File.separator;
-+	}
-+
-+	// Extract the files
-+
- 	ZipInputStream zis = new ZipInputStream(in);
- 	ZipEntry e;
- 	while ((e = zis.getNextEntry()) != null) {
-@@ -695,6 +709,10 @@
-     void extractFile(ZipInputStream zis, ZipEntry e) throws IOException {
-         String name = e.getName();
- 	File f = new File(e.getName().replace('/', File.separatorChar));
-+	if (!f.getCanonicalPath().startsWith(cwd)) {
-+ 	    output(formatMsg("out.ignore.entry", name));
-+	    return;
-+	}
- 	if (e.isDirectory()) {
- 	    if (!f.exists() && !f.mkdirs() || !f.isDirectory()) {
- 		throw new IOException(formatMsg("error.create.dir", f.getPath()));
-@@ -705,6 +723,10 @@
- 	} else {
- 	    if (f.getParent() != null) {
- 		File d = new File(f.getParent());
-+		if (!d.getCanonicalPath().startsWith(cwd)) {
-+	 	    output(formatMsg("out.ignore.entry", name));
-+		    return;
-+		}
- 		if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
- 		    throw new IOException(formatMsg("error.create.dir", d.getPath()));
- 		}
-Index: j2sdk1.3.1/src/share/classes/sun/tools/jar/resources/jar.properties
-===================================================================
-RCS file: /var/jcvs/javasrc_1_3_scsl/j2sdk1.3.1/src/share/classes/sun/tools/jar/resources/jar.properties,v
-retrieving revision 1.1.1.1
diff --git a/java/jdk13/files/patch-j2sdk1.3.1-resources-jar.properties b/java/jdk13/files/patch-j2sdk1.3.1-resources-jar.properties
deleted file mode 100644
index c94b5c82f..000000000
--- a/java/jdk13/files/patch-j2sdk1.3.1-resources-jar.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../src/share/classes/sun/tools/jar/resources/jar.properties	11 Jul 2001 21:39:05 -0000	1.1.1.1
-+++ ../src/share/classes/sun/tools/jar/resources/jar.properties	27 Apr 2005 05:07:52 -0000
-@@ -30,6 +30,8 @@
-         {0} : could not create directory
- error.incorrect.length=\
-         incorrect length while processing: {0}
-+error.no.cwd=\
-+	{0} : could not determine current working directory
- out.added.manifest=\
-         added manifest
- out.update.manifest=\
diff --git a/java/jdk13/files/patch-javai_md.c b/java/jdk13/files/patch-javai_md.c
deleted file mode 100644
index 5a70733cc..000000000
--- a/java/jdk13/files/patch-javai_md.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../src/solaris/javavm/runtime/javai_md.c	24 Jul 2003 07:06:56 -0000	1.7
-+++ ../src/solaris/javavm/runtime/javai_md.c	15 Jan 2004 07:37:23 -0000
-@@ -137,7 +137,7 @@
- #ifdef __linux__
- #define DEFAULT_LD_LIBRARY_PATH "/usr/lib:/lib" /* See ld.so(8) */
- #else
--#define DEFAULT_LD_LIBRARY_PATH "/usr/lib" /* See ld.so.1(1) */
-+#define DEFAULT_LD_LIBRARY_PATH "/usr/lib:%%LOCALBASE%%/lib" /* See ld.so.1(1) */
- #endif
-     {
- 	/* Get the user setting of LD_LIBRARY_PATH */
diff --git a/java/jdk13/files/patch-monitor_md.c b/java/jdk13/files/patch-monitor_md.c
deleted file mode 100644
index b47390878..000000000
--- a/java/jdk13/files/patch-monitor_md.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../src/solaris/hpi/native_threads/src/monitor_md.c	11 Jul 2001 21:42:33 -0000	1.1.1.1
-+++ ../src/solaris/hpi/native_threads/src/monitor_md.c	22 Nov 2004 17:19:50 -0000
-@@ -132,7 +132,7 @@
- 	mid->monitor_owner = self;
- 	mid->entry_count = 1;
- 	return SYS_OK;
--    } else if (err == EBUSY) { /* it's already locked */
-+    } else if (err == EBUSY || err == EDEADLK) { /* it's already locked */
- 	if (mid->monitor_owner == self) {
- 	    mid->entry_count++;
- 	    return SYS_OK;
diff --git a/java/jdk13/files/patch-mutex.hpp b/java/jdk13/files/patch-mutex.hpp
deleted file mode 100644
index af669fc01..000000000
--- a/java/jdk13/files/patch-mutex.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/src/share/vm/runtime/mutex.hpp	17 Aug 2001 22:56:19 -0000	1.1.1.2
-+++ ../../hotspot1.3.1/src/share/vm/runtime/mutex.hpp	22 Nov 2004 17:19:42 -0000
-@@ -55,7 +55,6 @@
-   debug_only(Thread* _last_owner;) // the last thread to own the lock    
- #endif
-   
--  void set_owner_implementation(Thread* owner)                        PRODUCT_RETURN;
-   void trace                   (const char* operation)                PRODUCT_RETURN;
-   void check_prelock_state     (Thread* thread)                       PRODUCT_RETURN;
-   void check_block_state       (Thread* thread)                       PRODUCT_RETURN;
-@@ -69,6 +68,7 @@
-     _allow_vm_block_flag     = true
-   };	
- 
-+  void set_owner_implementation(Thread* owner)                        PRODUCT_RETURN;
-   Mutex(int prio, const char *name, bool allow_vm_block = !_allow_vm_block_flag);
-   ~Mutex();
-   
diff --git a/java/jdk13/files/patch-nsCOMPtr.h b/java/jdk13/files/patch-nsCOMPtr.h
deleted file mode 100644
index 8c629a684..000000000
--- a/java/jdk13/files/patch-nsCOMPtr.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$FreeBSD$
-
---- ../ext/plugin/oji-plugin/include/solaris/navig5/nsCOMPtr.h	11 Jul 2001 21:45:15 -0000	1.1.1.1
-+++ ../ext/plugin/oji-plugin/include/solaris/navig5/nsCOMPtr.h	30 Aug 2004 06:21:43 -0000
-@@ -600,7 +600,7 @@
-     Specializing |nsCOMPtr| for |nsISupports| allows us to 
-   */
- 
--// template <>
-+template <>
- class nsCOMPtr<nsISupports>
-     : private nsCOMPtr_base
-   {
-@@ -843,7 +843,7 @@
-   };
- 
- 
--// template <>
-+template <>
- class nsGetterAddRefs<nsISupports>
-   {
-     public:
diff --git a/java/jdk13/files/patch-os_bsd.hpp b/java/jdk13/files/patch-os_bsd.hpp
deleted file mode 100644
index 26609b5d8..000000000
--- a/java/jdk13/files/patch-os_bsd.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/src/os/bsd/vm/os_bsd.hpp	16 Jan 2002 18:46:39 -0000	1.2
-+++ ../../hotspot1.3.1/src/os/bsd/vm/os_bsd.hpp	22 Nov 2004 17:19:42 -0000
-@@ -186,7 +186,7 @@
-     bool trylock() {
-       verify();
-       int status = pthread_mutex_trylock(_mutex);
--      if (status == EBUSY)
-+      if (status == EBUSY || status = EDEADLK)
- 	return false;
-       assert(status == 0, "pthread_mutex_lock");
-       #ifndef PRODUCT
-@@ -349,7 +349,7 @@
-     bool trylock() {
-       verify();
-       int status = pthread_mutex_trylock(_mutex);
--      if (status == EBUSY)
-+      if (status == EBUSY || status = EDEADLK)
- 	return false;
-       assert(status == 0, "pthread_mutex_trylock");
-       #ifndef PRODUCT
diff --git a/java/jdk13/files/patch-os_linux.cpp b/java/jdk13/files/patch-os_linux.cpp
deleted file mode 100644
index 91bce2047..000000000
--- a/java/jdk13/files/patch-os_linux.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/src/os/linux/vm/os_linux.cpp.orig	Tue Jan 20 10:49:50 2004
-+++ ../../hotspot1.3.1/src/os/linux/vm/os_linux.cpp	Tue Jan 20 10:50:14 2004
-@@ -319,7 +319,7 @@
- #define SUNRSASIGN_JAR "/lib/sunrsasign.jar"
- #define CLASSES_DIR    "/classes"
- #define EXTENSIONS_DIR "/lib/ext"
--#define DEFAULT_LD_LIBRARY_PATH "/usr/lib" /* See ld.so.1(1) */
-+#define DEFAULT_LD_LIBRARY_PATH "/usr/lib:%%LOCALBASE%%/lib" /* See ld.so.1(1) */
- 
-   char *v; /* tmp var */
-   {
diff --git a/java/jdk13/files/patch-os_linux.hpp b/java/jdk13/files/patch-os_linux.hpp
deleted file mode 100644
index f21e6129b..000000000
--- a/java/jdk13/files/patch-os_linux.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/src/os/linux/vm/os_linux.hpp	5 Jun 2002 05:27:47 -0000	1.4
-+++ ../../hotspot1.3.1/src/os/linux/vm/os_linux.hpp	22 Nov 2004 17:19:42 -0000
-@@ -186,7 +186,7 @@
-     bool trylock() {
-       verify();
-       int status = os::Solaris::mutex_trylock(_mutex);
--      if (status == EBUSY)
-+      if (status == EBUSY || status == EDEADLK)
- 	return false;
-       assert(status == 0, "mutex_lock");
-       return true;
-@@ -348,7 +348,7 @@
-     bool trylock() {
-       verify();
-       int status = os::Solaris::mutex_trylock(_mutex);
--      if (status == EBUSY)
-+      if (status == EBUSY || status == EDEADLK)
- 	return false;
-       assert(status == 0, "mutex_trylock");
-       return true;
diff --git a/java/jdk13/files/patch-scavenge.hpp b/java/jdk13/files/patch-scavenge.hpp
deleted file mode 100644
index 406384ae7..000000000
--- a/java/jdk13/files/patch-scavenge.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/src/share/vm/memory/scavenge.hpp	11 Jul 2001 21:33:24 -0000	1.1.1.1
-+++ ../../hotspot1.3.1/src/share/vm/memory/scavenge.hpp	22 Nov 2004 17:19:42 -0000
-@@ -91,6 +91,9 @@
-   // fill the new generation large dummy objects
-   static void fill_newgen();
- 
-+  // Scavenge entry point called from VM operation
-+  static void invoke_at_safepoint(int size_to_be_allocated, bool deferred, bool& notify_ref_lock);
-+
-  private:
-   // Scavenge functions and java/lang/ref handling
-   static void scavenge_oop(oop* p);
-@@ -121,9 +124,6 @@
- 
-   static void compute_scavenge_functions();
-  
--  // Scavenge entry point called from VM operation
--  static void invoke_at_safepoint(int size_to_be_allocated, bool deferred, bool& notify_ref_lock);
--
-   // Cheney scan
-   static void evacuate_followers();
- 
diff --git a/java/jdk13/files/patch-shared.hpp b/java/jdk13/files/patch-shared.hpp
deleted file mode 100644
index d7211f301..000000000
--- a/java/jdk13/files/patch-shared.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/src/share/vm/interpreter/shared.hpp	11 Jul 2001 21:33:22 -0000	1.1.1.1
-+++ ../../hotspot1.3.1/src/share/vm/interpreter/shared.hpp	22 Nov 2004 17:19:42 -0000
-@@ -35,15 +35,13 @@
- // to control the C++ namespace.
- class OptoReg VALUE_OBJ_CLASS_SPEC { 
-  public:
--  enum Name {
--    // Chunk 0
-+  typedef int Name;
- #ifdef COMPILER2
--    Physical = AdlcVMDeps::Physical, // Start of physical regs 
-+  static const Name Physical = AdlcVMDeps::Physical; // Start of physical regs
- #endif
--    // A few oddballs at the edge of the world
--    Special = -2,		// All special (not allocated) values
--    Bad = -1			// Not a register
--  };
-+  // A few oddballs at the edge of the world
-+  static const Name Special = -2;	// All special (not allocated) values
-+  static const Name Bad = -1;		// Not a register
- 
-   // Increment a register number.  As in:
-   //    "for ( OptoReg::Name i; i=Control; i = add(i,1) ) ..."
-@@ -64,7 +62,7 @@
- // when we do not yet know how big the frame will be.
- class VMReg VALUE_OBJ_CLASS_SPEC { 
- public:
--  enum Name { };
-+  typedef int Name;
- };
- 
- 
diff --git a/java/jdk13/files/patch-t2kScalerContext.cpp b/java/jdk13/files/patch-t2kScalerContext.cpp
deleted file mode 100644
index 53034bc3b..000000000
--- a/java/jdk13/files/patch-t2kScalerContext.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- ../src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp	12 Jul 2001 21:54:30 -0000	1.2
-+++ ../src/share/native/sun/awt/font/fontmanager/fontobjects/t2kScalerContext.cpp	10 Aug 2004 14:29:24 -0000
-@@ -784,7 +784,7 @@
- CMAPMapper::CharsToGlyphs(
-         int count, const Unicode unicodes[], UInt32 glyphs[]) const
- {
--    ConvertUnicodeToGlyphs(*font, (unsigned char *)cmap, count, unicodes, glyphs);
-+    ConvertUnicodeToGlyphs(*font, (byte*&)cmap, count, unicodes, glyphs);
- }
- 
- //////////////////////////////////////////////////////////////////////////////
diff --git a/java/jdk13/files/patch-vm.make b/java/jdk13/files/patch-vm.make
deleted file mode 100644
index 79a99183f..000000000
--- a/java/jdk13/files/patch-vm.make
+++ /dev/null
@@ -1,35 +0,0 @@
-$FreeBSD$
-
---- ../../hotspot1.3.1/build/linux/makefiles/vm.make	23 Jul 2004 18:17:54 -0000	1.7
-+++ ../../hotspot1.3.1/build/linux/makefiles/vm.make	22 Nov 2004 17:19:42 -0000
-@@ -62,7 +62,7 @@
- BUILD_VERSION = -DHOTSPOT_BUILD_VERSION="\"$(HOTSPOT_BUILD_VERSION)\""
- BUILD_VERSION$(HOTSPOT_BUILD_VERSION) = 
- 
--CPPFLAGS = ${SYSDEFS} ${INCLUDES} ${BUILD_VERSION}
-+CXXFLAGS += ${SYSDEFS} ${INCLUDES} ${BUILD_VERSION}
- 
- # Suppress warnings (for now)
- CFLAGS += -w
-@@ -70,9 +70,9 @@
- # do not include shared lib path in a.outs
- #AOUT_FLAGS += -norunpath
- 
--COMPILE   = ${CPP} ${CPPFLAGS} ${CFLAGS}
--LINK_LIB  = ${CPP} -shared -mimpure-text
--LINK      = ${CPP} ${AOUT_FLAGS}
-+COMPILE   = ${CXX} ${CXXFLAGS} ${CFLAGS}
-+LINK_LIB  = ${CXX} -shared -mimpure-text
-+LINK      = ${CXX} ${AOUT_FLAGS}
- 
- 
- COMPILE.s = ${COMPILE} -S
-@@ -157,7 +157,7 @@
- LAUNCHER = $(GAMMADIR)/src/os/$(Platform_os_family)/launcher
- LAUNCHERFLAGS = -I$(LAUNCHER) -I$(GAMMADIR)/src/share/vm/prims
- launcher.o: launcher.c $(LAUNCHER)/java.c $(LAUNCHER)/java_md.c
--	$(CC) -g -c -o $@ launcher.c $(LAUNCHERFLAGS) $(CPPFLAGS)
-+	$(CC) -g -c -o $@ launcher.c $(LAUNCHERFLAGS) $(CXXFLAGS)
- 
- # Figure out how to turn this off:
- #LAUNCHERFLAGS += -DOLDJAVA