Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Mar 2015 00:56:48 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r382061 - in head/java: openjdk6 openjdk6/files openjdk8 openjdk8/files
Message-ID:  <201503240056.t2O0umFf012570@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Tue Mar 24 00:56:47 2015
New Revision: 382061
URL: https://svnweb.freebsd.org/changeset/ports/382061
QAT: https://qat.redports.org/buildarchive/r382061/

Log:
  Catch up with font directory changes.

Modified:
  head/java/openjdk6/Makefile
  head/java/openjdk6/files/fontconfig.properties
  head/java/openjdk8/Makefile
  head/java/openjdk8/files/bsd.fontconfig.properties.in

Modified: head/java/openjdk6/Makefile
==============================================================================
--- head/java/openjdk6/Makefile	Tue Mar 24 00:39:54 2015	(r382060)
+++ head/java/openjdk6/Makefile	Tue Mar 24 00:56:47 2015	(r382061)
@@ -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,} \

Modified: head/java/openjdk6/files/fontconfig.properties
==============================================================================
--- head/java/openjdk6/files/fontconfig.properties	Tue Mar 24 00:39:54 2015	(r382060)
+++ head/java/openjdk6/files/fontconfig.properties	Tue Mar 24 00:56:47 2015	(r382061)
@@ -165,26 +165,26 @@ sequence.fallback=chinese-big5,chinese-g
 
 # 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=/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/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_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/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.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/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.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

Modified: head/java/openjdk8/Makefile
==============================================================================
--- head/java/openjdk8/Makefile	Tue Mar 24 00:39:54 2015	(r382060)
+++ head/java/openjdk8/Makefile	Tue Mar 24 00:56:47 2015	(r382061)
@@ -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 \

Modified: head/java/openjdk8/files/bsd.fontconfig.properties.in
==============================================================================
--- head/java/openjdk8/files/bsd.fontconfig.properties.in	Tue Mar 24 00:39:54 2015	(r382060)
+++ head/java/openjdk8/files/bsd.fontconfig.properties.in	Tue Mar 24 00:56:47 2015	(r382061)
@@ -166,26 +166,26 @@ sequence.fallback=chinese-big5,chinese-g
 
 # 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503240056.t2O0umFf012570>