--- common/autoconf/build-aux/autoconf-config.guess.orig	2014-03-04 02:49:56 UTC
+++ common/autoconf/build-aux/autoconf-config.guess
@@ -805,6 +805,15 @@ EOF
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
+    *:BSDSUniX:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		echo x86_64-unknown-bsdsunix`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_PROCESSOR}-unknown-bsdsunix`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit ;;
--- common/autoconf/build-aux/autoconf-config.sub.orig	2017-02-08 12:51:34 UTC
+++ common/autoconf/build-aux/autoconf-config.sub
@@ -1269,7 +1269,7 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -openbsd* | -bsdsunix | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
--- common/autoconf/generated-configure.sh.orig	2017-02-08 12:51:59 UTC
+++ common/autoconf/generated-configure.sh
@@ -6826,6 +6826,9 @@ test -n "$target_alias" &&
     *netbsd*)
       VAR_OS_VENDOR=netbsd
       ;;
+    *bsdsunix*)
+      VAR_OS_VENDOR=bsdsunix
+      ;;
     *freebsd*)
       VAR_OS_VENDOR=freebsd
       ;;
@@ -6979,6 +6982,9 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUI
     *netbsd*)
       VAR_OS_VENDOR=netbsd
       ;;
+    *bsdsunix*)
+      VAR_OS_VENDOR=bsdsunix
+      ;;
     *freebsd*)
       VAR_OS_VENDOR=freebsd
       ;;
@@ -19458,6 +19464,8 @@ $as_echo "(none, will use system headers
   elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
     # Do not probe for cc on AIX.
     COMPILER_CHECK_LIST="xlc_r"
+  elif test "`uname -s`" = "BSDSUniX"; then
+    COMPILER_CHECK_LIST="cc gcc"
   elif test "`uname -s`" = "FreeBSD"; then
     COMPILER_CHECK_LIST="cc gcc"
   else
@@ -29826,6 +29834,10 @@ fi
       PACKAGE_PATH=/opt/local
     fi
 
+    if test "`uname -s`" = "BSDSUniX"; then
+      PACKAGE_PATH=/usr/local
+    fi
+
     if test "`uname -s`" = "FreeBSD"; then
       PACKAGE_PATH=/usr/local
     fi
--- common/autoconf/platform.m4.orig	2017-02-08 12:51:59 UTC
+++ common/autoconf/platform.m4
@@ -156,6 +156,9 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_OS]
     *netbsd*)
       VAR_OS_VENDOR=netbsd
       ;;
+    *bsdsunix*)
+      VAR_OS_VENDOR=bsdsunix
+      ;;
     *freebsd*)
       VAR_OS_VENDOR=freebsd
       ;;
--- common/autoconf/toolchain.m4.orig	2017-02-08 12:52:03 UTC
+++ common/autoconf/toolchain.m4
@@ -350,6 +350,8 @@ AC_DEFUN([TOOLCHAIN_SETUP_PATHS],
   elif test "x$OPENJDK_TARGET_OS" = "xaix"; then
     # Do not probe for cc on AIX.
     COMPILER_CHECK_LIST="xlc_r"
+  elif test "`uname -s`" = "BSDSUniX"; then
+    COMPILER_CHECK_LIST="cc gcc"
   elif test "`uname -s`" = "FreeBSD"; then
     COMPILER_CHECK_LIST="cc gcc"
   else
@@ -1051,6 +1053,10 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_
       PACKAGE_PATH=/opt/local
     fi
 
+    if test "`uname -s`" = "BSDSUniX"; then
+      PACKAGE_PATH=/usr/local
+    fi
+
     if test "`uname -s`" = "FreeBSD"; then
       PACKAGE_PATH=/usr/local
     fi
--- hotspot/agent/src/os/bsd/ps_proc.c.orig	2014-03-04 02:51:51 UTC
+++ hotspot/agent/src/os/bsd/ps_proc.c
@@ -317,7 +317,7 @@ uintptr_t linkmap_addr(struct ps_prochan
 #endif // __FreeBSD__ && __FreeBSD_version < 701000
 
 static bool read_lib_info(struct ps_prochandle* ph) {
-#if defined(__FreeBSD__) && __FreeBSD_version >= 701000
+#if (defined(__FreeBSD__) && __FreeBSD_version >= 701000) || defined(__BSDSUniX__)
   struct kinfo_vmentry *freep, *kve;
   int i, cnt;
 
--- hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java.orig	2017-02-08 12:51:59 UTC
+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
@@ -37,6 +37,8 @@ public class PlatformInfo {
       return "solaris";
     } else if (os.equals("Linux")) {
       return "linux";
+    } else if (os.equals("BSDSUniX")) {
+      return "bsd";
     } else if (os.equals("FreeBSD")) {
       return "bsd";
     } else if (os.equals("NetBSD")) {
--- hotspot/make/bsd/makefiles/saproc.make.orig	2017-02-08 12:51:59 UTC
+++ hotspot/make/bsd/makefiles/saproc.make
@@ -81,9 +81,15 @@ else
     # always needed, even if SDKPATH is empty
     SA_SYSROOT_FLAGS += -F"$(SDKPATH)/System/Library/Frameworks/JavaVM.framework/Frameworks"
   else
-    SASRCFILES = $(SASRCDIR)/StubDebuggerLocal.c
-    SALIBS = 
-    SAARCH = $(ARCHFLAG)
+    ifeq ($(OS_VENDOR), BSDSUniX)
+      SASRCFILES = $(BSD_NON_STUB_SASRCFILES)
+      SALIBS = -lutil -lthread_db
+      SAARCH = $(ARCHFLAG)
+    else
+      SASRCFILES = $(SASRCDIR)/StubDebuggerLocal.c
+      SALIBS = 
+      SAARCH = $(ARCHFLAG)
+    endif
   endif
 endif
 
--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig	2017-02-08 12:51:59 UTC
+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
@@ -96,7 +96,7 @@
 #define SPELL_REG_FP "ebp"
 #endif // AMD64
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
 # define context_trapno uc_mcontext.mc_trapno
 # ifdef AMD64
 #  define context_pc uc_mcontext.mc_rip
@@ -594,7 +594,7 @@ JVM_handle_bsd_signal(int sig,
           stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
       }
     } else if (thread->thread_state() == _thread_in_vm &&
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
                (sig == SIGBUS || sig == SIGSEGV) && 
 #else
                sig == SIGBUS && /* info->si_code == BUS_OBJERR && */
--- hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp.orig	2017-02-08 12:52:00 UTC
+++ hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp
@@ -112,7 +112,7 @@ static inline int m68k_lock_test_and_set
  *
  */
 
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
 #include <machine/atomic.h>
 #define __kernel_cmpxchg(oldval, newval, ptr) (!atomic_cmpset_rel_32((volatile u_int32_t *)(ptr), (u_int32_t)(oldval), (u_int32_t)(newval)))
 #elif defined(__NetBSD__)
--- hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp.orig	2017-02-08 12:52:00 UTC
+++ hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp
@@ -37,7 +37,7 @@
  * and gcc __sync_synchronize(); implementation does not use the kernel
  * helper for all gcc versions so it is unreliable to use as well.
  */
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
 #include <machine/atomic.h>
 #define __kernel_dmb dmb
 #elif defined(__NetBSD__)
--- hotspot/src/os/bsd/vm/osThread_bsd.cpp.orig	2017-02-08 12:51:59 UTC
+++ hotspot/src/os/bsd/vm/osThread_bsd.cpp
@@ -30,7 +30,7 @@
 
 void OSThread::pd_initialize() {
   assert(this != NULL, "check");
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__BSDSUniX__)
   _thread_id        = 0;
 #else
   _thread_id        = NULL;
--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2017-02-08 12:52:00 UTC
+++ hotspot/src/os/bsd/vm/os_bsd.cpp
@@ -104,8 +104,8 @@
 # include <sys/ioctl.h>
 # include <sys/syscall.h>
 
-#ifdef __FreeBSD__
-# if __FreeBSD_version > 900030
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
+# if (defined(__FreeBSD__) && __FreeBSD_version > 900030) || defined(__BSDSUniX__)
 #  include <pthread_np.h>
 # else
 #  include <sys/thr.h>
@@ -114,7 +114,7 @@
 # include <vm/vm_param.h>
 #endif
 
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__BSDSUniX__)
 # include <elf.h>
 #endif
 
@@ -185,7 +185,7 @@ julong os::available_memory() {
 
 // available here means free
 julong os::Bsd::available_memory() {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
   static const char *vm_stats[] = {
     "vm.stats.vm.v_free_count",
     "vm.stats.vm.v_cache_count",
@@ -772,7 +772,7 @@ static void *java_start(Thread *thread) 
   guarantee(unique_thread_id != 0, "unique thread id was not found");
   osthread->set_unique_thread_id(unique_thread_id);
 #endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
   uint64_t unique_thread_id = os::Bsd::gettid();
   guarantee(unique_thread_id != 0, "unique thread id was not found");
   osthread->set_unique_thread_id(unique_thread_id);
@@ -940,7 +940,7 @@ bool os::create_attached_thread(JavaThre
   guarantee(unique_thread_id != 0, "just checking");
   osthread->set_unique_thread_id(unique_thread_id);
 #endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
   uint64_t unique_thread_id = os::Bsd::gettid();
   guarantee(unique_thread_id != 0, "unique thread id was not found");
   osthread->set_unique_thread_id(unique_thread_id);
@@ -1266,8 +1266,8 @@ pid_t os::Bsd::gettid() {
   guarantee(retval != 0, "just checking");
   return retval;
 
-#elif defined(__FreeBSD__)
-#if __FreeBSD_version > 900030
+#elif defined(__FreeBSD__) || defined(__BSDSUniX__)
+#if (defined(__FreeBSD__) && __FreeBSD_version > 900030) || defined(__BSDSUniX__)
   return ::pthread_getthreadid_np();
 #else
   long tid;
@@ -1289,7 +1289,7 @@ pid_t os::Bsd::gettid() {
 intx os::current_thread_id() {
 #if defined(__APPLE__)
   return (intx)::pthread_mach_thread_np(::pthread_self());
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__BSDSUniX__)
   return os::Bsd::gettid();
 #else
   return (intx)::pthread_self();
@@ -1788,7 +1788,7 @@ void os::pd_print_cpu_info(outputStream*
   // Nothing to do for now.
 }
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
 static void get_swap_info(int *total_pages, int *used_pages) {
   struct xswdev xsw;
   size_t mibsize, size;
@@ -1820,7 +1820,7 @@ void os::print_memory_info(outputStream*
             os::physical_memory() >> 10);
   st->print("(" UINT64_FORMAT "k free)",
             os::available_memory() >> 10);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
   int total, used;
   get_swap_info(&total, &used);
   st->print(", swap " UINT64_FORMAT "k",
@@ -2878,7 +2878,7 @@ OSReturn os::set_native_priority(Thread*
 #ifdef __OpenBSD__
   // OpenBSD pthread_setprio starves low priority threads
   return OS_OK;
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__BSDSUniX__)
   int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
   return (ret == 0) ? OS_OK : OS_ERR;
 #elif defined(__APPLE__) || defined(__NetBSD__)
@@ -2907,7 +2907,7 @@ OSReturn os::get_native_priority(const T
   }
 
   errno = 0;
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__BSDSUniX__)
   *priority_ptr = pthread_getprio(thread->osthread()->pthread_id());
 #elif defined(__APPLE__) || defined(__NetBSD__)
   int policy;
@@ -3869,7 +3869,7 @@ void os::make_polling_page_readable(void
 };
 
 int os::active_processor_count() {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
   int online_cpus = 0;
   cpuset_t mask;
   if (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(mask),
--- hotspot/src/os/bsd/vm/os_bsd.inline.hpp.orig	2017-02-08 12:47:47 UTC
+++ hotspot/src/os/bsd/vm/os_bsd.inline.hpp
@@ -67,7 +67,7 @@ inline bool os::uses_stack_guard_pages()
 
 inline bool os::allocate_stack_guard_pages() {
   assert(uses_stack_guard_pages(), "sanity check");
-#if !defined(__FreeBSD__) || __FreeBSD__ < 5
+#if !defined(__BSDSUniX__) && (!defined(__FreeBSD__) || __FreeBSD__ < 5)
   // Since FreeBSD 4 uses malloc() for allocating the thread stack
   // there is no need to do anything extra to allocate the guard pages
   return false;
--- hotspot/src/os/bsd/vm/vmError_bsd.cpp.orig	2017-02-08 12:51:59 UTC
+++ hotspot/src/os/bsd/vm/vmError_bsd.cpp
@@ -33,7 +33,7 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 #include <signal.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
 #include <limits.h>
 #include <sys/sysctl.h>
 #endif
@@ -42,7 +42,7 @@
 
 static void set_debugger(char *buf, int buflen) {
   int pid = os::current_process_id();
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
   char cmd[PATH_MAX+1];
   int name[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, pid };
   size_t len = sizeof(cmd);
--- hotspot/src/share/vm/utilities/elfFile.hpp.orig	2017-02-08 12:47:34 UTC
+++ hotspot/src/share/vm/utilities/elfFile.hpp
@@ -38,6 +38,7 @@
 
 typedef Elf64_Half      Elf_Half;
 typedef Elf64_Word      Elf_Word;
+#ifndef __BSDSUniX__
 typedef Elf64_Off       Elf_Off;
 typedef Elf64_Addr      Elf_Addr;
 
@@ -45,6 +46,7 @@ typedef Elf64_Ehdr      Elf_Ehdr;
 typedef Elf64_Shdr      Elf_Shdr;
 typedef Elf64_Phdr      Elf_Phdr;
 typedef Elf64_Sym       Elf_Sym;
+#endif
 
 #if !defined(_ALLBSD_SOURCE) || defined(__APPLE__)
 #define ELF_ST_TYPE ELF64_ST_TYPE
@@ -54,6 +56,7 @@ typedef Elf64_Sym       Elf_Sym;
 
 typedef Elf32_Half      Elf_Half;
 typedef Elf32_Word      Elf_Word;
+#ifndef __BSDSUniX__
 typedef Elf32_Off       Elf_Off;
 typedef Elf32_Addr      Elf_Addr;
 
@@ -62,6 +65,7 @@ typedef Elf32_Ehdr      Elf_Ehdr;
 typedef Elf32_Shdr      Elf_Shdr;
 typedef Elf32_Phdr      Elf_Phdr;
 typedef Elf32_Sym       Elf_Sym;
+#endif
 
 #if !defined(_ALLBSD_SOURCE) || defined(__APPLE__)
 #define ELF_ST_TYPE ELF32_ST_TYPE
--- hotspot/src/share/vm/utilities/macros.hpp.orig	2017-02-08 12:51:34 UTC
+++ hotspot/src/share/vm/utilities/macros.hpp
@@ -278,7 +278,7 @@
 #define NOT_WINDOWS(code) code
 #endif
 
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__BSDSUniX__)
 #define BSD_ONLY(code) code
 #define NOT_BSD(code)
 #else
--- hotspot/test/compiler/6894807/Test6894807.sh.orig	2017-02-08 12:52:00 UTC
+++ hotspot/test/compiler/6894807/Test6894807.sh
@@ -21,7 +21,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin )
     NULL=/dev/null
     PS=":"
     FS="/"
--- hotspot/test/jprt.config.orig	2014-03-04 02:52:45 UTC
+++ hotspot/test/jprt.config
@@ -113,7 +113,7 @@ case "${osname}" in
     umask 002
     ;;
 
-  FreeBSD | OpenBSD )
+  BSDSUniX | FreeBSD | OpenBSD )
     # Add basic paths
     path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
 
--- hotspot/test/runtime/7110720/Test7110720.sh.orig	2017-02-08 12:52:00 UTC
+++ hotspot/test/runtime/7110720/Test7110720.sh
@@ -28,7 +28,7 @@ echo "TESTSRC=${TESTSRC}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin )
     FS="/"
     RM=/bin/rm
     CP=/bin/cp
--- hotspot/test/test_env.sh.orig	2017-02-08 12:52:00 UTC
+++ hotspot/test/test_env.sh
@@ -53,7 +53,7 @@ echo "TESTCLASSES=${TESTCLASSES}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  AIX | *BSD | Darwin | Linux | SunOS )
+  AIX | BSDSUniX | *BSD | Darwin | Linux | SunOS )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/src/share/classes/java/awt/GraphicsEnvironment.java.orig	2017-02-08 12:51:35 UTC
+++ jdk/src/share/classes/java/awt/GraphicsEnvironment.java
@@ -179,6 +179,7 @@ public abstract class GraphicsEnvironmen
                             headless = defaultHeadless =
                                 ("Linux".equals(osName) ||
                                  "SunOS".equals(osName) ||
+                                 "BSDSUniX".equals(osName) ||
                                  "FreeBSD".equals(osName) ||
                                  "NetBSD".equals(osName) ||
                                  "OpenBSD".equals(osName) ||
--- jdk/src/share/classes/sun/awt/OSInfo.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/share/classes/sun/awt/OSInfo.java
@@ -102,6 +102,10 @@ public class OSInfo {
                 return SOLARIS;
             }
 
+            if ("BSDSUniX".equals(osName)) {
+                return BSD;
+            }
+
             if (osName.endsWith("BSD")) {
                 return BSD;
             }
--- jdk/src/share/classes/sun/font/FontUtilities.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/share/classes/sun/font/FontUtilities.java
@@ -80,7 +80,7 @@ public final class FontUtilities {
 
                 isLinux = osName.startsWith("Linux");
 
-                isBSD = osName.endsWith("BSD");
+                isBSD = osName.contains("BSD");
 
                 isMacOSX = osName.contains("OS X"); // TODO: MacOSX
 
--- jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java
@@ -1306,7 +1306,7 @@ public class ExtendedCharsets
         String osName = AccessController.doPrivileged(
             new GetPropertyAction("os.name"));
         if ("SunOS".equals(osName) || "Linux".equals(osName) || "AIX".equals(osName)
-               || osName.endsWith("BSD") || osName.contains("OS X")) {
+               || osName.contains("BSD") || osName.contains("OS X")) {
             charset("x-COMPOUND_TEXT", "COMPOUND_TEXT",
                     new String[] {
                         "COMPOUND_TEXT",        // JDK historical
--- jdk/src/share/classes/sun/print/PSPrinterJob.java.orig	2017-02-08 12:52:03 UTC
+++ jdk/src/share/classes/sun/print/PSPrinterJob.java
@@ -1587,9 +1587,9 @@ public class PSPrinterJob extends Raster
         }
 
        String osname = System.getProperty("os.name");
-       if (osname.equals("Linux") || osname.endsWith("BSD") || osname.contains("OS X")) {
+       if (osname.equals("Linux") || osname.equals("BSDSUniX") || osname.endsWith("BSD") || osname.contains("OS X")) {
             String lprPath = "/usr/bin/lpr";
-            if (osname.equals("FreeBSD")) {
+            if (osname.equals("FreeBSD") || osname.equals("BSDSUniX")) {
                 final PrintService pservice = getPrintService();
                 Boolean isIPPPrinter =
                     (Boolean)java.security.AccessController.doPrivileged(
--- jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java
@@ -48,7 +48,7 @@ public class GSSManagerImpl extends GSSM
                     public Boolean run() {
                             String osname = System.getProperty("os.name");
                             if (osname.startsWith("SunOS") ||
-                                osname.endsWith("BSD") ||
+                                osname.contains("BSD") ||
                                 osname.contains("OS X") ||
                                 osname.startsWith("Linux")) {
                                 return new Boolean(System.getProperty
--- jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
@@ -90,7 +90,7 @@ public final class SunNativeProvider ext
                                     "libgssapi_krb5.so",
                                     "libgssapi_krb5.so.2",
                                 };
-                            } else if (osname.endsWith("BSD")) {
+                            } else if (osname.contains("BSD")) {
                                 gssLibs = new String[]{
                                     "libgssapi.so",
                                     "libgssapi_krb5.so",
--- jdk/src/share/native/com/sun/media/sound/Platform.c.orig	2014-03-04 02:59:33 UTC
+++ jdk/src/share/native/com/sun/media/sound/Platform.c
@@ -113,7 +113,7 @@ JNIEXPORT jint JNICALL Java_com_sun_medi
     switch (feature) {
     case com_sun_media_sound_Platform_FEATURE_MIDIIO:
        return com_sun_media_sound_Platform_LIB_MAIN;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
     case com_sun_media_sound_Platform_FEATURE_PORTS:
        return com_sun_media_sound_Platform_LIB_ALSA;
     case com_sun_media_sound_Platform_FEATURE_DIRECT_AUDIO:
--- jdk/src/solaris/bin/java_md_solinux.c.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/solaris/bin/java_md_solinux.c
@@ -35,7 +35,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/types.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
 #include <sys/sysctl.h>
 #endif
 #include "manifest_info.h"
@@ -977,7 +977,7 @@ SetExecname(char **argv)
             exec_path = JLI_StringDup(buf);
         }
     }
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__BSDSUniX__)
     {
         char buf[PATH_MAX+1];
         int name[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
--- jdk/src/solaris/bin/java_md_solinux.h.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/solaris/bin/java_md_solinux.h
@@ -26,7 +26,7 @@
 #ifndef JAVA_MD_SOLINUX_H
 #define JAVA_MD_SOLINUX_H
 
-#if defined(HAVE_GETHRTIME) || defined(__FreeBSD__)
+#if defined(HAVE_GETHRTIME) || defined(__FreeBSD__) || defined(__BSDSUniX__)
 /*
  * Support for doing cheap, accurate interval timing.
  */
@@ -57,7 +57,7 @@ extern char **environ;
 #ifdef __solaris__
 static const char *system_dir   = "/usr/jdk";
 static const char *user_dir     = "/jdk";
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__BSDSUniX__)
 static const char *system_dir  = PACKAGE_PATH "/openjdk8";
 static const char *user_dir    = "/java";
 #else /* !__solaris__, i.e. Linux, AIX,.. */
--- jdk/src/solaris/classes/java/lang/UNIXProcess.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/solaris/classes/java/lang/UNIXProcess.java
@@ -161,7 +161,8 @@ final class UNIXProcess extends Process 
 
             if (osName.equals("Linux")) { return LINUX; }
             if (osName.contains("OS X")) { return MACOS; }
             if (osName.endsWith("BSD")) { return BSD; }
+            if (osName.equals("BSDSUniX")) { return BSD; }
             if (osName.equals("SunOS")) { return SOLARIS; }
             if (osName.equals("AIX")) { return AIX; }
 
--- jdk/src/solaris/classes/sun/net/PortConfig.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/solaris/classes/sun/net/PortConfig.java
@@ -52,7 +52,7 @@ public final class PortConfig {
                     } else if (os.startsWith("SunOS")) {
                         defaultLower = 32768;
                         defaultUpper = 65535;
-                    } else if (os.endsWith("BSD") || os.contains("OS X")) {
+                    } else if (os.endsWith("BSD") || os.equals("BSDSUniX") || os.contains("OS X")) {
                         defaultLower = 49152;
                         defaultUpper = 65535;
                     } else if (os.startsWith("AIX")) {
--- jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
@@ -66,7 +66,9 @@ public class DefaultAsynchronousChannelP
             return createProvider("sun.nio.ch.SolarisAsynchronousChannelProvider");
         if (osname.equals("Linux"))
             return createProvider("sun.nio.ch.LinuxAsynchronousChannelProvider");
         if (osname.endsWith("BSD") || osname.contains("OS X"))
+            return createProvider("sun.nio.ch.BsdAsynchronousChannelProvider");
+        if (osname.equals("BSDSUniX"))
             return createProvider("sun.nio.ch.BsdAsynchronousChannelProvider");
         if (osname.equals("AIX"))
             return createProvider("sun.nio.ch.AixAsynchronousChannelProvider");
--- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.orig	2017-02-08 12:52:02 UTC
+++ jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java
@@ -76,7 +76,9 @@ public class DefaultFileSystemProvider {
             return createProvider("sun.nio.fs.SolarisFileSystemProvider");
         if (osname.equals("Linux"))
             return createProvider("sun.nio.fs.LinuxFileSystemProvider");
         if (osname.endsWith("BSD"))
+            return createProvider("sun.nio.fs.BsdFileSystemProvider");
+        if (osname.equals("BSDSUniX"))
             return createProvider("sun.nio.fs.BsdFileSystemProvider");
         if (osname.contains("OS X"))
             return createProvider("sun.nio.fs.MacOSXFileSystemProvider");
--- jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
@@ -161,7 +161,8 @@ public class UnixPrintServiceLookup exte
 
     static boolean isBSD() {
         return (osname.equals("Linux") ||
                 osname.endsWith("BSD") ||
+                osname.equals("BSDSUniX") ||
                 osname.contains("OS X"));
     }
 
--- jdk/src/solaris/native/java/lang/java_props_md.c.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/solaris/native/java/lang/java_props_md.c
@@ -151,7 +151,7 @@ static int ParseLocale(JNIEnv* env, int 
     lc = setlocale(cat, NULL);
 #endif
 
-#if !defined(__linux__) && !defined(__FreeBSD__)
+#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__BSDSUniX__)
     if (lc == NULL) {
         return 0;
     }
--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/solaris/native/java/net/NetworkInterface.c
@@ -62,7 +62,7 @@
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/sockio.h>
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__BSDSUniX__)
 #include <net/ethernet.h>
 #include <net/if_var.h>
 #elif defined(__OpenBSD__)
@@ -2013,7 +2013,7 @@ static netif *enumIPv6Interfaces(JNIEnv 
 #endif
 
 static int getIndex(int sock, const char *name) {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
     // Try to get the interface index
     // (Not supported on Solaris 2.6 or 7)
     struct ifreq if2;
--- jdk/src/solaris/native/java/util/TimeZone_md.c.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/solaris/native/java/util/TimeZone_md.c
@@ -56,7 +56,7 @@
 #endif
 
 #if defined(__linux__) || defined(_ALLBSD_SOURCE)
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
 static const char *ETC_TIMEZONE_FILE = "/var/db/zoneinfo";
 #else
 static const char *ETC_TIMEZONE_FILE = "/etc/timezone";
--- jdk/src/solaris/native/sun/management/OperatingSystemImpl.c.orig	2017-02-08 12:52:02 UTC
+++ jdk/src/solaris/native/sun/management/OperatingSystemImpl.c
@@ -56,7 +56,7 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <unistd.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
 #include <vm/vm_param.h>
 #endif
 
@@ -171,7 +171,7 @@ static jlong get_total_or_available_swap
         throw_internal_error(env, "sysctlbyname failed");
     }
     return available ? (jlong)vmusage.xsu_avail : (jlong)vmusage.xsu_total;
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__BSDSUniX__)
     struct xswdev xsw;
     size_t mibsize, size;
     jlong npages;
@@ -265,7 +265,7 @@ Java_sun_management_OperatingSystemImpl_
         throw_internal_error(env, "task_info failed");
     }
     return t_info.virtual_size;
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__BSDSUniX__)
     FILE *fp;
     unsigned long end, start;
     jlong total = 0;
@@ -365,7 +365,7 @@ Java_sun_management_OperatingSystemImpl_
         return -1;
     }
     return (jlong)vm_stats.free_count * page_size;
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__BSDSUniX__)
     static const char *vm_stats[] = {
        "vm.stats.vm.v_free_count",
        "vm.stats.vm.v_cache_count",
--- jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h
@@ -319,7 +319,7 @@ typedef int sctp_freepaddrs_func(struct 
 typedef int sctp_bindx_func(int sd, struct sockaddr *addrs, int addrcnt, int flags);
 typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
 
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__BSDSUniX__)
 
 #include <stdint.h>
 #include <sys/types.h>
@@ -331,7 +331,7 @@ typedef int sctp_peeloff_func(int sock, 
 
 #endif /* __linux__ */
 
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__BSDSUniX__)
 
 sctp_getladdrs_func* nio_sctp_getladdrs;
 sctp_freeladdrs_func* nio_sctp_freeladdrs;
--- jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c
@@ -58,7 +58,7 @@ static int preCloseFD = -1;     /* File 
  */
 jboolean loadSocketExtensionFuncs
   (JNIEnv* env) {
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__BSDSUniX__)
     if (dlopen(nativeSctpLib, RTLD_GLOBAL | RTLD_LAZY) == NULL) {
         JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
               dlerror());
--- jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/solaris/native/sun/nio/fs/MagicFileTypeDetector.c
@@ -31,7 +31,7 @@
 #include <dlfcn.h>
 #include <string.h>
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__BSDSUniX__)
 #define MAGIC_MAJOR_VERSION "4"
 #else
 #define MAGIC_MAJOR_VERSION "1"
--- jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c.orig	2017-02-08 12:52:00 UTC
+++ jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c
@@ -37,7 +37,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__)  && !defined(__BSDSUniX__)
 #include <sys/syslimits.h>
 #endif
 #include <sys/un.h>
--- jdk/test/com/sun/corba/5036554/TestCorbaBug.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/com/sun/corba/5036554/TestCorbaBug.sh
@@ -48,7 +48,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/com/sun/corba/cachedSocket/7056731.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/com/sun/corba/cachedSocket/7056731.sh
@@ -31,7 +31,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/com/sun/jdi/ImmutableResourceTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/com/sun/jdi/ImmutableResourceTest.sh
@@ -56,7 +56,7 @@ pass()
 
 OS=`uname -s`
 case "$OS" in
-   SunOS | Linux | *BSD | Darwin | AIX )
+   SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
       PATHSEP=":"
       ;;
 
--- jdk/test/com/sun/jdi/JITDebug.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/com/sun/jdi/JITDebug.sh
@@ -63,7 +63,7 @@ pass()
 OS=`uname -s`
 export TRANSPORT_METHOD
 case "$OS" in
-   SunOS | Linux | *BSD | Darwin | AIX )
+   SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
       PATHSEP=":"
       TRANSPORT_METHOD=dt_socket
       ;;
--- jdk/test/com/sun/jdi/PrivateTransportTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/com/sun/jdi/PrivateTransportTest.sh
@@ -106,7 +106,7 @@ case `uname -s` in 
     xx=`find ${jreloc}/lib -name libdt_socket.so`
     libloc=`dirname ${xx}`
     ;;
-  *BSD | Darwin)
+  BSDSUniX | *BSD | Darwin)
     libloc=${jreloc}/lib
     ;;
   Windows*)
--- jdk/test/com/sun/jdi/ShellScaffold.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/com/sun/jdi/ShellScaffold.sh
@@ -284,7 +284,7 @@ EOF
          psCmd=ps
          jstack=jstack.exe
          ;;
-       SunOS | Linux | *BSD | Darwin | AIX)
+       SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX)
          transport=dt_socket
          address=
          devnull=/dev/null
--- jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh
@@ -45,7 +45,7 @@ fi
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     ;;
   Windows* | CYGWIN*)
--- jdk/test/java/awt/JAWT/JAWT.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/awt/JAWT/JAWT.sh
@@ -62,7 +62,7 @@ case "$OS" in
 	MAKE="make"
 	LD_LIBRARY_PATH="."
     ;;
-  *BSD )
+  BSDSUniX | *BSD )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh
@@ -86,6 +86,14 @@ case "$OS" in
       TMP="/tmp"
       ;;
 
+   BSDSUniX )
+      VAR="A different value for BSDSUniX"
+      DEFAULT_JDK=/usr/local/openjdk8
+      FILESEP="/"
+      PATHSEP=":"
+      TMP="/tmp"
+      ;;
+
    *BSD )
       VAR="A different value for BSD"
       DEFAULT_JDK=/usr/local/openjdk8
--- jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh
@@ -59,7 +59,7 @@ pass() 
 # Checking for proper OS
 OS=`uname -s`
 case "$OS" in
-   SunOS | Linux | *BSD | Darwin | AIX )
+   SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
       FILESEP="/"
       ;;
     
--- jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
@@ -119,6 +119,14 @@ case "$OS" in
       TMP="/tmp"
       ;;
 
+   BSDSUniX )
+      VAR="A different value for BSDSUniX"
+      DEFAULT_JDK=/usr/local/openjdk8
+      FILESEP="/"
+      PATHSEP=":"
+      TMP="/tmp"
+      ;;
+
    *BSD )
       VAR="A different value for BSD"
       DEFAULT_JDK=/usr/local/openjdk8
--- jdk/test/java/io/File/GetXSpace.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/io/File/GetXSpace.java
@@ -51,7 +51,7 @@ public class GetXSpace {
     private static final String dfFormat;
     static {
         if (name.equals("SunOS") || name.equals("Linux")
-                || name.endsWith("BSD") || name.contains("OS X")) {
+                || name.contains("BSD") || name.contains("OS X")) {
             // FileSystem Total Used Available Use% MountedOn
             dfFormat = "([^\\s]+)\\s+(\\d+)\\s+\\d+\\s+(\\d+)\\s+\\d+%\\s+([^\\s]+)";
         } else if (name.startsWith("Windows")) {
--- jdk/test/java/io/File/GetXSpace.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/io/File/GetXSpace.sh
@@ -26,7 +26,7 @@
 # set platform-dependent variable
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin ) TMP=/tmp  ;;
+  SunOS | Linux | BSDSUniX | *BSD | Darwin ) TMP=/tmp  ;;
   Windows_98 )    return    ;;
   Windows* )      SID=`sid`; TMP="c:/temp"  ;;
   * )
--- jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh
@@ -45,7 +45,7 @@ OS=`uname -s`
 # Need to determine the classpath separator and filepath separator based on the
 # operating system.
 case "$OS" in
-SunOS | Linux | *BSD | Darwin | AIX )
+SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
   PS=":"  ;;
 Windows* | CYGWIN* )
   PS=";"  ;;
--- jdk/test/java/io/Serializable/serialver/classpath/run.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/io/Serializable/serialver/classpath/run.sh
@@ -47,7 +47,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"    ;;
   Windows* | CYGWIN* )
     PS=";"    ;;
--- jdk/test/java/io/Serializable/serialver/nested/run.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/io/Serializable/serialver/nested/run.sh
@@ -47,7 +47,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"    ;;
   Windows* | CYGWIN* )
     PS=";"    ;;
--- jdk/test/java/lang/ClassLoader/Assert.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/lang/ClassLoader/Assert.sh
@@ -25,7 +25,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin | *BSD )
+  SunOS | Linux | Darwin | BSDSUniX | *BSD )
     FS="/"
     CHMOD="${FS}bin${FS}chmod"
     ;;
--- jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
@@ -55,7 +55,7 @@ case "$OS" in
   Linux )
     FS="/"
     ;;
-  *BSD | Darwin )
+  BSDSUniX | *BSD | Darwin )
     FS="/"
     ;;
   AIX )
--- jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
@@ -60,7 +60,7 @@ case "$OS" in
   Linux )
     FS="/"
     ;;
-  *BSD | Darwin )
+  BSDSUniX | *BSD | Darwin )
     FS="/"
     ;;
   AIX )
--- jdk/test/java/lang/ProcessBuilder/DestroyTest.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/lang/ProcessBuilder/DestroyTest.java
@@ -148,7 +148,7 @@ public class DestroyTest {
         } else if (osName.startsWith("Linux") == true) {
             return new UnixTest(
                 File.createTempFile("ProcessTrap-", ".sh",null));
-        } else if (osName.endsWith("BSD")) {
+        } else if (osName.contains("BSD")) {
             return new UnixTest(
                 File.createTempFile("ProcessTrap-", ".sh",null));
         } else if (osName.startsWith("Mac OS")) {
--- jdk/test/java/lang/ProcessBuilder/Zombies.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/lang/ProcessBuilder/Zombies.java
@@ -34,7 +34,7 @@ public class Zombies {
 
     static final String os = System.getProperty("os.name");
 
-    static final String TrueCommand = (os.endsWith("BSD") || os.contains("OS X")) ?
+    static final String TrueCommand = (os.contains("BSD") || os.contains("OS X")) ?
         "/usr/bin/true" : "/bin/true";
 
     public static void main(String[] args) throws Throwable {
--- jdk/test/java/lang/StringCoding/CheckEncodings.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/lang/StringCoding/CheckEncodings.sh
@@ -30,7 +30,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX ) ;;
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX ) ;;
   Windows* | CYGWIN* )
     echo "Passed"; exit 0 ;;
   * ) echo "Unrecognized system!" ;  exit 1 ;;
--- jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh
@@ -48,7 +48,7 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/java/lang/instrument/MakeJAR2.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/lang/instrument/MakeJAR2.sh
@@ -55,7 +55,7 @@ fi
 
 OS=`uname -s`
 case "$OS" in
-   SunOS | Linux | *BSD | Darwin )
+   SunOS | Linux | BSDSUniX | *BSD | Darwin )
       PATHSEP=":"
       ;;
 
--- jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh
@@ -43,7 +43,7 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
-  *BSD | Darwin )
+  BSDSUniX | *BSD | Darwin )
     PS=":"
     FS="/"
     ;;
--- jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java
@@ -82,7 +82,7 @@ public class GetSystemLoadAverage {
     private static String osName = System.getProperty("os.name");
 
     private static String LOAD_AVERAGE_TEXT
-            = (osName.endsWith("BSD") || osName.contains("OS X"))
+            = (osName.contains("BSD") || osName.contains("OS X"))
                 ? "load averages:"
                 : "load average:";
 
@@ -101,7 +101,7 @@ public class GetSystemLoadAverage {
         System.out.println("Load average returned from uptime = " + output);
         System.out.println("getSystemLoadAverage() returned " + loadavg);
 
-        String[] lavg = (osName.endsWith("BSD") || osName.contains("OS X"))
+        String[] lavg = (osName.contains("BSD") || osName.contains("OS X"))
                 ? output.split(" ")
                 : output.split(",");
         double expected = Double.parseDouble(lavg[0]);
--- jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh
@@ -61,7 +61,7 @@ i=1
 while true; do
   echo "Run $i: TestSystemLoadAvg"
   case `uname -s` in
-       SunOS | Linux | *BSD | Darwin | AIX )
+       SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
          runOne GetSystemLoadAverage
          ;;
       * )
--- jdk/test/java/net/Authenticator/B4933582.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/net/Authenticator/B4933582.sh
@@ -26,7 +26,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/java/net/DatagramSocket/Send12k.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/net/DatagramSocket/Send12k.java
@@ -39,7 +39,7 @@ public class Send12k {
          String osName = System.getProperty("os.name");
          int SEND_SIZE;
 
-         if(osName.endsWith("BSD") || osName.contains("Mac")) {
+         if(osName.contains("BSD") || osName.contains("Mac")) {
              SEND_SIZE = 16 * 576;
          } else {
              SEND_SIZE = 16 * 1024;
--- jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java
@@ -45,7 +45,7 @@ public class SendDatagramToBadAddress {
             return (true);
         if (p.getProperty ("os.name").equals ("Linux"))
             return (true);
-        if (p.getProperty ("os.name").endsWith ("BSD"))
+        if (p.getProperty ("os.name").contains ("BSD"))
             return (true);
         if (p.getProperty ("os.name").startsWith ("Mac OS"))
             return (true);
--- jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
@@ -27,7 +27,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PATHSEP=":"
     FILESEP="/"
     ;;
--- jdk/test/java/net/Socket/OldSocketImpl.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/net/Socket/OldSocketImpl.sh
@@ -28,7 +28,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/java/net/URLClassLoader/B5077773.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/net/URLClassLoader/B5077773.sh
@@ -34,7 +34,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/java/net/URLClassLoader/sealing/checksealed.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/net/URLClassLoader/sealing/checksealed.sh
@@ -27,7 +27,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/java/net/URLConnection/6212146/test.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/net/URLConnection/6212146/test.sh
@@ -33,7 +33,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/java/net/URL/B5086147.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/net/URL/B5086147.sh
@@ -26,7 +26,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     exit 0
     ;;
   CYGWIN* )
--- jdk/test/java/nio/channels/FileChannel/Transfer.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/nio/channels/FileChannel/Transfer.java
@@ -228,7 +228,7 @@ public class Transfer {
         // Windows and Linux can't handle the really large file sizes for a
         // truncate or a positional write required by the test for 4563125
         String osName = System.getProperty("os.name");
-        if (!(osName.startsWith("SunOS") || osName.endsWith("BSD") || osName.contains("OS X")))
+        if (!(osName.startsWith("SunOS") || osName.contains("BSD") || osName.contains("OS X")))
             return;
         File source = File.createTempFile("blah", null);
         source.deleteOnExit();
--- jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh
@@ -34,7 +34,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX ) ;;
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX ) ;;
   # Skip locale test for Windows
   Windows* | CYGWIN* )
     echo "Passed"; exit 0 ;;
--- jdk/test/java/nio/charset/spi/basic.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/nio/charset/spi/basic.sh
@@ -48,7 +48,7 @@ JAR=$COMPILEJAVA/bin/jar
 
 DIR=`pwd`
 case `uname` in
-  SunOS | Linux | *BSD | Darwin | AIX ) CPS=':' ;;
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX ) CPS=':' ;;
   Windows* )      CPS=';' ;;
   CYGWIN*  )
     DIR=`/usr/bin/cygpath -a -s -m $DIR`
--- jdk/test/java/nio/file/FileSystem/Basic.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/nio/file/FileSystem/Basic.java
@@ -76,7 +76,7 @@ public class Basic {
             checkSupported(fs, "posix", "unix", "owner", "acl", "user");
         if (os.equals("Linux"))
             checkSupported(fs, "posix", "unix", "owner", "dos", "user");
-        if (os.endsWith("BSD") || os.contains("OS X"))
+        if (os.contains("BSD") || os.contains("OS X"))
             checkSupported(fs, "posix", "unix", "owner");
         if (os.equals("Windows"))
             checkSupported(fs, "owner", "dos", "acl", "user");
--- jdk/test/java/nio/file/Files/CopyAndMove.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/nio/file/Files/CopyAndMove.java
@@ -651,7 +651,7 @@ public class CopyAndMove {
 
                 // check POSIX attributes are copied
                 String os = System.getProperty("os.name");
-                if ((os.equals("SunOS") || os.equals("Linux") || os.endsWith("BSD")) &&
+                if ((os.equals("SunOS") || os.equals("Linux") || os.contains("BSD")) &&
                     testPosixAttributes)
                 {
                     checkPosixAttributes(
@@ -1155,7 +1155,7 @@ public class CopyAndMove {
     static void randomizeAttributes(Path file) throws IOException {
         String os = System.getProperty("os.name");
         boolean isWindows = os.startsWith("Windows");
-        boolean isUnix = os.equals("SunOS") || os.equals("Linux") || os.endsWith("BSD");
+        boolean isUnix = os.equals("SunOS") || os.equals("Linux") || os.contains("BSD");
         boolean isDirectory = isDirectory(file, NOFOLLOW_LINKS);
 
         if (isUnix) {
--- jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh
@@ -33,7 +33,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     ;;
   Windows* | CYGWIN* )
--- jdk/test/java/rmi/registry/readTest/readTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/rmi/registry/readTest/readTest.sh
@@ -34,7 +34,7 @@ ARGS=""
 REGARGS=""
 
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     CHMOD="${FS}bin${FS}chmod"
--- jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
@@ -58,7 +58,7 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
-  *BSD | Darwin )
+  BSDSUniX | *BSD | Darwin )
     PATHSEP=":"
     FILESEP="/"
     ;;
--- jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
@@ -42,7 +42,7 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
-  *BSD | Darwin )
+  BSDSUniX | *BSD | Darwin )
     PATHSEP=":"
     FILESEP="/"
     ;;
--- jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh
@@ -66,7 +66,7 @@ case "$OS" in
     PATHSEP=";"
     FILESEP="/"
     ;;
-  *BSD | Darwin )
+  BSDSUniX | *BSD | Darwin )
     PATHSEP=":"
     FILESEP="/"
     ;;
--- jdk/test/java/security/Security/signedfirst/Dyn.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/security/Security/signedfirst/Dyn.sh
@@ -58,7 +58,7 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
-  *BSD | Darwin )
+  BSDSUniX | *BSD | Darwin )
     PATHSEP=":"
     FILESEP="/"
     ;;
--- jdk/test/java/security/Security/signedfirst/Static.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/security/Security/signedfirst/Static.sh
@@ -58,7 +58,7 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
-  *BSD | Darwin )
+  BSDSUniX | *BSD | Darwin )
     PATHSEP=":"
     FILESEP="/"
     ;;
--- jdk/test/java/util/Currency/PropertiesTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/util/Currency/PropertiesTest.sh
@@ -52,7 +52,7 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/java/util/Locale/LocaleCategory.sh.orig	2017-02-08 12:47:35 UTC
+++ jdk/test/java/util/Locale/LocaleCategory.sh
@@ -52,7 +52,7 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/java/util/Locale/LocaleProviders.sh.orig	2017-02-08 12:47:35 UTC
+++ jdk/test/java/util/Locale/LocaleProviders.sh
@@ -56,7 +56,7 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/java/util/PluggableLocale/ExecTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/util/PluggableLocale/ExecTest.sh
@@ -62,7 +62,7 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/java/util/ResourceBundle/Bug6299235Test.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/util/ResourceBundle/Bug6299235Test.sh
@@ -31,7 +31,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PATHSEP=":"
     FILESEP="/"
     ;;
--- jdk/test/java/util/ServiceLoader/basic.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/util/ServiceLoader/basic.sh
@@ -43,7 +43,7 @@ JAR="$COMPILEJAVA/bin/jar"
 
 OS=`uname -s`
 case "$OS" in
-    SunOS | Linux | *BSD | Darwin | AIX )
+    SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
       SEP=':' ;;
     * )
       SEP='\;' ;;
--- jdk/test/java/util/prefs/CheckUserPrefsStorage.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/java/util/prefs/CheckUserPrefsStorage.sh
@@ -31,7 +31,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh
@@ -56,7 +56,7 @@ echo "TESTCLASSES=${TESTCLASSES}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh
@@ -89,7 +89,7 @@ case "$OS" in
       FILESEP="/"
       ;;
 
-   Linux | *BSD | Darwin | AIX )
+   Linux | BSDSUniX | *BSD | Darwin | AIX )
       VAR="A different value for Linux"
       DEFAULT_JDK=/none
       #DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386
--- jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh
@@ -90,7 +90,7 @@ case "$OS" in
       FILESEP="/"
       ;;
 
-   Linux | *BSD | Darwin | AIX )
+   Linux | BSDSUniX | *BSD | Darwin | AIX )
       VAR="A different value for Linux"
       DEFAULT_JDK=/none
       #DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386
--- jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
@@ -108,6 +108,14 @@ case "$OS" in
       TMP="/tmp"
       ;;
 
+   BSDSUniX )
+      VAR="A different value for BSDSUniX"
+      DEFAULT_JDK=/usr/local/openjdk8
+      FILESEP="/"
+      PATHSEP=":"
+      TMP="/tmp"
+      ;;
+
    *BSD )
       VAR="A different value for BSD"
       DEFAULT_JDK=/usr/local/openjdk8
--- jdk/test/javax/script/CommonSetup.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/javax/script/CommonSetup.sh
@@ -36,7 +36,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/javax/security/auth/Subject/doAs/Test.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/javax/security/auth/Subject/doAs/Test.sh
@@ -43,6 +43,11 @@ case "$OS" in
     FS="/"
     RM="/bin/rm -f"
     ;;
+  BSDSUniX )
+    PS=":"
+    FS="/"
+    RM="/bin/rm -f"
+    ;;
   *BSD | Darwin )
     PS=":"
     FS="/"
--- jdk/test/lib/security/java.policy/Ext_AllPolicy.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/lib/security/java.policy/Ext_AllPolicy.sh
@@ -53,7 +53,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
@@ -42,7 +42,7 @@ if [[ $OS == CYGWIN_NT* ]] ; then
 fi
 
 case $OS in
-SunOS | Linux | *BSD | Darwin | AIX )
+SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PATHSEP=":"
     FILESEP="/"
     DFILESEP=$FILESEP
--- jdk/test/sun/net/ftp/MarkResetTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/net/ftp/MarkResetTest.sh
@@ -28,7 +28,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/sun/net/www/http/HttpClient/RetryPost.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/net/www/http/HttpClient/RetryPost.sh
@@ -28,7 +28,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/sun/net/www/protocol/jar/B5105410.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/net/www/protocol/jar/B5105410.sh
@@ -31,7 +31,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/sun/net/www/protocol/jar/jarbug/run.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/net/www/protocol/jar/jarbug/run.sh
@@ -31,7 +31,7 @@ DEST=`pwd`
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     CHMOD="${FS}bin${FS}chmod"
--- jdk/test/sun/nio/ch/SelProvider.java.orig	2017-02-08 12:56:14 UTC
+++ jdk/test/sun/nio/ch/SelProvider.java
@@ -39,7 +39,8 @@ public class SelProvider {
                 expected = "sun.nio.ch.DevPollSelectorProvider";
             } else if ("Linux".equals(osname)) {
                 expected = "sun.nio.ch.EPollSelectorProvider";
-            } else if (osname.endsWith("BSD") || osname.contains("OS X")) {
+            } else if (osname.endsWith("BSD") || osname.contains("OS X") ||
+			"BSDSUniX".equals(osname)) {
                 expected = "sun.nio.ch.KQueueSelectorProvider";
             } else {
                 return;
--- jdk/test/sun/security/krb5/runNameEquals.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/krb5/runNameEquals.sh
@@ -52,7 +52,7 @@ NATIVE=false
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin )
     PATHSEP=":"
     FILESEP="/"
     NATIVE=true
--- jdk/test/sun/security/mscapi/ShortRSAKey1024.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/mscapi/ShortRSAKey1024.sh
@@ -50,7 +50,7 @@ fi
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | CYGWIN* )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | CYGWIN* )
     FS="/"
     ;;
   Windows_* )
--- jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
@@ -66,7 +66,7 @@ case "$OS" in
     CP="${FS}bin${FS}cp"
     CHMOD="${FS}bin${FS}chmod"
     ;;
-  *BSD | Darwin )
+  BSDSUniX | *BSD | Darwin )
     FS="/"
     PS=":"
     CP="${FS}bin${FS}cp"
--- jdk/test/sun/security/pkcs11/Provider/Login.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/pkcs11/Provider/Login.sh
@@ -67,7 +67,7 @@ case "$OS" in
     CP="${FS}bin${FS}cp"
     CHMOD="${FS}bin${FS}chmod"
     ;;
-  *BSD | Darwin )
+  BSDSUniX | *BSD | Darwin )
     FS="/"
     PS=":"
     CP="${FS}bin${FS}cp"
--- jdk/test/sun/security/provider/KeyStore/DKSTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/provider/KeyStore/DKSTest.sh
@@ -50,7 +50,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh
@@ -52,7 +52,7 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
-  Linux | *BSD | Darwin )
+  Linux | BSDSUniX | *BSD | Darwin )
     PATHSEP=":"
     FILESEP="/"
     ;;
--- jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh
@@ -59,7 +59,7 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
-  *BSD | Darwin )
+  BSDSUniX | *BSD | Darwin )
     PS=":"
     FS="/"
     ;;
--- jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh
@@ -33,7 +33,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
@@ -46,7 +46,7 @@ fi
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
         FILESEP="/"
         PATHSEP=":"
         ;;
--- jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
@@ -32,7 +32,7 @@
 HOSTNAME=`uname -n`
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
@@ -32,7 +32,7 @@
 HOSTNAME=`uname -n`
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
--- jdk/test/sun/security/tools/jarsigner/AlgOptions.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/jarsigner/AlgOptions.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/security/tools/jarsigner/PercentSign.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/jarsigner/PercentSign.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/security/tools/jarsigner/diffend.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/jarsigner/diffend.sh
@@ -47,7 +47,7 @@ case "$OS" in
     FS="/"
     CP="${FS}bin${FS}cp -f"
     ;;
-  *BSD )
+  BSDSUniX | *BSD )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/security/tools/jarsigner/emptymanifest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/jarsigner/emptymanifest.sh
@@ -39,7 +39,7 @@ case "$OS" in
   Windows_* )
     FS="\\"
     ;;
-  *BSD )
+  BSDSUniX | *BSD )
     PS=":"
     FS="/"
     PATH="${PATH}${PS}${FS}usr${FS}local${FS}bin"
--- jdk/test/sun/security/tools/jarsigner/oldsig.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/jarsigner/oldsig.sh
@@ -42,7 +42,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/security/tools/keytool/AltProviderPath.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/keytool/AltProviderPath.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh
@@ -55,7 +55,7 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
-  *BSD | Darwin )
+  BSDSUniX | *BSD | Darwin )
     PATHSEP=":"
     FILESEP="/"
     ;;
--- jdk/test/sun/security/tools/keytool/NoExtNPE.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/keytool/NoExtNPE.sh
@@ -48,7 +48,7 @@ case "$OS" in
   Linux )
     FILESEP="/"
     ;;
-  *BSD | Darwin )
+  BSDSUniX | *BSD | Darwin )
     FILESEP="/"
     ;;
   AIX )
--- jdk/test/sun/security/tools/keytool/SecretKeyKS.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/keytool/SecretKeyKS.sh
@@ -45,7 +45,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/security/tools/keytool/StandardAlgName.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/keytool/StandardAlgName.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     PATHSEP=":"
     FILESEP="/"
     ;;
--- jdk/test/sun/security/tools/keytool/i18n.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/keytool/i18n.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD )
+  SunOS | Linux | BSDSUniX | *BSD )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/security/tools/keytool/printssl.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/keytool/printssl.sh
@@ -40,7 +40,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     FS="/"
     ;;
   CYGWIN* )
--- jdk/test/sun/security/tools/keytool/resource.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/keytool/resource.sh
@@ -43,7 +43,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     FS="/"
     ;;
--- jdk/test/sun/security/tools/keytool/standard.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/keytool/standard.sh
@@ -45,7 +45,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     FS="/"
     ;;
   Windows_* )
--- jdk/test/sun/security/tools/policytool/Alias.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/policytool/Alias.sh
@@ -47,7 +47,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/security/tools/policytool/ChangeUI.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/policytool/ChangeUI.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/security/tools/policytool/OpenPolicy.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/policytool/OpenPolicy.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/security/tools/policytool/SaveAs.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/policytool/SaveAs.sh
@@ -47,7 +47,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/security/tools/policytool/UpdatePermissions.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/policytool/UpdatePermissions.sh
@@ -47,7 +47,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/security/tools/policytool/UsePolicy.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/policytool/UsePolicy.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/security/tools/policytool/i18n.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/security/tools/policytool/i18n.sh
@@ -49,7 +49,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | AIX )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
--- jdk/test/sun/tools/common/CommonSetup.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/tools/common/CommonSetup.sh
@@ -109,7 +109,7 @@ case "$OS" in
     OS="Linux"
     isLinux=true
     ;;
-  *BSD )
+  BSDSUniX | *BSD )
     OS="BSD"
     isBSD=true
     ;;
--- jdk/test/sun/tools/jconsole/ResourceCheckTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/tools/jconsole/ResourceCheckTest.sh
@@ -54,7 +54,7 @@ pass() 
 
 OS=`uname -s`
 case "$OS" in
-   SunOS | Linux | *BSD | Darwin | AIX)
+   SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX)
       PATHSEP=":"
       ;;
 
--- jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh
@@ -56,7 +56,7 @@ pass()
 
 OS=`uname -s`
 case "$OS" in
-   SunOS | Linux | *BSD | Darwin | AIX )
+   SunOS | Linux | BSDSUniX | *BSD | Darwin | AIX )
       PATHSEP=":"
       ;;
 
--- jdk/test/tools/launcher/TestHelper.java.orig	2017-02-08 12:52:00 UTC
+++ jdk/test/tools/launcher/TestHelper.java
@@ -95,7 +95,7 @@ public class TestHelper {
     static final boolean isAIX =
             System.getProperty("os.name", "unknown").startsWith("AIX");
     static final boolean isBSD =
-            System.getProperty("os.name", "unknown").endsWith("BSD");
+            System.getProperty("os.name", "unknown").contains("BSD");
     static final String LIBJVM = isWindows
                         ? "jvm.dll"
                         : "libjvm" + (isMacOSX ? ".dylib" : ".so");
--- langtools/test/tools/javah/ReadOldClass.sh.orig	2017-02-08 12:52:00 UTC
+++ langtools/test/tools/javah/ReadOldClass.sh
@@ -43,7 +43,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin | CYGWIN* )
+  SunOS | Linux | BSDSUniX | *BSD | Darwin | CYGWIN* )
     PS=":"
     FS="/"
     ;;