Add DragonFly support.

(for patch-ad, NetBSD support is already in, reuse for DragonFly).

6 files changed, 57 insertions, 14 deletions

diff --git a/net/omniORB/distinfo b/net/omniORB/distinfo
index 6d6d94e38e0..dde842eac91 100644
--- a/net/omniORB/distinfo
+++ b/net/omniORB/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/09/01 15:52:58 drochner Exp $
+$NetBSD: distinfo,v 1.2 2011/01/01 05:43:28 obache Exp $
 
 SHA1 (omniORB-4.1.4.tar.gz) = 7150d999bcef10c6c3cb24725386497c3f338aa1
 RMD160 (omniORB-4.1.4.tar.gz) = b84131230c59b1cef8f714ff1545e44f6779ade1
 Size (omniORB-4.1.4.tar.gz) = 3093814 bytes
-SHA1 (patch-aa) = d89023f2d875f20ab44f2c72caccf1d89420eff2
-SHA1 (patch-ad) = ea3009b39fda6addf47a064f5df518135e44b789
-SHA1 (patch-ae) = 87bd20235c52417fedf8f2db6480d160e9a5ae38
+SHA1 (patch-aa) = 679f8f8da61c1e5106ae40067c7d8f5dcc1576d4
+SHA1 (patch-ab) = 4b20f8c5a4d34259d9a5810c7642a71822626c2c
+SHA1 (patch-ac) = 797e6fb2dba6b96a2f55008196f84c95101367ed
+SHA1 (patch-ad) = 8678d9e3aebafdd41cba62bb980e89c020feab80
+SHA1 (patch-ae) = 6249b22ce41528e42672f8159eb50dc01999256a
 SHA1 (patch-af) = feb5c3c52290181f6bcf990622fa7911e73127c8
diff --git a/net/omniORB/patches/patch-aa b/net/omniORB/patches/patch-aa
index 65a2aa3f9e6..083ef12f39d 100644
--- a/net/omniORB/patches/patch-aa
+++ b/net/omniORB/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/09/01 15:52:58 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2011/01/01 05:43:28 obache Exp $
 
---- bin/scripts/omkdirhier.orig	2004-02-11 21:36:28.000000000 +0600
+--- bin/scripts/omkdirhier.orig	2005-01-06 23:07:20.000000000 +0000
 +++ bin/scripts/omkdirhier
-@@ -81,7 +81,7 @@ do
+@@ -60,7 +60,7 @@ do
  				fi
  			done
  
diff --git a/net/omniORB/patches/patch-ab b/net/omniORB/patches/patch-ab
new file mode 100644
index 00000000000..a019778373f
--- /dev/null
+++ b/net/omniORB/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2011/01/01 05:43:28 obache Exp $
+
+--- configure.orig	2009-07-16 13:11:17.000000000 +0000
++++ configure
+@@ -13072,6 +13072,7 @@ case "$host" in
+   *-*-irix*)     plat_name="IRIX";     plat_def="__irix__";     os_v="6";;
+   *-*-aix*)      plat_name="AIX";      plat_def="__aix__";      os_v="4";;
+   *-*-darwin*)   plat_name="Darwin";   plat_def="__darwin__";   os_v="1";;
++  *-*-dragonfly*)plat_name="DragonFly";plat_def="__dragonfly__";os_v="2";;
+   *-*-freebsd3*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="3";;
+   *-*-freebsd4*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="4";;
+   *-*-freebsd5*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="5";;
diff --git a/net/omniORB/patches/patch-ac b/net/omniORB/patches/patch-ac
new file mode 100644
index 00000000000..1d07602de71
--- /dev/null
+++ b/net/omniORB/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2011/01/01 05:43:28 obache Exp $
+
+--- include/omniORB4/internal/SocketCollection.h.orig	2009-05-06 16:16:09.000000000 +0000
++++ include/omniORB4/internal/SocketCollection.h
+@@ -188,7 +188,7 @@
+ #   undef OMNI_IPV6_SOCKETS_ACCEPT_IPV4_CONNECTIONS
+ #endif
+ 
+-#if defined(__freebsd__) || defined(__netbsd__)
++#if defined(__freebsd__) || defined(__netbsd__) || defined(__dragonfly__)
+ #   undef OMNI_IPV6_SOCKETS_ACCEPT_IPV4_CONNECTIONS
+ #endif
+ 
diff --git a/net/omniORB/patches/patch-ad b/net/omniORB/patches/patch-ad
index fddf700b6d2..635f9a36cb0 100644
--- a/net/omniORB/patches/patch-ad
+++ b/net/omniORB/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.1.1.1 2010/09/01 15:52:58 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2011/01/01 05:43:28 obache Exp $
 
---- include/omnithread.h.orig	2004-07-02 02:11:21.000000000 +0700
+--- include/omnithread.h.orig	2009-05-06 16:16:17.000000000 +0000
 +++ include/omnithread.h
-@@ -151,6 +151,9 @@ class omni_thread;
+@@ -158,6 +158,9 @@ class omni_thread;
  #elif defined(__irix__)
  #include <omnithread/posix.h>
  
-+#elif defined(__netbsd__)
++#elif defined(__dragonfly__)
 +#include <omnithread/posix.h>
 +
  #elif defined(__freebsd__)
diff --git a/net/omniORB/patches/patch-ae b/net/omniORB/patches/patch-ae
index c824d9245ed..8faa66d3262 100644
--- a/net/omniORB/patches/patch-ae
+++ b/net/omniORB/patches/patch-ae
@@ -1,8 +1,24 @@
-$NetBSD: patch-ae,v 1.1.1.1 2010/09/01 15:52:58 drochner Exp $
+$NetBSD: patch-ae,v 1.2 2011/01/01 05:43:28 obache Exp $
 
---- mk/beforeauto.mk.in.orig	2007-05-11 12:17:21.000000000 +0200
+--- mk/beforeauto.mk.in.orig	2009-06-18 08:45:32.000000000 +0000
 +++ mk/beforeauto.mk.in
-@@ -1030,7 +1030,11 @@ endif
+@@ -1062,10 +1062,27 @@ OMNITHREAD_LIB += -pthread
+ endif
+ 
+ ###################
++ifdef DragonFly
++IMPORT_CPPFLAGS += -D__dragonfly__
++
++CLINKOPTIONS    = $(CDEBUGFLAGS) $(COPTIONS) -Wl,-rpath,$(INSTALLLIBDIR)
++CXXLINKOPTIONS  = $(CXXDEBUGFLAGS) $(CXXOPTIONS) -Wl,-rpath,$(INSTALLLIBDIR)
++SharedLibraryPlatformLinkFlagsTemplate = $(CXXLINKOPTIONS) -shared -Wl,-soname,$$soname
++
++OMNITHREAD_CPPFLAGS = -D_REENTRANT -D_THREAD_SAFE
++OMNITHREAD_POSIX_CPPFLAGS = -DUsePthread -DPthreadDraftVersion=10
++OMNITHREAD_LIB += -pthread
++endif
++
++###################
  ifdef NetBSD
  IMPORT_CPPFLAGS += -D__netbsd__