Use full pathname to libfontconfig.so.

Really fixes NullPointerException in getDefaultPlatformFont.
Remove previous hack and bump revision again.

5 files changed, 48 insertions, 52 deletions

diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index bafa5f6dee6..0340e1f1445 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/11/08 00:22:07 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2009/11/08 17:57:46 tnn Exp $
 
 DISTNAME=	openjdk-7-ea-src-b75-30_oct_2009
 PKGNAME=	openjdk7-1.7.0.75.20091106
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.bz2
@@ -89,7 +89,8 @@ 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_FILES.fontpaths+=		jdk/src/solaris/native/sun/awt/fontpath.c
-SUBST_SED.fontpaths=		-e 's|%%PREFIX%%|${PREFIX}|'
+SUBST_SED.fontpaths=		-e 's|@PREFIX@|${PREFIX}|g'
+SUBST_SED.fontpaths+=		-e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g'
 
 PLIST_VARS+=	i386
 .if ${MACHINE_ARCH} == "i386"
@@ -140,6 +141,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/cacerts.out				\
 	  ${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts
 
+.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.cups?=	build
 .include "../../print/cups/buildlink3.mk"
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 19e608a28dd..85a61fd6e2b 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2009/11/08 00:22:07 tnn Exp $
+$NetBSD: distinfo,v 1.7 2009/11/08 17:57:46 tnn Exp $
 
 SHA1 (openjdk7/9eb43c172d5b.tar.bz2) = 148136f77c5f565c27cfb2b1346363469becc5ab
 RMD160 (openjdk7/9eb43c172d5b.tar.bz2) = 7c79d15754eae87c543a131a36e26b52fb30e7e7
@@ -49,11 +49,10 @@ SHA1 (patch-ag) = 6287960055a79d05dc193e31d29ffc0158b33cdd
 SHA1 (patch-ah) = 2632580f92b27506c33df8714ed163ef3ed9844f
 SHA1 (patch-ai) = 6d6c394c3de7578754b901686b88142cbc524ef7
 SHA1 (patch-aj) = e370b618f4417d5ca19164c8eb59075123179b5a
-SHA1 (patch-ak) = 20ee0527aa3e6cbaf7e0419cc09feed0465379ea
 SHA1 (patch-am) = 7e0ffa317a83d5b1e34c3f3e76b7a3de26980df6
 SHA1 (patch-an) = b0636c22521d9727ad79df6914c9ce8c7c70b362
 SHA1 (patch-ao) = 87ee9dd450d0b4e7cbd2302466a2e9f586fa6df1
-SHA1 (patch-ap) = 4219c2eb348603ee7ebcfad0b3e6dca81b942c91
+SHA1 (patch-ap) = 1cdd568c89e0525ed17e55300a51af15e9f19e08
 SHA1 (patch-aq) = 17be1ad20f0930ad53e0de197fd01f10284cbb5d
 SHA1 (patch-ar) = 19abc4c858c730fb337d68d1d524db82c73ffa36
 SHA1 (patch-as) = d78c44af2e412da65239a8339e00d79eca881e2f
@@ -72,4 +71,4 @@ SHA1 (patch-bj) = 4198e1aa8e3c65434fbb947a00eed49e73106291
 SHA1 (patch-bk) = 66bccfdf42fcc6f6995f3f18fc2515d55cab46c6
 SHA1 (patch-bl) = a3b3bd6007c83664538baf401447fd0df9f4143b
 SHA1 (patch-bm) = 40c83ad219f529c3ca130547560681ab57b44bf8
-SHA1 (patch-bn) = 571d98951cc2a53dd1512e7f7d4495381e1c4004
+SHA1 (patch-bn) = 5b34da35e39e08c935c805b5ef7b2c8cc8d285da
diff --git a/lang/openjdk7/patches/patch-ak b/lang/openjdk7/patches/patch-ak
deleted file mode 100644
index febd07eab9b..00000000000
--- a/lang/openjdk7/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2009/11/08 00:22:07 tnn Exp $
-
---- jdk/src/solaris/classes/sun/awt/X11FontManager.java.orig	2009-11-08 01:12:18.000000000 +0100
-+++ jdk/src/solaris/classes/sun/awt/X11FontManager.java
-@@ -790,6 +790,11 @@ public class X11FontManager extends SunF
-         getFontConfigManager().initFontConfigFonts(false);
-         FontConfigManager.FcCompFont[] fontConfigFonts =
-             getFontConfigManager().getFontConfigFonts();
-+	if (fontConfigFonts == null) {
-+            info[0] = "nonexistent";
-+            info[1] = "/nonexistent.ttf";
-+            return info;
-+	}
-         for (int i=0; i<fontConfigFonts.length; i++) {
-             if ("sans".equals(fontConfigFonts[i].fcFamily) &&
-                 0 == fontConfigFonts[i].style) {
diff --git a/lang/openjdk7/patches/patch-ap b/lang/openjdk7/patches/patch-ap
index 1ac9c8adf68..92c78d6d1bc 100644
--- a/lang/openjdk7/patches/patch-ap
+++ b/lang/openjdk7/patches/patch-ap
@@ -1,18 +1,29 @@
-$NetBSD: patch-ap,v 1.2 2009/10/21 10:35:09 ghen Exp $
+$NetBSD: patch-ap,v 1.3 2009/11/08 17:57:46 tnn Exp $
 
---- jdk/src/solaris/native/sun/awt/fontpath.c.orig	2009-01-10 14:29:12.000000000 +0100
+--- jdk/src/solaris/native/sun/awt/fontpath.c.orig	2009-11-08 11:51:19.000000000 +0100
 +++ jdk/src/solaris/native/sun/awt/fontpath.c
-@@ -164,6 +164,27 @@ static char *fullLinuxFontPath[] = {
+@@ -70,8 +70,8 @@ extern Display *awt_display;
+ #define FONTCONFIG_DLL_VERSIONED X11_PATH "/lib/" VERSIONED_JNI_LIB_NAME("fontconfig", "1")
+ #define FONTCONFIG_DLL X11_PATH "/lib/" JNI_LIB_NAME("fontconfig")
+ #else
+-#define FONTCONFIG_DLL_VERSIONED VERSIONED_JNI_LIB_NAME("fontconfig", "1")
+-#define FONTCONFIG_DLL JNI_LIB_NAME("fontconfig")
++#define FONTCONFIG_DLL_VERSIONED "@BUILDLINK_PREFIX.fontconfig@/lib/" JNI_LIB_NAME("fontconfig")
++#define FONTCONFIG_DLL "@BUILDLINK_PREFIX.fontconfig@/lib/" JNI_LIB_NAME("fontconfig")
+ #endif
+ 
+ #define MAXFDIRS 512    /* Max number of directories that contain fonts */
+@@ -163,6 +163,27 @@ static char *fullLinuxFontPath[] = {
      NULL, /* terminates the list */
  };
  #endif
 +static char *pkgsrcFontPath[] = {
-+   "%%PREFIX%%/lib/X11/fonts/100dpi",
-+   "%%PREFIX%%/lib/X11/fonts/75dpi",
-+   "%%PREFIX%%/lib/X11/fonts/Type1",
-+   "%%PREFIX%%/lib/X11/fonts/cyrillic",
-+   "%%PREFIX%%/lib/X11/fonts/misc",
-+   "%%PREFIX%%/lib/X11/fonts/TTF",
++   "@PREFIX@/lib/X11/fonts/100dpi",
++   "@PREFIX@/lib/X11/fonts/75dpi",
++   "@PREFIX@/lib/X11/fonts/Type1",
++   "@PREFIX@/lib/X11/fonts/cyrillic",
++   "@PREFIX@/lib/X11/fonts/misc",
++   "@PREFIX@/lib/X11/fonts/TTF",
 +   "/usr/X11R7/lib/X11/fonts/100dpi",
 +   "/usr/X11R7/lib/X11/fonts/75dpi",
 +   "/usr/X11R7/lib/X11/fonts/Type1",
@@ -30,7 +41,7 @@ $NetBSD: patch-ap,v 1.2 2009/10/21 10:35:09 ghen Exp $
  
  static char **getFontConfigLocations();
  
-@@ -515,6 +536,7 @@ static char *getPlatformFontPathChars(JN
+@@ -525,6 +546,7 @@ static char *getPlatformFontPathChars(JN
  #else /* IF SOLARIS */
      knowndirs = fullSolarisFontPath;
  #endif
diff --git a/lang/openjdk7/patches/patch-bn b/lang/openjdk7/patches/patch-bn
index 2b969e40321..a6e0e9ba7d0 100644
--- a/lang/openjdk7/patches/patch-bn
+++ b/lang/openjdk7/patches/patch-bn
@@ -1,4 +1,4 @@
-$NetBSD: patch-bn,v 1.1 2009/10/21 10:31:46 ghen Exp $
+$NetBSD: patch-bn,v 1.2 2009/11/08 17:57:46 tnn 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
@@ -10,28 +10,28 @@ $NetBSD: patch-bn,v 1.1 2009/10/21 10:31:46 ghen Exp $
 -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=@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_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.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
@@ -39,9 +39,9 @@ $NetBSD: patch-bn,v 1.1 2009/10/21 10:31:46 ghen Exp $
 -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
++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