add/fix patch comments

5 files changed, 33 insertions, 18 deletions

diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index dea7158fdab..7daaf9f853d 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2015/09/12 16:56:48 joerg Exp $
+$NetBSD: distinfo,v 1.27 2015/09/24 22:54:28 tnn Exp $
 
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@@ -47,7 +47,7 @@ SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
 SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8
 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
 SHA1 (patch-common_autoconf_boot-jdk.m4) = b7f8722a25c1c7ab489a9fd65cf60fb4af9530eb
-SHA1 (patch-common_autoconf_generated-configure.sh) = 51e5dc909058b8ea26833a66c1d7eb0dafc3042d
+SHA1 (patch-common_autoconf_generated-configure.sh) = cda7bc95247400a1702e9da937d485d1a2084f97
 SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b
 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 6b3e2f769c754b3ee5de8c07444964414136fa81
@@ -95,9 +95,9 @@ SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
 SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
 SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41
 SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 5fed2c4036080dd5230941bbb76025859e936267
-SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 2f87fe9f0dd5a9298954d4da21938d147c368d42
+SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d
 SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393
-SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = fe58fe992521c0ef8b7b60f8213bfcd714790c1e
+SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 9d8900a6f9cc6af99b08e281b0d6d4c337916317
 SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50
 SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 18e79e74dc8ec2b24ab91ad8af2195bfd508d1b4
 SHA1 (patch-jdk_src_solaris_bin_ergo.c) = 0e2e496a0d596cc9de546c722b3387ad5a08bc21
@@ -106,7 +106,7 @@ SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = ea9f74b654ddc7ab9
 SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = f11483cb75ab5cad5a5b749cab287d5dbaaefe63
 SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675
 SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d
-SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 6c6648c2716508209f07512327afe3ec1179f64c
+SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 672c9a044936cb11cc91e9a3e550dc69ef665209
 SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 3409e21ec151e407053fd510760c8b082f1beda5
 SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c404a3520f82b8cc5eb906725aa2bc7f27cad801
 SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = cf0f8218e0088b677cd66fd5bc0d575ab08b710f
diff --git a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
index a17946ba6b2..4d63f6037f0 100644
--- a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
+++ b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
@@ -1,10 +1,11 @@
-$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.6 2015/07/03 20:40:59 fhajny Exp $
+$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.7 2015/09/24 22:54:28 tnn Exp $
 
 GCC support on SunOS.
 Fix max heap.
 Avoid requiring ALSA.
+Fix broken configure check for llvm-config.
 
---- common/autoconf/generated-configure.sh.orig	2015-06-10 10:29:06.000000000 +0000
+--- common/autoconf/generated-configure.sh.orig	2015-08-05 15:28:20.000000000 +0000
 +++ common/autoconf/generated-configure.sh
 @@ -6883,7 +6883,7 @@ test -n "$target_alias" &&
        VAR_CPU_BITS=32
@@ -46,7 +47,7 @@ Avoid requiring ALSA.
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -16217,16 +16217,15 @@ $as_echo_n "checking flags for boot jdk
+@@ -16217,16 +16217,15 @@ $as_echo_n "checking flags for boot jdk 
    # Maximum amount of heap memory.
    # Maximum stack size.
    if test "x$BUILD_NUM_BITS" = x32; then
@@ -156,7 +157,7 @@ Avoid requiring ALSA.
              *)
                C_O_FLAG_HI="-O3"
                C_O_FLAG_NORM="-O2"
-@@ -29862,7 +29875,7 @@ fi
+@@ -29862,7 +29876,7 @@ fi
    #
    case $COMPILER_NAME in
      gcc )
@@ -165,7 +166,7 @@ Avoid requiring ALSA.
        -pipe \
        -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
        case $OPENJDK_TARGET_CPU_ARCH in
-@@ -30475,7 +30488,8 @@ $as_echo "alsa pulse x11" >&6; }
+@@ -30475,7 +30489,8 @@ $as_echo "alsa pulse x11" >&6; }
    if test "x$OPENJDK_TARGET_OS" = xbsd; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5
  $as_echo_n "checking what is not needed on BSD?... " >&6; }
@@ -175,7 +176,7 @@ Avoid requiring ALSA.
        ALSA_NOT_NEEDED=yes
        PULSE_NOT_NEEDED=yes
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
-@@ -31701,7 +31715,11 @@ $as_echo "$as_me: WARNING: freetype not
+@@ -31701,7 +31716,11 @@ $as_echo "$as_me: WARNING: freetype not 
  
        # Allow --with-freetype-lib and --with-freetype-include to override
        if test "x$with_freetype_include" != x; then
@@ -188,7 +189,7 @@ Avoid requiring ALSA.
        fi
        if test "x$with_freetype_lib" != x; then
          POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
-@@ -34519,7 +34537,7 @@ $as_echo "$as_me: The path of FREETYPE_I
+@@ -34519,7 +34538,7 @@ $as_echo "$as_me: The path of FREETYPE_I
      FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
    fi
  
@@ -197,7 +198,7 @@ Avoid requiring ALSA.
          FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
        else
          FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
-@@ -34652,7 +34670,7 @@ $as_echo "$as_me: The path of FREETYPE_L
+@@ -34652,7 +34671,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"
        else
@@ -206,7 +207,17 @@ Avoid requiring ALSA.
        fi
      fi
  
-@@ -35923,7 +35941,7 @@ fi
+@@ -35878,9 +35897,6 @@ fi
+ 
+ 
+ 
+-    if test "x$LLVM_CONFIG" != xllvm-config; then
+-      as_fn_error $? "llvm-config not found in $PATH." "$LINENO" 5
+-    fi
+ 
+     llvm_components="jit mcjit engine nativecodegen native"
+     unset LLVM_CFLAGS
+@@ -35923,7 +35939,7 @@ fi
    fi
  
    # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
diff --git a/lang/openjdk8/patches/patch-jdk_make_lib_NioLibraries.gmk b/lang/openjdk8/patches/patch-jdk_make_lib_NioLibraries.gmk
index 6b16fa9f81e..3560bbd6ac4 100644
--- a/lang/openjdk8/patches/patch-jdk_make_lib_NioLibraries.gmk
+++ b/lang/openjdk8/patches/patch-jdk_make_lib_NioLibraries.gmk
@@ -1,4 +1,6 @@
-$NetBSD: patch-jdk_make_lib_NioLibraries.gmk,v 1.3 2015/07/03 20:40:59 fhajny Exp $
+$NetBSD: patch-jdk_make_lib_NioLibraries.gmk,v 1.4 2015/09/24 22:54:28 tnn Exp $
+
+Fix list of platforms that do not have SCTP support.
 
 --- jdk/make/lib/NioLibraries.gmk.orig	2015-06-10 10:36:24.000000000 +0000
 +++ jdk/make/lib/NioLibraries.gmk
diff --git a/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c b/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c
index bb77b5e4f50..3e2b12b55b0 100644
--- a/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c
+++ b/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c,v 1.1 2015/02/08 08:41:25 tnn Exp $
+$NetBSD: patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c,v 1.2 2015/09/24 22:54:28 tnn Exp $
 
-patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c
+Ensure we use the bundled jpeg.
 
 --- jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c.orig	2015-02-02 15:37:11.000000000 +0000
 +++ jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
diff --git a/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c b/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c
index cd266f85b04..f11de1f5130 100644
--- a/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c
+++ b/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-jdk_src_solaris_native_java_lang_java__props__md.c,v 1.1 2015/02/08 08:41:25 tnn Exp $
+$NetBSD: patch-jdk_src_solaris_native_java_lang_java__props__md.c,v 1.2 2015/09/24 22:54:28 tnn Exp $
+
+DragonFly support.
 
 --- jdk/src/solaris/native/java/lang/java_props_md.c.orig	2015-02-02 15:37:12.000000000 +0000
 +++ jdk/src/solaris/native/java/lang/java_props_md.c