Update boost to 1.38.0. Patches from Brook Milligan in private mail.

Lots of changes to list here.  As usual, some new libraries have been
added and there have been improvements all around.  Of special interest
is that we can now erase most of our local patches because they have
been imported upstream.

10 files changed, 34 insertions, 126 deletions

diff --git a/meta-pkgs/boost/Makefile.common b/meta-pkgs/boost/Makefile.common
index 194cf24d11d..b251b4bd6ca 100644
--- a/meta-pkgs/boost/Makefile.common
+++ b/meta-pkgs/boost/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.15 2008/09/13 16:14:13 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.16 2009/03/03 08:57:58 jmmv Exp $
 #
 
 BOOST_PACKAGE?=		undefined
 BOOST_COMMENT?=		undefined
 
-BOOST_VERSION=		1.36.0
+BOOST_VERSION=		1.38.0
 BOOST_SHORT_VERSION=	${BOOST_VERSION:S/./_/:C/\..*$//}
 
 DISTNAME=		boost_${BOOST_VERSION:S/./_/g}
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo
index 296c9ba55c6..71ae6f63133 100644
--- a/meta-pkgs/boost/distinfo
+++ b/meta-pkgs/boost/distinfo
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.16 2008/09/17 15:04:21 joerg Exp $
+$NetBSD: distinfo,v 1.17 2009/03/03 08:57:58 jmmv Exp $
 
-SHA1 (boost_1_36_0.tar.bz2) = b8f0f5d90b260aff995ef38fad4eee5e73d00810
-RMD160 (boost_1_36_0.tar.bz2) = 0ac38ee3c355c22fd5534bc806bf516890e5182d
-Size (boost_1_36_0.tar.bz2) = 28839275 bytes
-SHA1 (patch-ac) = 453d4107df03e96e66cbdbebceebdfcbed2710c1
-SHA1 (patch-ad) = cf9811e3ce56e0d32a63eeb86eaf520f730ab70f
-SHA1 (patch-af) = f0a1fc4b9884663fbe5b9613bc61837b8e6e6af1
-SHA1 (patch-ak) = 32785c636ccc9be479db2d40d170f95e77d4e291
-SHA1 (patch-am) = 1b49351c5172903956886959859f4fd97fdf060c
-SHA1 (patch-ap) = 41960933cc1b59b13a3346d31393b1ccd917e147
-SHA1 (patch-aq) = 490fdf23b2422c75b0cfd3e2035766f4530d2d33
+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
diff --git a/meta-pkgs/boost/options.mk b/meta-pkgs/boost/options.mk
new file mode 100644
index 00000000000..ce01b1cfa1a
--- /dev/null
+++ b/meta-pkgs/boost/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2009/03/03 08:57:58 jmmv Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.boost
+PKG_SUPPORTED_OPTIONS=	debug expat icu
+
+.include "../../mk/bsd.options.mk"
+
+.if ${BOOST_PACKAGE} == "libs"
+
+.if !empty(PKG_OPTIONS:Mexpat)
+MAKE_ENV+=		EXPAT_INCLUDE=${PREFIX}/include
+MAKE_ENV+=		EXPAT_LIBPATH=${PREFIX}/lib
+.  include "../../textproc/expat/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Micu)
+MAKE_ENV+=		ICU_PATH=${PREFIX}
+.  include "../../textproc/icu/buildlink3.mk"
+.endif
+
+.endif # ${BOOST_PACKAGE} == "libs"
diff --git a/meta-pkgs/boost/patches/patch-ap b/meta-pkgs/boost/patches/patch-aa
index 1fffe735ff4..73ab566a8c3 100644
--- a/meta-pkgs/boost/patches/patch-ap
+++ b/meta-pkgs/boost/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.1 2008/09/13 16:14:13 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2009/03/03 08:57:58 jmmv Exp $
 
---- Jamroot.orig	2008-07-22 06:27:10.000000000 -0600
-+++ Jamroot	2008-08-19 12:59:31.000000000 -0600
-@@ -241,6 +241,10 @@
+--- Jamroot.orig
++++ Jamroot
+@@ -253,6 +255,10 @@
         ECHO "error: both --with-<library> and --without-<library> specified" ;
         EXIT ;
     }
@@ -13,11 +13,11 @@ $NetBSD: patch-ap,v 1.1 2008/09/13 16:14:13 jmmv Exp $
  
     local wrong = [ set.difference $(with-parameter) : $(existing-libraries) ] ;
     if $(wrong)
-@@ -384,6 +388,7 @@
+@@ -398,6 +404,7 @@
      :   <location>$(stage-locate)/lib
          <install-dependencies>on <install-type>LIB 
          <install-no-version-symlinks>on
-+        <dll-path>@PREFIX@/lib
++	<dll-path>/usr/pkg/lib
      ;
  explicit stage-proper ;
  
diff --git a/meta-pkgs/boost/patches/patch-ac b/meta-pkgs/boost/patches/patch-ac
deleted file mode 100644
index 6c1a721f512..00000000000
--- a/meta-pkgs/boost/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/08/12 20:58:45 jmmv Exp $
-
---- libs/regex/src/wide_posix_api.cpp.orig	2005-03-30 13:38:51.000000000 +0200
-+++ libs/regex/src/wide_posix_api.cpp
-@@ -29,7 +29,7 @@
- #include <cstring>
- #include <cstdio>
- 
--#if defined(BOOST_NO_STDC_NAMESPACE)
-+#if defined(BOOST_NO_STDC_NAMESPACE) || defined(__NetBSD__)
- namespace std{
- #  ifndef BOOST_NO_SWPRINTF
-       using ::swprintf;
diff --git a/meta-pkgs/boost/patches/patch-ad b/meta-pkgs/boost/patches/patch-ad
deleted file mode 100644
index 27fc16ab616..00000000000
--- a/meta-pkgs/boost/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2008/09/13 16:14:13 jmmv Exp $
-
---- boost/config/suffix.hpp.orig	2008-07-15 04:41:52.000000000 -0600
-+++ boost/config/suffix.hpp
-@@ -215,7 +215,7 @@
- // from here then add to the appropriate compiler section):
- //
- #if (defined(__MT__) || defined(_MT) || defined(_REENTRANT) \
--    || defined(_PTHREADS)) && !defined(BOOST_HAS_THREADS)
-+    || defined(_PTHREADS) || defined(__APPLE__) || defined(__DragonFly__)) && !defined(BOOST_HAS_THREADS)
- #  define BOOST_HAS_THREADS
- #endif
- 
diff --git a/meta-pkgs/boost/patches/patch-af b/meta-pkgs/boost/patches/patch-af
deleted file mode 100644
index 288719240bd..00000000000
--- a/meta-pkgs/boost/patches/patch-af
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-af,v 1.3 2008/01/04 19:58:42 jmmv Exp $
-
---- boost/config/platform/bsd.hpp.orig	2006-02-16 12:05:44.000000000 +0100
-+++ boost/config/platform/bsd.hpp
-@@ -36,20 +36,20 @@
- // FreeBSD 3.x has pthreads support, but defines _POSIX_THREADS in <pthread.h>
- // and not in <unistd.h>
- //
--#if (defined(__FreeBSD__) && (__FreeBSD__ <= 3)) || defined(__OpenBSD__)
-+#if (defined(__FreeBSD__) && (__FreeBSD__ <= 3)) || defined(__OpenBSD__) || defined(__DragonFly__)
- #  define BOOST_HAS_PTHREADS
- #endif
- 
- //
- // No wide character support in the BSD header files:
- //
--#if !(defined(__FreeBSD__) && (__FreeBSD__ >= 5))
-+#if !(defined(__FreeBSD__) && (__FreeBSD__ >= 5)) && !defined(__DragonFly__)
- #  define BOOST_NO_CWCHAR
- #endif
- //
- // The BSD <ctype.h> has macros only, no functions:
- //
--#if !defined(__OpenBSD__)
-+#if !defined(__OpenBSD__) && !defined(__DragonFly__)
- #  define BOOST_NO_CTYPE_FUNCTIONS
- #endif
- 
diff --git a/meta-pkgs/boost/patches/patch-ak b/meta-pkgs/boost/patches/patch-ak
deleted file mode 100644
index 046a7c96f48..00000000000
--- a/meta-pkgs/boost/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2008/01/04 19:58:42 jmmv Exp $
-
---- boost/wave/token_ids.hpp.orig	2006-12-20 17:38:24.000000000 +0100
-+++ boost/wave/token_ids.hpp
-@@ -27,7 +27,7 @@
- #if !defined(BOOST_WAVE_TOKEN_IDS_DEFINED)
- #define BOOST_WAVE_TOKEN_IDS_DEFINED
- 
--#if defined (__FreeBSD__) && defined (T_DIVIDE)
-+#if (defined (__FreeBSD__) || defined (__DragonFly__)) && defined (T_DIVIDE)
- #undef T_DIVIDE
- #endif
- 
diff --git a/meta-pkgs/boost/patches/patch-am b/meta-pkgs/boost/patches/patch-am
deleted file mode 100644
index 25b4a26e38e..00000000000
--- a/meta-pkgs/boost/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 2008/09/13 16:14:13 jmmv Exp $
-
---- tools/build/v2/tools/python.jam.orig	2008-07-15 09:53:41.000000000 -0400
-+++ tools/build/v2/tools/python.jam
-@@ -649,6 +649,8 @@ local rule system-library-dependencies (
-         case darwin : return ;
-         case windows : return ;
- 
-+        case *bsd : return  <library>pthread <toolset>gcc:<library>util ;
-+
-         case hpux : return  <library>rt ;
- 
-         case aix : return  <library>pthread <library>dl ;
diff --git a/meta-pkgs/boost/patches/patch-aq b/meta-pkgs/boost/patches/patch-aq
deleted file mode 100644
index 6cbd9f55d92..00000000000
--- a/meta-pkgs/boost/patches/patch-aq
+++ /dev/null
@@ -1,27 +0,0 @@
---- boost/test/impl/execution_monitor.ipp.orig	2008-09-15 04:30:57 +0300
-+++ boost/test/impl/execution_monitor.ipp	2008-09-16 09:35:04 +0300
-@@ -139,7 +139,7 @@ namespace { void _set_se_translator( voi
- #   define BOOST_TEST_USE_ALT_STACK
- #  endif
- 
--#  if !defined(__CYGWIN__) && !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__))
-+#  if !defined(__CYGWIN__) && !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)) && !defined(__NetBSD__) && !defined(__DragonFly__)
- #    define BOOST_TEST_CATCH_SIGPOLL
- #  endif
- 
-@@ -249,6 +249,7 @@ system_signal_exception::report() const
-     if( !m_sig_info )
-         return; // no error actually occur?
- 
-+#if !defined(__DragonFly__)
-     if( m_sig_info->si_code <= 0 ) {
-         switch( m_sig_info->si_code ) {
-         case SI_USER:
-@@ -489,6 +490,7 @@ system_signal_exception::report() const
-             report_error( execution_exception::system_error, "unrecognized signal" );
-         }
-     }
-+#endif /* !__DragonFly__ */
- }
- 
- //____________________________________________________________________________//