Update to patchset 7.

svn path=/head/; revision=63554
2025-07-18 17:59:20 -04:00 · 2002-07-25 18:31:26 +00:00 · 2002-07-25 18:31:26 +00:00 · 833af3b828 · 2021-03-31 03:12:20 +00:00
commit 833af3b828
parent c01d06b8d1
68 changed files with 8 additions and 2216 deletions
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@ -7,7 +7,6 @@

 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	4
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@ -36,7 +35,7 @@ RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 WRKSRC=		${WRKDIR}/j2sdk1.3.1/make

 JDK_VERSION=	1.3.1
-JDK_PATCHSET_VERSION=	6
+JDK_PATCHSET_VERSION=	7

 .if defined(NATIVE_BOOTSTRAP)
 JDK13DIR?=	${LOCALBASE}/jdk${JDK_VERSION}
--- a/java/jdk13/distinfo
+++ b/java/jdk13/distinfo
@ -1,2 +1,2 @@
 MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57
-MD5 (bsd-jdk131-patches-6.tar.gz) = 9cade10b81d6034fdd2176bef32bdbf9
+MD5 (bsd-jdk131-patches-7.tar.gz) = e119cf9ceb4b6ca38d597c9916600530
--- a/java/jdk13/files/patch-GNUmakefile
+++ b/java/jdk13/files/patch-GNUmakefile
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- ../ext/plugin/build/solaris/GNUmakefile	2002/03/13 13:35:23	1.1
-+++ ../ext/plugin/build/solaris/GNUmakefile	2002/03/13 13:36:33
-@@ -645,7 +645,7 @@
- $(PLUGIN_OJI): $(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
- 	export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
- 	$(GCC) $(GCCPIC) $(GCCLD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) \
-	$(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
-+	$(NAVIG5_OFILES) $(COMMON_OFILES_GNU) -L$(X11_LIB) -lXt
- 
- clean clobber::
- 	/bin/rm -f -r $(TMP_DIR) $(OUTPUT_DIR)/plugin
--- a/java/jdk13/files/patch-HAE_API_BSDOS.c
+++ b/java/jdk13/files/patch-HAE_API_BSDOS.c
@ -1,16 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk13/files/Attic/patch-HAE_API_BSDOS.c,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c	Thu Apr 11 14:58:48 2002
-+++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c	Thu Apr 11 15:14:18 2002
-@@ -58,7 +58,11 @@
- #include <sys/wait.h>
- #include <errno.h>
- #ifdef __FreeBSD__
-+#if __FreeBSD__ > 3
-+#include <sys/soundcard.h>
-+#else
- #include <machine/soundcard.h>
-+#endif
- #endif
- #ifdef __NetBSD__
- #include <soundcard.h>
--- a/java/jdk13/files/patch-HAE_API_BSDOS_Capture.c
+++ b/java/jdk13/files/patch-HAE_API_BSDOS_Capture.c
@ -1,16 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk13/files/Attic/patch-HAE_API_BSDOS_Capture.c,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c	Thu Apr 11 14:58:48 2002
-+++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c	Thu Apr 11 15:15:16 2002
-@@ -45,7 +45,11 @@
- #include <sys/wait.h>
- #include <errno.h>
- #ifdef __FreeBSD__
-+#if __FreeBSD__ > 3
-+#include <sys/soundcard.h>
-+#else
- #include <machine/soundcard.h>
-+#endif
- #endif
- #ifdef __NetBSD__
- #include <soundcard.h>
--- a/java/jdk13/files/patch-common::Release.gmk
+++ b/java/jdk13/files/patch-common::Release.gmk
@ -1,25 +0,0 @@
-Index: Release.gmk
-===================================================================
-RCS file: /data/java/JDK2/javasrc_1_3_scsl/j2sdk1.3.1/make/common/Release.gmk,v
-retrieving revision 1.7
-diff -u -r1.7 common/Release.gmk
--- common/Release.gmk	21 Jan 2002 22:40:08 -0000	1.7
-+++ common/Release.gmk	10 Apr 2002 18:02:30 -0000
-@@ -521,10 +521,17 @@
- 	@# src.jar
- 	@#
- 	$(MKDIR) -p $(JDK_IMAGE_DIR)/src
-+ifeq ($(PLATFORM), bsd) 
-+	# Avoid the "argument list too long" problem.
-+	($(CD) $(SHARE_SRC)/classes; \
-+	    $(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o  -name '*.java' -print \
-+	    | $(CPIO) -pd $(JDK_IMAGE_DIR)/src)
-+else
- 	($(CD) $(SHARE_SRC)/classes; $(TAR) cf - \
- 	    `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o \
- 	    -name '*.java' -print`)| \
- 	    ($(CD) $(JDK_IMAGE_DIR)/src; $(TAR) xvf -)
-+endif
- 	@# We do not want to ship this, it isn't part of the build yet.
- 	$(RM) -r $(JDK_IMAGE_DIR)/src/javax/swing/pending
- 	$(MKDIR) -p $(JDK_IMAGE_DIR)/src/launcher
--- a/java/jdk13/files/patch-font.properties.zh_TW.bsd
+++ b/java/jdk13/files/patch-font.properties.zh_TW.bsd
@ -1,240 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk13/files/Attic/patch-font.properties.zh_TW.bsd,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../src/solaris/classes/sun/awt/motif/font.properties.zh_TW.bsd	1 Jan 1970 00:00:00 -0000
-+++ ../src/solaris/classes/sun/awt/motif/font.properties.zh_TW.bsd	13 Apr 2002 05:09:42 -0000
-@@ -0,0 +1,235 @@
-+#
-+# @(#)font.properties.zh	1.0 00/06/20
-+#
-+# Copyright 2000 by Sun Microsystems, Inc.,
-+# 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
-+# All rights reserved.
-+#
-+# This software is the confidential and proprietary information
-+# of Sun Microsystems, Inc. ("Confidential Information").  You
-+# shall not disclose such Confidential Information and shall use
-+# it only in accordance with the terms of the license agreement
-+# you entered into with Sun.
-+#
-+
-+#
-+# AWT Font default Properties for Simplified Chinese TurboLinux 6.0 and higher
-+#
-+
-+# Serif font definition
-+#
-+serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-+serif.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-+serif.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
-+serif.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
-+serif.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# SansSerif font definition
-+#
-+sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Monospaced font definition
-+#
-+monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Dialog font definition
-+#
-+dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# DialogInput font definition
-+#
-+dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+
-+# Default font definition
-+#
-+default.char=274f
-+
-+# name aliases
-+#
-+# alias.timesroman=serif
-+# alias.helvetica=sansserif
-+# alias.courier=monospaced
-+
-+# for backward compatibility
-+#
-+#zapfdingbats.0=-monotype-monotype sorts-regular-r---*-%d-*-*-p-*-adobe-dingbats
-+
-+# Static FontCharset info.
-+#
-+# This information is used by the font which is not indexed by Unicode.
-+# Such fonts can use their own subclass of FontCharset.
-+#
-+# This information can be overriden by describing more specific style.
-+# For example
-+#
-+#  fontcharset.serif.plain.3=SpecialSymbols
-+#  means serif.plain.3 font's index can be retrieved with the convert() method
-+#  of instance of SpecialSymbols and what kind of characters serif.plain.3 font
-+#  has can be judged with the isCovered() method of instance of SpecialSymbols.
-+#
-+fontcharset.serif.0=sun.io.CharToByteISO8859_1
-+fontcharset.serif.1=sun.io.CharToByteMS950
-+
-+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
-+fontcharset.sansserif.1=sun.io.CharToByteMS950
-+
-+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
-+fontcharset.monospaced.1=sun.io.CharToByteMS950
-+
-+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
-+fontcharset.dialog.1=sun.io.CharToByteMS950
-+
-+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
-+fontcharset.dialoginput.1=sun.io.CharToByteMS950
-+
-+# exclusion info.
-+#
-+# This information describe exclusion ranges for each fonts.
-+#
-+# 'exclusion.serif.plain.0' overrides 'exclusion.serif.0', and
-+# 'exclusion.serif.0' overrides exclusion.0, and so on.
-+#
-+
-+# XFontSet string
-+# X11 only properties
-+#
-+fontset.serif.plain=\
-+-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.serif.italic=\
-+-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.serif.bold=\
-+-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.serif.bolditalic=\
-+-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# SansSerif font definition 
-+#
-+
-+fontset.sansserif.plain=\
-+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.sansserif.italic=\
-+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.sansserif.bold=\
-+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.sansserif.bolditalic=\
-+-b&h-lucida-bold-i-normal-snas-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Monospaced font definition 
-+#
-+fontset.monospaced.plain=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.monospaced.italic=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.monospaced.bold=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-,1\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.monospaced.bolditalic=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Dialog font definition 
-+#
-+fontset.dialog.italic=\
-+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialog.bold=\
-+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialog.bolditalic=\
-+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialog.plain=\
-+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# DialogInput font definition 
-+#
-+fontset.dialoginput.italic=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialoginput.bold=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialoginput.bolditalic=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialoginput.plain=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+#
-+fontset.default=\
-+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
--- a/java/jdk13/files/patch-ja::sunw_java_plugin.po
+++ b/java/jdk13/files/patch-ja::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk13/files/Attic/patch-ja::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/ja/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/ja/sunw_java_plugin.po	Sat Apr 27 01:05:41 2002
-@@ -21,20 +21,12 @@
- msgstr "Plugin: Netscape プロキシ設定の読み込みに失敗しました。URL \n"
- msgid  "Plugin: couldn't read directory"
- msgstr "Plugin: ディレクトリを読み取れません。"
-msgid  "plugin: java process exited with status"
-msgstr "plugin: java プロセスが終了状態付きで終了しました。"
- msgid  "plugin: java process died due to signal"
- msgstr "plugin: java プロセスがシグナルのために終了しました。"
- msgid  "  a core file was generated"
- msgstr "  コアファイルが生成されました。"
-msgid  "Plugin: trouble with work request from child"
-msgstr "Plugin: 子からの処理要求に失敗しました。"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "Plugin: 現ホストの IP アドレスが見つかりません。"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "Plugin: Netscape プロキシ設定の読み込みに失敗しました。URL \n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "Plugin: ディレクトリ plugins/../java が見つかりません。"
- msgid  "Plugin: unexpected work request from child"
- msgstr "Plugin: 子からの予期しない処理要求です。"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk13/files/patch-ko.UTF-8::sunw_java_plugin.po
+++ b/java/jdk13/files/patch-ko.UTF-8::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk13/files/Attic/patch-ko.UTF-8::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/ko.UTF-8/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/ko.UTF-8/sunw_java_plugin.po	Sat Apr 27 01:06:46 2002
-@@ -21,20 +21,12 @@
- msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "플러그인: 디렉토리를 읽을 수 없습니다."
-msgid  "plugin: java process exited with status"
-msgstr "플러그인: 현재 상태로 자바 프로세스를 종료합니다."
- msgid  "plugin: java process died due to signal"
- msgstr "플러그인: 신호로 인해 자바 프로세스가 중단되었습니다."
- msgid  "  a core file was generated"
- msgstr "  코어 파일이 생성되었습니다."
-msgid  "Plugin: trouble with work request from child"
-msgstr "플러그인: 하위로부터의 작업 요청에 문제가 발생했습니다."
- msgid  "Plugin: can't find IP address for current host"
- msgstr "플러그인: 현재 호스트의 IP 주소를 찾을 수 없습니다."
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "플러그인: plugins/../java 디렉토리를 찾을 수 없습니다."
- msgid  "Plugin: unexpected work request from child"
- msgstr "플러그인: 하위로부터의 예상치 못한 작업 요청입니다."
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk13/files/patch-ko::sunw_java_plugin.po
+++ b/java/jdk13/files/patch-ko::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk13/files/Attic/patch-ko::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/ko/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/ko/sunw_java_plugin.po	Sat Apr 27 01:06:37 2002
-@@ -21,20 +21,12 @@
- msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "플러그인: 디렉토리를 읽을 수 없습니다."
-msgid  "plugin: java process exited with status"
-msgstr "플러그인: 현재 상태로 자바 프로세스를 종료합니다."
- msgid  "plugin: java process died due to signal"
- msgstr "플러그인: 신호로 인해 자바 프로세스가 중단되었습니다."
- msgid  "  a core file was generated"
- msgstr "  코어 파일이 생성되었습니다."
-msgid  "Plugin: trouble with work request from child"
-msgstr "플러그인: 하위로부터의 작업 요청에 문제가 발생했습니다."
- msgid  "Plugin: can't find IP address for current host"
- msgstr "플러그인: 현재 호스트의 IP 주소를 찾을 수 없습니다."
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "플러그인: plugins/../java 디렉토리를 찾을 수 없습니다."
- msgid  "Plugin: unexpected work request from child"
- msgstr "플러그인: 하위로부터의 예상치 못한 작업 요청입니다."
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk13/files/patch-native.c
+++ b/java/jdk13/files/patch-native.c
@ -1,31 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk13/files/Attic/patch-native.c,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	22 Jan 2002 19:56:49 -0000	1.5
-+++ ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	13 Apr 2002 05:11:05 -0000
-@@ -590,7 +590,7 @@
-     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
-     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "readHttpsURL",
- 			"(Ljava/lang/Object;[BII)I");
-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this, buf, offset, len);
-+    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this, buf, offset, len);
- }
- 
- /*
-@@ -605,7 +605,7 @@
-     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
-     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "bytesAvailable",
- 			"(Ljava/lang/Object;)I");
-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this);
-+    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this);
- }
- 
- /*
-@@ -623,7 +623,7 @@
- 			"(Ljava/lang/Object;)V");
-     jfieldID nativeConnID = (*env)->GetFieldID(env, isClass, "nativeConnection", "J");
- 
-    (*env)->CallStaticObjectMethod(env, clz, meth, is);
-+    (*env)->CallStaticVoidMethod(env, clz, meth, is);
- 
-     /* 
-        It is extremely important to unset the nativeConnection field in 
--- a/java/jdk13/files/patch-sun::awt::Makefile
+++ b/java/jdk13/files/patch-sun::awt::Makefile
@ -1,14 +0,0 @@
-$FreeBSD$
-
--- sun/awt/Makefile	18 Jan 2002 04:35:42 -0000	1.6
-+++ sun/awt/Makefile	13 Apr 2002 05:10:12 -0000
-@@ -406,7 +406,8 @@
- 	font.properties			\
- 	font.properties.ja		\
- 	psfont.properties.ja		\
-	font.properties.zh		
-+	font.properties.zh		\
-+	font.properties.zh_TW
- 
- FONTPROPS_SRC_SUFFIX = .$(PLATFORM)
- 
--- a/java/jdk13/files/patch-utils.c
+++ b/java/jdk13/files/patch-utils.c
@ -1,20 +0,0 @@
-$FreeBSD$
-
--- ../ext/plugin/oji-plugin/src/motif/common/utils.c	25 Aug 2001 17:48:42 -0000	1.2
-+++ ../ext/plugin/oji-plugin/src/motif/common/utils.c	10 Jun 2002 20:27:38 -0000
-@@ -10,6 +10,7 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #ifndef SVR4
-+#include <sys/param.h>
- #include <sys/uio.h>
- #endif
- #include <fcntl.h>
-@@ -17,6 +18,7 @@
- #include <locale.h>
- #include <errno.h>
- #include <strings.h>
-+#include <string.h>
- #include <dlfcn.h>
- #include "plugin_defs.h"
- #include "pluginversion.h"
--- a/java/jdk13/files/patch-zb.GBK::sunw_java_plugin.po
+++ b/java/jdk13/files/patch-zb.GBK::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk13/files/Attic/patch-zb.GBK::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh.GBK/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh.GBK/sunw_java_plugin.po	Sat Apr 27 01:07:14 2002
-@@ -21,20 +21,12 @@
- msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "插件：无法读取目录"
-msgid  "plugin: java process exited with status"
-msgstr "插件：java 已带状态退出"
- msgid  "plugin: java process died due to signal"
- msgstr "插件：java 进程已因信号而死"
- msgid  "  a core file was generated"
- msgstr " 生成了一个内核文件"
-msgid  "Plugin: trouble with work request from child"
-msgstr "插件：处理来自子类的工作请求有问题"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "插件：找不到当前主机的 IP 地址"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "插件：找不到 plugins/../java 目录"
- msgid  "Plugin: unexpected work request from child"
- msgstr "插件：来自子类的意外的工作请求"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk13/files/patch-zh::sunw_java_plugin.po
+++ b/java/jdk13/files/patch-zh::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk13/files/Attic/patch-zh::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh/sunw_java_plugin.po	Sat Apr 27 01:06:57 2002
-@@ -21,20 +21,12 @@
- msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "插件：无法读取目录"
-msgid  "plugin: java process exited with status"
-msgstr "插件：java 已带状态退出"
- msgid  "plugin: java process died due to signal"
- msgstr "插件：java 进程已因信号而死"
- msgid  "  a core file was generated"
- msgstr " 生成了一个内核文件"
-msgid  "Plugin: trouble with work request from child"
-msgstr "插件：处理来自子类的工作请求有问题"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "插件：找不到当前主机的 IP 地址"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "插件：找不到 plugins/../java 目录"
- msgid  "Plugin: unexpected work request from child"
- msgstr "插件：来自子类的意外的工作请求"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk13/files/patch-zh_TW.BIG5::sunw_java_plugin.po
+++ b/java/jdk13/files/patch-zh_TW.BIG5::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk13/files/Attic/patch-zh_TW.BIG5::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po	Sat Apr 27 01:07:46 2002
-@@ -21,20 +21,12 @@
- msgstr "Plugin: 讀取 Netscape 代理設定 URL 時發生問題\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "Plugin: 無法讀取目錄"
-msgid  "plugin: java process exited with status"
-msgstr "plugin: java 程序隨狀態退出"
- msgid  "plugin: java process died due to signal"
- msgstr "plugin: java 程序已因訊號而毀"
- msgid  "  a core file was generated"
- msgstr "  已產生核心檔案"
-msgid  "Plugin: trouble with work request from child"
-msgstr "Plugin: 子類別所要求的工作發生問題"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "Plugin: 找不到目前主機的 IP 位址"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "Plugin: 讀取 Netscape 代理配置 URL 時發生問題\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "Plugin: 找不到 plugins/../java 目錄"
- msgid  "Plugin: unexpected work request from child"
- msgstr "Plugin: 子類別要求了非預期的工作"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk13/files/patch-zh_TW::sunw_java_plugin.po
+++ b/java/jdk13/files/patch-zh_TW::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk13/files/Attic/patch-zh_TW::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po	Sat Apr 27 01:07:31 2002
-@@ -21,20 +21,12 @@
- msgstr "Plugin: ûôÌ½ Netscape ÅîÜ¡ÝÃÌù URL ÕëàõÆíÙÂ÷î\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "Plugin: àÒÎÎûôÌ½Æøòç"
-msgid  "plugin: java process exited with status"
-msgstr "plugin: java á£Ê©òñÎíèèØÍÅø"
- msgid  "plugin: java process died due to signal"
- msgstr "plugin: java á£Ê©ÄØÇÞØ¹æÀÈÔäÚ"
- msgid  "  a core file was generated"
- msgstr "  ÄØÜ¨ÆíÕøÅÀóòÕù"
-msgid  "Plugin: trouble with work request from child"
-msgstr "Plugin: ÄÍùËÉ±ÍÔÓÑÊåÎûÄÖÉ¢àõÆíÙÂ÷î"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "Plugin: ÊÆÄâÌ¯ÆøÐ©Åäñ¢Îû IP ÈíÉß"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "Plugin: ûôÌ½ Netscape ÅîÜ¡ØÙåô URL ÕëàõÆíÙÂ÷î\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "Plugin: ÊÆÄâÌ¯ plugins/../java Æøòç"
- msgid  "Plugin: unexpected work request from child"
- msgstr "Plugin: ÄÍùËÉ±ÓÑÊåÄ§ÏæçßßæÎûÄÖÉ¢"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk14/Makefile
+++ b/java/jdk14/Makefile
@ -7,7 +7,6 @@

 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	4
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@ -36,7 +35,7 @@ RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 WRKSRC=		${WRKDIR}/j2sdk1.3.1/make

 JDK_VERSION=	1.3.1
-JDK_PATCHSET_VERSION=	6
+JDK_PATCHSET_VERSION=	7

 .if defined(NATIVE_BOOTSTRAP)
 JDK13DIR?=	${LOCALBASE}/jdk${JDK_VERSION}
--- a/java/jdk14/distinfo
+++ b/java/jdk14/distinfo
@ -1,2 +1,2 @@
 MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57
-MD5 (bsd-jdk131-patches-6.tar.gz) = 9cade10b81d6034fdd2176bef32bdbf9
+MD5 (bsd-jdk131-patches-7.tar.gz) = e119cf9ceb4b6ca38d597c9916600530
--- a/java/jdk14/files/patch-GNUmakefile
+++ b/java/jdk14/files/patch-GNUmakefile
@ -1,14 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/java/jdk14/files/Attic/patch-GNUmakefile,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/build/solaris/GNUmakefile	2002/03/13 13:35:23	1.1
-+++ ../ext/plugin/build/solaris/GNUmakefile	2002/03/13 13:36:33
-@@ -645,7 +645,7 @@
- $(PLUGIN_OJI): $(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
- 	export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
- 	$(GCC) $(GCCPIC) $(GCCLD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) \
-	$(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
-+	$(NAVIG5_OFILES) $(COMMON_OFILES_GNU) -L$(X11_LIB) -lXt
- 
- clean clobber::
- 	/bin/rm -f -r $(TMP_DIR) $(OUTPUT_DIR)/plugin
--- a/java/jdk14/files/patch-HAE_API_BSDOS.c
+++ b/java/jdk14/files/patch-HAE_API_BSDOS.c
@ -1,16 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk14/files/Attic/patch-HAE_API_BSDOS.c,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c	Thu Apr 11 14:58:48 2002
-+++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c	Thu Apr 11 15:14:18 2002
-@@ -58,7 +58,11 @@
- #include <sys/wait.h>
- #include <errno.h>
- #ifdef __FreeBSD__
-+#if __FreeBSD__ > 3
-+#include <sys/soundcard.h>
-+#else
- #include <machine/soundcard.h>
-+#endif
- #endif
- #ifdef __NetBSD__
- #include <soundcard.h>
--- a/java/jdk14/files/patch-HAE_API_BSDOS_Capture.c
+++ b/java/jdk14/files/patch-HAE_API_BSDOS_Capture.c
@ -1,16 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk14/files/Attic/patch-HAE_API_BSDOS_Capture.c,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c	Thu Apr 11 14:58:48 2002
-+++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c	Thu Apr 11 15:15:16 2002
-@@ -45,7 +45,11 @@
- #include <sys/wait.h>
- #include <errno.h>
- #ifdef __FreeBSD__
-+#if __FreeBSD__ > 3
-+#include <sys/soundcard.h>
-+#else
- #include <machine/soundcard.h>
-+#endif
- #endif
- #ifdef __NetBSD__
- #include <soundcard.h>
--- a/java/jdk14/files/patch-common::Release.gmk
+++ b/java/jdk14/files/patch-common::Release.gmk
@ -1,25 +0,0 @@
-Index: Release.gmk
-===================================================================
-RCS file: /data/java/JDK2/javasrc_1_3_scsl/j2sdk1.3.1/make/common/Release.gmk,v
-retrieving revision 1.7
-diff -u -r1.7 common/Release.gmk
--- common/Release.gmk	21 Jan 2002 22:40:08 -0000	1.7
-+++ common/Release.gmk	10 Apr 2002 18:02:30 -0000
-@@ -521,10 +521,17 @@
- 	@# src.jar
- 	@#
- 	$(MKDIR) -p $(JDK_IMAGE_DIR)/src
-+ifeq ($(PLATFORM), bsd) 
-+	# Avoid the "argument list too long" problem.
-+	($(CD) $(SHARE_SRC)/classes; \
-+	    $(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o  -name '*.java' -print \
-+	    | $(CPIO) -pd $(JDK_IMAGE_DIR)/src)
-+else
- 	($(CD) $(SHARE_SRC)/classes; $(TAR) cf - \
- 	    `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o \
- 	    -name '*.java' -print`)| \
- 	    ($(CD) $(JDK_IMAGE_DIR)/src; $(TAR) xvf -)
-+endif
- 	@# We do not want to ship this, it isn't part of the build yet.
- 	$(RM) -r $(JDK_IMAGE_DIR)/src/javax/swing/pending
- 	$(MKDIR) -p $(JDK_IMAGE_DIR)/src/launcher
--- a/java/jdk14/files/patch-font.properties.zh_TW.bsd
+++ b/java/jdk14/files/patch-font.properties.zh_TW.bsd
@ -1,240 +0,0 @@
-$FreeBSD$
-
--- ../src/solaris/classes/sun/awt/motif/font.properties.zh_TW.bsd	1 Jan 1970 00:00:00 -0000
-+++ ../src/solaris/classes/sun/awt/motif/font.properties.zh_TW.bsd	13 Apr 2002 05:09:42 -0000
-@@ -0,0 +1,235 @@
-+#
-+# @(#)font.properties.zh	1.0 00/06/20
-+#
-+# Copyright 2000 by Sun Microsystems, Inc.,
-+# 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
-+# All rights reserved.
-+#
-+# This software is the confidential and proprietary information
-+# of Sun Microsystems, Inc. ("Confidential Information").  You
-+# shall not disclose such Confidential Information and shall use
-+# it only in accordance with the terms of the license agreement
-+# you entered into with Sun.
-+#
-+
-+#
-+# AWT Font default Properties for Simplified Chinese TurboLinux 6.0 and higher
-+#
-+
-+# Serif font definition
-+#
-+serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-+serif.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-+serif.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
-+serif.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
-+serif.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# SansSerif font definition
-+#
-+sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Monospaced font definition
-+#
-+monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Dialog font definition
-+#
-+dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# DialogInput font definition
-+#
-+dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+
-+# Default font definition
-+#
-+default.char=274f
-+
-+# name aliases
-+#
-+# alias.timesroman=serif
-+# alias.helvetica=sansserif
-+# alias.courier=monospaced
-+
-+# for backward compatibility
-+#
-+#zapfdingbats.0=-monotype-monotype sorts-regular-r---*-%d-*-*-p-*-adobe-dingbats
-+
-+# Static FontCharset info.
-+#
-+# This information is used by the font which is not indexed by Unicode.
-+# Such fonts can use their own subclass of FontCharset.
-+#
-+# This information can be overriden by describing more specific style.
-+# For example
-+#
-+#  fontcharset.serif.plain.3=SpecialSymbols
-+#  means serif.plain.3 font's index can be retrieved with the convert() method
-+#  of instance of SpecialSymbols and what kind of characters serif.plain.3 font
-+#  has can be judged with the isCovered() method of instance of SpecialSymbols.
-+#
-+fontcharset.serif.0=sun.io.CharToByteISO8859_1
-+fontcharset.serif.1=sun.io.CharToByteMS950
-+
-+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
-+fontcharset.sansserif.1=sun.io.CharToByteMS950
-+
-+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
-+fontcharset.monospaced.1=sun.io.CharToByteMS950
-+
-+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
-+fontcharset.dialog.1=sun.io.CharToByteMS950
-+
-+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
-+fontcharset.dialoginput.1=sun.io.CharToByteMS950
-+
-+# exclusion info.
-+#
-+# This information describe exclusion ranges for each fonts.
-+#
-+# 'exclusion.serif.plain.0' overrides 'exclusion.serif.0', and
-+# 'exclusion.serif.0' overrides exclusion.0, and so on.
-+#
-+
-+# XFontSet string
-+# X11 only properties
-+#
-+fontset.serif.plain=\
-+-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.serif.italic=\
-+-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.serif.bold=\
-+-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.serif.bolditalic=\
-+-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# SansSerif font definition 
-+#
-+
-+fontset.sansserif.plain=\
-+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.sansserif.italic=\
-+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.sansserif.bold=\
-+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.sansserif.bolditalic=\
-+-b&h-lucida-bold-i-normal-snas-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Monospaced font definition 
-+#
-+fontset.monospaced.plain=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.monospaced.italic=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.monospaced.bold=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-,1\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.monospaced.bolditalic=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Dialog font definition 
-+#
-+fontset.dialog.italic=\
-+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialog.bold=\
-+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialog.bolditalic=\
-+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialog.plain=\
-+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# DialogInput font definition 
-+#
-+fontset.dialoginput.italic=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialoginput.bold=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialoginput.bolditalic=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialoginput.plain=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+#
-+fontset.default=\
-+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
--- a/java/jdk14/files/patch-ja::sunw_java_plugin.po
+++ b/java/jdk14/files/patch-ja::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk14/files/Attic/patch-ja::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/ja/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/ja/sunw_java_plugin.po	Sat Apr 27 01:05:41 2002
-@@ -21,20 +21,12 @@
- msgstr "Plugin: Netscape プロキシ設定の読み込みに失敗しました。URL \n"
- msgid  "Plugin: couldn't read directory"
- msgstr "Plugin: ディレクトリを読み取れません。"
-msgid  "plugin: java process exited with status"
-msgstr "plugin: java プロセスが終了状態付きで終了しました。"
- msgid  "plugin: java process died due to signal"
- msgstr "plugin: java プロセスがシグナルのために終了しました。"
- msgid  "  a core file was generated"
- msgstr "  コアファイルが生成されました。"
-msgid  "Plugin: trouble with work request from child"
-msgstr "Plugin: 子からの処理要求に失敗しました。"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "Plugin: 現ホストの IP アドレスが見つかりません。"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "Plugin: Netscape プロキシ設定の読み込みに失敗しました。URL \n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "Plugin: ディレクトリ plugins/../java が見つかりません。"
- msgid  "Plugin: unexpected work request from child"
- msgstr "Plugin: 子からの予期しない処理要求です。"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk14/files/patch-ko.UTF-8::sunw_java_plugin.po
+++ b/java/jdk14/files/patch-ko.UTF-8::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk14/files/Attic/patch-ko.UTF-8::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/ko.UTF-8/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/ko.UTF-8/sunw_java_plugin.po	Sat Apr 27 01:06:46 2002
-@@ -21,20 +21,12 @@
- msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "플러그인: 디렉토리를 읽을 수 없습니다."
-msgid  "plugin: java process exited with status"
-msgstr "플러그인: 현재 상태로 자바 프로세스를 종료합니다."
- msgid  "plugin: java process died due to signal"
- msgstr "플러그인: 신호로 인해 자바 프로세스가 중단되었습니다."
- msgid  "  a core file was generated"
- msgstr "  코어 파일이 생성되었습니다."
-msgid  "Plugin: trouble with work request from child"
-msgstr "플러그인: 하위로부터의 작업 요청에 문제가 발생했습니다."
- msgid  "Plugin: can't find IP address for current host"
- msgstr "플러그인: 현재 호스트의 IP 주소를 찾을 수 없습니다."
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "플러그인: plugins/../java 디렉토리를 찾을 수 없습니다."
- msgid  "Plugin: unexpected work request from child"
- msgstr "플러그인: 하위로부터의 예상치 못한 작업 요청입니다."
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk14/files/patch-ko::sunw_java_plugin.po
+++ b/java/jdk14/files/patch-ko::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk14/files/Attic/patch-ko::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/ko/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/ko/sunw_java_plugin.po	Sat Apr 27 01:06:37 2002
-@@ -21,20 +21,12 @@
- msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "플러그인: 디렉토리를 읽을 수 없습니다."
-msgid  "plugin: java process exited with status"
-msgstr "플러그인: 현재 상태로 자바 프로세스를 종료합니다."
- msgid  "plugin: java process died due to signal"
- msgstr "플러그인: 신호로 인해 자바 프로세스가 중단되었습니다."
- msgid  "  a core file was generated"
- msgstr "  코어 파일이 생성되었습니다."
-msgid  "Plugin: trouble with work request from child"
-msgstr "플러그인: 하위로부터의 작업 요청에 문제가 발생했습니다."
- msgid  "Plugin: can't find IP address for current host"
- msgstr "플러그인: 현재 호스트의 IP 주소를 찾을 수 없습니다."
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "플러그인: plugins/../java 디렉토리를 찾을 수 없습니다."
- msgid  "Plugin: unexpected work request from child"
- msgstr "플러그인: 하위로부터의 예상치 못한 작업 요청입니다."
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk14/files/patch-native.c
+++ b/java/jdk14/files/patch-native.c
@ -1,31 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk14/files/Attic/patch-native.c,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	22 Jan 2002 19:56:49 -0000	1.5
-+++ ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	13 Apr 2002 05:11:05 -0000
-@@ -590,7 +590,7 @@
-     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
-     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "readHttpsURL",
- 			"(Ljava/lang/Object;[BII)I");
-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this, buf, offset, len);
-+    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this, buf, offset, len);
- }
- 
- /*
-@@ -605,7 +605,7 @@
-     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
-     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "bytesAvailable",
- 			"(Ljava/lang/Object;)I");
-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this);
-+    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this);
- }
- 
- /*
-@@ -623,7 +623,7 @@
- 			"(Ljava/lang/Object;)V");
-     jfieldID nativeConnID = (*env)->GetFieldID(env, isClass, "nativeConnection", "J");
- 
-    (*env)->CallStaticObjectMethod(env, clz, meth, is);
-+    (*env)->CallStaticVoidMethod(env, clz, meth, is);
- 
-     /* 
-        It is extremely important to unset the nativeConnection field in 
--- a/java/jdk14/files/patch-sun::awt::Makefile
+++ b/java/jdk14/files/patch-sun::awt::Makefile
@ -1,14 +0,0 @@
-$FreeBSD$
-
--- sun/awt/Makefile	18 Jan 2002 04:35:42 -0000	1.6
-+++ sun/awt/Makefile	13 Apr 2002 05:10:12 -0000
-@@ -406,7 +406,8 @@
- 	font.properties			\
- 	font.properties.ja		\
- 	psfont.properties.ja		\
-	font.properties.zh		
-+	font.properties.zh		\
-+	font.properties.zh_TW
- 
- FONTPROPS_SRC_SUFFIX = .$(PLATFORM)
- 
--- a/java/jdk14/files/patch-utils.c
+++ b/java/jdk14/files/patch-utils.c
@ -1,20 +0,0 @@
-$FreeBSD$
-
--- ../ext/plugin/oji-plugin/src/motif/common/utils.c	25 Aug 2001 17:48:42 -0000	1.2
-+++ ../ext/plugin/oji-plugin/src/motif/common/utils.c	10 Jun 2002 20:27:38 -0000
-@@ -10,6 +10,7 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #ifndef SVR4
-+#include <sys/param.h>
- #include <sys/uio.h>
- #endif
- #include <fcntl.h>
-@@ -17,6 +18,7 @@
- #include <locale.h>
- #include <errno.h>
- #include <strings.h>
-+#include <string.h>
- #include <dlfcn.h>
- #include "plugin_defs.h"
- #include "pluginversion.h"
--- a/java/jdk14/files/patch-zb.GBK::sunw_java_plugin.po
+++ b/java/jdk14/files/patch-zb.GBK::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk14/files/Attic/patch-zb.GBK::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh.GBK/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh.GBK/sunw_java_plugin.po	Sat Apr 27 01:07:14 2002
-@@ -21,20 +21,12 @@
- msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "插件：无法读取目录"
-msgid  "plugin: java process exited with status"
-msgstr "插件：java 已带状态退出"
- msgid  "plugin: java process died due to signal"
- msgstr "插件：java 进程已因信号而死"
- msgid  "  a core file was generated"
- msgstr " 生成了一个内核文件"
-msgid  "Plugin: trouble with work request from child"
-msgstr "插件：处理来自子类的工作请求有问题"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "插件：找不到当前主机的 IP 地址"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "插件：找不到 plugins/../java 目录"
- msgid  "Plugin: unexpected work request from child"
- msgstr "插件：来自子类的意外的工作请求"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk14/files/patch-zh::sunw_java_plugin.po
+++ b/java/jdk14/files/patch-zh::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk14/files/Attic/patch-zh::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh/sunw_java_plugin.po	Sat Apr 27 01:06:57 2002
-@@ -21,20 +21,12 @@
- msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "插件：无法读取目录"
-msgid  "plugin: java process exited with status"
-msgstr "插件：java 已带状态退出"
- msgid  "plugin: java process died due to signal"
- msgstr "插件：java 进程已因信号而死"
- msgid  "  a core file was generated"
- msgstr " 生成了一个内核文件"
-msgid  "Plugin: trouble with work request from child"
-msgstr "插件：处理来自子类的工作请求有问题"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "插件：找不到当前主机的 IP 地址"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "插件：找不到 plugins/../java 目录"
- msgid  "Plugin: unexpected work request from child"
- msgstr "插件：来自子类的意外的工作请求"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk14/files/patch-zh_TW.BIG5::sunw_java_plugin.po
+++ b/java/jdk14/files/patch-zh_TW.BIG5::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk14/files/Attic/patch-zh_TW.BIG5::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po	Sat Apr 27 01:07:46 2002
-@@ -21,20 +21,12 @@
- msgstr "Plugin: 讀取 Netscape 代理設定 URL 時發生問題\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "Plugin: 無法讀取目錄"
-msgid  "plugin: java process exited with status"
-msgstr "plugin: java 程序隨狀態退出"
- msgid  "plugin: java process died due to signal"
- msgstr "plugin: java 程序已因訊號而毀"
- msgid  "  a core file was generated"
- msgstr "  已產生核心檔案"
-msgid  "Plugin: trouble with work request from child"
-msgstr "Plugin: 子類別所要求的工作發生問題"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "Plugin: 找不到目前主機的 IP 位址"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "Plugin: 讀取 Netscape 代理配置 URL 時發生問題\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "Plugin: 找不到 plugins/../java 目錄"
- msgid  "Plugin: unexpected work request from child"
- msgstr "Plugin: 子類別要求了非預期的工作"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk14/files/patch-zh_TW::sunw_java_plugin.po
+++ b/java/jdk14/files/patch-zh_TW::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk14/files/Attic/patch-zh_TW::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po	Sat Apr 27 01:07:31 2002
-@@ -21,20 +21,12 @@
- msgstr "Plugin: ûôÌ½ Netscape ÅîÜ¡ÝÃÌù URL ÕëàõÆíÙÂ÷î\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "Plugin: àÒÎÎûôÌ½Æøòç"
-msgid  "plugin: java process exited with status"
-msgstr "plugin: java á£Ê©òñÎíèèØÍÅø"
- msgid  "plugin: java process died due to signal"
- msgstr "plugin: java á£Ê©ÄØÇÞØ¹æÀÈÔäÚ"
- msgid  "  a core file was generated"
- msgstr "  ÄØÜ¨ÆíÕøÅÀóòÕù"
-msgid  "Plugin: trouble with work request from child"
-msgstr "Plugin: ÄÍùËÉ±ÍÔÓÑÊåÎûÄÖÉ¢àõÆíÙÂ÷î"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "Plugin: ÊÆÄâÌ¯ÆøÐ©Åäñ¢Îû IP ÈíÉß"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "Plugin: ûôÌ½ Netscape ÅîÜ¡ØÙåô URL ÕëàõÆíÙÂ÷î\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "Plugin: ÊÆÄâÌ¯ plugins/../java Æøòç"
- msgid  "Plugin: unexpected work request from child"
- msgstr "Plugin: ÄÍùËÉ±ÓÑÊåÄ§ÏæçßßæÎûÄÖÉ¢"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@ -7,7 +7,6 @@

 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	4
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@ -36,7 +35,7 @@ RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 WRKSRC=		${WRKDIR}/j2sdk1.3.1/make

 JDK_VERSION=	1.3.1
-JDK_PATCHSET_VERSION=	6
+JDK_PATCHSET_VERSION=	7

 .if defined(NATIVE_BOOTSTRAP)
 JDK13DIR?=	${LOCALBASE}/jdk${JDK_VERSION}
--- a/java/jdk15/distinfo
+++ b/java/jdk15/distinfo
@ -1,2 +1,2 @@
 MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57
-MD5 (bsd-jdk131-patches-6.tar.gz) = 9cade10b81d6034fdd2176bef32bdbf9
+MD5 (bsd-jdk131-patches-7.tar.gz) = e119cf9ceb4b6ca38d597c9916600530
--- a/java/jdk15/files/patch-GNUmakefile
+++ b/java/jdk15/files/patch-GNUmakefile
@ -1,14 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/java/jdk15/files/Attic/patch-GNUmakefile,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/build/solaris/GNUmakefile	2002/03/13 13:35:23	1.1
-+++ ../ext/plugin/build/solaris/GNUmakefile	2002/03/13 13:36:33
-@@ -645,7 +645,7 @@
- $(PLUGIN_OJI): $(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
- 	export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
- 	$(GCC) $(GCCPIC) $(GCCLD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) \
-	$(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
-+	$(NAVIG5_OFILES) $(COMMON_OFILES_GNU) -L$(X11_LIB) -lXt
- 
- clean clobber::
- 	/bin/rm -f -r $(TMP_DIR) $(OUTPUT_DIR)/plugin
--- a/java/jdk15/files/patch-HAE_API_BSDOS.c
+++ b/java/jdk15/files/patch-HAE_API_BSDOS.c
@ -1,16 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk15/files/Attic/patch-HAE_API_BSDOS.c,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c	Thu Apr 11 14:58:48 2002
-+++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c	Thu Apr 11 15:14:18 2002
-@@ -58,7 +58,11 @@
- #include <sys/wait.h>
- #include <errno.h>
- #ifdef __FreeBSD__
-+#if __FreeBSD__ > 3
-+#include <sys/soundcard.h>
-+#else
- #include <machine/soundcard.h>
-+#endif
- #endif
- #ifdef __NetBSD__
- #include <soundcard.h>
--- a/java/jdk15/files/patch-HAE_API_BSDOS_Capture.c
+++ b/java/jdk15/files/patch-HAE_API_BSDOS_Capture.c
@ -1,16 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk15/files/Attic/patch-HAE_API_BSDOS_Capture.c,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c	Thu Apr 11 14:58:48 2002
-+++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c	Thu Apr 11 15:15:16 2002
-@@ -45,7 +45,11 @@
- #include <sys/wait.h>
- #include <errno.h>
- #ifdef __FreeBSD__
-+#if __FreeBSD__ > 3
-+#include <sys/soundcard.h>
-+#else
- #include <machine/soundcard.h>
-+#endif
- #endif
- #ifdef __NetBSD__
- #include <soundcard.h>
--- a/java/jdk15/files/patch-common::Release.gmk
+++ b/java/jdk15/files/patch-common::Release.gmk
@ -1,25 +0,0 @@
-Index: Release.gmk
-===================================================================
-RCS file: /data/java/JDK2/javasrc_1_3_scsl/j2sdk1.3.1/make/common/Release.gmk,v
-retrieving revision 1.7
-diff -u -r1.7 common/Release.gmk
--- common/Release.gmk	21 Jan 2002 22:40:08 -0000	1.7
-+++ common/Release.gmk	10 Apr 2002 18:02:30 -0000
-@@ -521,10 +521,17 @@
- 	@# src.jar
- 	@#
- 	$(MKDIR) -p $(JDK_IMAGE_DIR)/src
-+ifeq ($(PLATFORM), bsd) 
-+	# Avoid the "argument list too long" problem.
-+	($(CD) $(SHARE_SRC)/classes; \
-+	    $(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o  -name '*.java' -print \
-+	    | $(CPIO) -pd $(JDK_IMAGE_DIR)/src)
-+else
- 	($(CD) $(SHARE_SRC)/classes; $(TAR) cf - \
- 	    `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o \
- 	    -name '*.java' -print`)| \
- 	    ($(CD) $(JDK_IMAGE_DIR)/src; $(TAR) xvf -)
-+endif
- 	@# We do not want to ship this, it isn't part of the build yet.
- 	$(RM) -r $(JDK_IMAGE_DIR)/src/javax/swing/pending
- 	$(MKDIR) -p $(JDK_IMAGE_DIR)/src/launcher
--- a/java/jdk15/files/patch-font.properties.zh_TW.bsd
+++ b/java/jdk15/files/patch-font.properties.zh_TW.bsd
@ -1,240 +0,0 @@
-$FreeBSD$
-
--- ../src/solaris/classes/sun/awt/motif/font.properties.zh_TW.bsd	1 Jan 1970 00:00:00 -0000
-+++ ../src/solaris/classes/sun/awt/motif/font.properties.zh_TW.bsd	13 Apr 2002 05:09:42 -0000
-@@ -0,0 +1,235 @@
-+#
-+# @(#)font.properties.zh	1.0 00/06/20
-+#
-+# Copyright 2000 by Sun Microsystems, Inc.,
-+# 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
-+# All rights reserved.
-+#
-+# This software is the confidential and proprietary information
-+# of Sun Microsystems, Inc. ("Confidential Information").  You
-+# shall not disclose such Confidential Information and shall use
-+# it only in accordance with the terms of the license agreement
-+# you entered into with Sun.
-+#
-+
-+#
-+# AWT Font default Properties for Simplified Chinese TurboLinux 6.0 and higher
-+#
-+
-+# Serif font definition
-+#
-+serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-+serif.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-+serif.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
-+serif.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
-+serif.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# SansSerif font definition
-+#
-+sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Monospaced font definition
-+#
-+monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Dialog font definition
-+#
-+dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# DialogInput font definition
-+#
-+dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+
-+# Default font definition
-+#
-+default.char=274f
-+
-+# name aliases
-+#
-+# alias.timesroman=serif
-+# alias.helvetica=sansserif
-+# alias.courier=monospaced
-+
-+# for backward compatibility
-+#
-+#zapfdingbats.0=-monotype-monotype sorts-regular-r---*-%d-*-*-p-*-adobe-dingbats
-+
-+# Static FontCharset info.
-+#
-+# This information is used by the font which is not indexed by Unicode.
-+# Such fonts can use their own subclass of FontCharset.
-+#
-+# This information can be overriden by describing more specific style.
-+# For example
-+#
-+#  fontcharset.serif.plain.3=SpecialSymbols
-+#  means serif.plain.3 font's index can be retrieved with the convert() method
-+#  of instance of SpecialSymbols and what kind of characters serif.plain.3 font
-+#  has can be judged with the isCovered() method of instance of SpecialSymbols.
-+#
-+fontcharset.serif.0=sun.io.CharToByteISO8859_1
-+fontcharset.serif.1=sun.io.CharToByteMS950
-+
-+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
-+fontcharset.sansserif.1=sun.io.CharToByteMS950
-+
-+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
-+fontcharset.monospaced.1=sun.io.CharToByteMS950
-+
-+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
-+fontcharset.dialog.1=sun.io.CharToByteMS950
-+
-+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
-+fontcharset.dialoginput.1=sun.io.CharToByteMS950
-+
-+# exclusion info.
-+#
-+# This information describe exclusion ranges for each fonts.
-+#
-+# 'exclusion.serif.plain.0' overrides 'exclusion.serif.0', and
-+# 'exclusion.serif.0' overrides exclusion.0, and so on.
-+#
-+
-+# XFontSet string
-+# X11 only properties
-+#
-+fontset.serif.plain=\
-+-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.serif.italic=\
-+-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.serif.bold=\
-+-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.serif.bolditalic=\
-+-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# SansSerif font definition 
-+#
-+
-+fontset.sansserif.plain=\
-+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.sansserif.italic=\
-+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.sansserif.bold=\
-+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.sansserif.bolditalic=\
-+-b&h-lucida-bold-i-normal-snas-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Monospaced font definition 
-+#
-+fontset.monospaced.plain=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.monospaced.italic=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.monospaced.bold=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-,1\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.monospaced.bolditalic=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Dialog font definition 
-+#
-+fontset.dialog.italic=\
-+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialog.bold=\
-+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialog.bolditalic=\
-+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialog.plain=\
-+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# DialogInput font definition 
-+#
-+fontset.dialoginput.italic=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialoginput.bold=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialoginput.bolditalic=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialoginput.plain=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+#
-+fontset.default=\
-+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
--- a/java/jdk15/files/patch-ja::sunw_java_plugin.po
+++ b/java/jdk15/files/patch-ja::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk15/files/Attic/patch-ja::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/ja/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/ja/sunw_java_plugin.po	Sat Apr 27 01:05:41 2002
-@@ -21,20 +21,12 @@
- msgstr "Plugin: Netscape プロキシ設定の読み込みに失敗しました。URL \n"
- msgid  "Plugin: couldn't read directory"
- msgstr "Plugin: ディレクトリを読み取れません。"
-msgid  "plugin: java process exited with status"
-msgstr "plugin: java プロセスが終了状態付きで終了しました。"
- msgid  "plugin: java process died due to signal"
- msgstr "plugin: java プロセスがシグナルのために終了しました。"
- msgid  "  a core file was generated"
- msgstr "  コアファイルが生成されました。"
-msgid  "Plugin: trouble with work request from child"
-msgstr "Plugin: 子からの処理要求に失敗しました。"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "Plugin: 現ホストの IP アドレスが見つかりません。"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "Plugin: Netscape プロキシ設定の読み込みに失敗しました。URL \n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "Plugin: ディレクトリ plugins/../java が見つかりません。"
- msgid  "Plugin: unexpected work request from child"
- msgstr "Plugin: 子からの予期しない処理要求です。"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk15/files/patch-ko.UTF-8::sunw_java_plugin.po
+++ b/java/jdk15/files/patch-ko.UTF-8::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk15/files/Attic/patch-ko.UTF-8::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/ko.UTF-8/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/ko.UTF-8/sunw_java_plugin.po	Sat Apr 27 01:06:46 2002
-@@ -21,20 +21,12 @@
- msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "플러그인: 디렉토리를 읽을 수 없습니다."
-msgid  "plugin: java process exited with status"
-msgstr "플러그인: 현재 상태로 자바 프로세스를 종료합니다."
- msgid  "plugin: java process died due to signal"
- msgstr "플러그인: 신호로 인해 자바 프로세스가 중단되었습니다."
- msgid  "  a core file was generated"
- msgstr "  코어 파일이 생성되었습니다."
-msgid  "Plugin: trouble with work request from child"
-msgstr "플러그인: 하위로부터의 작업 요청에 문제가 발생했습니다."
- msgid  "Plugin: can't find IP address for current host"
- msgstr "플러그인: 현재 호스트의 IP 주소를 찾을 수 없습니다."
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "플러그인: plugins/../java 디렉토리를 찾을 수 없습니다."
- msgid  "Plugin: unexpected work request from child"
- msgstr "플러그인: 하위로부터의 예상치 못한 작업 요청입니다."
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk15/files/patch-ko::sunw_java_plugin.po
+++ b/java/jdk15/files/patch-ko::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk15/files/Attic/patch-ko::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/ko/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/ko/sunw_java_plugin.po	Sat Apr 27 01:06:37 2002
-@@ -21,20 +21,12 @@
- msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "플러그인: 디렉토리를 읽을 수 없습니다."
-msgid  "plugin: java process exited with status"
-msgstr "플러그인: 현재 상태로 자바 프로세스를 종료합니다."
- msgid  "plugin: java process died due to signal"
- msgstr "플러그인: 신호로 인해 자바 프로세스가 중단되었습니다."
- msgid  "  a core file was generated"
- msgstr "  코어 파일이 생성되었습니다."
-msgid  "Plugin: trouble with work request from child"
-msgstr "플러그인: 하위로부터의 작업 요청에 문제가 발생했습니다."
- msgid  "Plugin: can't find IP address for current host"
- msgstr "플러그인: 현재 호스트의 IP 주소를 찾을 수 없습니다."
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "플러그인: plugins/../java 디렉토리를 찾을 수 없습니다."
- msgid  "Plugin: unexpected work request from child"
- msgstr "플러그인: 하위로부터의 예상치 못한 작업 요청입니다."
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk15/files/patch-native.c
+++ b/java/jdk15/files/patch-native.c
@ -1,31 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk15/files/Attic/patch-native.c,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	22 Jan 2002 19:56:49 -0000	1.5
-+++ ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	13 Apr 2002 05:11:05 -0000
-@@ -590,7 +590,7 @@
-     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
-     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "readHttpsURL",
- 			"(Ljava/lang/Object;[BII)I");
-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this, buf, offset, len);
-+    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this, buf, offset, len);
- }
- 
- /*
-@@ -605,7 +605,7 @@
-     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
-     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "bytesAvailable",
- 			"(Ljava/lang/Object;)I");
-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this);
-+    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this);
- }
- 
- /*
-@@ -623,7 +623,7 @@
- 			"(Ljava/lang/Object;)V");
-     jfieldID nativeConnID = (*env)->GetFieldID(env, isClass, "nativeConnection", "J");
- 
-    (*env)->CallStaticObjectMethod(env, clz, meth, is);
-+    (*env)->CallStaticVoidMethod(env, clz, meth, is);
- 
-     /* 
-        It is extremely important to unset the nativeConnection field in 
--- a/java/jdk15/files/patch-sun::awt::Makefile
+++ b/java/jdk15/files/patch-sun::awt::Makefile
@ -1,14 +0,0 @@
-$FreeBSD$
-
--- sun/awt/Makefile	18 Jan 2002 04:35:42 -0000	1.6
-+++ sun/awt/Makefile	13 Apr 2002 05:10:12 -0000
-@@ -406,7 +406,8 @@
- 	font.properties			\
- 	font.properties.ja		\
- 	psfont.properties.ja		\
-	font.properties.zh		
-+	font.properties.zh		\
-+	font.properties.zh_TW
- 
- FONTPROPS_SRC_SUFFIX = .$(PLATFORM)
- 
--- a/java/jdk15/files/patch-utils.c
+++ b/java/jdk15/files/patch-utils.c
@ -1,20 +0,0 @@
-$FreeBSD$
-
--- ../ext/plugin/oji-plugin/src/motif/common/utils.c	25 Aug 2001 17:48:42 -0000	1.2
-+++ ../ext/plugin/oji-plugin/src/motif/common/utils.c	10 Jun 2002 20:27:38 -0000
-@@ -10,6 +10,7 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #ifndef SVR4
-+#include <sys/param.h>
- #include <sys/uio.h>
- #endif
- #include <fcntl.h>
-@@ -17,6 +18,7 @@
- #include <locale.h>
- #include <errno.h>
- #include <strings.h>
-+#include <string.h>
- #include <dlfcn.h>
- #include "plugin_defs.h"
- #include "pluginversion.h"
--- a/java/jdk15/files/patch-zb.GBK::sunw_java_plugin.po
+++ b/java/jdk15/files/patch-zb.GBK::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk15/files/Attic/patch-zb.GBK::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh.GBK/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh.GBK/sunw_java_plugin.po	Sat Apr 27 01:07:14 2002
-@@ -21,20 +21,12 @@
- msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "插件：无法读取目录"
-msgid  "plugin: java process exited with status"
-msgstr "插件：java 已带状态退出"
- msgid  "plugin: java process died due to signal"
- msgstr "插件：java 进程已因信号而死"
- msgid  "  a core file was generated"
- msgstr " 生成了一个内核文件"
-msgid  "Plugin: trouble with work request from child"
-msgstr "插件：处理来自子类的工作请求有问题"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "插件：找不到当前主机的 IP 地址"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "插件：找不到 plugins/../java 目录"
- msgid  "Plugin: unexpected work request from child"
- msgstr "插件：来自子类的意外的工作请求"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk15/files/patch-zh::sunw_java_plugin.po
+++ b/java/jdk15/files/patch-zh::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk15/files/Attic/patch-zh::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh/sunw_java_plugin.po	Sat Apr 27 01:06:57 2002
-@@ -21,20 +21,12 @@
- msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "插件：无法读取目录"
-msgid  "plugin: java process exited with status"
-msgstr "插件：java 已带状态退出"
- msgid  "plugin: java process died due to signal"
- msgstr "插件：java 进程已因信号而死"
- msgid  "  a core file was generated"
- msgstr " 生成了一个内核文件"
-msgid  "Plugin: trouble with work request from child"
-msgstr "插件：处理来自子类的工作请求有问题"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "插件：找不到当前主机的 IP 地址"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "插件：找不到 plugins/../java 目录"
- msgid  "Plugin: unexpected work request from child"
- msgstr "插件：来自子类的意外的工作请求"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk15/files/patch-zh_TW.BIG5::sunw_java_plugin.po
+++ b/java/jdk15/files/patch-zh_TW.BIG5::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk15/files/Attic/patch-zh_TW.BIG5::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po	Sat Apr 27 01:07:46 2002
-@@ -21,20 +21,12 @@
- msgstr "Plugin: 讀取 Netscape 代理設定 URL 時發生問題\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "Plugin: 無法讀取目錄"
-msgid  "plugin: java process exited with status"
-msgstr "plugin: java 程序隨狀態退出"
- msgid  "plugin: java process died due to signal"
- msgstr "plugin: java 程序已因訊號而毀"
- msgid  "  a core file was generated"
- msgstr "  已產生核心檔案"
-msgid  "Plugin: trouble with work request from child"
-msgstr "Plugin: 子類別所要求的工作發生問題"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "Plugin: 找不到目前主機的 IP 位址"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "Plugin: 讀取 Netscape 代理配置 URL 時發生問題\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "Plugin: 找不到 plugins/../java 目錄"
- msgid  "Plugin: unexpected work request from child"
- msgstr "Plugin: 子類別要求了非預期的工作"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk15/files/patch-zh_TW::sunw_java_plugin.po
+++ b/java/jdk15/files/patch-zh_TW::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk15/files/Attic/patch-zh_TW::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po	Sat Apr 27 01:07:31 2002
-@@ -21,20 +21,12 @@
- msgstr "Plugin: ûôÌ½ Netscape ÅîÜ¡ÝÃÌù URL ÕëàõÆíÙÂ÷î\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "Plugin: àÒÎÎûôÌ½Æøòç"
-msgid  "plugin: java process exited with status"
-msgstr "plugin: java á£Ê©òñÎíèèØÍÅø"
- msgid  "plugin: java process died due to signal"
- msgstr "plugin: java á£Ê©ÄØÇÞØ¹æÀÈÔäÚ"
- msgid  "  a core file was generated"
- msgstr "  ÄØÜ¨ÆíÕøÅÀóòÕù"
-msgid  "Plugin: trouble with work request from child"
-msgstr "Plugin: ÄÍùËÉ±ÍÔÓÑÊåÎûÄÖÉ¢àõÆíÙÂ÷î"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "Plugin: ÊÆÄâÌ¯ÆøÐ©Åäñ¢Îû IP ÈíÉß"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "Plugin: ûôÌ½ Netscape ÅîÜ¡ØÙåô URL ÕëàõÆíÙÂ÷î\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "Plugin: ÊÆÄâÌ¯ plugins/../java Æøòç"
- msgid  "Plugin: unexpected work request from child"
- msgstr "Plugin: ÄÍùËÉ±ÓÑÊåÄ§ÏæçßßæÎûÄÖÉ¢"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@ -7,7 +7,6 @@

 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	4
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@ -36,7 +35,7 @@ RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 WRKSRC=		${WRKDIR}/j2sdk1.3.1/make

 JDK_VERSION=	1.3.1
-JDK_PATCHSET_VERSION=	6
+JDK_PATCHSET_VERSION=	7

 .if defined(NATIVE_BOOTSTRAP)
 JDK13DIR?=	${LOCALBASE}/jdk${JDK_VERSION}
--- 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-6.tar.gz) = 9cade10b81d6034fdd2176bef32bdbf9
+MD5 (bsd-jdk131-patches-7.tar.gz) = e119cf9ceb4b6ca38d597c9916600530
--- a/java/jdk16/files/patch-GNUmakefile
+++ b/java/jdk16/files/patch-GNUmakefile
@ -1,14 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/java/jdk16/files/Attic/patch-GNUmakefile,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/build/solaris/GNUmakefile	2002/03/13 13:35:23	1.1
-+++ ../ext/plugin/build/solaris/GNUmakefile	2002/03/13 13:36:33
-@@ -645,7 +645,7 @@
- $(PLUGIN_OJI): $(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
- 	export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
- 	$(GCC) $(GCCPIC) $(GCCLD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) \
-	$(NAVIG5_OFILES) $(COMMON_OFILES_GNU)
-+	$(NAVIG5_OFILES) $(COMMON_OFILES_GNU) -L$(X11_LIB) -lXt
- 
- clean clobber::
- 	/bin/rm -f -r $(TMP_DIR) $(OUTPUT_DIR)/plugin
--- a/java/jdk16/files/patch-HAE_API_BSDOS.c
+++ b/java/jdk16/files/patch-HAE_API_BSDOS.c
@ -1,16 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk16/files/Attic/patch-HAE_API_BSDOS.c,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c	Thu Apr 11 14:58:48 2002
-+++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c	Thu Apr 11 15:14:18 2002
-@@ -58,7 +58,11 @@
- #include <sys/wait.h>
- #include <errno.h>
- #ifdef __FreeBSD__
-+#if __FreeBSD__ > 3
-+#include <sys/soundcard.h>
-+#else
- #include <machine/soundcard.h>
-+#endif
- #endif
- #ifdef __NetBSD__
- #include <soundcard.h>
--- a/java/jdk16/files/patch-HAE_API_BSDOS_Capture.c
+++ b/java/jdk16/files/patch-HAE_API_BSDOS_Capture.c
@ -1,16 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk16/files/Attic/patch-HAE_API_BSDOS_Capture.c,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c	Thu Apr 11 14:58:48 2002
-+++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c	Thu Apr 11 15:15:16 2002
-@@ -45,7 +45,11 @@
- #include <sys/wait.h>
- #include <errno.h>
- #ifdef __FreeBSD__
-+#if __FreeBSD__ > 3
-+#include <sys/soundcard.h>
-+#else
- #include <machine/soundcard.h>
-+#endif
- #endif
- #ifdef __NetBSD__
- #include <soundcard.h>
--- a/java/jdk16/files/patch-common::Release.gmk
+++ b/java/jdk16/files/patch-common::Release.gmk
@ -1,25 +0,0 @@
-Index: Release.gmk
-===================================================================
-RCS file: /data/java/JDK2/javasrc_1_3_scsl/j2sdk1.3.1/make/common/Release.gmk,v
-retrieving revision 1.7
-diff -u -r1.7 common/Release.gmk
--- common/Release.gmk	21 Jan 2002 22:40:08 -0000	1.7
-+++ common/Release.gmk	10 Apr 2002 18:02:30 -0000
-@@ -521,10 +521,17 @@
- 	@# src.jar
- 	@#
- 	$(MKDIR) -p $(JDK_IMAGE_DIR)/src
-+ifeq ($(PLATFORM), bsd) 
-+	# Avoid the "argument list too long" problem.
-+	($(CD) $(SHARE_SRC)/classes; \
-+	    $(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o  -name '*.java' -print \
-+	    | $(CPIO) -pd $(JDK_IMAGE_DIR)/src)
-+else
- 	($(CD) $(SHARE_SRC)/classes; $(TAR) cf - \
- 	    `$(FIND) $(SOURCES) -name CVS -prune -o -name SCCS -prune -o \
- 	    -name '*.java' -print`)| \
- 	    ($(CD) $(JDK_IMAGE_DIR)/src; $(TAR) xvf -)
-+endif
- 	@# We do not want to ship this, it isn't part of the build yet.
- 	$(RM) -r $(JDK_IMAGE_DIR)/src/javax/swing/pending
- 	$(MKDIR) -p $(JDK_IMAGE_DIR)/src/launcher
--- a/java/jdk16/files/patch-font.properties.zh_TW.bsd
+++ b/java/jdk16/files/patch-font.properties.zh_TW.bsd
@ -1,240 +0,0 @@
-$FreeBSD$
-
--- ../src/solaris/classes/sun/awt/motif/font.properties.zh_TW.bsd	1 Jan 1970 00:00:00 -0000
-+++ ../src/solaris/classes/sun/awt/motif/font.properties.zh_TW.bsd	13 Apr 2002 05:09:42 -0000
-@@ -0,0 +1,235 @@
-+#
-+# @(#)font.properties.zh	1.0 00/06/20
-+#
-+# Copyright 2000 by Sun Microsystems, Inc.,
-+# 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
-+# All rights reserved.
-+#
-+# This software is the confidential and proprietary information
-+# of Sun Microsystems, Inc. ("Confidential Information").  You
-+# shall not disclose such Confidential Information and shall use
-+# it only in accordance with the terms of the license agreement
-+# you entered into with Sun.
-+#
-+
-+#
-+# AWT Font default Properties for Simplified Chinese TurboLinux 6.0 and higher
-+#
-+
-+# Serif font definition
-+#
-+serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-+serif.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-+serif.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
-+serif.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
-+serif.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# SansSerif font definition
-+#
-+sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+sansserif.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Monospaced font definition
-+#
-+monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+monospaced.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Dialog font definition
-+#
-+dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-+dialog.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# DialogInput font definition
-+#
-+dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.italic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.bold.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-+dialoginput.bolditalic.1=-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+
-+# Default font definition
-+#
-+default.char=274f
-+
-+# name aliases
-+#
-+# alias.timesroman=serif
-+# alias.helvetica=sansserif
-+# alias.courier=monospaced
-+
-+# for backward compatibility
-+#
-+#zapfdingbats.0=-monotype-monotype sorts-regular-r---*-%d-*-*-p-*-adobe-dingbats
-+
-+# Static FontCharset info.
-+#
-+# This information is used by the font which is not indexed by Unicode.
-+# Such fonts can use their own subclass of FontCharset.
-+#
-+# This information can be overriden by describing more specific style.
-+# For example
-+#
-+#  fontcharset.serif.plain.3=SpecialSymbols
-+#  means serif.plain.3 font's index can be retrieved with the convert() method
-+#  of instance of SpecialSymbols and what kind of characters serif.plain.3 font
-+#  has can be judged with the isCovered() method of instance of SpecialSymbols.
-+#
-+fontcharset.serif.0=sun.io.CharToByteISO8859_1
-+fontcharset.serif.1=sun.io.CharToByteMS950
-+
-+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
-+fontcharset.sansserif.1=sun.io.CharToByteMS950
-+
-+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
-+fontcharset.monospaced.1=sun.io.CharToByteMS950
-+
-+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
-+fontcharset.dialog.1=sun.io.CharToByteMS950
-+
-+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
-+fontcharset.dialoginput.1=sun.io.CharToByteMS950
-+
-+# exclusion info.
-+#
-+# This information describe exclusion ranges for each fonts.
-+#
-+# 'exclusion.serif.plain.0' overrides 'exclusion.serif.0', and
-+# 'exclusion.serif.0' overrides exclusion.0, and so on.
-+#
-+
-+# XFontSet string
-+# X11 only properties
-+#
-+fontset.serif.plain=\
-+-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.serif.italic=\
-+-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.serif.bold=\
-+-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.serif.bolditalic=\
-+-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# SansSerif font definition 
-+#
-+
-+fontset.sansserif.plain=\
-+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.sansserif.italic=\
-+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.sansserif.bold=\
-+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.sansserif.bolditalic=\
-+-b&h-lucida-bold-i-normal-snas-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Monospaced font definition 
-+#
-+fontset.monospaced.plain=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.monospaced.italic=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.monospaced.bold=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-,1\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.monospaced.bolditalic=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# Dialog font definition 
-+#
-+fontset.dialog.italic=\
-+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialog.bold=\
-+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialog.bolditalic=\
-+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialog.plain=\
-+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+# DialogInput font definition 
-+#
-+fontset.dialoginput.italic=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialoginput.bold=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialoginput.bolditalic=\
-+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+fontset.dialoginput.plain=\
-+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
-+
-+#
-+fontset.default=\
-+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
-+-Arphic-AR PL Mingti2L Big5-medium-r-normal--*-%d-*-*-c-*-big5-0
--- a/java/jdk16/files/patch-ja::sunw_java_plugin.po
+++ b/java/jdk16/files/patch-ja::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk16/files/Attic/patch-ja::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/ja/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/ja/sunw_java_plugin.po	Sat Apr 27 01:05:41 2002
-@@ -21,20 +21,12 @@
- msgstr "Plugin: Netscape プロキシ設定の読み込みに失敗しました。URL \n"
- msgid  "Plugin: couldn't read directory"
- msgstr "Plugin: ディレクトリを読み取れません。"
-msgid  "plugin: java process exited with status"
-msgstr "plugin: java プロセスが終了状態付きで終了しました。"
- msgid  "plugin: java process died due to signal"
- msgstr "plugin: java プロセスがシグナルのために終了しました。"
- msgid  "  a core file was generated"
- msgstr "  コアファイルが生成されました。"
-msgid  "Plugin: trouble with work request from child"
-msgstr "Plugin: 子からの処理要求に失敗しました。"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "Plugin: 現ホストの IP アドレスが見つかりません。"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "Plugin: Netscape プロキシ設定の読み込みに失敗しました。URL \n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "Plugin: ディレクトリ plugins/../java が見つかりません。"
- msgid  "Plugin: unexpected work request from child"
- msgstr "Plugin: 子からの予期しない処理要求です。"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk16/files/patch-ko.UTF-8::sunw_java_plugin.po
+++ b/java/jdk16/files/patch-ko.UTF-8::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk16/files/Attic/patch-ko.UTF-8::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/ko.UTF-8/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/ko.UTF-8/sunw_java_plugin.po	Sat Apr 27 01:06:46 2002
-@@ -21,20 +21,12 @@
- msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "플러그인: 디렉토리를 읽을 수 없습니다."
-msgid  "plugin: java process exited with status"
-msgstr "플러그인: 현재 상태로 자바 프로세스를 종료합니다."
- msgid  "plugin: java process died due to signal"
- msgstr "플러그인: 신호로 인해 자바 프로세스가 중단되었습니다."
- msgid  "  a core file was generated"
- msgstr "  코어 파일이 생성되었습니다."
-msgid  "Plugin: trouble with work request from child"
-msgstr "플러그인: 하위로부터의 작업 요청에 문제가 발생했습니다."
- msgid  "Plugin: can't find IP address for current host"
- msgstr "플러그인: 현재 호스트의 IP 주소를 찾을 수 없습니다."
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "플러그인: plugins/../java 디렉토리를 찾을 수 없습니다."
- msgid  "Plugin: unexpected work request from child"
- msgstr "플러그인: 하위로부터의 예상치 못한 작업 요청입니다."
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk16/files/patch-ko::sunw_java_plugin.po
+++ b/java/jdk16/files/patch-ko::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk16/files/Attic/patch-ko::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/ko/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/ko/sunw_java_plugin.po	Sat Apr 27 01:06:37 2002
-@@ -21,20 +21,12 @@
- msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "플러그인: 디렉토리를 읽을 수 없습니다."
-msgid  "plugin: java process exited with status"
-msgstr "플러그인: 현재 상태로 자바 프로세스를 종료합니다."
- msgid  "plugin: java process died due to signal"
- msgstr "플러그인: 신호로 인해 자바 프로세스가 중단되었습니다."
- msgid  "  a core file was generated"
- msgstr "  코어 파일이 생성되었습니다."
-msgid  "Plugin: trouble with work request from child"
-msgstr "플러그인: 하위로부터의 작업 요청에 문제가 발생했습니다."
- msgid  "Plugin: can't find IP address for current host"
- msgstr "플러그인: 현재 호스트의 IP 주소를 찾을 수 없습니다."
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "플러그인: 다음으로부터 Netscape 프락시 구성 URL을 읽을 수 없습니다.\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "플러그인: plugins/../java 디렉토리를 찾을 수 없습니다."
- msgid  "Plugin: unexpected work request from child"
- msgstr "플러그인: 하위로부터의 예상치 못한 작업 요청입니다."
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk16/files/patch-native.c
+++ b/java/jdk16/files/patch-native.c
@ -1,31 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk16/files/Attic/patch-native.c,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	22 Jan 2002 19:56:49 -0000	1.5
-+++ ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	13 Apr 2002 05:11:05 -0000
-@@ -590,7 +590,7 @@
-     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
-     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "readHttpsURL",
- 			"(Ljava/lang/Object;[BII)I");
-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this, buf, offset, len);
-+    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this, buf, offset, len);
- }
- 
- /*
-@@ -605,7 +605,7 @@
-     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
-     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "bytesAvailable",
- 			"(Ljava/lang/Object;)I");
-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this);
-+    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this);
- }
- 
- /*
-@@ -623,7 +623,7 @@
- 			"(Ljava/lang/Object;)V");
-     jfieldID nativeConnID = (*env)->GetFieldID(env, isClass, "nativeConnection", "J");
- 
-    (*env)->CallStaticObjectMethod(env, clz, meth, is);
-+    (*env)->CallStaticVoidMethod(env, clz, meth, is);
- 
-     /* 
-        It is extremely important to unset the nativeConnection field in 
--- a/java/jdk16/files/patch-sun::awt::Makefile
+++ b/java/jdk16/files/patch-sun::awt::Makefile
@ -1,14 +0,0 @@
-$FreeBSD$
-
--- sun/awt/Makefile	18 Jan 2002 04:35:42 -0000	1.6
-+++ sun/awt/Makefile	13 Apr 2002 05:10:12 -0000
-@@ -406,7 +406,8 @@
- 	font.properties			\
- 	font.properties.ja		\
- 	psfont.properties.ja		\
-	font.properties.zh		
-+	font.properties.zh		\
-+	font.properties.zh_TW
- 
- FONTPROPS_SRC_SUFFIX = .$(PLATFORM)
- 
--- a/java/jdk16/files/patch-utils.c
+++ b/java/jdk16/files/patch-utils.c
@ -1,20 +0,0 @@
-$FreeBSD$
-
--- ../ext/plugin/oji-plugin/src/motif/common/utils.c	25 Aug 2001 17:48:42 -0000	1.2
-+++ ../ext/plugin/oji-plugin/src/motif/common/utils.c	10 Jun 2002 20:27:38 -0000
-@@ -10,6 +10,7 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #ifndef SVR4
-+#include <sys/param.h>
- #include <sys/uio.h>
- #endif
- #include <fcntl.h>
-@@ -17,6 +18,7 @@
- #include <locale.h>
- #include <errno.h>
- #include <strings.h>
-+#include <string.h>
- #include <dlfcn.h>
- #include "plugin_defs.h"
- #include "pluginversion.h"
--- a/java/jdk16/files/patch-zb.GBK::sunw_java_plugin.po
+++ b/java/jdk16/files/patch-zb.GBK::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk16/files/Attic/patch-zb.GBK::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh.GBK/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh.GBK/sunw_java_plugin.po	Sat Apr 27 01:07:14 2002
-@@ -21,20 +21,12 @@
- msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "插件：无法读取目录"
-msgid  "plugin: java process exited with status"
-msgstr "插件：java 已带状态退出"
- msgid  "plugin: java process died due to signal"
- msgstr "插件：java 进程已因信号而死"
- msgid  "  a core file was generated"
- msgstr " 生成了一个内核文件"
-msgid  "Plugin: trouble with work request from child"
-msgstr "插件：处理来自子类的工作请求有问题"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "插件：找不到当前主机的 IP 地址"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "插件：找不到 plugins/../java 目录"
- msgid  "Plugin: unexpected work request from child"
- msgstr "插件：来自子类的意外的工作请求"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk16/files/patch-zh::sunw_java_plugin.po
+++ b/java/jdk16/files/patch-zh::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk16/files/Attic/patch-zh::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh/sunw_java_plugin.po	Sat Apr 27 01:06:57 2002
-@@ -21,20 +21,12 @@
- msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "插件：无法读取目录"
-msgid  "plugin: java process exited with status"
-msgstr "插件：java 已带状态退出"
- msgid  "plugin: java process died due to signal"
- msgstr "插件：java 进程已因信号而死"
- msgid  "  a core file was generated"
- msgstr " 生成了一个内核文件"
-msgid  "Plugin: trouble with work request from child"
-msgstr "插件：处理来自子类的工作请求有问题"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "插件：找不到当前主机的 IP 地址"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "插件：从下列来源读取 Netscape 代理服务器配置 URL 有问题\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "插件：找不到 plugins/../java 目录"
- msgid  "Plugin: unexpected work request from child"
- msgstr "插件：来自子类的意外的工作请求"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk16/files/patch-zh_TW.BIG5::sunw_java_plugin.po
+++ b/java/jdk16/files/patch-zh_TW.BIG5::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk16/files/Attic/patch-zh_TW.BIG5::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po	Sat Apr 27 01:07:46 2002
-@@ -21,20 +21,12 @@
- msgstr "Plugin: 讀取 Netscape 代理設定 URL 時發生問題\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "Plugin: 無法讀取目錄"
-msgid  "plugin: java process exited with status"
-msgstr "plugin: java 程序隨狀態退出"
- msgid  "plugin: java process died due to signal"
- msgstr "plugin: java 程序已因訊號而毀"
- msgid  "  a core file was generated"
- msgstr "  已產生核心檔案"
-msgid  "Plugin: trouble with work request from child"
-msgstr "Plugin: 子類別所要求的工作發生問題"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "Plugin: 找不到目前主機的 IP 位址"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "Plugin: 讀取 Netscape 代理配置 URL 時發生問題\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "Plugin: 找不到 plugins/../java 目錄"
- msgid  "Plugin: unexpected work request from child"
- msgstr "Plugin: 子類別要求了非預期的工作"
- msgid  "Plugin: Java VM process has died."
--- a/java/jdk16/files/patch-zh_TW::sunw_java_plugin.po
+++ b/java/jdk16/files/patch-zh_TW::sunw_java_plugin.po
@ -1,25 +0,0 @@
-$FreeBSD: /tmp/pcvs/ports/java/jdk16/files/Attic/patch-zh_TW::sunw_java_plugin.po,v 1.1 2002-06-05 21:43:14 kris Exp $
-
--- ../ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po.orig	Sun May  6 15:15:35 2001
-+++ ../ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po	Sat Apr 27 01:07:31 2002
-@@ -21,20 +21,12 @@
- msgstr "Plugin: ûôÌ½ Netscape ÅîÜ¡ÝÃÌù URL ÕëàõÆíÙÂ÷î\n"
- msgid  "Plugin: couldn't read directory"
- msgstr "Plugin: àÒÎÎûôÌ½Æøòç"
-msgid  "plugin: java process exited with status"
-msgstr "plugin: java á£Ê©òñÎíèèØÍÅø"
- msgid  "plugin: java process died due to signal"
- msgstr "plugin: java á£Ê©ÄØÇÞØ¹æÀÈÔäÚ"
- msgid  "  a core file was generated"
- msgstr "  ÄØÜ¨ÆíÕøÅÀóòÕù"
-msgid  "Plugin: trouble with work request from child"
-msgstr "Plugin: ÄÍùËÉ±ÍÔÓÑÊåÎûÄÖÉ¢àõÆíÙÂ÷î"
- msgid  "Plugin: can't find IP address for current host"
- msgstr "Plugin: ÊÆÄâÌ¯ÆøÐ©Åäñ¢Îû IP ÈíÉß"
-msgid  "Plugin: trouble reading Netscape proxy  configuration URL from\n"
-msgstr "Plugin: ûôÌ½ Netscape ÅîÜ¡ØÙåô URL ÕëàõÆíÙÂ÷î\n"
-msgid  "Plugin: can't find plugins/../java directory"
-msgstr "Plugin: ÊÆÄâÌ¯ plugins/../java Æøòç"
- msgid  "Plugin: unexpected work request from child"
- msgstr "Plugin: ÄÍùËÉ±ÓÑÊåÄ§ÏæçßßæÎûÄÖÉ¢"
- msgid  "Plugin: Java VM process has died."