Add initial support for DragonFly/i386 2.4. (only build tested)

22 files changed, 300 insertions, 30 deletions

diff --git a/lang/openjdk7/bootstrap.mk b/lang/openjdk7/bootstrap.mk
index c53aab5b1aa..7bc2c6ed351 100644
--- a/lang/openjdk7/bootstrap.mk
+++ b/lang/openjdk7/bootstrap.mk
@@ -1,6 +1,7 @@
-# $NetBSD: bootstrap.mk,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.2 2009/10/18 10:21:01 tnn Exp $
 
 ONLY_FOR_PLATFORM=	NetBSD-[456].*-i386 NetBSD-[456].*-x86_64
+ONLY_FOR_PLATFORM+=	DragonFly-2.4.*-i386
 
 BOOT.nb4-i386=		bootstrap-jdk-7-bin-netbsd-4-i386-20091012.tar.bz2
 # not yet
@@ -9,6 +10,7 @@ BOOT.nb5-i386=		bootstrap-jdk-7-bin-netbsd-5-i386-20090926.tar.bz2
 BOOT.nb5-amd64=		bootstrap-jdk-7-bin-netbsd-5-amd64-20090925.tar.bz2
 BOOT.nb6-i386=		bootstrap-jdk-7-bin-netbsd-6-i386-20091014.tar.bz2
 BOOT.nb6-amd64=		bootstrap-jdk-7-bin-netbsd-6-amd64-20091013.tar.bz2
+BOOT.df24-i386=		bootstrap-jdk-7-bin-dragonfly-2_4-i386-20091018.tar.bz2
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-4.[0-8]*-i386) || make(distinfo)
 DISTFILES+=		${BOOT.nb4-i386}
@@ -42,4 +44,9 @@ DISTFILES+=		${BOOT.nb6-amd64}
 EXTRACT_ONLY+=		${BOOT.nb6-amd64}
 .endif
 
+.if !empty(MACHINE_PLATFORM:MDragonFly-2.4.*-i386) || make(distinfo)
+DISTFILES+=		${BOOT.df24-i386}
+EXTRACT_ONLY+=		${BOOT.df24-i386}
+.endif
+
 ALT_BOOTDIR=		${WRKDIR}/bootstrap
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 2747cc00c33..bc344992262 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: distinfo,v 1.2 2009/10/18 10:21:01 tnn Exp $
 
 SHA1 (openjdk7/175529fae103.tar.bz2) = 297f474423a18d727a87b922b1665ea4e5d54732
 RMD160 (openjdk7/175529fae103.tar.bz2) = 37bb512ccce29eb764a6bf9649c13715bf3eb2d6
@@ -6,6 +6,9 @@ Size (openjdk7/175529fae103.tar.bz2) = 4599216 bytes
 SHA1 (openjdk7/apache-ant-1.7.1-bin.zip) = a7e8fa7bc2102a8d8df99c64db73c2eae3d8b483
 RMD160 (openjdk7/apache-ant-1.7.1-bin.zip) = a4e2c992ac7c81949b391d146baf9c411dbb2c2d
 Size (openjdk7/apache-ant-1.7.1-bin.zip) = 11657986 bytes
+SHA1 (openjdk7/bootstrap-jdk-7-bin-dragonfly-2_4-i386-20091018.tar.bz2) = e51aafb9711a0a6b050d31ad4143b5799b20c88f
+RMD160 (openjdk7/bootstrap-jdk-7-bin-dragonfly-2_4-i386-20091018.tar.bz2) = 81b97b27f40fdb29004004e799af80a52504c378
+Size (openjdk7/bootstrap-jdk-7-bin-dragonfly-2_4-i386-20091018.tar.bz2) = 24354825 bytes
 SHA1 (openjdk7/bootstrap-jdk-7-bin-netbsd-4-i386-20091012.tar.bz2) = 51cbd9fc1a97fc40cf61391933b082f8eee17abb
 RMD160 (openjdk7/bootstrap-jdk-7-bin-netbsd-4-i386-20091012.tar.bz2) = c2e2e0a17ae6d53eee1b91948a6d39080b07cafd
 Size (openjdk7/bootstrap-jdk-7-bin-netbsd-4-i386-20091012.tar.bz2) = 24186222 bytes
@@ -36,16 +39,16 @@ Size (openjdk7/rhino1_7R2.zip) = 2996867 bytes
 SHA1 (openjdk7/xalan-j_2_7_1-bin.zip) = 681f04e180de88264bd3df68946001efb0bc2ff1
 RMD160 (openjdk7/xalan-j_2_7_1-bin.zip) = d7174fcc9dd8b3876b5a9c8cde021953475b57f8
 Size (openjdk7/xalan-j_2_7_1-bin.zip) = 17336979 bytes
-SHA1 (patch-aa) = fbcdd83c292de2be9a5b31971e3d69750c038735
-SHA1 (patch-ab) = a49c5712262d30b36d1913811f51c8f1a1dcb39d
+SHA1 (patch-aa) = 6cc7d152038414b6bfe6b809e569669836af1587
+SHA1 (patch-ab) = 001f676c0232f76ff49ac3ec248f696af1e2397b
 SHA1 (patch-ac) = 7e6c0fcfe0b9eaa756eba361d8f9b35d08d17111
-SHA1 (patch-ad) = f5d3255c07bcf764c56f4b1d550ff5d5cdfd1257
-SHA1 (patch-ae) = f888ba67cfc7255911ee049e1a69dae4efe7dd17
-SHA1 (patch-af) = 9c9c152005c0feec1e6fd0db0fc552a3637db9b7
+SHA1 (patch-ad) = 88950e3d6792a18dd2e2349fee2b7b4c0d822ea4
+SHA1 (patch-ae) = 6fa5076b78b3456266d744846ec376c0ed36cb86
+SHA1 (patch-af) = 3d14a176c89e021afe99ad1b1e7505b56f4e8db0
 SHA1 (patch-ag) = 6287960055a79d05dc193e31d29ffc0158b33cdd
-SHA1 (patch-ah) = 1870d4c12802a93d3ad8e7d0780c50ba1d5e9c3e
+SHA1 (patch-ah) = 2632580f92b27506c33df8714ed163ef3ed9844f
 SHA1 (patch-ai) = 6d6c394c3de7578754b901686b88142cbc524ef7
-SHA1 (patch-aj) = 8ef0a8d446ea5883d1807a49ab123395d50a06ac
+SHA1 (patch-aj) = e370b618f4417d5ca19164c8eb59075123179b5a
 SHA1 (patch-am) = 7e0ffa317a83d5b1e34c3f3e76b7a3de26980df6
 SHA1 (patch-an) = b0636c22521d9727ad79df6914c9ce8c7c70b362
 SHA1 (patch-ao) = 87ee9dd450d0b4e7cbd2302466a2e9f586fa6df1
@@ -56,3 +59,16 @@ SHA1 (patch-as) = d78c44af2e412da65239a8339e00d79eca881e2f
 SHA1 (patch-at) = 3b6c2268747c62f0008f67e8f3d5478e1905c551
 SHA1 (patch-au) = ba3414e924ffd82ca75ae1f8df507753141f2491
 SHA1 (patch-av) = be5bb72a3dd251f2a2822f7a1bea3b461b38d016
+SHA1 (patch-ba) = 2c56f89ea6297689fec7a7620f64ced752ed34c6
+SHA1 (patch-bb) = cd6b792bd42644da36c7fe1c4abc79f94e2295fc
+SHA1 (patch-bc) = 301ba93a42ff228254ecb3c9748aa2555dfd601d
+SHA1 (patch-bd) = 8dc567964e0e47e091043936af540fad6e067583
+SHA1 (patch-be) = e89f8420a9cf97c416ef6d1343d837c16623e02f
+SHA1 (patch-bf) = 7a84c0f0681669537afa50e870c7215e6e7572c1
+SHA1 (patch-bg) = 393c1bac2e83078bc02810eefd79ab8f0dd25170
+SHA1 (patch-bh) = 52b01c8b418efff5f3cc628b305a6d25ef4d13b3
+SHA1 (patch-bi) = c733f906c23a37aeb5ca93f136205563cc5fab64
+SHA1 (patch-bj) = 4198e1aa8e3c65434fbb947a00eed49e73106291
+SHA1 (patch-bk) = 66bccfdf42fcc6f6995f3f18fc2515d55cab46c6
+SHA1 (patch-bl) = a3b3bd6007c83664538baf401447fd0df9f4143b
+SHA1 (patch-bm) = 40c83ad219f529c3ca130547560681ab57b44bf8
diff --git a/lang/openjdk7/patches/patch-aa b/lang/openjdk7/patches/patch-aa
index d7bc9e69a3a..2fa3a0951c1 100644
--- a/lang/openjdk7/patches/patch-aa
+++ b/lang/openjdk7/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-aa,v 1.2 2009/10/18 10:21:01 tnn Exp $
 
---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2009-09-30 13:17:40.000000000 +0200
+--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig	2009-10-17 16:49:37.000000000 +0200
 +++ hotspot/src/os/bsd/vm/os_bsd.cpp
+@@ -63,7 +63,7 @@
+ # include <link.h>
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ # include <elf.h>
+ #endif
+ 
 @@ -2013,6 +2013,9 @@ bool _print_ascii_file(const char* filen
    return true;
  }
@@ -12,3 +21,21 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
  void os::print_dll_info(outputStream *st) {
     st->print_cr("Dynamic libraries:");
  #ifdef _ALLBSD_SOURCE
+@@ -3251,7 +3254,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(__DragonFly__)
+   int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
+ #elif defined(__APPLE__) || defined(__NetBSD__)
+   struct sched_param sp;
+@@ -3279,7 +3282,7 @@ OSReturn os::get_native_priority(const T
+   }
+ 
+   errno = 0;
+-#if defined(__OpenBSD__) || defined(__FreeBSD__)
++#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+   *priority_ptr = pthread_getprio(thread->osthread()->pthread_id());
+ #elif defined(__APPLE__) || defined(__NetBSD__)
+   int policy;
diff --git a/lang/openjdk7/patches/patch-ab b/lang/openjdk7/patches/patch-ab
index 8fb18461c55..265ecff6ab6 100644
--- a/lang/openjdk7/patches/patch-ab
+++ b/lang/openjdk7/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-ab,v 1.2 2009/10/18 10:21:01 tnn Exp $
 
---- ./jdk/make/common/shared/Sanity.gmk.orig	2008-12-21 21:41:14.000000000 +0100
-+++ ./jdk/make/common/shared/Sanity.gmk
+--- jdk/make/common/shared/Sanity.gmk.orig	2008-12-21 21:41:14.000000000 +0100
++++ jdk/make/common/shared/Sanity.gmk
 @@ -787,7 +787,8 @@ $(TEMPDIR)/freetypeinfo: FRC
  	@(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
  	    $(ECHO) "Failed to build freetypecheck." ) > $@
diff --git a/lang/openjdk7/patches/patch-ad b/lang/openjdk7/patches/patch-ad
index c4195a4a198..5741bab69ca 100644
--- a/lang/openjdk7/patches/patch-ad
+++ b/lang/openjdk7/patches/patch-ad
@@ -1,8 +1,22 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-ad,v 1.2 2009/10/18 10:21:01 tnn Exp $
 
---- corba/make/common/shared/Platform.gmk.orig	2009-10-12 18:15:48.000000000 +0200
+--- corba/make/common/shared/Platform.gmk.orig	2009-10-17 16:49:37.000000000 +0200
 +++ corba/make/common/shared/Platform.gmk
-@@ -339,9 +339,9 @@ ifeq ($(PLATFORM), bsd)
+@@ -269,6 +269,13 @@ ifeq ($(SYSTEM_UNAME), FreeBSD)
+  REQUIRED_OS_VERSION = 6.0
+ endif
+ 
++ifeq ($(SYSTEM_UNAME), DragonFly)
++  PLATFORM = bsd
++  OS_NAME = dragonfly
++  OS_VENDOR = DragonFlyBSD
++ REQUIRED_OS_VERSION = 2.4
++endif
++
+ ifeq ($(SYSTEM_UNAME), Darwin)
+   PLATFORM = bsd
+   OS_NAME = darwin
+@@ -339,9 +346,9 @@ ifeq ($(PLATFORM), bsd)
    REQUIRED_FREE_SPACE=1500000
    # How much RAM does this machine have:
    ifeq ($(OS_VENDOR), OpenBSD)
diff --git a/lang/openjdk7/patches/patch-ae b/lang/openjdk7/patches/patch-ae
index 17202d142c2..c5e8d115a9c 100644
--- a/lang/openjdk7/patches/patch-ae
+++ b/lang/openjdk7/patches/patch-ae
@@ -1,14 +1,16 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-ae,v 1.2 2009/10/18 10:21:01 tnn Exp $
 
---- hotspot/make/bsd/makefiles/gcc.make.orig	2008-12-30 18:02:47.000000000 +0100
+--- hotspot/make/bsd/makefiles/gcc.make.orig	2009-10-18 02:16:47.000000000 +0200
 +++ hotspot/make/bsd/makefiles/gcc.make
-@@ -151,6 +151,10 @@ MAPFLAG = -Xlinker --version-script=FILE
+@@ -153,6 +153,12 @@ MAPFLAG = -Xlinker --version-script=FILE
  #
  # Shared Library
  #
 +
++ifeq ($(OS_VENDOR), NetBSD)
 +# XXX tnn fixme: -lgcc_s seems to be needed on NetBSD.
 +LFLAGS+=	-lgcc_s
++endif
 +
  ifeq ($(OS_VENDOR), Darwin)
    # Standard linker flags
diff --git a/lang/openjdk7/patches/patch-af b/lang/openjdk7/patches/patch-af
index 6760b09da31..86b3284a293 100644
--- a/lang/openjdk7/patches/patch-af
+++ b/lang/openjdk7/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-af,v 1.2 2009/10/18 10:21:01 tnn Exp $
 
---- jdk/make/common/shared/Defs-utils.gmk.orig	2009-09-24 23:41:39.000000000 +0200
+--- jdk/make/common/shared/Defs-utils.gmk.orig	2009-10-18 02:25:45.000000000 +0200
 +++ jdk/make/common/shared/Defs-utils.gmk
-@@ -240,7 +240,8 @@ ifeq ($(PLATFORM),bsd)
+@@ -240,7 +240,14 @@ ifeq ($(PLATFORM),bsd)
    endif
    ifeq ($(OS_VENDOR), NetBSD)
      NAWK       = $(UTILS_USR_BIN_PATH)awk
@@ -11,5 +11,11 @@ $NetBSD: patch-af,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
 +    ZIPEXE     = $(PKGSRC_ZIPEXE)
 +    UNZIP      = $(PKGSRC_UNZIP)
 +    UNZIPSFX   = $(PKGSRC_UNZIPSFX)
++  endif
++  ifeq ($(OS_VENDOR), DragonFlyBSD)
++    NAWK       = $(UTILS_USR_BIN_PATH)awk
++    ZIPEXE     = $(PKGSRC_ZIPEXE)
++    UNZIP      = $(PKGSRC_UNZIP)
++    UNZIPSFX   = $(PKGSRC_UNZIPSFX)
    endif
  endif
diff --git a/lang/openjdk7/patches/patch-ah b/lang/openjdk7/patches/patch-ah
index bb01cb5ccba..249bcfeb212 100644
--- a/lang/openjdk7/patches/patch-ah
+++ b/lang/openjdk7/patches/patch-ah
@@ -1,8 +1,22 @@
-$NetBSD: patch-ah,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-ah,v 1.2 2009/10/18 10:21:01 tnn Exp $
 
---- jdk/make/common/shared/Platform.gmk.orig	2009-10-12 18:15:48.000000000 +0200
+--- jdk/make/common/shared/Platform.gmk.orig	2009-10-17 16:49:37.000000000 +0200
 +++ jdk/make/common/shared/Platform.gmk
-@@ -288,9 +288,9 @@ ifeq ($(PLATFORM), bsd)
+@@ -218,6 +218,13 @@ ifeq ($(SYSTEM_UNAME), FreeBSD)
+   REQUIRED_OS_VERSION = 6.0
+ endif
+ 
++ifeq ($(SYSTEM_UNAME), DragonFly)
++  PLATFORM = bsd
++  OS_NAME = dragonfly
++  OS_VENDOR = DragonFlyBSD
++  REQUIRED_OS_VERSION = 2.4
++endif
++
+ ifeq ($(SYSTEM_UNAME), Darwin)
+   PLATFORM = bsd
+   OS_NAME = darwin
+@@ -288,9 +295,9 @@ ifeq ($(PLATFORM), bsd)
    REQUIRED_FREE_SPACE=1500000
    # How much RAM does this machine have:
    ifeq ($(OS_VENDOR), OpenBSD)
diff --git a/lang/openjdk7/patches/patch-aj b/lang/openjdk7/patches/patch-aj
index f73fe25b7d8..65926ab0f07 100644
--- a/lang/openjdk7/patches/patch-aj
+++ b/lang/openjdk7/patches/patch-aj
@@ -1,9 +1,13 @@
-$NetBSD: patch-aj,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $
+$NetBSD: patch-aj,v 1.2 2009/10/18 10:21:01 tnn Exp $
 
---- jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2009-09-24 22:52:54.000000000 +0200
+--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig	2009-10-17 16:49:37.000000000 +0200
 +++ jdk/src/solaris/native/java/net/NetworkInterface.c
-@@ -53,10 +53,8 @@
- #if defined(__FreeBSD__) || defined(__APPLE__)
+@@ -50,13 +50,11 @@
+ #if defined(_ALLBSD_SOURCE)
+ #include <sys/param.h>
+ #include <sys/ioctl.h>
+-#if defined(__FreeBSD__) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
  #include <net/ethernet.h>
  #include <net/if_var.h>
 -#elif defined(__OpenBSD__)
diff --git a/lang/openjdk7/patches/patch-ba b/lang/openjdk7/patches/patch-ba
new file mode 100644
index 00000000000..2d3df92df9c
--- /dev/null
+++ b/lang/openjdk7/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2009/10/18 10:21:01 tnn Exp $
+
+--- hotspot/src/share/vm/utilities/macros.hpp.orig	2009-10-17 16:49:37.000000000 +0200
++++ hotspot/src/share/vm/utilities/macros.hpp
+@@ -148,7 +148,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(__DragonFly__)
+ #define BSD_ONLY(code) code
+ #define NOT_BSD(code)
+ #else
diff --git a/lang/openjdk7/patches/patch-bb b/lang/openjdk7/patches/patch-bb
new file mode 100644
index 00000000000..b6f13cc204e
--- /dev/null
+++ b/lang/openjdk7/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2009/10/18 10:21:01 tnn Exp $
+
+--- langtools/src/share/classes/com/sun/tools/javah/Util.java.orig	2009-10-17 16:49:37.000000000 +0200
++++ langtools/src/share/classes/com/sun/tools/javah/Util.java
+@@ -186,6 +186,8 @@ public class Util {
+ 	    os = "Darwin";
+ 	} else if (os.indexOf("NetBSD") >= 0) {
+ 	    os = "NetBSD";
++	} else if (os.indexOf("DragonFly") >= 0) {
++	    os = "DragonFly";
+ 	} else if (os.indexOf("OpenBSD") >= 0) {
+ 	    os = "OpenBSD";
+         }
diff --git a/lang/openjdk7/patches/patch-bc b/lang/openjdk7/patches/patch-bc
new file mode 100644
index 00000000000..4e161b0ac81
--- /dev/null
+++ b/lang/openjdk7/patches/patch-bc
@@ -0,0 +1,13 @@
+$NetBSD: patch-bc,v 1.1 2009/10/18 10:21:01 tnn Exp $
+
+--- jdk/src/solaris/hpi/native_threads/src/threads_bsd.c.orig	2009-10-17 16:49:37.000000000 +0200
++++ jdk/src/solaris/hpi/native_threads/src/threads_bsd.c
+@@ -42,7 +42,7 @@
+ #include <sys/sysctl.h>
+ 
+ #include <pthread.h>
+-#if defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #include <pthread_np.h>
+ #endif
+ #ifdef __NetBSD__
diff --git a/lang/openjdk7/patches/patch-bd b/lang/openjdk7/patches/patch-bd
new file mode 100644
index 00000000000..6dfa84a3a12
--- /dev/null
+++ b/lang/openjdk7/patches/patch-bd
@@ -0,0 +1,13 @@
+$NetBSD: patch-bd,v 1.1 2009/10/18 10:21:01 tnn Exp $
+
+--- jdk/src/solaris/hpi/include/interrupt.h.orig	2009-10-17 16:49:37.000000000 +0200
++++ jdk/src/solaris/hpi/include/interrupt.h
+@@ -75,7 +75,7 @@ void intrDispatch(int interrupt, void *s
+  *      N_INTERRUPTS  - The number of interrupt channels.  These
+  *                      are numbered from 0 to (N_INTERRUPTS - 1).
+  */
+-#if defined(__linux__) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #define       N_INTERRUPTS    NSIG    /* 0 to NSIG - 1*/
+ #else
+ #define N_INTERRUPTS    32      /* 0 to 31 */
diff --git a/lang/openjdk7/patches/patch-be b/lang/openjdk7/patches/patch-be
new file mode 100644
index 00000000000..8e031218b38
--- /dev/null
+++ b/lang/openjdk7/patches/patch-be
@@ -0,0 +1,13 @@
+$NetBSD: patch-be,v 1.1 2009/10/18 10:21:01 tnn Exp $
+
+--- jdk/src/solaris/native/java/lang/UNIXProcess_md.c.orig	2009-10-17 16:49:37.000000000 +0200
++++ jdk/src/solaris/native/java/lang/UNIXProcess_md.c
+@@ -53,7 +53,7 @@
+ #include <fcntl.h>
+ #include <limits.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <dlfcn.h>
+ #include <pthread.h>
+ #include <pthread_np.h>
diff --git a/lang/openjdk7/patches/patch-bf b/lang/openjdk7/patches/patch-bf
new file mode 100644
index 00000000000..2122a6a711e
--- /dev/null
+++ b/lang/openjdk7/patches/patch-bf
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.1 2009/10/18 10:21:01 tnn Exp $
+
+--- jdk/src/solaris/bin/java_md.c.orig	2009-10-17 16:49:37.000000000 +0200
++++ jdk/src/solaris/bin/java_md.c
+@@ -96,7 +96,7 @@ extern char **environ;
+  *      A collection of useful strings. One should think of these as #define
+  *      entries, but actual strings can be more efficient (with many compilers).
+  */
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ static const char *system_dir	= PACKAGE_PATH "/openjdk7";
+ static const char *user_dir	= "/java";
+ #elif defined(__NetBSD__)
diff --git a/lang/openjdk7/patches/patch-bg b/lang/openjdk7/patches/patch-bg
new file mode 100644
index 00000000000..470aff5d359
--- /dev/null
+++ b/lang/openjdk7/patches/patch-bg
@@ -0,0 +1,22 @@
+$NetBSD: patch-bg,v 1.1 2009/10/18 10:21:01 tnn Exp $
+
+--- jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig	2009-10-17 16:49:37.000000000 +0200
++++ jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+@@ -352,7 +352,7 @@ Java_java_net_PlainDatagramSocketImpl_di
+ #ifdef AF_INET6
+         if (ipv6_available()) {
+             struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&addr;
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+             him6->sin6_family = AF_INET6;
+ #else
+             him6->sin6_family = AF_UNSPEC;
+@@ -362,7 +362,7 @@ Java_java_net_PlainDatagramSocketImpl_di
+ #endif
+         {
+             struct sockaddr_in *him4 = (struct sockaddr_in*)&addr;
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+             him4->sin_family = AF_INET;
+ #else
+             him4->sin_family = AF_UNSPEC;
diff --git a/lang/openjdk7/patches/patch-bh b/lang/openjdk7/patches/patch-bh
new file mode 100644
index 00000000000..5e548964b48
--- /dev/null
+++ b/lang/openjdk7/patches/patch-bh
@@ -0,0 +1,14 @@
+$NetBSD: patch-bh,v 1.1 2009/10/18 10:21:01 tnn Exp $
+
+--- hotspot/make/defs.make.orig	2009-10-17 16:49:37.000000000 +0200
++++ hotspot/make/defs.make
+@@ -125,6 +125,9 @@ ifeq ($(OS),)
+   ifeq ($(OS), Darwin)
+     OS=bsd
+   endif
++  ifeq ($(OS), DragonFly)
++    OS=bsd
++  endif
+   HOST := $(shell uname -n)
+ endif
+ 
diff --git a/lang/openjdk7/patches/patch-bi b/lang/openjdk7/patches/patch-bi
new file mode 100644
index 00000000000..1d7b94af6bd
--- /dev/null
+++ b/lang/openjdk7/patches/patch-bi
@@ -0,0 +1,13 @@
+$NetBSD: patch-bi,v 1.1 2009/10/18 10:21:01 tnn Exp $
+
+--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig	2009-10-17 16:49:37.000000000 +0200
++++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
+@@ -60,7 +60,7 @@
+ #define SPELL_REG_FP "ebp"
+ #endif // AMD64
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ # define context_trapno uc_mcontext.mc_trapno
+ # ifdef AMD64
+ #  define context_pc uc_mcontext.mc_rip
diff --git a/lang/openjdk7/patches/patch-bj b/lang/openjdk7/patches/patch-bj
new file mode 100644
index 00000000000..6681f060e91
--- /dev/null
+++ b/lang/openjdk7/patches/patch-bj
@@ -0,0 +1,14 @@
+$NetBSD: patch-bj,v 1.1 2009/10/18 10:21:01 tnn Exp $
+
+--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig	2009-10-17 16:49:37.000000000 +0200
++++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
+@@ -243,6 +243,9 @@ inline int g_isnan(float  f) { return is
+ inline int g_isnan(double f) { return isnand(f); }
+ #elif defined(__APPLE__)
+ inline int g_isnan(double f) { return isnan(f); }
++#elif defined(__DragonFly__)
++inline int g_isnan(float  f) { return __isnanf(f); }
++inline int g_isnan(double f) { return __isnand(f); }
+ #elif defined(LINUX) || defined(_ALLBSD_SOURCE)
+ inline int g_isnan(float  f) { return isnanf(f); }
+ inline int g_isnan(double f) { return isnan(f); }
diff --git a/lang/openjdk7/patches/patch-bk b/lang/openjdk7/patches/patch-bk
new file mode 100644
index 00000000000..07e1b21c3dc
--- /dev/null
+++ b/lang/openjdk7/patches/patch-bk
@@ -0,0 +1,13 @@
+$NetBSD: patch-bk,v 1.1 2009/10/18 10:21:01 tnn Exp $
+
+--- jdk/make/java/npt/Makefile.orig	2009-10-17 16:49:37.000000000 +0200
++++ jdk/make/java/npt/Makefile
+@@ -70,7 +70,7 @@ ifeq ($(PLATFORM), bsd)
+   ifeq ($(OS_VENDOR), Apple)
+     OTHER_LDLIBS += -liconv
+   else
+-    ifneq ($(OS_NAME), netbsd)
++    ifeq ($(OS_NAME), freebsd)
+       CPPFLAGS += -I$(PACKAGE_PATH)/include
+       OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
+     endif
diff --git a/lang/openjdk7/patches/patch-bl b/lang/openjdk7/patches/patch-bl
new file mode 100644
index 00000000000..1db6524cf93
--- /dev/null
+++ b/lang/openjdk7/patches/patch-bl
@@ -0,0 +1,13 @@
+$NetBSD: patch-bl,v 1.1 2009/10/18 10:21:01 tnn Exp $
+
+--- jdk/make/java/instrument/Makefile.orig	2009-10-17 16:49:37.000000000 +0200
++++ jdk/make/java/instrument/Makefile
+@@ -111,7 +111,7 @@ ifeq ($(PLATFORM), bsd)
+     LDFLAGS += -Wl,--whole-archive
+     LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
+     LDFLAGS += -Wl,--no-whole-archive
+-    ifneq ($(OS_NAME), netbsd)
++    ifeq ($(OS_NAME), freebsd)
+ # Use CPPFLAGS instead of OTHER_INCLUDES to force this last
+       CPPFLAGS += -I$(PACKAGE_PATH)/include
+       OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
diff --git a/lang/openjdk7/patches/patch-bm b/lang/openjdk7/patches/patch-bm
new file mode 100644
index 00000000000..d50c5114a59
--- /dev/null
+++ b/lang/openjdk7/patches/patch-bm
@@ -0,0 +1,13 @@
+$NetBSD: patch-bm,v 1.1 2009/10/18 10:21:01 tnn Exp $
+
+--- jdk/make/sun/splashscreen/Makefile.orig	2009-10-17 16:49:37.000000000 +0200
++++ jdk/make/sun/splashscreen/Makefile
+@@ -76,7 +76,7 @@ ifneq ($(PLATFORM), windows)
+     ifeq ($(OS_VENDOR), Apple)
+       OTHER_LDLIBS += -liconv
+     else
+-      ifneq ($(OS_NAME), netbsd)
++      ifeq ($(OS_NAME), freebsd)
+         CPPFLAGS += -I$(PACKAGE_PATH)/include
+         OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
+       else