 @@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.54 2017/11/23 17:20:01 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2017/11/28 05:07:25 ryoon Exp $
-DISTNAME=	openjdk-1.8.144-20170830
+DISTNAME=	openjdk-1.8.152-20171128
-PKGNAME=	openjdk8-1.8.144
+PKGNAME=	openjdk8-1.8.152
 PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://openjdk.java.net/
 COMMENT=	Open-source implementation of the Java Platform, Standard Edition
 LICENSE=	gnu-gpl-v2
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 # Use same DIST_SUBDIR as openjdk7 to avoid duplication of common distfiles

 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.7 2017/03/31 07:55:14 abs Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/11/28 05:07:25 ryoon Exp $
 bin/openjdk8-jar
 bin/openjdk8-java
 bin/openjdk8-javac
 bin/openjdk8-javadoc
 bin/openjdk8-javah
 bin/openjdk8-javap
 bin/openjdk8-jcmd
 bin/openjdk8-jps
 bin/openjdk8-jstack
 bin/openjdk8-keytool
 bin/openjdk8-orbd
 bin/openjdk8-policytool
 bin/openjdk8-rmid
 @@ -423,32 +423,34 @@ java/openjdk8/jre/lib/jsse.jar
 java/openjdk8/jre/lib/jvm.hprof.txt
 java/openjdk8/jre/lib/logging.properties
 java/openjdk8/jre/lib/management-agent.jar
 java/openjdk8/jre/lib/management/jmxremote.access
 java/openjdk8/jre/lib/management/jmxremote.password.template
 java/openjdk8/jre/lib/management/management.properties
 java/openjdk8/jre/lib/management/snmp.acl.template
 java/openjdk8/jre/lib/meta-index
 java/openjdk8/jre/lib/net.properties
 java/openjdk8/jre/lib/psfont.properties.ja
 java/openjdk8/jre/lib/psfontj2d.properties
 java/openjdk8/jre/lib/resources.jar
 java/openjdk8/jre/lib/rt.jar
 java/openjdk8/jre/lib/security/US_export_policy.jar
 java/openjdk8/jre/lib/security/blacklisted.certs
 java/openjdk8/jre/lib/security/cacerts
 java/openjdk8/jre/lib/security/java.policy
 java/openjdk8/jre/lib/security/java.security
-java/openjdk8/jre/lib/security/local_policy.jar
+java/openjdk8/jre/lib/security/policy/limited/US_export_policy.jar
 java/openjdk8/jre/lib/security/policy/limited/local_policy.jar
 java/openjdk8/jre/lib/security/policy/unlimited/US_export_policy.jar
 java/openjdk8/jre/lib/security/policy/unlimited/local_policy.jar
 java/openjdk8/jre/lib/sound.properties
 java/openjdk8/jre/lib/tzdb.dat
 java/openjdk8/lib/${ARCH}/jexec
 java/openjdk8/lib/${ARCH}/jli/libjli.so
 java/openjdk8/lib/${ARCH}/libjawt.so
 java/openjdk8/lib/ct.sym
 java/openjdk8/lib/dt.jar
 java/openjdk8/lib/ir.idl
 java/openjdk8/lib/jconsole.jar
 java/openjdk8/lib/orb.idl
 ${PLIST.native}java/openjdk8/lib/sa-jdi.jar
 java/openjdk8/lib/tools.jar
 java/openjdk8/man/man1/appletviewer.1

 @@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.50 2017/09/02 04:13:41 ryoon Exp $
+$NetBSD: distinfo,v 1.51 2017/11/28 05:07:25 ryoon 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
 SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4
 Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee
 SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 10b80dd953e68c958732ccb56464ee95d8727a95fd7e930a988355348eb3ee47b27350225b28bcc3ec1480a2297c193675150c70bf2ee1820b118f48cdcf67b2
 Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea
 SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = eec0b48e62e29d526911b71079627e3b3a0057e78d1a0195072bac432e4e772f29f9dcc39d6ce972ec56c4b48ec103833779d5b50dae8164303174540f360c1d
 Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes
 @@ -34,42 +34,42 @@ SHA512 (openjdk7/bootstrap-jdk-1.7.76-ne
 Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 27615992 bytes
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 69375362b2638d803c71392008a73f956d315085
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 06b40db72e7154daff49093f3b6e8aa39cae27b3
 SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 5391de2d35934b79462b603cd19c65b21712891d59afe9d6e5319ea479fe2bc528e4f423648cd6fc9bcaec97ed57b9e01d1c46d04bc4edb9ed5ae7131b7cd5d7
 Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 23041084 bytes
 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
 SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 15ee0583de67df94c980eec197e5279344eaf94d4830e2030f8c8cbc795bce1e0abdf435be4be4c5da271a41d5441e9ebf4bd4f088b17698b5a1e4cc685ebf3a
 Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes
 SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d
 RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140
 SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 1403e582dacd0474e57d9aa8f1333060c50d099ef5d2c5a992ff7f63dcde2e538ff1e7fb78e45d12fd5aea6daf0704672e7f326399d415ee0d6bb53b6f925e9f
 Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes
-SHA1 (openjdk7/openjdk-1.8.144-20170830.tar.xz) = a897c539fec09e9f97769f4fd64e4f387569c8b4
+SHA1 (openjdk7/openjdk-1.8.152-20171128.tar.xz) = e4937fd9af8c1a111358a3a8d64fc6765509cd23
-RMD160 (openjdk7/openjdk-1.8.144-20170830.tar.xz) = 4506dc7484898d397adf34922d534082d9f598ad
+RMD160 (openjdk7/openjdk-1.8.152-20171128.tar.xz) = db7f212a789ab2265d802e51c6c5274a97151c65
-SHA512 (openjdk7/openjdk-1.8.144-20170830.tar.xz) = 207f9ba412276a87b6305c83290266a65f7a9ae93299bcf8e6169863c1fceeae4345687efb99b3c02822c84f2d1ad0bec66c66c6a74c002958a4bc2db34ed0a7
+SHA512 (openjdk7/openjdk-1.8.152-20171128.tar.xz) = 4e3e3c1c4049071df292b317ab4d7ec2fe0c98b3d1f628a61997f8a564936dba1380691a8ef04fb84b2759fd9db34fe0646f4fb7959084acd6ffba022d69597a
-Size (openjdk7/openjdk-1.8.144-20170830.tar.xz) = 55434592 bytes
+Size (openjdk7/openjdk-1.8.152-20171128.tar.xz) = 55518112 bytes
 SHA1 (patch-aa) = 512a42ff1a0d6c4a0672ec32e9396cc0c5c8c9fb
 SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c
 SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178
 SHA1 (patch-ap) = 89114a9ee048b92d897509feb283cf9aeeac9fc5
 SHA1 (patch-as) = 484ba6dd99c650ebe3df5639548ee2874c326aaa
 SHA1 (patch-at) = 736ead4b9f391c711bf1f387d87ffb9363823557
 SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e7e456fe2a44656b800
 SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
 SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8
 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
 SHA1 (patch-common_autoconf_boot-jdk.m4) = 530da90ea4062f9d8c208557ff634579b0b19f55
-SHA1 (patch-common_autoconf_generated-configure.sh) = 116f1b37fc737ca30998a28b40ef00f7be95a744
+SHA1 (patch-common_autoconf_generated-configure.sh) = becb70acee2cfaa5f8bab588ece118303fe1f123
 SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b
 SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = a686ca478011561df93cce6311b5a344d79c3a24
 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 2c0d286c87f8239e8d5aa7fcc21e09b4b1c5a46e
 SHA1 (patch-hotspot_make_bsd_makefiles_jsig.make) = 36ba2dc2db7d802aa558ea984afa42ae2d61deb7
 SHA1 (patch-hotspot_make_bsd_makefiles_saproc.make) = 76a0cc758ee1d62136e8e698df7e46fe20aa9e19
 SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14
 SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
 SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 7195c97c4f559b2e9410028315de351c5047d59d
 SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 0c9dc2b97d49cf557dc57071fd7c312b9cb8e598
 SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 632f96a322f1568df6f49bf31716bafe1d324976
 SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = 4763215f5ce2c3d9fcadb69e52afad7c9de97417
 SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 10ecc1bd24d6d555e4730041c9dce1d3258bcab0
 @@ -96,44 +96,44 @@ SHA1 (patch-hotspot_src_os_solaris_vm_de
 SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = c8840633681c01d4a911e32e8d79060fbbdc506e
 SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 589bf0707023b9f799caf2cafe5aeba89af46b05
 SHA1 (patch-hotspot_src_share_vm_classfile_symbolTable.cpp) = c0077a7691ce2ba698f46d9fc8c81bf974aef68c
 SHA1 (patch-hotspot_src_share_vm_gc__implementation_concurrentMarkSweep_compactibleFreeListSpace.cpp) = b2bb8e74e43099fa9d1e157400bbb78386281235
 SHA1 (patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp) = 9e9347f9695cce3599fe12448445bb20d9b36f08
 SHA1 (patch-hotspot_src_share_vm_memory_metaspace.cpp) = 260005e002e0926447952850bbc1150e50a05509
 SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 2a728aa8fb04976195ebf58549a544b97e56b329
 SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 4654248e3fdf9a1be8ef5563e50b12dcd59aa1aa
 SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293
 SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 80265396c62de95b0937d770c1dba0e8a53daa80
 SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = a8e8fef04d7acb4772f57961e7df3681bd53d0b9
 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7
 SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7
-SHA1 (patch-jdk_make_CompileLaunchers.gmk) = fc386f8992db579483ad779f1aecfca762a29f92
+SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 1a8807595c5774fc6ecfc7caa3b53b806cc9537b
 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) = 519960ee33b748b5d91b101c2d644117a6b18e12
-SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 0afdb43822b01b244d56446ae11d15629eeec285
+SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 60392b9e8f4c823cffb120b9d7418bf8cb31e776
 SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d
 SHA1 (patch-jdk_make_lib_ServiceabilityLibraries.gmk) = 76eb64f3602f67ccb346df7a0acedf097869ba76
 SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393
 SHA1 (patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java) = b7d53d0c3554eebde8f7180e75259eb25123ce8b
 SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606
 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
 SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = f6fd4c1e0627867ba8d5071da7c53697177805dd
 SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = ea9f74b654ddc7ab977daff6c9176d78657145a9
 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) = 672c9a044936cb11cc91e9a3e550dc69ef665209
-SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 4e4cd6b8aef0011edf176505624ef4f518eb6c7e
+SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 6d58169565503ef8e50224fce8380e42cb87baba
 SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c51d6b0687011a54c27e6253cad33d8f8cc27124
 SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = cf0f8218e0088b677cd66fd5bc0d575ab08b710f
 SHA1 (patch-jdk_test_Makefile) = 36430647c444dea491ae0c916c6ad7b1a3607ec6
 SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = 5fb2dd92820afcca5a04956d81e5244840b513f7
 SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = e5d6121d2af74238347baa2d63670f0d520847f8
 SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = bb0a20f688093f2d60f4a4937ae418fcebfcc7ca
 SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 07b071ace2a91acd1968ed670aead67d72f0d490
 SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = c2db0716408ae1d081b3516b6c866b8f43cf5b6f
 SHA1 (patch-langtools_make_build.xml) = e9dccdb67a0f25b266755f66e520c6420afaf7ba

 @@ -1,217 +1,217 @@
-$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.12 2017/05/10 13:59:57 ryoon Exp $
+$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.13 2017/11/28 05:07:25 ryoon Exp $
 BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386)
---- common/autoconf/generated-configure.sh.orig	2016-10-26 22:56:42.000000000 +0000
+--- common/autoconf/generated-configure.sh.orig	2017-11-28 00:13:34.000000000 +0000
 +++ common/autoconf/generated-configure.sh
-@@ -8454,9 +8454,9 @@ done
+@@ -8486,9 +8486,9 @@ done
    # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
    if test "x$MAKE" != x; then
      # User has supplied a make, test it.
 -    if test ! -f "$MAKE"; then
 -      as_fn_error $? "The specified make (by MAKE=$MAKE) is not found." "$LINENO" 5
 -    fi
 +#    if test ! -f "$MAKE"; then
 +#      as_fn_error $? "The specified make (by MAKE=$MAKE) is not found." "$LINENO" 5
 +#    fi
    MAKE_CANDIDATE=""$MAKE""
    DESCRIPTION="user supplied MAKE=$MAKE"
-@@ -11755,7 +11755,7 @@ $as_echo "$as_me: Potential Boot JDK fou
+@@ -11787,7 +11787,7 @@ $as_echo "$as_me: Potential Boot JDK fou
              BOOT_JDK_FOUND=no
            else
              # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
 -            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
 +            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | grep version`
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -12539,7 +12539,7 @@ fi
+@@ -12571,7 +12571,7 @@ fi
        # Resolve file symlinks
        while test $COUNTER -lt 20; do
          ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
 -        if test "x$ISLINK" == x; then
 +        if test "x$ISLINK" = x; then
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -16225,16 +16225,15 @@ $as_echo_n "checking flags for boot jdk
+@@ -16257,16 +16257,15 @@ $as_echo_n "checking flags for boot jdk
    # Maximum amount of heap memory.
    # Maximum stack size.
    if test "x$BOOT_JDK_BITS" = x32; then
 -    JVM_MAX_HEAP=1100M
      STACK_SIZE=768
    else
      # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
      # pointers are used. Apparently, we need to increase the heap and stack
      # space for the jvm. More specifically, when running javac to build huge
      # jdk batch
 -    JVM_MAX_HEAP=1600M
      STACK_SIZE=1536
    fi
 +  JVM_MAX_HEAP=800M
    $ECHO "Check if jvm arg is ok: -Xmx$JVM_MAX_HEAP" >&5
    $ECHO "Command: $JAVA -Xmx$JVM_MAX_HEAP -version" >&5
-@@ -19454,7 +19453,7 @@ $as_echo "(none, will use system headers
+@@ -19486,7 +19485,7 @@ $as_echo "(none, will use system headers
    elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
      COMPILER_CHECK_LIST="cl"
    elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
 -    COMPILER_CHECK_LIST="cc gcc"
 +    COMPILER_CHECK_LIST="gcc cc"
    elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
      # Do not probe for cc on AIX.
      COMPILER_CHECK_LIST="xlc_r"
-@@ -19910,7 +19909,7 @@ $as_echo_n "checking resolved symbolic l
+@@ -19942,7 +19941,7 @@ $as_echo_n "checking resolved symbolic l
        # Resolve file symlinks
        while test $COUNTER -lt 20; do
          ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
 -        if test "x$ISLINK" == x; then
 +        if test "x$ISLINK" = x; then
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -20348,7 +20347,7 @@ $as_echo_n "checking for resolved symbol
+@@ -20380,7 +20379,7 @@ $as_echo_n "checking for resolved symbol
        # Resolve file symlinks
        while test $COUNTER -lt 20; do
          ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
 -        if test "x$ISLINK" == x; then
 +        if test "x$ISLINK" = x; then
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -20376,7 +20375,7 @@ $as_echo "no, keeping CC" >&6; }
+@@ -20408,7 +20407,7 @@ $as_echo "no, keeping CC" >&6; }
    COMPILER=$CC
    COMPILER_NAME=$COMPILER_NAME
 -  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
 +  if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$GCC" = xno; then
      # Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
      COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
      $ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
-@@ -21511,7 +21510,7 @@ $as_echo_n "checking resolved symbolic l
+@@ -21544,7 +21543,7 @@ $as_echo_n "checking resolved symbolic l
        # Resolve file symlinks
        while test $COUNTER -lt 20; do
          ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
 -        if test "x$ISLINK" == x; then
 +        if test "x$ISLINK" = x; then
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -21949,7 +21948,7 @@ $as_echo_n "checking for resolved symbol
+@@ -21982,7 +21981,7 @@ $as_echo_n "checking for resolved symbol
        # Resolve file symlinks
        while test $COUNTER -lt 20; do
          ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
 -        if test "x$ISLINK" == x; then
 +        if test "x$ISLINK" = x; then
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -21977,7 +21976,7 @@ $as_echo "no, keeping CXX" >&6; }
+@@ -22010,7 +22009,7 @@ $as_echo "no, keeping CXX" >&6; }
    COMPILER=$CXX
    COMPILER_NAME=$COMPILER_NAME
 -  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
 +  if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$GCC" = xno; then
      # Make sure we use the Sun Studio compiler and not gcc on Solaris, which won't work
      COMPILER_VERSION_TEST=`$COMPILER -V 2>&1 | $HEAD -n 1`
      $ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
-@@ -29390,6 +29389,15 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+@@ -29451,6 +29450,15 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
      if test "x$OPENJDK_TARGET_OS" = xbsd || test "x$OPENJDK_TARGET_OS" = xmacosx; then
        SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
      fi
 +    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
 +      SET_SHARED_LIBRARY_NAME=''
 +      SET_SHARED_LIBRARY_MAPFILE=''
 +      SET_SHARED_LIBRARY_ORIGIN='-R\$$$$ORIGIN$1'
 +      SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
 +      CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
 +      CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
 +      POST_STRIP_CMD="$STRIP -x"
 +    fi
    else
      if test "x$OPENJDK_TARGET_OS" = xsolaris; then
        # If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
-@@ -29531,6 +29539,13 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -29592,6 +29600,13 @@ rm -f core conftest.err conftest.$ac_obj
                C_O_FLAG_NORM="-Os"
                C_O_FLAG_NONE=""
                ;;
 +            solaris )
 +              # libverify currently crashes in 32-bit builds with
 +              # alignment faults, temporary workaround with -O2
 +              C_O_FLAG_HI="-O2"
 +              C_O_FLAG_NORM="-O2"
 +              C_O_FLAG_NONE="-O0"
 +              ;;
              *)
                C_O_FLAG_HI="-O3"
                C_O_FLAG_NORM="-O2"
-@@ -29732,7 +29747,7 @@ fi
+@@ -29796,7 +29811,7 @@ fi
+   #
    case $COMPILER_NAME in
      gcc )
--      CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \
+-      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare \
-+      CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare -Wno-unused-parameter \
++      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -Wno-sign-compare -Wno-unused-parameter \
        -pipe \
        -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
-       case $OPENJDK_TARGET_CPU_ARCH in
+       CXXSTD_CXXFLAG="-std=gnu++98"
-@@ -30343,7 +30358,8 @@ $as_echo "alsa pulse x11" >&6; }
+@@ -30753,7 +30768,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; }
 -    if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd; then
 +    if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd -o "x$OPENJDK_TARGET_OS_VENDOR" = xnetbsd -o "x$OPENJDK_TARGET_OS_VENDOR" = xfreebsd; then
 +# XXX revisit this
        ALSA_NOT_NEEDED=yes
        PULSE_NOT_NEEDED=yes
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
-@@ -31555,7 +31571,11 @@ $as_echo "$as_me: WARNING: freetype not
+@@ -31965,7 +31981,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
 -        POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
 +          POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"
 +           # deal w/ freetype2 in new location
 +          if test -f "$with_freetype_include"/freetype2/ft2build.h; then
 +            POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"/freetype2
 +          fi
        fi
        if test "x$with_freetype_lib" != x; then
          POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
-@@ -34373,7 +34393,7 @@ $as_echo "$as_me: The path of FREETYPE_I
+@@ -34783,7 +34803,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 +34526,7 @@ $as_echo "$as_me: The path of FREETYPE_L
+@@ -34916,7 +34936,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
 -        FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -lfreetype"
 +        FREETYPE_LIBS="-Xlinker -R$FREETYPE_LIB_PATH -L$FREETYPE_LIB_PATH -lfreetype"
        fi
      fi
-@@ -35732,9 +35752,6 @@ fi
+@@ -36142,9 +36162,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
-@@ -35777,7 +35794,7 @@ fi
+@@ -36187,7 +36204,7 @@ fi
    fi
    # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
 -  if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x; then
 +  if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$LIBCXX" = x && test "x$GCC" = "xno"; then
      LIBCXX="/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
    fi

 @@ -1,32 +1,32 @@
-$NetBSD: patch-jdk_make_CompileLaunchers.gmk,v 1.4 2016/07/19 12:32:15 jperkin Exp $
+$NetBSD: patch-jdk_make_CompileLaunchers.gmk,v 1.5 2017/11/28 05:07:25 ryoon Exp $
---- jdk/make/CompileLaunchers.gmk.orig	2016-05-06 12:11:21.000000000 +0000
+--- jdk/make/CompileLaunchers.gmk.orig	2017-11-28 00:13:34.000000000 +0000
 +++ jdk/make/CompileLaunchers.gmk
 @@ -121,7 +121,7 @@ define SetupLauncher
    endif
    ifeq ($(USE_EXTERNAL_LIBZ), true)
 -    $1_LDFLAGS_SUFFIX += -lz
 +    $1_LDFLAGS_SUFFIX += @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.zlib@/lib -L@BUILDLINK_PREFIX.zlib@/lib -lz
    endif
    $1_OUTPUT_DIR_ARG := $9
 @@ -441,7 +441,7 @@ endif
  # binary (at least on linux) which causes the size to differ between old and new build.
  ifeq ($(USE_EXTERNAL_LIBZ), true)
    UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB
 -  UNPACKEXE_ZIPOBJS := -lz
 +  UNPACKEXE_ZIPOBJS := @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.zlib@/lib -L@BUILDLINK_PREFIX.zlib@/lib -lz
  else
-   UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
+   UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib
    UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
 @@ -548,9 +548,7 @@ BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/
  # jdk/make/java/Makefile
+ #
  ifeq ($(OPENJDK_TARGET_OS), solaris)
 -  ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
      BUILD_JEXEC := 1
 -  endif
  endif
  ifneq ($(findstring $(OPENJDK_TARGET_OS), linux bsd), )

 @@ -1,31 +1,31 @@
-$NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.3 2017/05/10 14:01:58 ryoon Exp $
+$NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.4 2017/11/28 05:07:25 ryoon Exp $
 Ensure we can find zlib.
---- jdk/make/lib/CoreLibraries.gmk.orig	2017-04-27 09:44:53.000000000 +0000
+--- jdk/make/lib/CoreLibraries.gmk.orig	2017-11-28 00:13:34.000000000 +0000
 +++ jdk/make/lib/CoreLibraries.gmk
-@@ -231,12 +231,14 @@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
+@@ -253,12 +253,14 @@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
  BUILD_LIBZIP_EXCLUDES :=
  ifeq ($(USE_EXTERNAL_LIBZ), true)
 -  LIBZ := -lz
 +  LIBZ := @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.zlib@/lib -L@BUILDLINK_PREFIX.zlib@/lib -lz
-   LIBZIP_EXCLUDES += zlib-1.2.8
+   LIBZIP_EXCLUDES += zlib
  else
-   ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
+   ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib
  endif
 +LIBICONV := @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.iconv@/lib -L@BUILDLINK_PREFIX.iconv@/lib -liconv
++
  BUILD_LIBZIP_REORDER :=
  ifeq ($(OPENJDK_TARGET_OS), solaris)
    ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-@@ -528,7 +530,7 @@ $(eval $(call SetupNativeCompilation,BUI
+@@ -550,7 +552,7 @@ $(eval $(call SetupNativeCompilation,BUI
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
 -    LDFLAGS_bsd := -L$(PACKAGE_PATH)/lib -liconv, \
 +    LDFLAGS_bsd := $(LIBICONV), \
      LDFLAGS_macosx := -liconv, \
      LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
      LDFLAGS_SUFFIX_solaris := -lc, \

 @@ -1,62 +1,62 @@
-$NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.3 2016/10/27 13:06:42 ryoon Exp $
+$NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.4 2017/11/28 05:07:25 ryoon Exp $
 Zones support.
---- jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2016-10-26 22:56:37.000000000 +0000
+--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2017-11-28 00:13:32.000000000 +0000
 +++ jdk/src/solaris/native/java/net/NetworkInterface.c
-@@ -42,6 +42,7 @@
+@@ -39,6 +39,7 @@
  #include <fcntl.h>
  #include <stropts.h>
  #include <sys/sockio.h>
 +#include <zone.h>
  #endif
  #if defined(__linux__)
-@@ -62,14 +63,12 @@
+@@ -58,14 +59,12 @@
  #include <sys/param.h>
  #include <sys/ioctl.h>
  #include <sys/sockio.h>
 -#if defined(__APPLE__) || defined(__FreeBSD__)
 +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__)
  #include <net/ethernet.h>
  #include <net/if_var.h>
 -#elif defined(__OpenBSD__)
 +#elif defined(__OpenBSD__) || defined(__NetBSD__)
  #include <netinet/if_ether.h>
  #include <netinet6/in6_var.h>
 -#elif defined(__NetBSD__)
 -#include <net/if_ether.h>
  #endif
  #include <net/if_dl.h>
  #include <netinet/in_var.h>
-@@ -1710,7 +1709,8 @@ static short getSubnet(JNIEnv *env, int
+@@ -82,7 +81,8 @@
      #ifndef SIOCGLIFHWADDR
          #define SIOCGLIFHWADDR _IOWR('i', 192, struct lifreq)
      #endif
--#define DEV_PREFIX  "/dev/"
+-    #define DEV_PREFIX "/dev/"
-+#define NET_DEV_PREFIX	"/dev/"
++    #define NET_DEV_PREFIX "/dev/"
-+#define ZONE_NET_DEV_PREFIX	"/dev/net/"
++    #define ZONE_NET_DEV_PREFIX    "/dev/net/"
  #endif
- /*
+ #ifdef LIFNAMSIZ
-  * Solaris specific DLPI code to get hardware address from a device.
+@@ -1843,9 +1843,18 @@ static int getMacFromDevice
@@ -1728,9 +1728,18 @@ static int getMacFromDevice
      char buf[128];
      int flags = 0;
 -    // Device is in /dev.  e.g.: /dev/bge0
 -    strcpy(style1dev, DEV_PREFIX);
 +   /*
 +    * Device is in /dev in global zone / standalone
 +    * Device is in /dev/net in a zone
 +    * e.g.: /dev/net/net0
 +    */
 +    if (getzoneid()==(zoneid_t)GLOBAL_ZONEID) {
 +        strcpy(style1dev, NET_DEV_PREFIX);
 +    } else {
 +        strcpy(style1dev, ZONE_NET_DEV_PREFIX);
 +    }
      strcat(style1dev, ifname);
++
      if ((fd = open(style1dev, O_RDWR)) < 0) {
-          // Can't open it. We probably are missing the privilege.
+         // Can't open it. We probably are missing the privilege.
-          // We'll have to try something else
+         // We'll have to try something else