[pkgsrc/trunk]: pkgsrc/lang/openjdk8 Really fix previous. Now fontconfig load...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc3c9adb2cee
branches:  trunk
changeset: 646523:dc3c9adb2cee
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue Feb 10 11:44:32 2015 +0000

description:
Really fix previous. Now fontconfig loads and the jconsole UI comes up.
Bump PKGREVISION.

diffstat:

 lang/openjdk8/Makefile         |  3 ++-
 lang/openjdk8/distinfo         |  4 ++--
 lang/openjdk8/patches/patch-ap |  6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diffs (51 lines):

diff -r 010278dd7903 -r dc3c9adb2cee lang/openjdk8/Makefile
--- a/lang/openjdk8/Makefile    Tue Feb 10 11:02:16 2015 +0000
+++ b/lang/openjdk8/Makefile    Tue Feb 10 11:44:32 2015 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2015/02/08 17:20:54 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/10 11:44:32 tnn Exp $
 
 DISTNAME=      openjdk-1.8.31-20150207
 PKGNAME=       openjdk8-1.8.31
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=  .tar.xz
diff -r 010278dd7903 -r dc3c9adb2cee lang/openjdk8/distinfo
--- a/lang/openjdk8/distinfo    Tue Feb 10 11:02:16 2015 +0000
+++ b/lang/openjdk8/distinfo    Tue Feb 10 11:44:32 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2015/02/10 11:02:16 tnn Exp $
+$NetBSD: distinfo,v 1.4 2015/02/10 11:44:32 tnn Exp $
 
 SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337
 RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157
@@ -33,7 +33,7 @@
 SHA1 (patch-aa) = 653a22362d55de11f4fc37240a5ac945eabff8a4
 SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c
 SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178
-SHA1 (patch-ap) = 93e01450504879a49a2bddff1d5f8699efc5e3a1
+SHA1 (patch-ap) = 89114a9ee048b92d897509feb283cf9aeeac9fc5
 SHA1 (patch-as) = 484ba6dd99c650ebe3df5639548ee2874c326aaa
 SHA1 (patch-at) = 736ead4b9f391c711bf1f387d87ffb9363823557
 SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e7e456fe2a44656b800
diff -r 010278dd7903 -r dc3c9adb2cee lang/openjdk8/patches/patch-ap
--- a/lang/openjdk8/patches/patch-ap    Tue Feb 10 11:02:16 2015 +0000
+++ b/lang/openjdk8/patches/patch-ap    Tue Feb 10 11:44:32 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.2 2015/02/10 11:02:16 tnn Exp $
+$NetBSD: patch-ap,v 1.3 2015/02/10 11:44:32 tnn Exp $
 
 Use pkgsrc fontconfig.
 
@@ -10,8 +10,8 @@
  
 -#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")
++#define FONTCONFIG_DLL_VERSIONED "@BUILDLINK_PREFIX.fontconfig@/lib/" JNI_LIB_NAME("fontconfig")
++#define FONTCONFIG_DLL "@BUILDLINK_PREFIX.fontconfig@/lib/" JNI_LIB_NAME("fontconfig")
  
  #define MAXFDIRS 512    /* Max number of directories that contain fonts */