Bump PKGREVISION

* Use working bootstrap kits for DragonFly from DPorts.
* Borrow patches from DragonFly Dports.
  Fix build under DragonFly 3.6.2 and 3.8.1.

10 files changed, 139 insertions, 20 deletions

diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index 4cb374e2cfc..61c81ac2367 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2014/07/21 00:15:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.72 2014/07/25 20:35:14 ryoon Exp $
 
 DISTNAME=	openjdk-1.7.60-20140614
 PKGNAME=	openjdk7-1.7.60
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.bz2
@@ -88,6 +88,11 @@ MAKE_ENV+=	USE_GCC=1
 MAKE_ENV+=	ARCH_DATA_MODEL=${ABI:Q}
 .endif
 
+SUBST_CLASSES+=		libpath
+SUBST_STAGE.libpath=	pre-build
+SUBST_FILES.libpath+=	hotspot/src/os/bsd/vm/os_bsd.cpp
+SUBST_VARS.libpath=	PREFIX
+
 # SmartOS has ccs tools in /usr/bin
 .if ${OS_VARIANT} == "SmartOS"
 SUBST_CLASSES+=		ccspath
diff --git a/lang/openjdk7/bootstrap.mk b/lang/openjdk7/bootstrap.mk
index 5b9a7a3f824..ce4293d3851 100644
--- a/lang/openjdk7/bootstrap.mk
+++ b/lang/openjdk7/bootstrap.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.10 2013/10/16 16:51:00 richard Exp $
+# $NetBSD: bootstrap.mk,v 1.11 2014/07/25 20:35:14 ryoon Exp $
 
 ONLY_FOR_PLATFORM=	NetBSD-[56].*-i386 NetBSD-[56].*-x86_64
 ONLY_FOR_PLATFORM+=	DragonFly-[23].*-* SunOS-*-*
@@ -14,6 +14,8 @@ BOOT.df33prebump-i386=	bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz
 BOOT.df33prebump-amd64=	bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz
 BOOT.df35-i386=		bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz
 BOOT.df35-amd64=	bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz
+BOOT.df35a-i386=	bootstrap-openjdk-7.25.15.dfly-3.5-i386.tar.xz
+BOOT.df35a-amd64=	bootstrap-openjdk-7.25.15.dfly-3.5-amd64.tar.xz
 BOOT.common-20110811=	bootstrap-jdk7-bin-common-20110811.tar.bz2
 
 DFBSDBOOTSTRAPSITE=	http://dl.wolfpond.org/openjdk7/
@@ -23,6 +25,8 @@ SITES.bootstrap-openjdk-7.9.05_2.dfly-3.3-i386.tar.xz=	${DFBSDBOOTSTRAPSITE}
 SITES.bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz=	${DFBSDBOOTSTRAPSITE}
 SITES.bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz=	${DFBSDBOOTSTRAPSITE}
 SITES.bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz=	${DFBSDBOOTSTRAPSITE}
+SITES.bootstrap-openjdk-7.25.15.dfly-3.5-i386.tar.xz=	${DFBSDBOOTSTRAPSITE}
+SITES.bootstrap-openjdk-7.25.15.dfly-3.5-amd64.tar.xz=	${DFBSDBOOTSTRAPSITE}
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo)
 DISTFILES+=		${BOOT.nb5-i386}
@@ -70,16 +74,26 @@ DISTFILES+=		${BOOT.df33prebump-amd64}
 EXTRACT_ONLY+=		${BOOT.df33prebump-amd64}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MDragonFly-3.[5-9]*-i386) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MDragonFly-3.5*-i386) || make(distinfo)
 DISTFILES+=		${BOOT.df35-i386}
 EXTRACT_ONLY+=		${BOOT.df35-i386}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MDragonFly-3.[5-9]*-x86_64) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MDragonFly-3.5*-x86_64) || make(distinfo)
 DISTFILES+=		${BOOT.df35-amd64}
 EXTRACT_ONLY+=		${BOOT.df35-amd64}
 .endif
 
+.if !empty(MACHINE_PLATFORM:MDragonFly-3.[6-9]*-i386) || make(distinfo)
+DISTFILES+=		${BOOT.df35a-i386}
+EXTRACT_ONLY+=		${BOOT.df35a-i386}
+.endif
+
+.if !empty(MACHINE_PLATFORM:MDragonFly-3.[6-9]*-x86_64) || make(distinfo)
+DISTFILES+=		${BOOT.df35a-amd64}
+EXTRACT_ONLY+=		${BOOT.df35a-amd64}
+.endif
+
 .if !empty(DISTFILES:M*20110811*) || make(distinfo)
 DISTFILES+=		${BOOT.common-20110811}
 EXTRACT_ONLY+=		${BOOT.common-20110811}
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index ecbd359b588..dd8010727b8 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2014/07/21 00:15:41 ryoon Exp $
+$NetBSD: distinfo,v 1.51 2014/07/25 20:35:14 ryoon Exp $
 
 SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
 RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
@@ -33,6 +33,12 @@ Size (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-amd64.tar.xz) = 20011172 bytes
 SHA1 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = d7994e2a485c3e4eca44e81f4215bb4c35b54d04
 RMD160 (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = bb9ba4fc83ec276c5e8decd53a6523eca1f6b819
 Size (openjdk7/bootstrap-openjdk-7.21.11.dfly-3.5-i386.tar.xz) = 21142004 bytes
+SHA1 (openjdk7/bootstrap-openjdk-7.25.15.dfly-3.5-amd64.tar.xz) = 5b5945c90c8c6cb3470e46cea287b8218c635b84
+RMD160 (openjdk7/bootstrap-openjdk-7.25.15.dfly-3.5-amd64.tar.xz) = 0c84a617bcfd3deff381ee9dce381223ee6225a4
+Size (openjdk7/bootstrap-openjdk-7.25.15.dfly-3.5-amd64.tar.xz) = 20036896 bytes
+SHA1 (openjdk7/bootstrap-openjdk-7.25.15.dfly-3.5-i386.tar.xz) = 5fdc2fd0eab6b5c3af805feaea0e50ebf8e4c266
+RMD160 (openjdk7/bootstrap-openjdk-7.25.15.dfly-3.5-i386.tar.xz) = be7c12ea9d5e6a5553733d25ee8deca7df9a403a
+Size (openjdk7/bootstrap-openjdk-7.25.15.dfly-3.5-i386.tar.xz) = 21561488 bytes
 SHA1 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = b9445fa4cc4674ba8b9330e45ae65c597f5fca10
 RMD160 (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = aa2443fa202f3ed8694b6d0e4031622b5da52283
 Size (openjdk7/bootstrap-openjdk-7.9.05_2.dfly-3.3-amd64.tar.xz) = 20874080 bytes
@@ -64,14 +70,14 @@ SHA1 (openjdk7/rhino1_7R3.zip) = 81f39d6e24529d62b23a6a92a1a09af95495d7c1
 RMD160 (openjdk7/rhino1_7R3.zip) = 3fdc3e1540d0fa35ba7dec1bf34a70b0d41cedd0
 Size (openjdk7/rhino1_7R3.zip) = 4651597 bytes
 SHA1 (patch-Makefile) = a9e415d19c2a8edb96a60ffdf81c804476a8e2f6
-SHA1 (patch-aa) = 69da3f571d37bb461f1d3edb342a56e63a2872af
+SHA1 (patch-aa) = d47738b934304ee0921fe56b036fc0483faa328b
 SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998
 SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6
 SHA1 (patch-ae) = 0bc7f2cf43835ce7d1e30e09a570e46a952a03e8
 SHA1 (patch-ag) = 83ec8015b8e0f2657f4289cea84bdc9b6d0c5e88
 SHA1 (patch-ah) = 2d358879d2851fb2fb8161c5a1ac5a93aa7a69c2
 SHA1 (patch-ai) = bee1b592401d15a91e7d926c9011bcd0d83fb5ec
-SHA1 (patch-ak) = 45beaba484a74fb47f74bec786c418781dc478e2
+SHA1 (patch-ak) = a8ce55038ee8755cf69a23bf77c4ea79466a8897
 SHA1 (patch-al) = d174343a5baa8a73d18ff1020cb0cc19e6714175
 SHA1 (patch-am) = d9b30616a7803d1f10751a2c6950317c167c5703
 SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd
@@ -90,6 +96,7 @@ SHA1 (patch-bn) = 880785559645be0fc2a93dbb14695d83631f3620
 SHA1 (patch-corba_make_common_shared_Defs-java.gmk) = 548718a351fe6159d3de4120cba90701c064ddda
 SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2
 SHA1 (patch-corba_make_common_shared_Platform.gmk) = 057af9ea52ca257750267289e4f1a950df0ed756
+SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = e2cca3e2d6a81ca077d23c49a55b228a65f20b58
 SHA1 (patch-hotspot_make_bsd_makefiles_buildtree.make) = 2605e4f684abb026be91b4993bb2f741822cf169
 SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf
 SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14
@@ -134,6 +141,7 @@ SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = d0ae37a032be6bf60da4be11bd3
 SHA1 (patch-jdk_make_common_shared_Defs-versions.gmk) = 20a9492180db88cf78bc107f1e2fc4a9101d2eab
 SHA1 (patch-jdk_make_java_Makefile) = c670455f8979b14fe44f0a285d0adfb2666d0005
 SHA1 (patch-jdk_make_java_instrument_Makefile) = ddd552847d384ebbceff3b4561551d204c4e9d5a
+SHA1 (patch-jdk_make_java_net_FILES__c.gmk) = 085bb17ed92a3858ca357979b7254a8a00b2a180
 SHA1 (patch-jdk_make_java_nio_Makefile) = d4b8b830ce73841ae107f8485400ab6116b9ca3c
 SHA1 (patch-jdk_make_java_npt_Makefile) = f79db8f4bc1388ce95dd5adfd54ba13665bebe47
 SHA1 (patch-jdk_make_sun_awt_Makefile) = 981082d4dfda204f09a66b9fc452bea218d3ce6a
@@ -160,13 +168,16 @@ SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = 265d9f401eff6a39d
 SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = 02e51e702868e1cea4a2628eccbcaa81f231efce
 SHA1 (patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java) = b57411309b8d46de6a9ab3606d72690908989d50
 SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 205b724aa91169cfe81217893bc5922e5b47da6f
+SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 3bc9e099a6c3152645882e4fba128ae8e709efbb
 SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 63af9eee1f5bbc695a14cab51fa7089eb2a0a04b
 SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = 883fb8cf76f9a6d47e1c96badb07be162add80f7
+SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.h) = c6f3b3bcaf67951a458f01788a9d32e5873c7e5a
 SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = 928e9fbc11d8e64a69e27573efa13482acb62480
 SHA1 (patch-jdk_test_Makefile) = 62618854251a5fe139310fc443af3f2f0103f63c
 SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = a2a13434a4e87730fa96f53efa176fa91d3c1eeb
 SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = 98a7c2fbccd50da0c879940131901b3937d72c0d
 SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = e003869d924ac3cb326c4093891bd0cfc0f7ff9c
 SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 1997194b919a96628568ef469150c1bd39ede295
+SHA1 (patch-jdk_test_jprt.config) = 4eb27e773c564dde79be102e7ccfe2e42ff8f0ca
 SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = 142fa7029bfbdbb63354ce4e315ea7f5fd372a32
 SHA1 (patch-langtools_make_build.xml) = 98fe0f88aaa774e47e1a358c7005b203c3123d09
diff --git a/lang/openjdk7/patches/patch-aa b/lang/openjdk7/patches/patch-aa
index 4350f377c58..b409ba52bcc 100644
--- a/lang/openjdk7/patches/patch-aa
+++ b/lang/openjdk7/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.11 2014/01/14 17:24:42 abs Exp $
+$NetBSD: patch-aa,v 1.12 2014/07/25 20:35:14 ryoon Exp $
 
 DragonFly support.
 Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
 
---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2014-01-01 05:50:05.000000000 +0000
+--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2014-06-14 20:38:20.000000000 +0000
 +++ hotspot/src/os/bsd/vm/os_bsd.cpp
 @@ -126,8 +126,11 @@
  # include <inttypes.h>
@@ -26,7 +26,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
  
    /* get processors count via hw.ncpus sysctl */
    mib[0] = CTL_HW;
-@@ -370,14 +374,11 @@ void os::Bsd::initialize_system_info() {
+@@ -372,14 +376,11 @@ void os::Bsd::initialize_system_info() {
         _physical_memory = 256*1024*1024;       // fallback (XXXBSD?)
    }
  
@@ -46,7 +46,16 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
  #endif
  }
  #else
-@@ -2222,7 +2223,9 @@ void * os::dll_load(const char *filename
+@@ -458,7 +459,7 @@ void os::init_system_properties_values()
+  *        7: The default directories, normally /lib and /usr/lib.
+  */
+ #ifndef DEFAULT_LIBPATH
+-#define DEFAULT_LIBPATH "/lib:/usr/lib"
++#define DEFAULT_LIBPATH "/lib:/usr/lib:@PREFIX@/lib"
+ #endif
+ 
+ #define EXTENSIONS_DIR  "/lib/ext"
+@@ -2224,7 +2225,9 @@ void * os::dll_load(const char *filename
      {EM_PPC,         EM_PPC,     ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
      {EM_PPC64,       EM_PPC64,   ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
      {EM_ARM,         EM_ARM,     ELFCLASS32,   ELFDATA2LSB, (char*)"ARM"},
@@ -56,7 +65,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
      {EM_ALPHA,       EM_ALPHA,   ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
      {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
      {EM_MIPS,        EM_MIPS,    ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
-@@ -2818,6 +2821,33 @@ bool Semaphore::timedwait(unsigned int s
+@@ -2820,6 +2823,33 @@ bool Semaphore::timedwait(unsigned int s
  
  #else
  
@@ -90,7 +99,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
  bool Semaphore::trywait() {
    return sem_trywait(&_semaphore) == 0;
  }
-@@ -3880,7 +3910,7 @@ OSReturn os::set_native_priority(Thread*
+@@ -3884,7 +3914,7 @@ OSReturn os::set_native_priority(Thread*
  #ifdef __OpenBSD__
    // OpenBSD pthread_setprio starves low priority threads
    return OS_OK;
@@ -99,7 +108,7 @@ Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
    int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
    return (ret == 0) ? OS_OK : OS_ERR;
  #elif defined(__APPLE__) || defined(__NetBSD__)
-@@ -3909,7 +3939,7 @@ OSReturn os::get_native_priority(const T
+@@ -3913,7 +3943,7 @@ OSReturn os::get_native_priority(const T
    }
  
    errno = 0;
diff --git a/lang/openjdk7/patches/patch-ak b/lang/openjdk7/patches/patch-ak
index d5aab951bef..38d7a39bb60 100644
--- a/lang/openjdk7/patches/patch-ak
+++ b/lang/openjdk7/patches/patch-ak
@@ -1,10 +1,10 @@
-$NetBSD: patch-ak,v 1.6 2013/06/15 09:31:05 jperkin Exp $
+$NetBSD: patch-ak,v 1.7 2014/07/25 20:35:14 ryoon Exp $
 
 Additional rpaths.
 
---- jdk/make/common/Defs-bsd.gmk.orig	2013-05-29 03:57:57.000000000 +0000
+--- jdk/make/common/Defs-bsd.gmk.orig	2014-06-14 20:38:28.000000000 +0000
 +++ jdk/make/common/Defs-bsd.gmk
-@@ -336,8 +336,8 @@ Z_ORIGIN_FLAG/zero  = -Xlinker -z -Xlink
+@@ -328,8 +328,8 @@ Z_ORIGIN_FLAG/zero  = -Xlinker -z -Xlink
  
  LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY))
  
@@ -15,7 +15,19 @@ Additional rpaths.
  
  #
  # -L paths for finding and -ljava
-@@ -399,7 +399,7 @@ endif
+@@ -380,6 +380,11 @@ endif
+ 
+ # Using map files currently break compilation on FreeBSD during shared library
+ # checks for some of the AWT native libraries.
++ifeq ($(OS_VENDOR), DragonFly)
++LDNOMAP=true
++endif
++
++#
+ ifeq ($(OS_VENDOR), FreeBSD)
+ LDNOMAP=true
+ endif
+@@ -391,7 +396,7 @@ endif
  # the library itself should not.
  #
  VM_NAME         = server
@@ -24,7 +36,7 @@ Additional rpaths.
  JAVALIB         = -ljava $(JVMLIB)
  
  #
-@@ -462,6 +462,14 @@ ifeq ($(OS_VENDOR), OpenBSD)
+@@ -454,6 +459,14 @@ ifeq ($(OS_VENDOR), OpenBSD)
    SYSTEM_ZLIB = true
  endif
  
diff --git a/lang/openjdk7/patches/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java b/lang/openjdk7/patches/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java
new file mode 100644
index 00000000000..f4d7d56473b
--- /dev/null
+++ b/lang/openjdk7/patches/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java
@@ -0,0 +1,13 @@
+$NetBSD: patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java,v 1.1 2014/07/25 20:35:14 ryoon Exp $
+
+--- hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java.orig	2014-06-14 20:38:20.000000000 +0000
++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
+@@ -45,6 +45,8 @@ public class PlatformInfo {
+       return "bsd";
+     } else if (os.equals("Darwin") || os.contains("OS X")) {
+       return "bsd";
++    } else if (os.equals("DragonFlyBSD")) {
++      return "bsd";
+     } else if (os.startsWith("Windows")) {
+       return "win32";
+     } else {
diff --git a/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk b/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk
new file mode 100644
index 00000000000..0af5912b323
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk
@@ -0,0 +1,13 @@
+$NetBSD: patch-jdk_make_java_net_FILES__c.gmk,v 1.1 2014/07/25 20:35:14 ryoon Exp $
+
+--- jdk/make/java/net/FILES_c.gmk.orig	2014-06-14 20:38:28.000000000 +0000
++++ jdk/make/java/net/FILES_c.gmk
+@@ -44,7 +44,7 @@ ifeq ($(PLATFORM), linux)
+     FILES_c += linux_close.c
+ endif
+ 
+-ifeq ($(PLATFORM), macosx)
++ifeq ($(PLATFORM), bsd)
+     FILES_c += bsd_close.c
+ endif
+ 
diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c
new file mode 100644
index 00000000000..00d99080a51
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-jdk_src_solaris_native_java_lang_java__props__md.c,v 1.1 2014/07/25 20:35:14 ryoon Exp $
+
+--- jdk/src/solaris/native/java/lang/java_props_md.c.orig	2014-06-14 20:38:31.000000000 +0000
++++ jdk/src/solaris/native/java/lang/java_props_md.c
+@@ -476,6 +476,11 @@ GetJavaProperties(JNIEnv *env)
+     {
+ #ifdef MACOSX
+         setOSNameAndVersion(&sprops);
++#elif defined(__DragonFly__)
++        struct utsname name;
++        uname(&name);
++        sprops.os_name = "DragonFlyBSD";
++        sprops.os_version = strdup(name.release);
+ #else
+         struct utsname name;
+         uname(&name);
diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h
new file mode 100644
index 00000000000..aa7384b1c80
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-jdk_src_solaris_native_java_net_net__util__md.h,v 1.1 2014/07/25 20:35:14 ryoon Exp $
+
+--- jdk/src/solaris/native/java/net/net_util_md.h.orig	2014-06-14 20:38:31.000000000 +0000
++++ jdk/src/solaris/native/java/net/net_util_md.h
+@@ -37,7 +37,7 @@
+ #endif
+ 
+ 
+-#if defined(__linux__) || defined(__FreeBSD__) || defined(MACOSX)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(MACOSX) || defined(__DragonFly__)
+ extern int NET_Timeout(int s, long timeout);
+ extern int NET_Read(int s, void* buf, size_t len);
+ extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
diff --git a/lang/openjdk7/patches/patch-jdk_test_jprt.config b/lang/openjdk7/patches/patch-jdk_test_jprt.config
new file mode 100644
index 00000000000..1008c3fc9f0
--- /dev/null
+++ b/lang/openjdk7/patches/patch-jdk_test_jprt.config
@@ -0,0 +1,13 @@
+$NetBSD: patch-jdk_test_jprt.config,v 1.1 2014/07/25 20:35:14 ryoon Exp $
+
+--- jdk/test/jprt.config.orig	2014-06-14 20:38:33.000000000 +0000
++++ jdk/test/jprt.config
+@@ -109,7 +109,7 @@ case "${osname}" in
+     umask 002
+     ;;
+ 
+-  FreeBSD | OpenBSD )
++  DragonFly | FreeBSD | OpenBSD )
+     # Add basic paths
+     path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
+