From c35e5814530e9a9aeb47086fea2e0862a721ada3 Mon Sep 17 00:00:00 2001
From: jkim <jkim@FreeBSD.org>
Date: Tue, 24 Mar 2015 00:56:47 +0000
Subject: Catch up with font directory changes.

---
 java/openjdk6/Makefile                    |  2 +-
 java/openjdk6/files/fontconfig.properties | 46 +++++++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'java/openjdk6')

diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index f79185b9fd0c..d05729a9b350 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openjdk6
 PORTVERSION=	b34
-PORTREVISION=	0
+PORTREVISION=	1
 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 0fbfe753edc1..6c38f1ac1d0f 100644
--- a/java/openjdk6/files/fontconfig.properties
+++ b/java/openjdk6/files/fontconfig.properties
@@ -165,26 +165,26 @@ sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean
 
 # Font File Names
 
-filename.DejaVu_Sans=/usr/local/lib/X11/fonts/dejavu/DejaVuSans.ttf
-filename.DejaVu_Sans_Bold=/usr/local/lib/X11/fonts/dejavu/DejaVuSans-Bold.ttf
-filename.DejaVu_Sans_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSans-Oblique.ttf
-filename.DejaVu_Sans_Bold_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSans-BoldOblique.ttf
-
-filename.DejaVu_Sans_Mono=/usr/local/lib/X11/fonts/dejavu/DejaVuSansMono.ttf
-filename.DejaVu_Sans_Mono_Bold=/usr/local/lib/X11/fonts/dejavu/DejaVuSansMono-Bold.ttf
-filename.DejaVu_Sans_Mono_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSansMono-Oblique.ttf
-filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf
-
-filename.DejaVu_Serif=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif.ttf
-filename.DejaVu_Serif_Bold=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif-Bold.ttf
-filename.DejaVu_Serif_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif-Oblique.ttf
-filename.DejaVu_Serif_Bold_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif-BoldOblique.ttf
-
-filename.Sazanami_Gothic=/usr/local/lib/X11/fonts/TTF/sazanami-gothic.ttf
-filename.Sazanami_Mincho=/usr/local/lib/X11/fonts/TTF/sazanami-mincho.ttf
-filename.AR_PL_UMing=/usr/local/lib/X11/fonts/TrueType/uming.ttc
-filename.AR_PL_UKai=/usr/local/lib/X11/fonts/TrueType/ukai.ttc
-filename.UnDotum=/usr/local/lib/X11/fonts/unfonts-core/UnDotum.ttf
-filename.UnDotum_Bold=/usr/local/lib/X11/fonts/unfonts-core/UnDotumBold.ttf
-filename.UnBatang=/usr/local/lib/X11/fonts/unfonts-core/UnBatang.ttf
-filename.UnBatang_Bold=/usr/local/lib/X11/fonts/unfonts-core/UnBatangBold.ttf
+filename.DejaVu_Sans=/usr/local/share/fonts/dejavu/DejaVuSans.ttf
+filename.DejaVu_Sans_Bold=/usr/local/share/fonts/dejavu/DejaVuSans-Bold.ttf
+filename.DejaVu_Sans_Oblique=/usr/local/share/fonts/dejavu/DejaVuSans-Oblique.ttf
+filename.DejaVu_Sans_Bold_Oblique=/usr/local/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf
+
+filename.DejaVu_Sans_Mono=/usr/local/share/fonts/dejavu/DejaVuSansMono.ttf
+filename.DejaVu_Sans_Mono_Bold=/usr/local/share/fonts/dejavu/DejaVuSansMono-Bold.ttf
+filename.DejaVu_Sans_Mono_Oblique=/usr/local/share/fonts/dejavu/DejaVuSansMono-Oblique.ttf
+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/local/share/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf
+
+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
-- 
cgit