Catch up with font directory changes.

4 files changed, 41 insertions, 40 deletions

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
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 1bce99b6b560..01daac8e96ff 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
 		https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
diff --git a/java/openjdk8/files/bsd.fontconfig.properties.in b/java/openjdk8/files/bsd.fontconfig.properties.in
index 8d5d4f6b4fc4..4929532e04f7 100644
--- a/java/openjdk8/files/bsd.fontconfig.properties.in
+++ b/java/openjdk8/files/bsd.fontconfig.properties.in
@@ -166,26 +166,26 @@ sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean
 
 # Font File Names
 
-filename.DejaVu_Sans=%%LOCALBASE%%/lib/X11/fonts/dejavu/DejaVuSans.ttf
-filename.DejaVu_Sans_Bold=%%LOCALBASE%%/lib/X11/fonts/dejavu/DejaVuSans-Bold.ttf
-filename.DejaVu_Sans_Oblique=%%LOCALBASE%%/lib/X11/fonts/dejavu/DejaVuSans-Oblique.ttf
-filename.DejaVu_Sans_Bold_Oblique=%%LOCALBASE%%/lib/X11/fonts/dejavu/DejaVuSans-BoldOblique.ttf
+filename.DejaVu_Sans=%%LOCALBASE%%/share/fonts/dejavu/DejaVuSans.ttf
+filename.DejaVu_Sans_Bold=%%LOCALBASE%%/share/fonts/dejavu/DejaVuSans-Bold.ttf
+filename.DejaVu_Sans_Oblique=%%LOCALBASE%%/share/fonts/dejavu/DejaVuSans-Oblique.ttf
+filename.DejaVu_Sans_Bold_Oblique=%%LOCALBASE%%/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf
 
-filename.DejaVu_Sans_Mono=%%LOCALBASE%%/lib/X11/fonts/dejavu/DejaVuSansMono.ttf
-filename.DejaVu_Sans_Mono_Bold=%%LOCALBASE%%/lib/X11/fonts/dejavu/DejaVuSansMono-Bold.ttf
-filename.DejaVu_Sans_Mono_Oblique=%%LOCALBASE%%/lib/X11/fonts/dejavu/DejaVuSansMono-Oblique.ttf
-filename.DejaVu_Sans_Mono_Bold_Oblique=%%LOCALBASE%%/lib/X11/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf
+filename.DejaVu_Sans_Mono=%%LOCALBASE%%/share/fonts/dejavu/DejaVuSansMono.ttf
+filename.DejaVu_Sans_Mono_Bold=%%LOCALBASE%%/share/fonts/dejavu/DejaVuSansMono-Bold.ttf
+filename.DejaVu_Sans_Mono_Oblique=%%LOCALBASE%%/share/fonts/dejavu/DejaVuSansMono-Oblique.ttf
+filename.DejaVu_Sans_Mono_Bold_Oblique=%%LOCALBASE%%/share/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf
 
-filename.DejaVu_Serif=%%LOCALBASE%%/lib/X11/fonts/dejavu/DejaVuSerif.ttf
-filename.DejaVu_Serif_Bold=%%LOCALBASE%%/lib/X11/fonts/dejavu/DejaVuSerif-Bold.ttf
-filename.DejaVu_Serif_Italic=%%LOCALBASE%%/lib/X11/fonts/dejavu/DejaVuSerif-Italic.ttf
-filename.DejaVu_Serif_Bold_Italic=%%LOCALBASE%%/lib/X11/fonts/dejavu/DejaVuSerif-BoldItalic.ttf
+filename.DejaVu_Serif=%%LOCALBASE%%/share/fonts/dejavu/DejaVuSerif.ttf
+filename.DejaVu_Serif_Bold=%%LOCALBASE%%/share/fonts/dejavu/DejaVuSerif-Bold.ttf
+filename.DejaVu_Serif_Italic=%%LOCALBASE%%/share/fonts/dejavu/DejaVuSerif-Italic.ttf
+filename.DejaVu_Serif_Bold_Italic=%%LOCALBASE%%/share/fonts/dejavu/DejaVuSerif-BoldItalic.ttf
 
 filename.Sazanami_Gothic=%%LOCALBASE%%/share/font-sazanami/sazanami-gothic.ttf
 filename.Sazanami_Mincho=%%LOCALBASE%%/share/font-sazanami/sazanami-mincho.ttf
 filename.AR_PL_ShanHeiSun_Uni=%%LOCALBASE%%/share/fonts/TrueType/uming.ttc
 filename.AR_PL_ZenKai_Uni=%%LOCALBASE%%/share/fonts/TrueType/ukai.ttc
-filename.NanumGothic=%%LOCALBASE%%/lib/X11/fonts/nanum-ttf/NanumGothic.ttf
-filename.NanumGothic_Bold=%%LOCALBASE%%/lib/X11/fonts/nanum-ttf/NanumGothicBold.ttf
-filename.NanumMyeongjo=%%LOCALBASE%%/lib/X11/fonts/nanum-ttf/NanumMyeongjo.ttf
-filename.NanumMyeongjo_Bold=%%LOCALBASE%%/lib/X11/fonts/nanum-ttf/NanumMyeongjoBold.ttf
+filename.NanumGothic=%%LOCALBASE%%/share/fonts/nanum-ttf/NanumGothic.ttf
+filename.NanumGothic_Bold=%%LOCALBASE%%/share/fonts/nanum-ttf/NanumGothicBold.ttf
+filename.NanumMyeongjo=%%LOCALBASE%%/share/fonts/nanum-ttf/NanumMyeongjo.ttf
+filename.NanumMyeongjo_Bold=%%LOCALBASE%%/share/fonts/nanum-ttf/NanumMyeongjoBold.ttf