. Set LATEST_LINK [1]

. Fix rare NULL pointer de-reference bug in plugin code [2]

. Use better chinese fonts [3]

. Bump PORTREVISION

Requested by:	kris [1]
Submitted by:	Georg-W. Koltermann <gwk@rahn-koltermann.de> [2],
		Clive Lin <clive@tongi.org> [3]

3 files changed, 317 insertions, 1 deletions

diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 2a923bbb6101..f5956056a7a8 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk14.html
@@ -33,6 +33,7 @@ WRKSRC=		${WRKDIR}/control/make
 
 JDK_VERSION=	1.4.2
 JDK_PATCHSET_VERSION=	6
+LATEST_LINK=	jdk14
 
 SUN_LINUX_JDK_VERSION=  1.4.2
 
diff --git a/java/jdk15/files/patch-awt_Component.c b/java/jdk15/files/patch-awt_Component.c
new file mode 100644
index 000000000000..db768c611349
--- /dev/null
+++ b/java/jdk15/files/patch-awt_Component.c
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../j2se/src/solaris/native/sun/awt/awt_Component.c.orig	27 Oct 2003 12:16:41 -0000	1.4
++++ ../../j2se/src/solaris/native/sun/awt/awt_Component.c	1 Mar 2004 21:36:45 -0000	1.5
+@@ -1179,7 +1179,7 @@
+             }
+             XtVaSetValues(to, XmNtraversalOn, True, NULL);
+         }
+-    } else if (from != NULL) {
++    } else if (from != NULL && to != NULL) {
+         // disable the tree starting from uncommon part to 'from'
+         if (parents_from[index] == parents_to[index]) {
+             if (index == count_from - 1) {
diff --git a/java/jdk15/files/patch-font.properties.zh_TW.bsd b/java/jdk15/files/patch-font.properties.zh_TW.bsd
new file mode 100644
index 000000000000..a142781b2ee2
--- /dev/null
+++ b/java/jdk15/files/patch-font.properties.zh_TW.bsd
@@ -0,0 +1,302 @@
+$FreeBSD$
+
+--- ../../j2se/src/solaris/classes/sun/awt/motif/font.properties.zh_TW.bsd.orig	16 Aug 2002 06:04:59 -0000	1.1
++++ ../../j2se/src/solaris/classes/sun/awt/motif/font.properties.zh_TW.bsd	1 Mar 2004 21:40:08 -0000	1.2
+@@ -1,235 +1,178 @@
++# %W% %E%
+ #
+-# @(#)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
++# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+ #
+ 
+-# Serif font definition
++# Component Font Mappings For RedhatLinux 8.0/zh_TW
+ #
+ 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.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+ 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.italic.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+ 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.bold.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+ 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
++serif.bolditalic.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+-# 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.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+ 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.italic.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+ 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.bold.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+ 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
++sansserif.bolditalic.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+-# 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.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+-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.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
++monospaced.italic.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+ 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.bold.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+-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
++monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
++monospaced.bolditalic.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+-# 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.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+ 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.italic.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+ 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.bold.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+ 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
++dialog.bolditalic.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+-# 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.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+-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.italic.0=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
++dialoginput.italic.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+ 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
++dialoginput.bold.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
++dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
++dialoginput.bolditalic.1=-arphic technology co.-ar pl mingti2l big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1
+ 
+-# Default font definition
++# Missing Glyph Character
+ #
+ 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.
++# Component Font Character Encodings
+ #
+ fontcharset.serif.0=sun.io.CharToByteISO8859_1
+-fontcharset.serif.1=sun.io.CharToByteMS950
++fontcharset.serif.1=sun.io.CharToByteUnicodeBigUnmarked
+ 
+ fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
+-fontcharset.sansserif.1=sun.io.CharToByteMS950
++fontcharset.sansserif.1=sun.io.CharToByteUnicodeBigUnmarked
+ 
+ fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
+-fontcharset.monospaced.1=sun.io.CharToByteMS950
++fontcharset.monospaced.1=sun.io.CharToByteUnicodeBigUnmarked
+ 
+ fontcharset.dialog.0=sun.io.CharToByteISO8859_1
+-fontcharset.dialog.1=sun.io.CharToByteMS950
++fontcharset.dialog.1=sun.io.CharToByteUnicodeBigUnmarked
+ 
+ fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
+-fontcharset.dialoginput.1=sun.io.CharToByteMS950
++fontcharset.dialoginput.1=sun.io.CharToByteUnicodeBigUnmarked
+ 
+-# 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.
++# Exclusion Ranges
+ #
+ 
+-# XFontSet string
+-# X11 only properties
++# XFontSet Information
+ #
+ 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
++-kc-fixed-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
++-kc-fixed-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
++-kc-fixed-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 
+-#
++-kc-fixed-medium-r-normal--*-%d-*-*-c-*-big5-0
+ 
+ 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
++-kc-fixed-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
++-kc-fixed-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
++-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
++-kc-fixed-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
++-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
++-kc-fixed-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
++-kc-fixed-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
++-kc-fixed-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
++-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
++-kc-fixed-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
++-kc-fixed-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
++-kc-fixed-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
++-kc-fixed-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
++-kc-fixed-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
++-kc-fixed-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
++-kc-fixed-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
++-kc-fixed-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
++-kc-fixed-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
++-kc-fixed-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
++-kc-fixed-medium-r-normal--*-%d-*-*-c-*-big5-0
++
++filename.-arphic_technology_co.-ar_pl_mingti2l_big5-medium-r-normal--*-%d-*-*-c-*-iso10646-1=/usr/local/share/fonts/TrueType/bsmi00lp.ttf