Restore some patches removed during last package update to make it compile

again on DragonFly. patch-af is probably merge error from upstream,
patch-aq is a temporary workaround and not for inclusion to upstream as
such.

3 files changed, 61 insertions, 1 deletions

diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo
index 71ae6f63133..189921bb1d5 100644
--- a/meta-pkgs/boost/distinfo
+++ b/meta-pkgs/boost/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.17 2009/03/03 08:57:58 jmmv Exp $
+$NetBSD: distinfo,v 1.18 2009/03/13 07:48:57 hasso Exp $
 
 SHA1 (boost_1_38_0.tar.bz2) = b32ff8133b0a38a74553c0d33cb1d70b3ce2d8f1
 RMD160 (boost_1_38_0.tar.bz2) = 1d7eb126151e4363ecd5617082cd45674f1352be
 Size (boost_1_38_0.tar.bz2) = 29164877 bytes
 SHA1 (patch-aa) = 692a9ab89c72ef8ce87dedbe16632c12c6e1f032
+SHA1 (patch-af) = ef9a9363420f519c45baaf98badff4c885a7595c
+SHA1 (patch-aq) = ac325bfa0def93fac36aa1b72b269306fe0a262e
diff --git a/meta-pkgs/boost/patches/patch-af b/meta-pkgs/boost/patches/patch-af
new file mode 100644
index 00000000000..35e8566db05
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.5 2009/03/13 07:48:57 hasso Exp $
+
+--- boost/config/platform/bsd.hpp.orig	2009-03-12 09:41:50 +0200
++++ boost/config/platform/bsd.hpp	2009-03-12 15:37:16 +0200
+@@ -62,7 +62,7 @@
+ //
+ // The BSD <ctype.h> has macros only, no functions:
+ //
+-#if !defined(__OpenBSD__) || defined(__DragonFly__)
++#if !defined(__OpenBSD__) && !defined(__DragonFly__)
+ #  define BOOST_NO_CTYPE_FUNCTIONS
+ #endif
+ 
diff --git a/meta-pkgs/boost/patches/patch-aq b/meta-pkgs/boost/patches/patch-aq
new file mode 100644
index 00000000000..077f908c20e
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-aq
@@ -0,0 +1,45 @@
+$NetBSD: patch-aq,v 1.4 2009/03/13 07:48:57 hasso Exp $
+
+This is a only temporary workaround, not for inclusion into upstream and should
+be fixed in DragonFly really.
+
+--- boost/test/impl/execution_monitor.ipp.orig	2009-03-12 15:44:41 +0200
++++ boost/test/impl/execution_monitor.ipp	2009-03-12 19:39:10 +0200
+@@ -151,7 +151,8 @@ namespace { void _set_se_translator( voi
+ #  if defined(SIGPOLL) && !defined(__CYGWIN__)                              && \
+       !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__))  && \
+       !defined(__NetBSD__)                                                  && \
+-      !defined(__QNXNTO__)
++      !defined(__QNXNTO__)                                                  && \
++      !defined(__DragonFly__)
+ #    define BOOST_TEST_CATCH_SIGPOLL
+ #  endif
+ 
+@@ -261,6 +262,7 @@ system_signal_exception::report() const
+     if( !m_sig_info )
+         return; // no error actually occur?
+ 
++#if !defined(__DragonFly__)
+     switch( m_sig_info->si_code ) {
+     case SI_USER:
+         report_error( execution_exception::system_error,
+@@ -502,6 +504,7 @@ system_signal_exception::report() const
+     default:
+         report_error( execution_exception::system_error, "unrecognized signal" );
+     }
++#endif /* !__DragonFly__ */
+ }
+ 
+ //____________________________________________________________________________//
+@@ -695,7 +698,10 @@ extern "C" {
+ 
+ static bool ignore_sigchild( siginfo_t* info )
+ {
+-    return info->si_signo == SIGCHLD && info->si_code == CLD_EXITED 
++    return info->si_signo == SIGCHLD
++#ifndef __DragonFly__
++	    && info->si_code == CLD_EXITED 
++#endif
+ #ifdef BOOST_TEST_IGNORE_NON_ZERO_CHILD_CODE
+             ;
+ #else