[pkgsrc/trunk]: pkgsrc/lang/openjdk8 try to fix broken freetype detection in ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9857d7f654b3
branches:  trunk
changeset: 646521:9857d7f654b3
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue Feb 10 08:20:27 2015 +0000

description:
try to fix broken freetype detection in some cases

diffstat:

 lang/openjdk8/distinfo                                             |   4 +-
 lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh |  11 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r 9b43cc2e9d87 -r 9857d7f654b3 lang/openjdk8/distinfo
--- a/lang/openjdk8/distinfo    Tue Feb 10 08:12:52 2015 +0000
+++ b/lang/openjdk8/distinfo    Tue Feb 10 08:20:27 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2015/02/08 08:41:25 tnn Exp $
+$NetBSD: distinfo,v 1.2 2015/02/10 08:20:27 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
@@ -40,7 +40,7 @@
 SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
 SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8
 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
-SHA1 (patch-common_autoconf_generated-configure.sh) = 0c9d7882010bb900a174e9c19e7ea31e73595a44
+SHA1 (patch-common_autoconf_generated-configure.sh) = 24214799573cc3ea99a867ad03a4c4209750e68d
 SHA1 (patch-common_autoconf_spec.gmk.in) = 8fda7fac31444997615a8f8bfe22d5b2df01ad3c
 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = de9d1f2c97df16119de56abb5e900f705813e514
diff -r 9b43cc2e9d87 -r 9857d7f654b3 lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
--- a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh        Tue Feb 10 08:12:52 2015 +0000
+++ b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh        Tue Feb 10 08:20:27 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.1 2015/02/08 08:41:25 tnn Exp $
+$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.2 2015/02/10 08:20:27 tnn Exp $
 
 --- common/autoconf/generated-configure.sh.orig        2015-02-02 15:31:06.000000000 +0000
 +++ common/autoconf/generated-configure.sh
@@ -91,6 +91,15 @@
        fi
        if test "x$with_freetype_lib" != x; then
          POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
+@@ -34373,7 +34379,7 @@ $as_echo "$as_me: The path of FREETYPE_I
+     FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
+   fi
+ 
+-      if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then
++      if test -d $FREETYPE_INCLUDE_PATH/freetype2; then
+         FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
+       else
+         FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
 @@ -34506,7 +34512,7 @@ $as_echo "$as_me: The path of FREETYPE_L
        if test "x$OPENJDK_TARGET_OS" = xwindows; then
          FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"