Tidy up default fontconfig.properties.

2 files changed, 80 insertions, 76 deletions

diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index d05729a9b350..b0fda78d5873 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openjdk6
 PORTVERSION=	b34
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \
diff --git a/java/openjdk6/files/fontconfig.properties b/java/openjdk6/files/fontconfig.properties
index 6c38f1ac1d0f..66d3e6266fe9 100644
--- a/java/openjdk6/files/fontconfig.properties
+++ b/java/openjdk6/files/fontconfig.properties
@@ -25,140 +25,140 @@
 
 # Version
 
-# Uses FreeBSD Ports Tree fonts and file paths.
+# Uses FreeBSD ports tree fonts and file paths.
 version=1
 
 # Component Font Mappings
 
 dialog.plain.latin-1=DejaVu Sans
+dialog.plain.chinese-big5=AR PL UMing TW
+dialog.plain.chinese-gb18030=AR PL UMing CN
 dialog.plain.japanese-x0208=Sazanami Gothic
-dialog.plain.korean=UnDotum
-dialog.plain.chinese-big5=AR PL UMing
-dialog.plain.chinese-gb18030=AR PL UMing
+dialog.plain.korean=NanumGothic
 
 dialog.bold.latin-1=DejaVu Sans Bold
+dialog.bold.chinese-big5=AR PL UMing TW
+dialog.bold.chinese-gb18030=AR PL UMing CN
 dialog.bold.japanese-x0208=Sazanami Gothic
-dialog.bold.korean=UnDotum Bold
-dialog.bold.chinese-big5=AR PL UMing
-dialog.bold.chinese-gb18030=AR PL UMing
+dialog.bold.korean=NanumGothicExtraBold
 
 dialog.italic.latin-1=DejaVu Sans Oblique
+dialog.italic.chinese-big5=AR PL UMing TW
+dialog.italic.chinese-gb18030=AR PL UMing CN
 dialog.italic.japanese-x0208=Sazanami Gothic
-dialog.italic.korean=UnDotum
-dialog.italic.chinese-big5=AR PL UMing
-dialog.italic.chinese-gb18030=AR PL UMing
+dialog.italic.korean=NanumGothic
 
 dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
+dialog.bolditalic.chinese-big5=AR PL UMing TW
+dialog.bolditalic.chinese-gb18030=AR PL UMing CN
 dialog.bolditalic.japanese-x0208=Sazanami Gothic
-dialog.bolditalic.korean=UnDotum Bold
-dialog.bolditalic.chinese-big5=AR PL UMing
-dialog.bolditalic.chinese-gb18030=AR PL UMing
+dialog.bolditalic.korean=NanumGothicExtraBold
 
 
 sansserif.plain.latin-1=DejaVu Sans
+sansserif.plain.chinese-big5=AR PL UMing TW
+sansserif.plain.chinese-gb18030=AR PL UMing CN
 sansserif.plain.japanese-x0208=Sazanami Gothic
-sansserif.plain.korean=UnDotum
-sansserif.plain.chinese-big5=AR PL UMing
-sansserif.plain.chinese-gb18030=AR PL UMing
+sansserif.plain.korean=NanumGothic
 
 sansserif.bold.latin-1=DejaVu Sans Bold
+sansserif.bold.chinese-big5=AR PL UMing TW
+sansserif.bold.chinese-gb18030=AR PL UMing CN
 sansserif.bold.japanese-x0208=Sazanami Gothic
-sansserif.bold.korean=UnDotum Bold
-sansserif.bold.chinese-big5=AR PL UMing
-sansserif.bold.chinese-gb18030=AR PL UMing
+sansserif.bold.korean=NanumGothicExtraBold
 
 sansserif.italic.latin-1=DejaVu Sans Oblique
+sansserif.italic.chinese-big5=AR PL UMing TW
+sansserif.italic.chinese-gb18030=AR PL UMing CN
 sansserif.italic.japanese-x0208=Sazanami Gothic
-sansserif.italic.korean=UnDotum
-sansserif.italic.chinese-big5=AR PL UMing
-sansserif.italic.chinese-gb18030=AR PL UMing
+sansserif.italic.korean=NanumGothic
 
 sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
+sansserif.bolditalic.chinese-big5=AR PL UMing TW
+sansserif.bolditalic.chinese-gb18030=AR PL UMing CN
 sansserif.bolditalic.japanese-x0208=Sazanami Gothic
-sansserif.bolditalic.korean=UnDotum Bold
-sansserif.bolditalic.chinese-big5=AR PL UMing
-sansserif.bolditalic.chinese-gb18030=AR PL UMing
+sansserif.bolditalic.korean=NanumGothicExtraBold
 
 
 serif.plain.latin-1=DejaVu Serif
+serif.plain.chinese-big5=AR PL UKai TW
+serif.plain.chinese-gb18030=AR PL UKai CN
 serif.plain.japanese-x0208=Sazanami Mincho
-serif.plain.korean=UnBatang
-serif.plain.chinese-big5=AR PL UKai
-serif.plain.chinese-gb18030=AR PL UKai
+serif.plain.korean=NanumMyeongjo
 
 serif.bold.latin-1=DejaVu Serif Bold
+serif.bold.chinese-big5=AR PL UKai TW
+serif.bold.chinese-gb18030=AR PL UKai CN
 serif.bold.japanese-x0208=Sazanami Mincho
-serif.bold.korean=UnBatang Bold
-serif.bold.chinese-big5=AR PL UKai
-serif.bold.chinese-gb18030=AR PL UKai
+serif.bold.korean=NanumMyeongjoExtraBold
 
-serif.italic.latin-1=DejaVu Serif Oblique
+serif.italic.latin-1=DejaVu Serif Italic
+serif.italic.chinese-big5=AR PL UKai TW
+serif.italic.chinese-gb18030=AR PL UKai CN
 serif.italic.japanese-x0208=Sazanami Mincho
-serif.italic.korean=UnBatang
-serif.italic.chinese-big5=AR PL UKai
-serif.italic.chinese-gb18030=AR PL UKai
+serif.italic.korean=NanumMyeongjo
 
-serif.bolditalic.latin-1=DejaVu Serif Bold Oblique
+serif.bolditalic.latin-1=DejaVu Serif Bold Italic
+serif.bolditalic.chinese-big5=AR PL UKai TW
+serif.bolditalic.chinese-gb18030=AR PL UKai CN
 serif.bolditalic.japanese-x0208=Sazanami Mincho
-serif.bolditalic.korean=UnBatang Bold
-serif.bolditalic.chinese-big5=AR PL UKai
-serif.bolditalic.chinese-gb18030=AR PL UKai
+serif.bolditalic.korean=NanumMyeongjoExtraBold
 
 
 monospaced.plain.latin-1=DejaVu Sans Mono
+monospaced.plain.chinese-big5=AR PL UMing TW
+monospaced.plain.chinese-gb18030=AR PL UMing CN
 monospaced.plain.japanese-x0208=Sazanami Gothic
-monospaced.plain.korean=UnDotum
-monospaced.plain.chinese-big5=AR PL UMing
-monospaced.plain.chinese-gb18030=AR PL UMing
+monospaced.plain.korean=NanumGothic
 
 monospaced.bold.latin-1=DejaVu Sans Mono Bold
+monospaced.bold.chinese-big5=AR PL UMing TW
+monospaced.bold.chinese-gb18030=AR PL UMing CN
 monospaced.bold.japanese-x0208=Sazanami Gothic
-monospaced.bold.korean=UnDotum Bold
-monospaced.bold.chinese-big5=AR PL UMing
-monospaced.bold.chinese-gb18030=AR PL UMing
+monospaced.bold.korean=NanumGothicExtraBold
 
 monospaced.italic.latin-1=DejaVu Sans Mono Oblique
+monospaced.italic.chinese-big5=AR PL UMing TW
+monospaced.italic.chinese-gb18030=AR PL UMing CN
 monospaced.italic.japanese-x0208=Sazanami Gothic
-monospaced.italic.korean=UnDotum
-monospaced.italic.chinese-big5=AR PL UMing
-monospaced.italic.chinese-gb18030=AR PL UMing
+monospaced.italic.korean=NanumGothic
 
 monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
+monospaced.bolditalic.chinese-big5=AR PL UMing TW
+monospaced.bolditalic.chinese-gb18030=AR PL UMing CN
 monospaced.bolditalic.japanese-x0208=Sazanami Gothic
-monospaced.bolditalic.korean=UnDotum Bold
-monospaced.bolditalic.chinese-big5=AR PL UMing
-monospaced.bolditalic.chinese-gb18030=AR PL UMing
+monospaced.bolditalic.korean=NanumGothicExtraBold
 
 
 dialoginput.plain.latin-1=DejaVu Sans Mono
+dialoginput.plain.chinese-big5=AR PL UMing TW
+dialoginput.plain.chinese-gb18030=AR PL UMing CN
 dialoginput.plain.japanese-x0208=Sazanami Gothic
-dialoginput.plain.korean=UnDotum
-dialoginput.plain.chinese-big5=AR PL UMing
-dialoginput.plain.chinese-gb18030=AR PL UMing
+dialoginput.plain.korean=NanumGothic
 
 dialoginput.bold.latin-1=DejaVu Sans Mono Bold
+dialoginput.bold.chinese-big5=AR PL UMing TW
+dialoginput.bold.chinese-gb18030=AR PL UMing CN
 dialoginput.bold.japanese-x0208=Sazanami Gothic
-dialoginput.bold.korean=UnDotum Bold
-dialoginput.bold.chinese-big5=AR PL UMing
-dialoginput.bold.chinese-gb18030=AR PL UMing
+dialoginput.bold.korean=NanumGothicExtraBold
 
 dialoginput.italic.latin-1=DejaVu Sans Mono Oblique
+dialoginput.italic.chinese-big5=AR PL UMing TW
+dialoginput.italic.chinese-gb18030=AR PL UMing CN
 dialoginput.italic.japanese-x0208=Sazanami Gothic
-dialoginput.italic.korean=UnDotum
-dialoginput.italic.chinese-big5=AR PL UMing
-dialoginput.italic.chinese-gb18030=AR PL UMing
+dialoginput.italic.korean=NanumGothic
 
 dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
+dialoginput.bolditalic.chinese-big5=AR PL UMing TW
+dialoginput.bolditalic.chinese-gb18030=AR PL UMing CN
 dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
-dialoginput.bolditalic.korean=UnDotum Bold
-dialoginput.bolditalic.chinese-big5=AR PL UMing
-dialoginput.bolditalic.chinese-gb18030=AR PL UMing
+dialoginput.bolditalic.korean=NanumGothicExtraBold
 
 # Search Sequences
 
 sequence.allfonts=latin-1
 sequence.allfonts.Big5=chinese-big5,latin-1
-sequence.allfonts.x-euc-jp-bsd=japanese-x0208,latin-1
+sequence.allfonts.x-eucJP-Open=japanese-x0208,latin-1
 sequence.allfonts.EUC-KR=korean,latin-1
 sequence.allfonts.GB18030=chinese-gb18030,latin-1
 sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean
@@ -177,14 +177,18 @@ filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/local/share/fonts/dejavu/DejaVuSansM
 
 filename.DejaVu_Serif=/usr/local/share/fonts/dejavu/DejaVuSerif.ttf
 filename.DejaVu_Serif_Bold=/usr/local/share/fonts/dejavu/DejaVuSerif-Bold.ttf
-filename.DejaVu_Serif_Oblique=/usr/local/share/fonts/dejavu/DejaVuSerif-Oblique.ttf
-filename.DejaVu_Serif_Bold_Oblique=/usr/local/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf
-
-filename.Sazanami_Gothic=/usr/local/share/fonts/TTF/sazanami-gothic.ttf
-filename.Sazanami_Mincho=/usr/local/share/fonts/TTF/sazanami-mincho.ttf
-filename.AR_PL_UMing=/usr/local/share/fonts/TrueType/uming.ttc
-filename.AR_PL_UKai=/usr/local/share/fonts/TrueType/ukai.ttc
-filename.UnDotum=/usr/local/share/fonts/unfonts-core/UnDotum.ttf
-filename.UnDotum_Bold=/usr/local/share/fonts/unfonts-core/UnDotumBold.ttf
-filename.UnBatang=/usr/local/share/fonts/unfonts-core/UnBatang.ttf
-filename.UnBatang_Bold=/usr/local/share/fonts/unfonts-core/UnBatangBold.ttf
+filename.DejaVu_Serif_Italic=/usr/local/share/fonts/dejavu/DejaVuSerif-Italic.ttf
+filename.DejaVu_Serif_Bold_Italic=/usr/local/share/fonts/dejavu/DejaVuSerif-BoldItalic.ttf
+
+filename.AR_PL_UKai_TW=/usr/local/share/fonts/TrueType/ukai.ttc
+filename.AR_PL_UMing_TW=/usr/local/share/fonts/TrueType/uming.ttc
+filename.AR_PL_UKai_CN=/usr/local/share/fonts/TrueType/ukai.ttc
+filename.AR_PL_UMing_CN=/usr/local/share/fonts/TrueType/uming.ttc
+
+filename.Sazanami_Gothic=/usr/local/share/font-sazanami/sazanami-gothic.ttf
+filename.Sazanami_Mincho=/usr/local/share/font-sazanami/sazanami-mincho.ttf
+
+filename.NanumGothic=/usr/local/share/fonts/nanum-ttf/NanumGothic.ttf
+filename.NanumGothicExtraBold=/usr/local/share/fonts/nanum-ttf/NanumGothicExtraBold.ttf
+filename.NanumMyeongjo=/usr/local/share/fonts/nanum-ttf/NanumMyeongjo.ttf
+filename.NanumMyeongjoExtraBold=/usr/local/share/fonts/nanum-ttf/NanumMyeongjoExtraBold.ttf