Fix font paths for dejavu (Latin and others), sazanami (Japanese) and baekmum

(Korean) fonts, and add (commented) dependencies on them.  Ok tnn@.
Bump PKGREVISION.

XXX uming/ukai (Chinese) are not in pkgsrc, anyone can package them, or suggest
replacements?
This commit is contained in:
ghen 2009-10-21 10:31:46 +00:00
parent b28606f24e
commit afbcc17ed6
3 changed files with 61 additions and 2 deletions

View file

@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.4 2009/10/18 12:30:54 tnn Exp $
# $NetBSD: Makefile,v 1.5 2009/10/21 10:31:46 ghen Exp $
DISTNAME= openjdk-7-ea-src-b72-17_sep_2009
PKGNAME= openjdk7-1.7.0.72.20090924
PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
EXTRACT_SUFX= .tar.bz2
@ -35,6 +36,10 @@ MAKE_ENV+= PKGSRC_ZIPEXE=${PREFIX}/bin/zip
MAKE_ENV+= PKGSRC_UNZIP=${PREFIX}/bin/unzip
MAKE_ENV+= PKGSRC_UNZIPSFX=${PREFIX}/bin/unzipsfv
DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
#DEPENDS+= ja-sazanami-ttf-[0-9]*:../../fonts/ja-sazanami-ttf
#DEPENDS+= baekmuk-ttf-[0-9]*:../../fonts/baekmuk-ttf
NO_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= gmake pax
@ -78,6 +83,12 @@ SUBST_FILES.add-rpaths= jdk/make/sun/awt/Makefile \
jdk/make/sun/xawt/Makefile
SUBST_SED.add-rpaths= -e 's|-L$$(OPENWIN_LIB)|-L$$(OPENWIN_LIB) -Wl,-R$$(OPENWIN_LIB)|g'
SUBST_CLASSES+= fontpaths
SUBST_STAGE.fontpaths= pre-build
SUBST_MESSAGE.fontpaths= fixing font paths
SUBST_FILES.fontpaths= jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
SUBST_SED.fontpaths= -e 's|%%PREFIX%%|${PREFIX}|'
PLIST_VARS+= i386
.if ${MACHINE_ARCH} == "i386"
PLIST.i386= yes

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.2 2009/10/18 10:21:01 tnn Exp $
$NetBSD: distinfo,v 1.3 2009/10/21 10:31:46 ghen Exp $
SHA1 (openjdk7/175529fae103.tar.bz2) = 297f474423a18d727a87b922b1665ea4e5d54732
RMD160 (openjdk7/175529fae103.tar.bz2) = 37bb512ccce29eb764a6bf9649c13715bf3eb2d6
@ -72,3 +72,4 @@ SHA1 (patch-bj) = 4198e1aa8e3c65434fbb947a00eed49e73106291
SHA1 (patch-bk) = 66bccfdf42fcc6f6995f3f18fc2515d55cab46c6
SHA1 (patch-bl) = a3b3bd6007c83664538baf401447fd0df9f4143b
SHA1 (patch-bm) = 40c83ad219f529c3ca130547560681ab57b44bf8
SHA1 (patch-bn) = 571d98951cc2a53dd1512e7f7d4495381e1c4004

View file

@ -0,0 +1,47 @@
$NetBSD: patch-bn,v 1.1 2009/10/21 10:31:46 ghen Exp $
--- jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties.orig 2009-10-21 11:09:00.000000000 +0200
+++ jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
@@ -166,24 +166,24 @@ sequence.fallback=chinese-big5,chinese-g
# Font File Names
-filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans.ttf
-filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Bold.ttf
-filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Oblique.ttf
-filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf
+filename.DejaVu_LGC_Sans=%%PREFIX%%/lib/X11/fonts/TTF/DejaVuSans.ttf
+filename.DejaVu_LGC_Sans_Bold=%%PREFIX%%/lib/X11/fonts/TTF/DejaVuSans-Bold.ttf
+filename.DejaVu_LGC_Sans_Oblique=%%PREFIX%%/lib/X11/fonts/TTF/DejaVuSans-Oblique.ttf
+filename.DejaVu_LGC_Sans_Bold_Oblique=%%PREFIX%%/lib/X11/fonts/TTF/DejaVuSans-BoldOblique.ttf
-filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono.ttf
-filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf
-filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Oblique.ttf
-filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-BoldOblique.ttf
+filename.DejaVu_LGC_Sans_Mono=%%PREFIX%%/lib/X11/fonts/TTF/DejaVuSansMono.ttf
+filename.DejaVu_LGC_Sans_Mono_Bold=%%PREFIX%%/lib/X11/fonts/TTF/DejaVuSansMono-Bold.ttf
+filename.DejaVu_LGC_Sans_Mono_Oblique=%%PREFIX%%/lib/X11/fonts/TTF/DejaVuSansMono-Oblique.ttf
+filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=%%PREFIX%%/lib/X11/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
-filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif.ttf
-filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Bold.ttf
-filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Oblique.ttf
-filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-BoldOblique.ttf
+filename.DejaVu_LGC_Serif=%%PREFIX%%/lib/X11/fonts/TTF/DejaVuSerif.ttf
+filename.DejaVu_LGC_Serif_Bold=%%PREFIX%%/lib/X11/fonts/TTF/DejaVuSerif-Bold.ttf
+filename.DejaVu_LGC_Serif_Oblique=%%PREFIX%%/lib/X11/fonts/TTF/DejaVuSerif-Italic.ttf
+filename.DejaVu_LGC_Serif_Bold_Oblique=%%PREFIX%%/lib/X11/fonts/TTF/DejaVuSerif-BoldItalic.ttf
-filename.Sazanami_Gothic=/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf
-filename.Sazanami_Mincho=/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf
-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/chinese/TrueType/uming.ttf
-filename.AR_PL_ZenKai_Uni=/usr/share/fonts/chinese/TrueType/ukai.ttf
-filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf
-filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf
+filename.Sazanami_Gothic=%%PREFIX%%/lib/X11/fonts/TTF/sazanami-gothic.ttf
+filename.Sazanami_Mincho=%%PREFIX%%/lib/X11/fonts/TTF/sazanami-mincho.ttf
+filename.AR_PL_ShanHeiSun_Uni=%%PREFIX%%/lib/X11/fonts/TTF/uming.ttf
+filename.AR_PL_ZenKai_Uni=%%PREFIX%%/lib/X11/fonts/TTF/ukai.ttf
+filename.Baekmuk_Gulim=%%PREFIX%%/lib/X11/fonts/TTF/gulim.ttf
+filename.Baekmuk_Batang=%%PREFIX%%/lib/X11/fonts/TTF/batang.ttf