diff options
| author | glewis <glewis@FreeBSD.org> | 2002-07-26 02:31:26 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2002-07-26 02:31:26 +0800 |
| commit | 1a993f62aa30bbbc0b19383cc365590c714f52a2 (patch) | |
| tree | 419b745e59949b844c296860a1d9d9063a3ee0c7 /java | |
| parent | 1520b406fced1fcc0aaebcd3599781aa69c5e36c (diff) | |
| download | freebsd-ports-graphics-1a993f62aa30bbbc0b19383cc365590c714f52a2.tar.gz freebsd-ports-graphics-1a993f62aa30bbbc0b19383cc365590c714f52a2.tar.zst freebsd-ports-graphics-1a993f62aa30bbbc0b19383cc365590c714f52a2.zip | |
Update to patchset 7.
Diffstat (limited to 'java')
68 files changed, 8 insertions, 2216 deletions
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile index 1c74eb0f861..dbf1c7ba5b5 100644 --- 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} diff --git a/java/jdk13/distinfo b/java/jdk13/distinfo index 5817a11c25c..2b86f42d039 100644 --- 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 diff --git a/java/jdk13/files/patch-GNUmakefile b/java/jdk13/files/patch-GNUmakefile deleted file mode 100644 index 3f6876b47f3..00000000000 --- a/java/jdk13/files/patch-GNUmakefile +++ /dev/null @@ -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 diff --git a/java/jdk13/files/patch-HAE_API_BSDOS.c b/java/jdk13/files/patch-HAE_API_BSDOS.c deleted file mode 100644 index a36fb157293..00000000000 --- a/java/jdk13/files/patch-HAE_API_BSDOS.c +++ /dev/null @@ -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> diff --git a/java/jdk13/files/patch-HAE_API_BSDOS_Capture.c b/java/jdk13/files/patch-HAE_API_BSDOS_Capture.c deleted file mode 100644 index 961d5225250..00000000000 --- a/java/jdk13/files/patch-HAE_API_BSDOS_Capture.c +++ /dev/null @@ -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> diff --git a/java/jdk13/files/patch-common::Release.gmk b/java/jdk13/files/patch-common::Release.gmk deleted file mode 100644 index eebba86583d..00000000000 --- a/java/jdk13/files/patch-common::Release.gmk +++ /dev/null @@ -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 diff --git a/java/jdk13/files/patch-font.properties.zh_TW.bsd b/java/jdk13/files/patch-font.properties.zh_TW.bsd deleted file mode 100644 index bc662616425..00000000000 --- a/java/jdk13/files/patch-font.properties.zh_TW.bsd +++ /dev/null @@ -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 diff --git a/java/jdk13/files/patch-ja::sunw_java_plugin.po b/java/jdk13/files/patch-ja::sunw_java_plugin.po deleted file mode 100644 index f5dacb618fc..00000000000 --- a/java/jdk13/files/patch-ja::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk13/files/patch-ko.UTF-8::sunw_java_plugin.po b/java/jdk13/files/patch-ko.UTF-8::sunw_java_plugin.po deleted file mode 100644 index 05241dfb83c..00000000000 --- a/java/jdk13/files/patch-ko.UTF-8::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk13/files/patch-ko::sunw_java_plugin.po b/java/jdk13/files/patch-ko::sunw_java_plugin.po deleted file mode 100644 index e8394eb7629..00000000000 --- a/java/jdk13/files/patch-ko::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk13/files/patch-native.c b/java/jdk13/files/patch-native.c deleted file mode 100644 index 6ea781d8066..00000000000 --- a/java/jdk13/files/patch-native.c +++ /dev/null @@ -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 diff --git a/java/jdk13/files/patch-sun::awt::Makefile b/java/jdk13/files/patch-sun::awt::Makefile deleted file mode 100644 index 969b6bb4a05..00000000000 --- a/java/jdk13/files/patch-sun::awt::Makefile +++ /dev/null @@ -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) - diff --git a/java/jdk13/files/patch-utils.c b/java/jdk13/files/patch-utils.c deleted file mode 100644 index 75f4b0be64e..00000000000 --- a/java/jdk13/files/patch-utils.c +++ /dev/null @@ -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" diff --git a/java/jdk13/files/patch-zb.GBK::sunw_java_plugin.po b/java/jdk13/files/patch-zb.GBK::sunw_java_plugin.po deleted file mode 100644 index 1ff693f3381..00000000000 --- a/java/jdk13/files/patch-zb.GBK::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk13/files/patch-zh::sunw_java_plugin.po b/java/jdk13/files/patch-zh::sunw_java_plugin.po deleted file mode 100644 index fb718666033..00000000000 --- a/java/jdk13/files/patch-zh::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk13/files/patch-zh_TW.BIG5::sunw_java_plugin.po b/java/jdk13/files/patch-zh_TW.BIG5::sunw_java_plugin.po deleted file mode 100644 index 342bd25a625..00000000000 --- a/java/jdk13/files/patch-zh_TW.BIG5::sunw_java_plugin.po +++ /dev/null @@ -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 Nz]w URL 謬oネ維D\n" - msgid "Plugin: couldn't read directory" - msgstr "Plugin: Lk的ヘ雀" --msgid "plugin: java process exited with status" --msgstr "plugin: java {農HAhX" - msgid "plugin: java process died due to signal" - msgstr "plugin: java {任w]T弦τ郡" - msgid " a core file was generated" - msgstr " w横ネ屬濱筆" --msgid "Plugin: trouble with work request from child" --msgstr "Plugin: l寵O勠nD困u@oネ維D" - msgid "Plugin: can't find IP address for current host" - msgstr "Plugin: тぃ譽惓eD穣 IP 讌}" --msgid "Plugin: trouble reading Netscape proxy configuration URL from\n" --msgstr "Plugin: 的 Netscape Nztm URL 謬oネ維D\n" --msgid "Plugin: can't find plugins/../java directory" --msgstr "Plugin: тぃ plugins/../java ヘ雀" - msgid "Plugin: unexpected work request from child" - msgstr "Plugin: l寵OnDFDw漢困u@" - msgid "Plugin: Java VM process has died." diff --git a/java/jdk13/files/patch-zh_TW::sunw_java_plugin.po b/java/jdk13/files/patch-zh_TW::sunw_java_plugin.po deleted file mode 100644 index 661fd1dcd9f..00000000000 --- a/java/jdk13/files/patch-zh_TW::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile index 1c74eb0f861..dbf1c7ba5b5 100644 --- 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} diff --git a/java/jdk14/distinfo b/java/jdk14/distinfo index 5817a11c25c..2b86f42d039 100644 --- 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 diff --git a/java/jdk14/files/patch-GNUmakefile b/java/jdk14/files/patch-GNUmakefile deleted file mode 100644 index 4b1cf932c2a..00000000000 --- a/java/jdk14/files/patch-GNUmakefile +++ /dev/null @@ -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 diff --git a/java/jdk14/files/patch-HAE_API_BSDOS.c b/java/jdk14/files/patch-HAE_API_BSDOS.c deleted file mode 100644 index 53cd8e55eed..00000000000 --- a/java/jdk14/files/patch-HAE_API_BSDOS.c +++ /dev/null @@ -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> diff --git a/java/jdk14/files/patch-HAE_API_BSDOS_Capture.c b/java/jdk14/files/patch-HAE_API_BSDOS_Capture.c deleted file mode 100644 index 54cd48102b2..00000000000 --- a/java/jdk14/files/patch-HAE_API_BSDOS_Capture.c +++ /dev/null @@ -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> diff --git a/java/jdk14/files/patch-common::Release.gmk b/java/jdk14/files/patch-common::Release.gmk deleted file mode 100644 index eebba86583d..00000000000 --- a/java/jdk14/files/patch-common::Release.gmk +++ /dev/null @@ -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 diff --git a/java/jdk14/files/patch-font.properties.zh_TW.bsd b/java/jdk14/files/patch-font.properties.zh_TW.bsd deleted file mode 100644 index 9a9f2e90996..00000000000 --- a/java/jdk14/files/patch-font.properties.zh_TW.bsd +++ /dev/null @@ -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 diff --git a/java/jdk14/files/patch-ja::sunw_java_plugin.po b/java/jdk14/files/patch-ja::sunw_java_plugin.po deleted file mode 100644 index 9330df1da85..00000000000 --- a/java/jdk14/files/patch-ja::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk14/files/patch-ko.UTF-8::sunw_java_plugin.po b/java/jdk14/files/patch-ko.UTF-8::sunw_java_plugin.po deleted file mode 100644 index d67c050d1a7..00000000000 --- a/java/jdk14/files/patch-ko.UTF-8::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk14/files/patch-ko::sunw_java_plugin.po b/java/jdk14/files/patch-ko::sunw_java_plugin.po deleted file mode 100644 index 703463d13af..00000000000 --- a/java/jdk14/files/patch-ko::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk14/files/patch-native.c b/java/jdk14/files/patch-native.c deleted file mode 100644 index 70860d59ce7..00000000000 --- a/java/jdk14/files/patch-native.c +++ /dev/null @@ -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 diff --git a/java/jdk14/files/patch-sun::awt::Makefile b/java/jdk14/files/patch-sun::awt::Makefile deleted file mode 100644 index 969b6bb4a05..00000000000 --- a/java/jdk14/files/patch-sun::awt::Makefile +++ /dev/null @@ -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) - diff --git a/java/jdk14/files/patch-utils.c b/java/jdk14/files/patch-utils.c deleted file mode 100644 index 75f4b0be64e..00000000000 --- a/java/jdk14/files/patch-utils.c +++ /dev/null @@ -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" diff --git a/java/jdk14/files/patch-zb.GBK::sunw_java_plugin.po b/java/jdk14/files/patch-zb.GBK::sunw_java_plugin.po deleted file mode 100644 index 49cbff5a120..00000000000 --- a/java/jdk14/files/patch-zb.GBK::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk14/files/patch-zh::sunw_java_plugin.po b/java/jdk14/files/patch-zh::sunw_java_plugin.po deleted file mode 100644 index bd69b4ec567..00000000000 --- a/java/jdk14/files/patch-zh::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk14/files/patch-zh_TW.BIG5::sunw_java_plugin.po b/java/jdk14/files/patch-zh_TW.BIG5::sunw_java_plugin.po deleted file mode 100644 index db9c16d3817..00000000000 --- a/java/jdk14/files/patch-zh_TW.BIG5::sunw_java_plugin.po +++ /dev/null @@ -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 Nz]w URL 謬oネ維D\n" - msgid "Plugin: couldn't read directory" - msgstr "Plugin: Lk的ヘ雀" --msgid "plugin: java process exited with status" --msgstr "plugin: java {農HAhX" - msgid "plugin: java process died due to signal" - msgstr "plugin: java {任w]T弦τ郡" - msgid " a core file was generated" - msgstr " w横ネ屬濱筆" --msgid "Plugin: trouble with work request from child" --msgstr "Plugin: l寵O勠nD困u@oネ維D" - msgid "Plugin: can't find IP address for current host" - msgstr "Plugin: тぃ譽惓eD穣 IP 讌}" --msgid "Plugin: trouble reading Netscape proxy configuration URL from\n" --msgstr "Plugin: 的 Netscape Nztm URL 謬oネ維D\n" --msgid "Plugin: can't find plugins/../java directory" --msgstr "Plugin: тぃ plugins/../java ヘ雀" - msgid "Plugin: unexpected work request from child" - msgstr "Plugin: l寵OnDFDw漢困u@" - msgid "Plugin: Java VM process has died." diff --git a/java/jdk14/files/patch-zh_TW::sunw_java_plugin.po b/java/jdk14/files/patch-zh_TW::sunw_java_plugin.po deleted file mode 100644 index 009a3ebd274..00000000000 --- a/java/jdk14/files/patch-zh_TW::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index 1c74eb0f861..dbf1c7ba5b5 100644 --- 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} diff --git a/java/jdk15/distinfo b/java/jdk15/distinfo index 5817a11c25c..2b86f42d039 100644 --- 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 diff --git a/java/jdk15/files/patch-GNUmakefile b/java/jdk15/files/patch-GNUmakefile deleted file mode 100644 index eac25e0c6e9..00000000000 --- a/java/jdk15/files/patch-GNUmakefile +++ /dev/null @@ -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 diff --git a/java/jdk15/files/patch-HAE_API_BSDOS.c b/java/jdk15/files/patch-HAE_API_BSDOS.c deleted file mode 100644 index 716aeff2d86..00000000000 --- a/java/jdk15/files/patch-HAE_API_BSDOS.c +++ /dev/null @@ -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> diff --git a/java/jdk15/files/patch-HAE_API_BSDOS_Capture.c b/java/jdk15/files/patch-HAE_API_BSDOS_Capture.c deleted file mode 100644 index d68235a1d3d..00000000000 --- a/java/jdk15/files/patch-HAE_API_BSDOS_Capture.c +++ /dev/null @@ -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> diff --git a/java/jdk15/files/patch-common::Release.gmk b/java/jdk15/files/patch-common::Release.gmk deleted file mode 100644 index eebba86583d..00000000000 --- a/java/jdk15/files/patch-common::Release.gmk +++ /dev/null @@ -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 diff --git a/java/jdk15/files/patch-font.properties.zh_TW.bsd b/java/jdk15/files/patch-font.properties.zh_TW.bsd deleted file mode 100644 index 9a9f2e90996..00000000000 --- a/java/jdk15/files/patch-font.properties.zh_TW.bsd +++ /dev/null @@ -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 diff --git a/java/jdk15/files/patch-ja::sunw_java_plugin.po b/java/jdk15/files/patch-ja::sunw_java_plugin.po deleted file mode 100644 index 04e67969343..00000000000 --- a/java/jdk15/files/patch-ja::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk15/files/patch-ko.UTF-8::sunw_java_plugin.po b/java/jdk15/files/patch-ko.UTF-8::sunw_java_plugin.po deleted file mode 100644 index 678aad5e02e..00000000000 --- a/java/jdk15/files/patch-ko.UTF-8::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk15/files/patch-ko::sunw_java_plugin.po b/java/jdk15/files/patch-ko::sunw_java_plugin.po deleted file mode 100644 index 4ad1d9569eb..00000000000 --- a/java/jdk15/files/patch-ko::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk15/files/patch-native.c b/java/jdk15/files/patch-native.c deleted file mode 100644 index 2c7f316ff9b..00000000000 --- a/java/jdk15/files/patch-native.c +++ /dev/null @@ -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 diff --git a/java/jdk15/files/patch-sun::awt::Makefile b/java/jdk15/files/patch-sun::awt::Makefile deleted file mode 100644 index 969b6bb4a05..00000000000 --- a/java/jdk15/files/patch-sun::awt::Makefile +++ /dev/null @@ -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) - diff --git a/java/jdk15/files/patch-utils.c b/java/jdk15/files/patch-utils.c deleted file mode 100644 index 75f4b0be64e..00000000000 --- a/java/jdk15/files/patch-utils.c +++ /dev/null @@ -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" diff --git a/java/jdk15/files/patch-zb.GBK::sunw_java_plugin.po b/java/jdk15/files/patch-zb.GBK::sunw_java_plugin.po deleted file mode 100644 index fa23c4801d9..00000000000 --- a/java/jdk15/files/patch-zb.GBK::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk15/files/patch-zh::sunw_java_plugin.po b/java/jdk15/files/patch-zh::sunw_java_plugin.po deleted file mode 100644 index c2284b61e0b..00000000000 --- a/java/jdk15/files/patch-zh::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk15/files/patch-zh_TW.BIG5::sunw_java_plugin.po b/java/jdk15/files/patch-zh_TW.BIG5::sunw_java_plugin.po deleted file mode 100644 index 254c176d845..00000000000 --- a/java/jdk15/files/patch-zh_TW.BIG5::sunw_java_plugin.po +++ /dev/null @@ -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 Nz]w URL 謬oネ維D\n" - msgid "Plugin: couldn't read directory" - msgstr "Plugin: Lk的ヘ雀" --msgid "plugin: java process exited with status" --msgstr "plugin: java {農HAhX" - msgid "plugin: java process died due to signal" - msgstr "plugin: java {任w]T弦τ郡" - msgid " a core file was generated" - msgstr " w横ネ屬濱筆" --msgid "Plugin: trouble with work request from child" --msgstr "Plugin: l寵O勠nD困u@oネ維D" - msgid "Plugin: can't find IP address for current host" - msgstr "Plugin: тぃ譽惓eD穣 IP 讌}" --msgid "Plugin: trouble reading Netscape proxy configuration URL from\n" --msgstr "Plugin: 的 Netscape Nztm URL 謬oネ維D\n" --msgid "Plugin: can't find plugins/../java directory" --msgstr "Plugin: тぃ plugins/../java ヘ雀" - msgid "Plugin: unexpected work request from child" - msgstr "Plugin: l寵OnDFDw漢困u@" - msgid "Plugin: Java VM process has died." diff --git a/java/jdk15/files/patch-zh_TW::sunw_java_plugin.po b/java/jdk15/files/patch-zh_TW::sunw_java_plugin.po deleted file mode 100644 index 2b1e7ec8c4a..00000000000 --- a/java/jdk15/files/patch-zh_TW::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index 1c74eb0f861..dbf1c7ba5b5 100644 --- 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} diff --git a/java/jdk16/distinfo b/java/jdk16/distinfo index 5817a11c25c..2b86f42d039 100644 --- a/java/jdk16/distinfo +++ b/java/jdk16/distinfo @@ -1,2 +1,2 @@ MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57 -MD5 (bsd-jdk131-patches-6.tar.gz) = 9cade10b81d6034fdd2176bef32bdbf9 +MD5 (bsd-jdk131-patches-7.tar.gz) = e119cf9ceb4b6ca38d597c9916600530 diff --git a/java/jdk16/files/patch-GNUmakefile b/java/jdk16/files/patch-GNUmakefile deleted file mode 100644 index 8cd4660a518..00000000000 --- a/java/jdk16/files/patch-GNUmakefile +++ /dev/null @@ -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 diff --git a/java/jdk16/files/patch-HAE_API_BSDOS.c b/java/jdk16/files/patch-HAE_API_BSDOS.c deleted file mode 100644 index cad17d0b05b..00000000000 --- a/java/jdk16/files/patch-HAE_API_BSDOS.c +++ /dev/null @@ -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> diff --git a/java/jdk16/files/patch-HAE_API_BSDOS_Capture.c b/java/jdk16/files/patch-HAE_API_BSDOS_Capture.c deleted file mode 100644 index 97d646ddf72..00000000000 --- a/java/jdk16/files/patch-HAE_API_BSDOS_Capture.c +++ /dev/null @@ -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> diff --git a/java/jdk16/files/patch-common::Release.gmk b/java/jdk16/files/patch-common::Release.gmk deleted file mode 100644 index eebba86583d..00000000000 --- a/java/jdk16/files/patch-common::Release.gmk +++ /dev/null @@ -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 diff --git a/java/jdk16/files/patch-font.properties.zh_TW.bsd b/java/jdk16/files/patch-font.properties.zh_TW.bsd deleted file mode 100644 index 9a9f2e90996..00000000000 --- a/java/jdk16/files/patch-font.properties.zh_TW.bsd +++ /dev/null @@ -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 diff --git a/java/jdk16/files/patch-ja::sunw_java_plugin.po b/java/jdk16/files/patch-ja::sunw_java_plugin.po deleted file mode 100644 index f7c0f5c03a1..00000000000 --- a/java/jdk16/files/patch-ja::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk16/files/patch-ko.UTF-8::sunw_java_plugin.po b/java/jdk16/files/patch-ko.UTF-8::sunw_java_plugin.po deleted file mode 100644 index 88547a7a113..00000000000 --- a/java/jdk16/files/patch-ko.UTF-8::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk16/files/patch-ko::sunw_java_plugin.po b/java/jdk16/files/patch-ko::sunw_java_plugin.po deleted file mode 100644 index deec1220b82..00000000000 --- a/java/jdk16/files/patch-ko::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk16/files/patch-native.c b/java/jdk16/files/patch-native.c deleted file mode 100644 index 3a6887bda0a..00000000000 --- a/java/jdk16/files/patch-native.c +++ /dev/null @@ -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 diff --git a/java/jdk16/files/patch-sun::awt::Makefile b/java/jdk16/files/patch-sun::awt::Makefile deleted file mode 100644 index 969b6bb4a05..00000000000 --- a/java/jdk16/files/patch-sun::awt::Makefile +++ /dev/null @@ -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) - diff --git a/java/jdk16/files/patch-utils.c b/java/jdk16/files/patch-utils.c deleted file mode 100644 index 75f4b0be64e..00000000000 --- a/java/jdk16/files/patch-utils.c +++ /dev/null @@ -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" diff --git a/java/jdk16/files/patch-zb.GBK::sunw_java_plugin.po b/java/jdk16/files/patch-zb.GBK::sunw_java_plugin.po deleted file mode 100644 index 05620855d7a..00000000000 --- a/java/jdk16/files/patch-zb.GBK::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk16/files/patch-zh::sunw_java_plugin.po b/java/jdk16/files/patch-zh::sunw_java_plugin.po deleted file mode 100644 index 14283658329..00000000000 --- a/java/jdk16/files/patch-zh::sunw_java_plugin.po +++ /dev/null @@ -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." diff --git a/java/jdk16/files/patch-zh_TW.BIG5::sunw_java_plugin.po b/java/jdk16/files/patch-zh_TW.BIG5::sunw_java_plugin.po deleted file mode 100644 index c70b469e80e..00000000000 --- a/java/jdk16/files/patch-zh_TW.BIG5::sunw_java_plugin.po +++ /dev/null @@ -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 Nz]w URL 謬oネ維D\n" - msgid "Plugin: couldn't read directory" - msgstr "Plugin: Lk的ヘ雀" --msgid "plugin: java process exited with status" --msgstr "plugin: java {農HAhX" - msgid "plugin: java process died due to signal" - msgstr "plugin: java {任w]T弦τ郡" - msgid " a core file was generated" - msgstr " w横ネ屬濱筆" --msgid "Plugin: trouble with work request from child" --msgstr "Plugin: l寵O勠nD困u@oネ維D" - msgid "Plugin: can't find IP address for current host" - msgstr "Plugin: тぃ譽惓eD穣 IP 讌}" --msgid "Plugin: trouble reading Netscape proxy configuration URL from\n" --msgstr "Plugin: 的 Netscape Nztm URL 謬oネ維D\n" --msgid "Plugin: can't find plugins/../java directory" --msgstr "Plugin: тぃ plugins/../java ヘ雀" - msgid "Plugin: unexpected work request from child" - msgstr "Plugin: l寵OnDFDw漢困u@" - msgid "Plugin: Java VM process has died." diff --git a/java/jdk16/files/patch-zh_TW::sunw_java_plugin.po b/java/jdk16/files/patch-zh_TW::sunw_java_plugin.po deleted file mode 100644 index 19220fd32aa..00000000000 --- a/java/jdk16/files/patch-zh_TW::sunw_java_plugin.po +++ /dev/null @@ -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." |