. Update to patchset 8.

This commit is contained in:
Greg Lewis 2003-02-12 19:00:42 +00:00
parent a0cb89f355
commit a3d89c1e3c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=75384
48 changed files with 8 additions and 4568 deletions

View file

@ -7,7 +7,6 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/java2/download.html
# http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@ -46,7 +45,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/fonts/TrueType/arphic:${PORTSDIR}/chinese/arphi
WRKSRC= ${WRKDIR}/j2sdk1.3.1/make
JDK_VERSION= 1.3.1
JDK_PATCHSET_VERSION= 7
JDK_PATCHSET_VERSION= 8
.if defined(NATIVE_BOOTSTRAP)
JDK13DIR?= ${LOCALBASE}/jdk${JDK_VERSION}

View file

@ -1,2 +1,2 @@
MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57
MD5 (bsd-jdk131-patches-7.tar.gz) = e119cf9ceb4b6ca38d597c9916600530
MD5 (bsd-jdk131-patches-8.tar.gz) = 1fd14cea9ce15e9a7e5ee2f60f50dd01

View file

@ -1,14 +0,0 @@
$FreeBSD$
diff -u -r1.3 PlainDatagramSocketImpl.c
--- ../src/solaris/native/java/net/PlainDatagramSocketImpl.c 19 Aug 2001 05:46:50 -0000 1.3
+++ ../src/solaris/native/java/net/PlainDatagramSocketImpl.c 31 Oct 2002 16:39:39 -0000
@@ -489,7 +489,7 @@
strerror(errno));
return;
}
-#if defined(__linux__) && defined(SO_BROADCAST)
+#if (defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && defined(SO_BROADCAST)
{
int t = 1;
setsockopt(fd, SOL_SOCKET, SO_BROADCAST, (char*) &t, sizeof(int));

View file

@ -1,16 +0,0 @@
$FreeBSD$
diff -u -r1.7 Makefile
--- sun/awt/Makefile 13 Apr 2002 05:25:41 -0000 1.7
+++ sun/awt/Makefile 25 Oct 2002 04:31:32 -0000
@@ -406,7 +406,10 @@
font.properties \
font.properties.ja \
psfont.properties.ja \
+ font.properties.ru \
+ font.properties.uk \
font.properties.zh \
+ font.properties.zh_CN \
font.properties.zh_TW
FONTPROPS_SRC_SUFFIX = .$(PLATFORM)

View file

@ -1,63 +0,0 @@
$FreeBSD$
diff -u -r1.5 awt_InputMethod.c
--- ../src/solaris/native/sun/awt/awt_InputMethod.c 10 Sep 2001 05:31:35 -0000 1.5
+++ ../src/solaris/native/sun/awt/awt_InputMethod.c 18 Oct 2002 02:58:26 -0000
@@ -1320,17 +1320,56 @@
X11InputMethodData *pX11IMData =
(X11InputMethodData *) (unsigned long) data;
char *xText;
+ char *ret;
jstring jText;
+ XIMPreeditState preeditState = XIMPreeditUnKnown;
+ XVaNestedList preeditAttr;
+ int bGetState = FALSE;
+
AWT_LOCK();
- if (pX11IMData->current_ic)
+ if (pX11IMData->current_ic) {
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState, &preeditState,
+ NULL);
+ if (!XGetICValues(pX11IMData->current_ic, XNPreeditAttributes,
+ preeditAttr, NULL)) {
+ bGetState = TRUE;
+ }
+ XFree(preeditAttr);
+
xText = XmbResetIC(pX11IMData->current_ic);
+
+ if (bGetState) {
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState,
+ preeditState, 0);
+ XSetICValues(pX11IMData->current_ic,
+ XNPreeditAttributes, preeditAttr, NULL);
+ XFree(preeditAttr);
+ }
+ }
else {
/*
* If there is no reference to the current XIC, try to reset both XICs.
*/
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState, &preeditState,
+ NULL);
+ if (!XGetICValues(pX11IMData->ic_active, XNPreeditAttributes,
+ preeditAttr, NULL)) {
+ bGetState = TRUE;
+ }
+ XFree(preeditAttr);
+
xText = XmbResetIC(pX11IMData->ic_active);
+
+ if (bGetState) {
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState,
+ preeditState, 0);
+ XSetICValues(pX11IMData->ic_active, XNPreeditAttributes,
+ preeditAttr, NULL);
+ XFree(preeditAttr);
+ }
+
/*it may also means that the real client component does
not have focus -- has been deactivated... its xic should
not have the focus, bug#4284651 showes reset XIC for htt

View file

@ -1,18 +0,0 @@
$FreeBSD$
--- common/Defs-bsd.gmk.orig Mon Sep 10 17:02:16 2001
+++ common/Defs-bsd.gmk Mon Sep 10 17:02:42 2001
@@ -221,10 +221,10 @@
else # ARCH
CFLAGS_COMMON = $(GCC_WARNINGS)
endif # ARCH
-CFLAGS_OPT = $(POPT)
+CFLAGS_OPT = $(POPT) $(SYS_CFLAGS)
CFLAGS_DBG = -g3
CXXFLAGS_COMMON = $(GCC_WARNINGS)
-CXXFLAGS_OPT = $(POPT)
+CXXFLAGS_OPT = $(POPT) $(SYS_CFLAGS)
CXXFLAGS_DBG = -g3
CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \

View file

@ -1,308 +0,0 @@
$FreeBSD$
diff -u -r1.3 -r1.4
--- ../src/solaris/classes/sun/awt/motif/font.properties.ja.bsd 25 Aug 2001 04:39:08 -0000 1.3
+++ ../src/solaris/classes/sun/awt/motif/font.properties.ja.bsd 5 Aug 2002 04:30:35 -0000 1.4
@@ -13,99 +13,99 @@
#
#
-# AWT Font default Properties for Japanese Redhat Linux 6.1 and higher
+# AWT Font default Properties for FreeBSD
#
# Serif font definition
#
serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.italic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.italic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.italic.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.italic.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.bold.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.bold.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.bold.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.bold.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.bolditalic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.bolditalic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.bolditalic.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.bolditalic.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# SansSerif font definition
#
sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.italic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.italic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bold.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.bold.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bolditalic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.bolditalic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Monospaced font definition
#
monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.italic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.italic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bold.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.bold.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bolditalic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.bolditalic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Dialog font definition
#
dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.italic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.italic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bold.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.bold.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bolditalic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.bolditalic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# DialogInput font definition
#
dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.italic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.italic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bold.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.bold.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bolditalic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.bolditalic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Default font definition
#
@@ -168,117 +168,117 @@
# Serif font definition
#
fontset.serif.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.serif.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.serif.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.serif.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# SansSerif font definition
#
fontset.sansserif.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.sansserif.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.sansserif.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.sansserif.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Monospaced font definition
#
fontset.monospaced.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.monospaced.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.monospaced.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.monospaced.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Dialog font definition
#
fontset.dialog.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialog.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialog.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialog.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# DialogInput font definition
#
fontset.dialoginput.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialoginput.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialoginput.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialoginput.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
#
fontset.default=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-#
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
+#
\ No newline at end of file

View file

@ -1,201 +0,0 @@
$FreeBSD$
diff -N src/solaris/classes/sun/awt/motif/font.properties.ru.bsd
--- ../src/solaris/classes/sun/awt/motif/font.properties.ru.bsd 1 Jan 1970 00:00:00 -0000
+++ ../src/solaris/classes/sun/awt/motif/font.properties.ru.bsd 18 Oct 2002 03:02:35 -0000
@@ -0,0 +1,195 @@
+#
+# @(#)font.properties.linux 1.7 01/04/21
+#
+# Copyright 1997-2001 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.
+#
+
+#
+# FreeBSD version derived from the Linux version derived from the
+# version for SunOS 5.5.1 Notice that
+# we use the .ttf files shipped in the JDK distribution.
+#
+
+# Serif font definition
+#
+serif.0=-*-times new roman-medium-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.italic.0=-*-times new roman-medium-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bold.0=-*-times new roman-bold-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bolditalic.0=-*-times new roman-bold-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+# SansSerif font definition
+#
+sansserif.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Monospaced font definition
+#
+monospaced.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.italic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bold.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bolditalic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+# Dialog font definition
+#
+dialog.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# DialogInput font definition
+#
+dialoginput.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.italic.0=-*-courier new-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bold.0=-*-courier new-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bolditalic.0=-*-courier new-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Default font definition
+#
+default.char=274f
+
+# name aliases
+#
+alias.timesroman=serif
+alias.helvetica=sansserif
+alias.courier=monospaced
+
+# for backward compatibility
+#uncomment with urw fonts
+#zapfdingbats.0=--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+# 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.awt.CharToByteSymbol
+
+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
+fontcharset.sansserif.1=sun.awt.CharToByteSymbol
+
+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
+fontcharset.monospaced.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
+fontcharset.dialog.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
+fontcharset.dialoginput.1=sun.awt.CharToByteSymbol
+
+#replace font line if you have zapf fonts
+#fontcharset.zapfdingbats.0=sun.io.CharToByteISO8859_1
+
+# 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=\
+-*-*-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.italic=\
+-*-*-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bold=\
+-*-*-demibold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bolditalic=\
+-*-*-demibold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.italic=\
+-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bold=\
+-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bolditalic=\
+-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.plain=\
+-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.monospaced.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialog.italic=\
+-*-*-medium-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bolditalic=\
+-*-*-bold-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialoginput.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+#uncomment with urw fonts
+#fontset.zapfdingbats=\
+#--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+#
+fontset.default=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+#

View file

@ -1,201 +0,0 @@
$FreeBSD$
diff -N src/solaris/classes/sun/awt/motif/font.properties.uk.bsd
--- ../src/solaris/classes/sun/awt/motif/font.properties.uk.bsd 1 Jan 1970 00:00:00 -0000
+++ ../src/solaris/classes/sun/awt/motif/font.properties.uk.bsd 18 Oct 2002 03:02:46 -0000
@@ -0,0 +1,195 @@
+#
+# @(#)font.properties.linux 1.7 01/04/21
+#
+# Copyright 1997-2001 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.
+#
+
+#
+# FreeBSD version derived from the Linux version derived from the
+# version for SunOS 5.5.1 Notice that
+# we use the .ttf files shipped in the JDK distribution.
+#
+
+# Serif font definition
+#
+serif.0=-*-times new roman-medium-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.italic.0=-*-times new roman-medium-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bold.0=-*-times new roman-bold-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bolditalic.0=-*-times new roman-bold-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+# SansSerif font definition
+#
+sansserif.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Monospaced font definition
+#
+monospaced.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.italic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bold.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bolditalic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+# Dialog font definition
+#
+dialog.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# DialogInput font definition
+#
+dialoginput.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.italic.0=-*-courier new-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bold.0=-*-courier new-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bolditalic.0=-*-courier new-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Default font definition
+#
+default.char=274f
+
+# name aliases
+#
+alias.timesroman=serif
+alias.helvetica=sansserif
+alias.courier=monospaced
+
+# for backward compatibility
+#uncomment with urw fonts
+#zapfdingbats.0=--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+# 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.awt.CharToByteSymbol
+
+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
+fontcharset.sansserif.1=sun.awt.CharToByteSymbol
+
+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
+fontcharset.monospaced.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
+fontcharset.dialog.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
+fontcharset.dialoginput.1=sun.awt.CharToByteSymbol
+
+#replace font line if you have zapf fonts
+#fontcharset.zapfdingbats.0=sun.io.CharToByteISO8859_1
+
+# 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=\
+-*-*-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.italic=\
+-*-*-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bold=\
+-*-*-demibold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bolditalic=\
+-*-*-demibold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.italic=\
+-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bold=\
+-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bolditalic=\
+-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.plain=\
+-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.monospaced.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialog.italic=\
+-*-*-medium-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bolditalic=\
+-*-*-bold-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialoginput.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+#uncomment with urw fonts
+#fontset.zapfdingbats=\
+#--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+#
+fontset.default=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+#

View file

@ -1,241 +0,0 @@
$FreeBSD$
diff -N src/solaris/classes/sun/awt/motif/font.properties.zh_CN.bsd
--- ../src/solaris/classes/sun/awt/motif/font.properties.zh_CN.bsd 1 Jan 1970 00:00:00 -0000
+++ ../src/solaris/classes/sun/awt/motif/font.properties.zh_CN.bsd 25 Oct 2002 04:30:51 -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 technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
+serif.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
+serif.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
+serif.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# SansSerif font definition
+#
+sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Monospaced font definition
+#
+monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Dialog font definition
+#
+dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# DialogInput font definition
+#
+dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-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.awt.motif.CharToByteX11GB2312
+
+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
+fontcharset.sansserif.1=sun.awt.motif.CharToByteX11GB2312
+
+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
+fontcharset.monospaced.1=sun.awt.motif.CharToByteX11GB2312
+
+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
+fontcharset.dialog.1=sun.awt.motif.CharToByteX11GB2312
+
+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
+fontcharset.dialoginput.1=sun.awt.motif.CharToByteX11GB2312
+
+# 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 technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.serif.italic=\
+-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.serif.bold=\
+-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.serif.bolditalic=\
+-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# SansSerif font definition
+#
+
+fontset.sansserif.plain=\
+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.sansserif.italic=\
+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.sansserif.bold=\
+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.sansserif.bolditalic=\
+-b&h-lucida-bold-i-normal-snas-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Monospaced font definition
+#
+fontset.monospaced.plain=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.monospaced.italic=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.monospaced.bold=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-,1\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.monospaced.bolditalic=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Dialog font definition
+#
+fontset.dialog.italic=\
+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialog.bold=\
+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialog.bolditalic=\
+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialog.plain=\
+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# DialogInput font definition
+#
+fontset.dialoginput.italic=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialoginput.bold=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialoginput.bolditalic=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialoginput.plain=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+#
+fontset.default=\
+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0

View file

@ -1,62 +0,0 @@
$FreeBSD$
--- ../../hotspot1.3.1/src/os_cpu/linux_i486/vm/os_linux_i486.cpp 11 Apr 2002 10:30:45 -0000 1.3
+++ ../../hotspot1.3.1/src/os_cpu/linux_i486/vm/os_linux_i486.cpp 28 Jul 2002 23:18:37 -0000 1.4
@@ -15,7 +15,6 @@
# include "incls/_os_linux_i486.cpp.incl"
# include "incls/_os_pd.hpp.incl"
-extern "C" {
// put OS-includes here
# include <sys/types.h>
# include <sys/mman.h>
@@ -34,14 +33,13 @@
# include <pwd.h>
# include <poll.h>
-
#include <setjmp.h>
-#define HACK
-#include </usr/src/lib/libc_r/uthread/pthread_private.h>
-//--billh
+#undef pthread_attr_default
+#undef pthread_mutexattr_default
+#undef pthread_condattr_default
-}
+#include <uthread/pthread_private.h>
#define MAX_PATH (2 * K)
#define INTERRUPT_SIGNAL SIGUSR1
@@ -188,10 +186,11 @@
// fastlane always uses callback for safepoints
assert(!GetThreadState || Arguments::has_profile(), "just checking");
-// The register UESP doensn't exist in the ucontext_t under FreeBSD. I
+// The register UESP doesn't exist in the ucontext_t under FreeBSD. I
// suspect that it's a kind of pseudo-register that's created by the glibc
// runtime in Linux and other OSes to differentiate the stack pointers
-// during an exception verses normal execution, much like the old 68k CPU.
+// during exception time verses normal execution. It's much like the old 68k
+// CPU's stack handling.
//
// _sp = (jint*)uc->uc_mcontext.gregs[UESP];
//
@@ -790,7 +789,6 @@
// JVMPI code
bool os::thread_is_running(JavaThread* tp) {
#if 0
-#endif
pthread_t tid = tp->osthread()->thread_id();
ucontext_t *uc = (ucontext_t *) &tid->ctx.uc;
sumObject_t *so = (sumObject_t*) uc;
@@ -824,6 +822,8 @@
tp->set_last_sum(sum);
return true;
}
+#endif
+ return true;
}

View file

@ -1,15 +0,0 @@
$FreeBSD$
diff -u -r1.8 GNUmakefile
--- ../ext/plugin/build/solaris/GNUmakefile 15 Mar 2002 06:08:52 -0000 1.8
+++ ../ext/plugin/build/solaris/GNUmakefile 23 Aug 2002 08:01:28 -0000
@@ -636,7 +636,8 @@
$(PLUGIN): $(COMMON_OFILES)
ifeq ($(findstring BSD,$(OS)), BSD)
export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
- $(CXX) $(LD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) $(COMMON_OFILES)
+ $(CXX) $(LD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) $(COMMON_OFILES) \
+ -L$(INTL_LIB) -lintl
else
export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
$(CXX) $(LD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) $(COMMON_OFILES)

View file

@ -7,7 +7,6 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/java2/download.html
# http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@ -46,7 +45,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/fonts/TrueType/arphic:${PORTSDIR}/chinese/arphi
WRKSRC= ${WRKDIR}/j2sdk1.3.1/make
JDK_VERSION= 1.3.1
JDK_PATCHSET_VERSION= 7
JDK_PATCHSET_VERSION= 8
.if defined(NATIVE_BOOTSTRAP)
JDK13DIR?= ${LOCALBASE}/jdk${JDK_VERSION}

View file

@ -1,2 +1,2 @@
MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57
MD5 (bsd-jdk131-patches-7.tar.gz) = e119cf9ceb4b6ca38d597c9916600530
MD5 (bsd-jdk131-patches-8.tar.gz) = 1fd14cea9ce15e9a7e5ee2f60f50dd01

View file

@ -1,14 +0,0 @@
$FreeBSD$
diff -u -r1.3 PlainDatagramSocketImpl.c
--- ../src/solaris/native/java/net/PlainDatagramSocketImpl.c 19 Aug 2001 05:46:50 -0000 1.3
+++ ../src/solaris/native/java/net/PlainDatagramSocketImpl.c 31 Oct 2002 16:39:39 -0000
@@ -489,7 +489,7 @@
strerror(errno));
return;
}
-#if defined(__linux__) && defined(SO_BROADCAST)
+#if (defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && defined(SO_BROADCAST)
{
int t = 1;
setsockopt(fd, SOL_SOCKET, SO_BROADCAST, (char*) &t, sizeof(int));

View file

@ -1,16 +0,0 @@
$FreeBSD$
diff -u -r1.7 Makefile
--- sun/awt/Makefile 13 Apr 2002 05:25:41 -0000 1.7
+++ sun/awt/Makefile 25 Oct 2002 04:31:32 -0000
@@ -406,7 +406,10 @@
font.properties \
font.properties.ja \
psfont.properties.ja \
+ font.properties.ru \
+ font.properties.uk \
font.properties.zh \
+ font.properties.zh_CN \
font.properties.zh_TW
FONTPROPS_SRC_SUFFIX = .$(PLATFORM)

View file

@ -1,63 +0,0 @@
$FreeBSD$
diff -u -r1.5 awt_InputMethod.c
--- ../src/solaris/native/sun/awt/awt_InputMethod.c 10 Sep 2001 05:31:35 -0000 1.5
+++ ../src/solaris/native/sun/awt/awt_InputMethod.c 18 Oct 2002 02:58:26 -0000
@@ -1320,17 +1320,56 @@
X11InputMethodData *pX11IMData =
(X11InputMethodData *) (unsigned long) data;
char *xText;
+ char *ret;
jstring jText;
+ XIMPreeditState preeditState = XIMPreeditUnKnown;
+ XVaNestedList preeditAttr;
+ int bGetState = FALSE;
+
AWT_LOCK();
- if (pX11IMData->current_ic)
+ if (pX11IMData->current_ic) {
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState, &preeditState,
+ NULL);
+ if (!XGetICValues(pX11IMData->current_ic, XNPreeditAttributes,
+ preeditAttr, NULL)) {
+ bGetState = TRUE;
+ }
+ XFree(preeditAttr);
+
xText = XmbResetIC(pX11IMData->current_ic);
+
+ if (bGetState) {
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState,
+ preeditState, 0);
+ XSetICValues(pX11IMData->current_ic,
+ XNPreeditAttributes, preeditAttr, NULL);
+ XFree(preeditAttr);
+ }
+ }
else {
/*
* If there is no reference to the current XIC, try to reset both XICs.
*/
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState, &preeditState,
+ NULL);
+ if (!XGetICValues(pX11IMData->ic_active, XNPreeditAttributes,
+ preeditAttr, NULL)) {
+ bGetState = TRUE;
+ }
+ XFree(preeditAttr);
+
xText = XmbResetIC(pX11IMData->ic_active);
+
+ if (bGetState) {
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState,
+ preeditState, 0);
+ XSetICValues(pX11IMData->ic_active, XNPreeditAttributes,
+ preeditAttr, NULL);
+ XFree(preeditAttr);
+ }
+
/*it may also means that the real client component does
not have focus -- has been deactivated... its xic should
not have the focus, bug#4284651 showes reset XIC for htt

View file

@ -1,18 +0,0 @@
$FreeBSD$
--- common/Defs-bsd.gmk.orig Mon Sep 10 17:02:16 2001
+++ common/Defs-bsd.gmk Mon Sep 10 17:02:42 2001
@@ -221,10 +221,10 @@
else # ARCH
CFLAGS_COMMON = $(GCC_WARNINGS)
endif # ARCH
-CFLAGS_OPT = $(POPT)
+CFLAGS_OPT = $(POPT) $(SYS_CFLAGS)
CFLAGS_DBG = -g3
CXXFLAGS_COMMON = $(GCC_WARNINGS)
-CXXFLAGS_OPT = $(POPT)
+CXXFLAGS_OPT = $(POPT) $(SYS_CFLAGS)
CXXFLAGS_DBG = -g3
CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \

View file

@ -1,308 +0,0 @@
$FreeBSD$
diff -u -r1.3 -r1.4
--- ../src/solaris/classes/sun/awt/motif/font.properties.ja.bsd 25 Aug 2001 04:39:08 -0000 1.3
+++ ../src/solaris/classes/sun/awt/motif/font.properties.ja.bsd 5 Aug 2002 04:30:35 -0000 1.4
@@ -13,99 +13,99 @@
#
#
-# AWT Font default Properties for Japanese Redhat Linux 6.1 and higher
+# AWT Font default Properties for FreeBSD
#
# Serif font definition
#
serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.italic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.italic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.italic.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.italic.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.bold.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.bold.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.bold.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.bold.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.bolditalic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.bolditalic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.bolditalic.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.bolditalic.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# SansSerif font definition
#
sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.italic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.italic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bold.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.bold.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bolditalic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.bolditalic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Monospaced font definition
#
monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.italic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.italic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bold.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.bold.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bolditalic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.bolditalic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Dialog font definition
#
dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.italic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.italic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bold.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.bold.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bolditalic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.bolditalic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# DialogInput font definition
#
dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.italic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.italic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bold.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.bold.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bolditalic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.bolditalic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Default font definition
#
@@ -168,117 +168,117 @@
# Serif font definition
#
fontset.serif.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.serif.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.serif.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.serif.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# SansSerif font definition
#
fontset.sansserif.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.sansserif.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.sansserif.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.sansserif.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Monospaced font definition
#
fontset.monospaced.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.monospaced.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.monospaced.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.monospaced.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Dialog font definition
#
fontset.dialog.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialog.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialog.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialog.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# DialogInput font definition
#
fontset.dialoginput.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialoginput.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialoginput.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialoginput.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
#
fontset.default=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-#
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
+#
\ No newline at end of file

View file

@ -1,201 +0,0 @@
$FreeBSD$
diff -N src/solaris/classes/sun/awt/motif/font.properties.ru.bsd
--- ../src/solaris/classes/sun/awt/motif/font.properties.ru.bsd 1 Jan 1970 00:00:00 -0000
+++ ../src/solaris/classes/sun/awt/motif/font.properties.ru.bsd 18 Oct 2002 03:02:35 -0000
@@ -0,0 +1,195 @@
+#
+# @(#)font.properties.linux 1.7 01/04/21
+#
+# Copyright 1997-2001 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.
+#
+
+#
+# FreeBSD version derived from the Linux version derived from the
+# version for SunOS 5.5.1 Notice that
+# we use the .ttf files shipped in the JDK distribution.
+#
+
+# Serif font definition
+#
+serif.0=-*-times new roman-medium-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.italic.0=-*-times new roman-medium-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bold.0=-*-times new roman-bold-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bolditalic.0=-*-times new roman-bold-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+# SansSerif font definition
+#
+sansserif.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Monospaced font definition
+#
+monospaced.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.italic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bold.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bolditalic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+# Dialog font definition
+#
+dialog.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# DialogInput font definition
+#
+dialoginput.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.italic.0=-*-courier new-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bold.0=-*-courier new-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bolditalic.0=-*-courier new-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Default font definition
+#
+default.char=274f
+
+# name aliases
+#
+alias.timesroman=serif
+alias.helvetica=sansserif
+alias.courier=monospaced
+
+# for backward compatibility
+#uncomment with urw fonts
+#zapfdingbats.0=--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+# 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.awt.CharToByteSymbol
+
+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
+fontcharset.sansserif.1=sun.awt.CharToByteSymbol
+
+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
+fontcharset.monospaced.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
+fontcharset.dialog.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
+fontcharset.dialoginput.1=sun.awt.CharToByteSymbol
+
+#replace font line if you have zapf fonts
+#fontcharset.zapfdingbats.0=sun.io.CharToByteISO8859_1
+
+# 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=\
+-*-*-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.italic=\
+-*-*-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bold=\
+-*-*-demibold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bolditalic=\
+-*-*-demibold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.italic=\
+-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bold=\
+-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bolditalic=\
+-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.plain=\
+-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.monospaced.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialog.italic=\
+-*-*-medium-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bolditalic=\
+-*-*-bold-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialoginput.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+#uncomment with urw fonts
+#fontset.zapfdingbats=\
+#--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+#
+fontset.default=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+#

View file

@ -1,201 +0,0 @@
$FreeBSD$
diff -N src/solaris/classes/sun/awt/motif/font.properties.uk.bsd
--- ../src/solaris/classes/sun/awt/motif/font.properties.uk.bsd 1 Jan 1970 00:00:00 -0000
+++ ../src/solaris/classes/sun/awt/motif/font.properties.uk.bsd 18 Oct 2002 03:02:46 -0000
@@ -0,0 +1,195 @@
+#
+# @(#)font.properties.linux 1.7 01/04/21
+#
+# Copyright 1997-2001 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.
+#
+
+#
+# FreeBSD version derived from the Linux version derived from the
+# version for SunOS 5.5.1 Notice that
+# we use the .ttf files shipped in the JDK distribution.
+#
+
+# Serif font definition
+#
+serif.0=-*-times new roman-medium-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.italic.0=-*-times new roman-medium-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bold.0=-*-times new roman-bold-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bolditalic.0=-*-times new roman-bold-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+# SansSerif font definition
+#
+sansserif.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Monospaced font definition
+#
+monospaced.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.italic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bold.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bolditalic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+# Dialog font definition
+#
+dialog.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# DialogInput font definition
+#
+dialoginput.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.italic.0=-*-courier new-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bold.0=-*-courier new-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bolditalic.0=-*-courier new-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Default font definition
+#
+default.char=274f
+
+# name aliases
+#
+alias.timesroman=serif
+alias.helvetica=sansserif
+alias.courier=monospaced
+
+# for backward compatibility
+#uncomment with urw fonts
+#zapfdingbats.0=--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+# 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.awt.CharToByteSymbol
+
+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
+fontcharset.sansserif.1=sun.awt.CharToByteSymbol
+
+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
+fontcharset.monospaced.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
+fontcharset.dialog.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
+fontcharset.dialoginput.1=sun.awt.CharToByteSymbol
+
+#replace font line if you have zapf fonts
+#fontcharset.zapfdingbats.0=sun.io.CharToByteISO8859_1
+
+# 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=\
+-*-*-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.italic=\
+-*-*-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bold=\
+-*-*-demibold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bolditalic=\
+-*-*-demibold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.italic=\
+-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bold=\
+-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bolditalic=\
+-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.plain=\
+-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.monospaced.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialog.italic=\
+-*-*-medium-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bolditalic=\
+-*-*-bold-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialoginput.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+#uncomment with urw fonts
+#fontset.zapfdingbats=\
+#--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+#
+fontset.default=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+#

View file

@ -1,241 +0,0 @@
$FreeBSD$
diff -N src/solaris/classes/sun/awt/motif/font.properties.zh_CN.bsd
--- ../src/solaris/classes/sun/awt/motif/font.properties.zh_CN.bsd 1 Jan 1970 00:00:00 -0000
+++ ../src/solaris/classes/sun/awt/motif/font.properties.zh_CN.bsd 25 Oct 2002 04:30:51 -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 technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
+serif.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
+serif.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
+serif.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# SansSerif font definition
+#
+sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Monospaced font definition
+#
+monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Dialog font definition
+#
+dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# DialogInput font definition
+#
+dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-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.awt.motif.CharToByteX11GB2312
+
+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
+fontcharset.sansserif.1=sun.awt.motif.CharToByteX11GB2312
+
+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
+fontcharset.monospaced.1=sun.awt.motif.CharToByteX11GB2312
+
+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
+fontcharset.dialog.1=sun.awt.motif.CharToByteX11GB2312
+
+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
+fontcharset.dialoginput.1=sun.awt.motif.CharToByteX11GB2312
+
+# 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 technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.serif.italic=\
+-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.serif.bold=\
+-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.serif.bolditalic=\
+-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# SansSerif font definition
+#
+
+fontset.sansserif.plain=\
+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.sansserif.italic=\
+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.sansserif.bold=\
+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.sansserif.bolditalic=\
+-b&h-lucida-bold-i-normal-snas-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Monospaced font definition
+#
+fontset.monospaced.plain=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.monospaced.italic=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.monospaced.bold=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-,1\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.monospaced.bolditalic=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Dialog font definition
+#
+fontset.dialog.italic=\
+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialog.bold=\
+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialog.bolditalic=\
+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialog.plain=\
+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# DialogInput font definition
+#
+fontset.dialoginput.italic=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialoginput.bold=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialoginput.bolditalic=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialoginput.plain=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+#
+fontset.default=\
+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0

View file

@ -1,62 +0,0 @@
$FreeBSD$
--- ../../hotspot1.3.1/src/os_cpu/linux_i486/vm/os_linux_i486.cpp 11 Apr 2002 10:30:45 -0000 1.3
+++ ../../hotspot1.3.1/src/os_cpu/linux_i486/vm/os_linux_i486.cpp 28 Jul 2002 23:18:37 -0000 1.4
@@ -15,7 +15,6 @@
# include "incls/_os_linux_i486.cpp.incl"
# include "incls/_os_pd.hpp.incl"
-extern "C" {
// put OS-includes here
# include <sys/types.h>
# include <sys/mman.h>
@@ -34,14 +33,13 @@
# include <pwd.h>
# include <poll.h>
-
#include <setjmp.h>
-#define HACK
-#include </usr/src/lib/libc_r/uthread/pthread_private.h>
-//--billh
+#undef pthread_attr_default
+#undef pthread_mutexattr_default
+#undef pthread_condattr_default
-}
+#include <uthread/pthread_private.h>
#define MAX_PATH (2 * K)
#define INTERRUPT_SIGNAL SIGUSR1
@@ -188,10 +186,11 @@
// fastlane always uses callback for safepoints
assert(!GetThreadState || Arguments::has_profile(), "just checking");
-// The register UESP doensn't exist in the ucontext_t under FreeBSD. I
+// The register UESP doesn't exist in the ucontext_t under FreeBSD. I
// suspect that it's a kind of pseudo-register that's created by the glibc
// runtime in Linux and other OSes to differentiate the stack pointers
-// during an exception verses normal execution, much like the old 68k CPU.
+// during exception time verses normal execution. It's much like the old 68k
+// CPU's stack handling.
//
// _sp = (jint*)uc->uc_mcontext.gregs[UESP];
//
@@ -790,7 +789,6 @@
// JVMPI code
bool os::thread_is_running(JavaThread* tp) {
#if 0
-#endif
pthread_t tid = tp->osthread()->thread_id();
ucontext_t *uc = (ucontext_t *) &tid->ctx.uc;
sumObject_t *so = (sumObject_t*) uc;
@@ -824,6 +822,8 @@
tp->set_last_sum(sum);
return true;
}
+#endif
+ return true;
}

View file

@ -1,15 +0,0 @@
$FreeBSD$
diff -u -r1.8 GNUmakefile
--- ../ext/plugin/build/solaris/GNUmakefile 15 Mar 2002 06:08:52 -0000 1.8
+++ ../ext/plugin/build/solaris/GNUmakefile 23 Aug 2002 08:01:28 -0000
@@ -636,7 +636,8 @@
$(PLUGIN): $(COMMON_OFILES)
ifeq ($(findstring BSD,$(OS)), BSD)
export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
- $(CXX) $(LD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) $(COMMON_OFILES)
+ $(CXX) $(LD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) $(COMMON_OFILES) \
+ -L$(INTL_LIB) -lintl
else
export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
$(CXX) $(LD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) $(COMMON_OFILES)

View file

@ -7,7 +7,6 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/java2/download.html
# http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@ -46,7 +45,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/fonts/TrueType/arphic:${PORTSDIR}/chinese/arphi
WRKSRC= ${WRKDIR}/j2sdk1.3.1/make
JDK_VERSION= 1.3.1
JDK_PATCHSET_VERSION= 7
JDK_PATCHSET_VERSION= 8
.if defined(NATIVE_BOOTSTRAP)
JDK13DIR?= ${LOCALBASE}/jdk${JDK_VERSION}

View file

@ -1,2 +1,2 @@
MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57
MD5 (bsd-jdk131-patches-7.tar.gz) = e119cf9ceb4b6ca38d597c9916600530
MD5 (bsd-jdk131-patches-8.tar.gz) = 1fd14cea9ce15e9a7e5ee2f60f50dd01

View file

@ -1,14 +0,0 @@
$FreeBSD$
diff -u -r1.3 PlainDatagramSocketImpl.c
--- ../src/solaris/native/java/net/PlainDatagramSocketImpl.c 19 Aug 2001 05:46:50 -0000 1.3
+++ ../src/solaris/native/java/net/PlainDatagramSocketImpl.c 31 Oct 2002 16:39:39 -0000
@@ -489,7 +489,7 @@
strerror(errno));
return;
}
-#if defined(__linux__) && defined(SO_BROADCAST)
+#if (defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && defined(SO_BROADCAST)
{
int t = 1;
setsockopt(fd, SOL_SOCKET, SO_BROADCAST, (char*) &t, sizeof(int));

View file

@ -1,16 +0,0 @@
$FreeBSD$
diff -u -r1.7 Makefile
--- sun/awt/Makefile 13 Apr 2002 05:25:41 -0000 1.7
+++ sun/awt/Makefile 25 Oct 2002 04:31:32 -0000
@@ -406,7 +406,10 @@
font.properties \
font.properties.ja \
psfont.properties.ja \
+ font.properties.ru \
+ font.properties.uk \
font.properties.zh \
+ font.properties.zh_CN \
font.properties.zh_TW
FONTPROPS_SRC_SUFFIX = .$(PLATFORM)

View file

@ -1,63 +0,0 @@
$FreeBSD$
diff -u -r1.5 awt_InputMethod.c
--- ../src/solaris/native/sun/awt/awt_InputMethod.c 10 Sep 2001 05:31:35 -0000 1.5
+++ ../src/solaris/native/sun/awt/awt_InputMethod.c 18 Oct 2002 02:58:26 -0000
@@ -1320,17 +1320,56 @@
X11InputMethodData *pX11IMData =
(X11InputMethodData *) (unsigned long) data;
char *xText;
+ char *ret;
jstring jText;
+ XIMPreeditState preeditState = XIMPreeditUnKnown;
+ XVaNestedList preeditAttr;
+ int bGetState = FALSE;
+
AWT_LOCK();
- if (pX11IMData->current_ic)
+ if (pX11IMData->current_ic) {
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState, &preeditState,
+ NULL);
+ if (!XGetICValues(pX11IMData->current_ic, XNPreeditAttributes,
+ preeditAttr, NULL)) {
+ bGetState = TRUE;
+ }
+ XFree(preeditAttr);
+
xText = XmbResetIC(pX11IMData->current_ic);
+
+ if (bGetState) {
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState,
+ preeditState, 0);
+ XSetICValues(pX11IMData->current_ic,
+ XNPreeditAttributes, preeditAttr, NULL);
+ XFree(preeditAttr);
+ }
+ }
else {
/*
* If there is no reference to the current XIC, try to reset both XICs.
*/
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState, &preeditState,
+ NULL);
+ if (!XGetICValues(pX11IMData->ic_active, XNPreeditAttributes,
+ preeditAttr, NULL)) {
+ bGetState = TRUE;
+ }
+ XFree(preeditAttr);
+
xText = XmbResetIC(pX11IMData->ic_active);
+
+ if (bGetState) {
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState,
+ preeditState, 0);
+ XSetICValues(pX11IMData->ic_active, XNPreeditAttributes,
+ preeditAttr, NULL);
+ XFree(preeditAttr);
+ }
+
/*it may also means that the real client component does
not have focus -- has been deactivated... its xic should
not have the focus, bug#4284651 showes reset XIC for htt

View file

@ -1,18 +0,0 @@
$FreeBSD$
--- common/Defs-bsd.gmk.orig Mon Sep 10 17:02:16 2001
+++ common/Defs-bsd.gmk Mon Sep 10 17:02:42 2001
@@ -221,10 +221,10 @@
else # ARCH
CFLAGS_COMMON = $(GCC_WARNINGS)
endif # ARCH
-CFLAGS_OPT = $(POPT)
+CFLAGS_OPT = $(POPT) $(SYS_CFLAGS)
CFLAGS_DBG = -g3
CXXFLAGS_COMMON = $(GCC_WARNINGS)
-CXXFLAGS_OPT = $(POPT)
+CXXFLAGS_OPT = $(POPT) $(SYS_CFLAGS)
CXXFLAGS_DBG = -g3
CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \

View file

@ -1,308 +0,0 @@
$FreeBSD$
diff -u -r1.3 -r1.4
--- ../src/solaris/classes/sun/awt/motif/font.properties.ja.bsd 25 Aug 2001 04:39:08 -0000 1.3
+++ ../src/solaris/classes/sun/awt/motif/font.properties.ja.bsd 5 Aug 2002 04:30:35 -0000 1.4
@@ -13,99 +13,99 @@
#
#
-# AWT Font default Properties for Japanese Redhat Linux 6.1 and higher
+# AWT Font default Properties for FreeBSD
#
# Serif font definition
#
serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.italic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.italic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.italic.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.italic.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.bold.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.bold.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.bold.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.bold.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.bolditalic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.bolditalic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.bolditalic.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.bolditalic.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# SansSerif font definition
#
sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.italic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.italic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bold.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.bold.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bolditalic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.bolditalic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Monospaced font definition
#
monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.italic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.italic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bold.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.bold.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bolditalic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.bolditalic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Dialog font definition
#
dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.italic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.italic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bold.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.bold.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bolditalic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.bolditalic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# DialogInput font definition
#
dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.italic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.italic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bold.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.bold.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bolditalic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.bolditalic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Default font definition
#
@@ -168,117 +168,117 @@
# Serif font definition
#
fontset.serif.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.serif.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.serif.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.serif.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# SansSerif font definition
#
fontset.sansserif.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.sansserif.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.sansserif.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.sansserif.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Monospaced font definition
#
fontset.monospaced.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.monospaced.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.monospaced.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.monospaced.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Dialog font definition
#
fontset.dialog.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialog.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialog.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialog.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# DialogInput font definition
#
fontset.dialoginput.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialoginput.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialoginput.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialoginput.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
#
fontset.default=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-#
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
+#
\ No newline at end of file

View file

@ -1,201 +0,0 @@
$FreeBSD$
diff -N src/solaris/classes/sun/awt/motif/font.properties.ru.bsd
--- ../src/solaris/classes/sun/awt/motif/font.properties.ru.bsd 1 Jan 1970 00:00:00 -0000
+++ ../src/solaris/classes/sun/awt/motif/font.properties.ru.bsd 18 Oct 2002 03:02:35 -0000
@@ -0,0 +1,195 @@
+#
+# @(#)font.properties.linux 1.7 01/04/21
+#
+# Copyright 1997-2001 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.
+#
+
+#
+# FreeBSD version derived from the Linux version derived from the
+# version for SunOS 5.5.1 Notice that
+# we use the .ttf files shipped in the JDK distribution.
+#
+
+# Serif font definition
+#
+serif.0=-*-times new roman-medium-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.italic.0=-*-times new roman-medium-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bold.0=-*-times new roman-bold-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bolditalic.0=-*-times new roman-bold-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+# SansSerif font definition
+#
+sansserif.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Monospaced font definition
+#
+monospaced.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.italic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bold.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bolditalic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+# Dialog font definition
+#
+dialog.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# DialogInput font definition
+#
+dialoginput.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.italic.0=-*-courier new-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bold.0=-*-courier new-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bolditalic.0=-*-courier new-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Default font definition
+#
+default.char=274f
+
+# name aliases
+#
+alias.timesroman=serif
+alias.helvetica=sansserif
+alias.courier=monospaced
+
+# for backward compatibility
+#uncomment with urw fonts
+#zapfdingbats.0=--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+# 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.awt.CharToByteSymbol
+
+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
+fontcharset.sansserif.1=sun.awt.CharToByteSymbol
+
+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
+fontcharset.monospaced.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
+fontcharset.dialog.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
+fontcharset.dialoginput.1=sun.awt.CharToByteSymbol
+
+#replace font line if you have zapf fonts
+#fontcharset.zapfdingbats.0=sun.io.CharToByteISO8859_1
+
+# 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=\
+-*-*-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.italic=\
+-*-*-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bold=\
+-*-*-demibold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bolditalic=\
+-*-*-demibold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.italic=\
+-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bold=\
+-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bolditalic=\
+-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.plain=\
+-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.monospaced.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialog.italic=\
+-*-*-medium-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bolditalic=\
+-*-*-bold-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialoginput.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+#uncomment with urw fonts
+#fontset.zapfdingbats=\
+#--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+#
+fontset.default=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+#

View file

@ -1,201 +0,0 @@
$FreeBSD$
diff -N src/solaris/classes/sun/awt/motif/font.properties.uk.bsd
--- ../src/solaris/classes/sun/awt/motif/font.properties.uk.bsd 1 Jan 1970 00:00:00 -0000
+++ ../src/solaris/classes/sun/awt/motif/font.properties.uk.bsd 18 Oct 2002 03:02:46 -0000
@@ -0,0 +1,195 @@
+#
+# @(#)font.properties.linux 1.7 01/04/21
+#
+# Copyright 1997-2001 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.
+#
+
+#
+# FreeBSD version derived from the Linux version derived from the
+# version for SunOS 5.5.1 Notice that
+# we use the .ttf files shipped in the JDK distribution.
+#
+
+# Serif font definition
+#
+serif.0=-*-times new roman-medium-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.italic.0=-*-times new roman-medium-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bold.0=-*-times new roman-bold-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bolditalic.0=-*-times new roman-bold-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+# SansSerif font definition
+#
+sansserif.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Monospaced font definition
+#
+monospaced.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.italic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bold.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bolditalic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+# Dialog font definition
+#
+dialog.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# DialogInput font definition
+#
+dialoginput.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.italic.0=-*-courier new-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bold.0=-*-courier new-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bolditalic.0=-*-courier new-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Default font definition
+#
+default.char=274f
+
+# name aliases
+#
+alias.timesroman=serif
+alias.helvetica=sansserif
+alias.courier=monospaced
+
+# for backward compatibility
+#uncomment with urw fonts
+#zapfdingbats.0=--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+# 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.awt.CharToByteSymbol
+
+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
+fontcharset.sansserif.1=sun.awt.CharToByteSymbol
+
+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
+fontcharset.monospaced.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
+fontcharset.dialog.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
+fontcharset.dialoginput.1=sun.awt.CharToByteSymbol
+
+#replace font line if you have zapf fonts
+#fontcharset.zapfdingbats.0=sun.io.CharToByteISO8859_1
+
+# 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=\
+-*-*-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.italic=\
+-*-*-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bold=\
+-*-*-demibold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bolditalic=\
+-*-*-demibold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.italic=\
+-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bold=\
+-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bolditalic=\
+-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.plain=\
+-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.monospaced.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialog.italic=\
+-*-*-medium-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bolditalic=\
+-*-*-bold-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialoginput.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+#uncomment with urw fonts
+#fontset.zapfdingbats=\
+#--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+#
+fontset.default=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+#

View file

@ -1,241 +0,0 @@
$FreeBSD$
diff -N src/solaris/classes/sun/awt/motif/font.properties.zh_CN.bsd
--- ../src/solaris/classes/sun/awt/motif/font.properties.zh_CN.bsd 1 Jan 1970 00:00:00 -0000
+++ ../src/solaris/classes/sun/awt/motif/font.properties.zh_CN.bsd 25 Oct 2002 04:30:51 -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 technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
+serif.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
+serif.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
+serif.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# SansSerif font definition
+#
+sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Monospaced font definition
+#
+monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Dialog font definition
+#
+dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# DialogInput font definition
+#
+dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-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.awt.motif.CharToByteX11GB2312
+
+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
+fontcharset.sansserif.1=sun.awt.motif.CharToByteX11GB2312
+
+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
+fontcharset.monospaced.1=sun.awt.motif.CharToByteX11GB2312
+
+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
+fontcharset.dialog.1=sun.awt.motif.CharToByteX11GB2312
+
+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
+fontcharset.dialoginput.1=sun.awt.motif.CharToByteX11GB2312
+
+# 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 technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.serif.italic=\
+-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.serif.bold=\
+-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.serif.bolditalic=\
+-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# SansSerif font definition
+#
+
+fontset.sansserif.plain=\
+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.sansserif.italic=\
+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.sansserif.bold=\
+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.sansserif.bolditalic=\
+-b&h-lucida-bold-i-normal-snas-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Monospaced font definition
+#
+fontset.monospaced.plain=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.monospaced.italic=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.monospaced.bold=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-,1\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.monospaced.bolditalic=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Dialog font definition
+#
+fontset.dialog.italic=\
+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialog.bold=\
+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialog.bolditalic=\
+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialog.plain=\
+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# DialogInput font definition
+#
+fontset.dialoginput.italic=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialoginput.bold=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialoginput.bolditalic=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialoginput.plain=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+#
+fontset.default=\
+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0

View file

@ -1,62 +0,0 @@
$FreeBSD$
--- ../../hotspot1.3.1/src/os_cpu/linux_i486/vm/os_linux_i486.cpp 11 Apr 2002 10:30:45 -0000 1.3
+++ ../../hotspot1.3.1/src/os_cpu/linux_i486/vm/os_linux_i486.cpp 28 Jul 2002 23:18:37 -0000 1.4
@@ -15,7 +15,6 @@
# include "incls/_os_linux_i486.cpp.incl"
# include "incls/_os_pd.hpp.incl"
-extern "C" {
// put OS-includes here
# include <sys/types.h>
# include <sys/mman.h>
@@ -34,14 +33,13 @@
# include <pwd.h>
# include <poll.h>
-
#include <setjmp.h>
-#define HACK
-#include </usr/src/lib/libc_r/uthread/pthread_private.h>
-//--billh
+#undef pthread_attr_default
+#undef pthread_mutexattr_default
+#undef pthread_condattr_default
-}
+#include <uthread/pthread_private.h>
#define MAX_PATH (2 * K)
#define INTERRUPT_SIGNAL SIGUSR1
@@ -188,10 +186,11 @@
// fastlane always uses callback for safepoints
assert(!GetThreadState || Arguments::has_profile(), "just checking");
-// The register UESP doensn't exist in the ucontext_t under FreeBSD. I
+// The register UESP doesn't exist in the ucontext_t under FreeBSD. I
// suspect that it's a kind of pseudo-register that's created by the glibc
// runtime in Linux and other OSes to differentiate the stack pointers
-// during an exception verses normal execution, much like the old 68k CPU.
+// during exception time verses normal execution. It's much like the old 68k
+// CPU's stack handling.
//
// _sp = (jint*)uc->uc_mcontext.gregs[UESP];
//
@@ -790,7 +789,6 @@
// JVMPI code
bool os::thread_is_running(JavaThread* tp) {
#if 0
-#endif
pthread_t tid = tp->osthread()->thread_id();
ucontext_t *uc = (ucontext_t *) &tid->ctx.uc;
sumObject_t *so = (sumObject_t*) uc;
@@ -824,6 +822,8 @@
tp->set_last_sum(sum);
return true;
}
+#endif
+ return true;
}

View file

@ -1,15 +0,0 @@
$FreeBSD$
diff -u -r1.8 GNUmakefile
--- ../ext/plugin/build/solaris/GNUmakefile 15 Mar 2002 06:08:52 -0000 1.8
+++ ../ext/plugin/build/solaris/GNUmakefile 23 Aug 2002 08:01:28 -0000
@@ -636,7 +636,8 @@
$(PLUGIN): $(COMMON_OFILES)
ifeq ($(findstring BSD,$(OS)), BSD)
export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
- $(CXX) $(LD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) $(COMMON_OFILES)
+ $(CXX) $(LD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) $(COMMON_OFILES) \
+ -L$(INTL_LIB) -lintl
else
export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
$(CXX) $(LD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) $(COMMON_OFILES)

View file

@ -7,7 +7,6 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/java2/download.html
# http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@ -46,7 +45,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/fonts/TrueType/arphic:${PORTSDIR}/chinese/arphi
WRKSRC= ${WRKDIR}/j2sdk1.3.1/make
JDK_VERSION= 1.3.1
JDK_PATCHSET_VERSION= 7
JDK_PATCHSET_VERSION= 8
.if defined(NATIVE_BOOTSTRAP)
JDK13DIR?= ${LOCALBASE}/jdk${JDK_VERSION}

View file

@ -1,2 +1,2 @@
MD5 (j2sdk-1_3_1-src.tar.gz) = 787a01655133df85e65eda7deb2ece57
MD5 (bsd-jdk131-patches-7.tar.gz) = e119cf9ceb4b6ca38d597c9916600530
MD5 (bsd-jdk131-patches-8.tar.gz) = 1fd14cea9ce15e9a7e5ee2f60f50dd01

View file

@ -1,14 +0,0 @@
$FreeBSD$
diff -u -r1.3 PlainDatagramSocketImpl.c
--- ../src/solaris/native/java/net/PlainDatagramSocketImpl.c 19 Aug 2001 05:46:50 -0000 1.3
+++ ../src/solaris/native/java/net/PlainDatagramSocketImpl.c 31 Oct 2002 16:39:39 -0000
@@ -489,7 +489,7 @@
strerror(errno));
return;
}
-#if defined(__linux__) && defined(SO_BROADCAST)
+#if (defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && defined(SO_BROADCAST)
{
int t = 1;
setsockopt(fd, SOL_SOCKET, SO_BROADCAST, (char*) &t, sizeof(int));

View file

@ -1,16 +0,0 @@
$FreeBSD$
diff -u -r1.7 Makefile
--- sun/awt/Makefile 13 Apr 2002 05:25:41 -0000 1.7
+++ sun/awt/Makefile 25 Oct 2002 04:31:32 -0000
@@ -406,7 +406,10 @@
font.properties \
font.properties.ja \
psfont.properties.ja \
+ font.properties.ru \
+ font.properties.uk \
font.properties.zh \
+ font.properties.zh_CN \
font.properties.zh_TW
FONTPROPS_SRC_SUFFIX = .$(PLATFORM)

View file

@ -1,63 +0,0 @@
$FreeBSD$
diff -u -r1.5 awt_InputMethod.c
--- ../src/solaris/native/sun/awt/awt_InputMethod.c 10 Sep 2001 05:31:35 -0000 1.5
+++ ../src/solaris/native/sun/awt/awt_InputMethod.c 18 Oct 2002 02:58:26 -0000
@@ -1320,17 +1320,56 @@
X11InputMethodData *pX11IMData =
(X11InputMethodData *) (unsigned long) data;
char *xText;
+ char *ret;
jstring jText;
+ XIMPreeditState preeditState = XIMPreeditUnKnown;
+ XVaNestedList preeditAttr;
+ int bGetState = FALSE;
+
AWT_LOCK();
- if (pX11IMData->current_ic)
+ if (pX11IMData->current_ic) {
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState, &preeditState,
+ NULL);
+ if (!XGetICValues(pX11IMData->current_ic, XNPreeditAttributes,
+ preeditAttr, NULL)) {
+ bGetState = TRUE;
+ }
+ XFree(preeditAttr);
+
xText = XmbResetIC(pX11IMData->current_ic);
+
+ if (bGetState) {
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState,
+ preeditState, 0);
+ XSetICValues(pX11IMData->current_ic,
+ XNPreeditAttributes, preeditAttr, NULL);
+ XFree(preeditAttr);
+ }
+ }
else {
/*
* If there is no reference to the current XIC, try to reset both XICs.
*/
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState, &preeditState,
+ NULL);
+ if (!XGetICValues(pX11IMData->ic_active, XNPreeditAttributes,
+ preeditAttr, NULL)) {
+ bGetState = TRUE;
+ }
+ XFree(preeditAttr);
+
xText = XmbResetIC(pX11IMData->ic_active);
+
+ if (bGetState) {
+ preeditAttr = XVaCreateNestedList(0, XNPreeditState,
+ preeditState, 0);
+ XSetICValues(pX11IMData->ic_active, XNPreeditAttributes,
+ preeditAttr, NULL);
+ XFree(preeditAttr);
+ }
+
/*it may also means that the real client component does
not have focus -- has been deactivated... its xic should
not have the focus, bug#4284651 showes reset XIC for htt

View file

@ -1,18 +0,0 @@
$FreeBSD$
--- common/Defs-bsd.gmk.orig Mon Sep 10 17:02:16 2001
+++ common/Defs-bsd.gmk Mon Sep 10 17:02:42 2001
@@ -221,10 +221,10 @@
else # ARCH
CFLAGS_COMMON = $(GCC_WARNINGS)
endif # ARCH
-CFLAGS_OPT = $(POPT)
+CFLAGS_OPT = $(POPT) $(SYS_CFLAGS)
CFLAGS_DBG = -g3
CXXFLAGS_COMMON = $(GCC_WARNINGS)
-CXXFLAGS_OPT = $(POPT)
+CXXFLAGS_OPT = $(POPT) $(SYS_CFLAGS)
CXXFLAGS_DBG = -g3
CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DSOLARIS2 $(VERSION_DEFINES) \

View file

@ -1,308 +0,0 @@
$FreeBSD$
diff -u -r1.3 -r1.4
--- ../src/solaris/classes/sun/awt/motif/font.properties.ja.bsd 25 Aug 2001 04:39:08 -0000 1.3
+++ ../src/solaris/classes/sun/awt/motif/font.properties.ja.bsd 5 Aug 2002 04:30:35 -0000 1.4
@@ -13,99 +13,99 @@
#
#
-# AWT Font default Properties for Japanese Redhat Linux 6.1 and higher
+# AWT Font default Properties for FreeBSD
#
# Serif font definition
#
serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.italic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.italic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.italic.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.italic.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
-serif.bold.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.bold.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.bold.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.bold.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
-serif.bolditalic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-serif.bolditalic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+serif.bolditalic.1=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+serif.bolditalic.2=-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# SansSerif font definition
#
sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.italic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.italic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bold.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.bold.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-sansserif.bolditalic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-sansserif.bolditalic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+sansserif.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+sansserif.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Monospaced font definition
#
monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.italic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.italic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bold.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.bold.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-monospaced.bolditalic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-monospaced.bolditalic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+monospaced.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+monospaced.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Dialog font definition
#
dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.italic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.italic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bold.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.bold.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
-dialog.bolditalic.1=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialog.bolditalic.2=-wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialog.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialog.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# DialogInput font definition
#
dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.italic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.italic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.italic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.italic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bold.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.bold.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.bold.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.bold.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
-dialoginput.bolditalic.1=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0
-dialoginput.bolditalic.2=-wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+dialoginput.bolditalic.1=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0
+dialoginput.bolditalic.2=-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Default font definition
#
@@ -168,117 +168,117 @@
# Serif font definition
#
fontset.serif.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.serif.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.serif.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.serif.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-mincho-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# SansSerif font definition
#
fontset.sansserif.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.sansserif.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.sansserif.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.sansserif.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Monospaced font definition
#
fontset.monospaced.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.monospaced.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.monospaced.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.monospaced.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# Dialog font definition
#
fontset.dialog.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialog.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialog.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialog.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-gothic-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
# DialogInput font definition
#
fontset.dialoginput.italic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialoginput.bold=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialoginput.bolditalic=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
fontset.dialoginput.plain=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
#
fontset.default=\
--sony-fixed-medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0,\
-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
--wadalab-mincho-medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
-#
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0201.1976-0,\
+-aliastt-gothic-medium-r-normal--*-%d-*-*-p-*-jisx0208.1983-0
+#
\ No newline at end of file

View file

@ -1,201 +0,0 @@
$FreeBSD$
diff -N src/solaris/classes/sun/awt/motif/font.properties.ru.bsd
--- ../src/solaris/classes/sun/awt/motif/font.properties.ru.bsd 1 Jan 1970 00:00:00 -0000
+++ ../src/solaris/classes/sun/awt/motif/font.properties.ru.bsd 18 Oct 2002 03:02:35 -0000
@@ -0,0 +1,195 @@
+#
+# @(#)font.properties.linux 1.7 01/04/21
+#
+# Copyright 1997-2001 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.
+#
+
+#
+# FreeBSD version derived from the Linux version derived from the
+# version for SunOS 5.5.1 Notice that
+# we use the .ttf files shipped in the JDK distribution.
+#
+
+# Serif font definition
+#
+serif.0=-*-times new roman-medium-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.italic.0=-*-times new roman-medium-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bold.0=-*-times new roman-bold-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bolditalic.0=-*-times new roman-bold-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+# SansSerif font definition
+#
+sansserif.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Monospaced font definition
+#
+monospaced.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.italic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bold.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bolditalic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+# Dialog font definition
+#
+dialog.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# DialogInput font definition
+#
+dialoginput.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.italic.0=-*-courier new-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bold.0=-*-courier new-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bolditalic.0=-*-courier new-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Default font definition
+#
+default.char=274f
+
+# name aliases
+#
+alias.timesroman=serif
+alias.helvetica=sansserif
+alias.courier=monospaced
+
+# for backward compatibility
+#uncomment with urw fonts
+#zapfdingbats.0=--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+# 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.awt.CharToByteSymbol
+
+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
+fontcharset.sansserif.1=sun.awt.CharToByteSymbol
+
+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
+fontcharset.monospaced.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
+fontcharset.dialog.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
+fontcharset.dialoginput.1=sun.awt.CharToByteSymbol
+
+#replace font line if you have zapf fonts
+#fontcharset.zapfdingbats.0=sun.io.CharToByteISO8859_1
+
+# 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=\
+-*-*-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.italic=\
+-*-*-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bold=\
+-*-*-demibold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bolditalic=\
+-*-*-demibold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.italic=\
+-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bold=\
+-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bolditalic=\
+-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.plain=\
+-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.monospaced.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialog.italic=\
+-*-*-medium-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bolditalic=\
+-*-*-bold-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialoginput.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+#uncomment with urw fonts
+#fontset.zapfdingbats=\
+#--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+#
+fontset.default=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+#

View file

@ -1,201 +0,0 @@
$FreeBSD$
diff -N src/solaris/classes/sun/awt/motif/font.properties.uk.bsd
--- ../src/solaris/classes/sun/awt/motif/font.properties.uk.bsd 1 Jan 1970 00:00:00 -0000
+++ ../src/solaris/classes/sun/awt/motif/font.properties.uk.bsd 18 Oct 2002 03:02:46 -0000
@@ -0,0 +1,195 @@
+#
+# @(#)font.properties.linux 1.7 01/04/21
+#
+# Copyright 1997-2001 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.
+#
+
+#
+# FreeBSD version derived from the Linux version derived from the
+# version for SunOS 5.5.1 Notice that
+# we use the .ttf files shipped in the JDK distribution.
+#
+
+# Serif font definition
+#
+serif.0=-*-times new roman-medium-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.italic.0=-*-times new roman-medium-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bold.0=-*-times new roman-bold-r-normal-*-*-%d-*-*-*-*-koi8-u
+
+serif.bolditalic.0=-*-times new roman-bold-i-normal-*-*-%d-*-*-*-*-koi8-u
+
+# SansSerif font definition
+#
+sansserif.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+sansserif.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Monospaced font definition
+#
+monospaced.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.italic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bold.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+monospaced.bolditalic.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+# Dialog font definition
+#
+dialog.0=-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.italic.0=-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bold.0=-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialog.bolditalic.0=-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# DialogInput font definition
+#
+dialoginput.0=-*-courier new-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.italic.0=-*-courier new-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bold.0=-*-courier new-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+dialoginput.bolditalic.0=-*-courier new-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+# Default font definition
+#
+default.char=274f
+
+# name aliases
+#
+alias.timesroman=serif
+alias.helvetica=sansserif
+alias.courier=monospaced
+
+# for backward compatibility
+#uncomment with urw fonts
+#zapfdingbats.0=--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+# 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.awt.CharToByteSymbol
+
+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
+fontcharset.sansserif.1=sun.awt.CharToByteSymbol
+
+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
+fontcharset.monospaced.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
+fontcharset.dialog.1=sun.awt.CharToByteSymbol
+
+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
+fontcharset.dialoginput.1=sun.awt.CharToByteSymbol
+
+#replace font line if you have zapf fonts
+#fontcharset.zapfdingbats.0=sun.io.CharToByteISO8859_1
+
+# 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=\
+-*-*-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.italic=\
+-*-*-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bold=\
+-*-*-demibold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.serif.bolditalic=\
+-*-*-demibold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.italic=\
+-*-arial-medium-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bold=\
+-*-arial-bold-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.bolditalic=\
+-*-arial-bold-i-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.sansserif.plain=\
+-*-arial-medium-r-normal--*-%d-*-*-*-*-koi8-u
+
+fontset.monospaced.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.monospaced.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialog.italic=\
+-*-*-medium-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.bolditalic=\
+-*-*-bold-i-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialog.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+
+fontset.dialoginput.italic=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bold=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.bolditalic=\
+-*-*-bold-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+fontset.dialoginput.plain=\
+-*-*-medium-r-normal-sans-*-%d-*-*-m-*-koi8-u
+
+#uncomment with urw fonts
+#fontset.zapfdingbats=\
+#--zapf dingbats-medium-r-normal--*-%d-*-*-*-*-adobe-fontspecific
+
+#
+fontset.default=\
+-*-*-medium-r-normal-sans-*-%d-*-*-*-*-koi8-u
+#

View file

@ -1,241 +0,0 @@
$FreeBSD$
diff -N src/solaris/classes/sun/awt/motif/font.properties.zh_CN.bsd
--- ../src/solaris/classes/sun/awt/motif/font.properties.zh_CN.bsd 1 Jan 1970 00:00:00 -0000
+++ ../src/solaris/classes/sun/awt/motif/font.properties.zh_CN.bsd 25 Oct 2002 04:30:51 -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 technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1
+serif.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1
+serif.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1
+serif.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# SansSerif font definition
+#
+sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+sansserif.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Monospaced font definition
+#
+monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+monospaced.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Dialog font definition
+#
+dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
+dialog.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# DialogInput font definition
+#
+dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.italic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.bold.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
+dialoginput.bolditalic.1=-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-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.awt.motif.CharToByteX11GB2312
+
+fontcharset.sansserif.0=sun.io.CharToByteISO8859_1
+fontcharset.sansserif.1=sun.awt.motif.CharToByteX11GB2312
+
+fontcharset.monospaced.0=sun.io.CharToByteISO8859_1
+fontcharset.monospaced.1=sun.awt.motif.CharToByteX11GB2312
+
+fontcharset.dialog.0=sun.io.CharToByteISO8859_1
+fontcharset.dialog.1=sun.awt.motif.CharToByteX11GB2312
+
+fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1
+fontcharset.dialoginput.1=sun.awt.motif.CharToByteX11GB2312
+
+# 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 technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.serif.italic=\
+-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.serif.bold=\
+-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.serif.bolditalic=\
+-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# SansSerif font definition
+#
+
+fontset.sansserif.plain=\
+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.sansserif.italic=\
+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.sansserif.bold=\
+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.sansserif.bolditalic=\
+-b&h-lucida-bold-i-normal-snas-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Monospaced font definition
+#
+fontset.monospaced.plain=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.monospaced.italic=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.monospaced.bold=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-,1\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.monospaced.bolditalic=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# Dialog font definition
+#
+fontset.dialog.italic=\
+-b&h-lucida-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialog.bold=\
+-b&h-lucida-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialog.bolditalic=\
+-b&h-lucida-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialog.plain=\
+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+# DialogInput font definition
+#
+fontset.dialoginput.italic=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialoginput.bold=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialoginput.bolditalic=\
+-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+fontset.dialoginput.plain=\
+-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0
+
+#
+fontset.default=\
+-b&h-lucida-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1,\
+-arphic technology co.-ar pl sungtil gb-medium-r-normal--0-0-0-0-p-0-gb2312.1980-0

View file

@ -1,62 +0,0 @@
$FreeBSD$
--- ../../hotspot1.3.1/src/os_cpu/linux_i486/vm/os_linux_i486.cpp 11 Apr 2002 10:30:45 -0000 1.3
+++ ../../hotspot1.3.1/src/os_cpu/linux_i486/vm/os_linux_i486.cpp 28 Jul 2002 23:18:37 -0000 1.4
@@ -15,7 +15,6 @@
# include "incls/_os_linux_i486.cpp.incl"
# include "incls/_os_pd.hpp.incl"
-extern "C" {
// put OS-includes here
# include <sys/types.h>
# include <sys/mman.h>
@@ -34,14 +33,13 @@
# include <pwd.h>
# include <poll.h>
-
#include <setjmp.h>
-#define HACK
-#include </usr/src/lib/libc_r/uthread/pthread_private.h>
-//--billh
+#undef pthread_attr_default
+#undef pthread_mutexattr_default
+#undef pthread_condattr_default
-}
+#include <uthread/pthread_private.h>
#define MAX_PATH (2 * K)
#define INTERRUPT_SIGNAL SIGUSR1
@@ -188,10 +186,11 @@
// fastlane always uses callback for safepoints
assert(!GetThreadState || Arguments::has_profile(), "just checking");
-// The register UESP doensn't exist in the ucontext_t under FreeBSD. I
+// The register UESP doesn't exist in the ucontext_t under FreeBSD. I
// suspect that it's a kind of pseudo-register that's created by the glibc
// runtime in Linux and other OSes to differentiate the stack pointers
-// during an exception verses normal execution, much like the old 68k CPU.
+// during exception time verses normal execution. It's much like the old 68k
+// CPU's stack handling.
//
// _sp = (jint*)uc->uc_mcontext.gregs[UESP];
//
@@ -790,7 +789,6 @@
// JVMPI code
bool os::thread_is_running(JavaThread* tp) {
#if 0
-#endif
pthread_t tid = tp->osthread()->thread_id();
ucontext_t *uc = (ucontext_t *) &tid->ctx.uc;
sumObject_t *so = (sumObject_t*) uc;
@@ -824,6 +822,8 @@
tp->set_last_sum(sum);
return true;
}
+#endif
+ return true;
}

View file

@ -1,15 +0,0 @@
$FreeBSD$
diff -u -r1.8 GNUmakefile
--- ../ext/plugin/build/solaris/GNUmakefile 15 Mar 2002 06:08:52 -0000 1.8
+++ ../ext/plugin/build/solaris/GNUmakefile 23 Aug 2002 08:01:28 -0000
@@ -636,7 +636,8 @@
$(PLUGIN): $(COMMON_OFILES)
ifeq ($(findstring BSD,$(OS)), BSD)
export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
- $(CXX) $(LD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) $(COMMON_OFILES)
+ $(CXX) $(LD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) $(COMMON_OFILES) \
+ -L$(INTL_LIB) -lintl
else
export LD_LIBRARY_PATH; LD_LIBRARY_PATH=$(X11_LIB); \
$(CXX) $(LD_SHARELIB_FLAG) $(LDFLAGS) -o $(@) $(COMMON_OFILES)