Changes 1.40.0:

* Build System improvements.
* Updated Libraries: Accumulators, Asio, Circular Buffer, Foreach, Function,
  Fusion, Hash, Interprocess, Intrusive, MPL, Program.Options, Proto, Random,
  Serialization, Unordered, Xpressive.

Changes 1.39.0:
* New Libraries: Signals2.
* Updated Libraries: Asio, Flyweight, Foreach, Hash, Interprocess, Intrusive,
  Program.Options, Proto, PtrContainer, Range, Unordered, Xpressive.
* Updated Tools: Boostbook, Quickbook.

6 files changed, 29 insertions, 61 deletions

diff --git a/meta-pkgs/boost/Makefile.common b/meta-pkgs/boost/Makefile.common
index e31cbe00369..6b6c3c37fb2 100644
--- a/meta-pkgs/boost/Makefile.common
+++ b/meta-pkgs/boost/Makefile.common
@@ -1,17 +1,14 @@
-# $NetBSD: Makefile.common,v 1.18 2009/08/21 14:54:30 adam Exp $
-#
+# $NetBSD: Makefile.common,v 1.19 2009/10/14 06:40:08 adam Exp $
 
 BOOST_PACKAGE?=		undefined
 BOOST_COMMENT?=		undefined
 
-BOOST_VERSION=		1.38.0
+BOOST_VERSION=		1.40.0
 BOOST_SHORT_VERSION=	${BOOST_VERSION:S/./_/:C/\..*$//}
 
 DISTNAME=		boost_${BOOST_VERSION:S/./_/g}
 CATEGORIES=		devel
 
-PKGREVISION=		2
-
 .if ${BOOST_PACKAGE} == "meta-pkg"
 
 PKGNAME=		boost-${BOOST_VERSION}
@@ -48,14 +45,14 @@ SUBST_VARS.fix-prefix=		PREFIX
 # Prevent using a pkgsrc libtool in OS X because the darwin toolset needs
 # the native libtool from /usr/bin.
 post-wrapper:
-	@ln -s /usr/bin/libtool ${WRAPPER_BINDIR}/libtool
+	ln -s /usr/bin/libtool ${WRAPPER_BINDIR}/libtool
 .endif
 
 # We can't do this at post-extract because the extract cookie will get a
 # future timestamp than the sources.  If this happens, print-PLIST does
 # not work.
 pre-configure:
-	@cd ${WRKSRC} && ${FIND} . -type f -print | ${XARGS} ${TOUCH}
+	cd ${WRKSRC} && ${FIND} . -type f -print | ${XARGS} ${TOUCH}
 
 # Generate a new user.hpp or use the installed one, depending on the
 # package we are building.
@@ -67,7 +64,7 @@ do-configure:
 	    ${WRKSRC}/boost/config/user.hpp
 .elif ${BOOST_CONFIG} == "generate"
 do-configure:
-	@cd ${WRKSRC}/libs/config && \
+	cd ${WRKSRC}/libs/config && \
 	    ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure
 	${CP} -f ${WRKSRC}/libs/config/user.hpp ${WRKSRC}/boost/config/user.hpp
 .endif
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo
index 3827af36619..84416b9ee8b 100644
--- a/meta-pkgs/boost/distinfo
+++ b/meta-pkgs/boost/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.21 2009/09/20 10:29:07 tnn Exp $
+$NetBSD: distinfo,v 1.22 2009/10/14 06:40:08 adam 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) = 0d93720118b04ccf2fd5f0446bb14439572896d1
+SHA1 (boost_1_40_0.tar.bz2) = 9dbaa06ce1d99ce310011c2eaf816ecb003b3096
+RMD160 (boost_1_40_0.tar.bz2) = dabcc7442b73048095aa3037917ea0713782781f
+Size (boost_1_40_0.tar.bz2) = 32068759 bytes
+SHA1 (patch-aa) = 5a38ee7ad5f16a823d8bb81a95734e7957c55f2d
 SHA1 (patch-ab) = 2fa89ce671e5fb0dca160a820524cff2d1ec8927
-SHA1 (patch-ac) = bfd4ccd3c745787b24779480a5aac38e122a0647
-SHA1 (patch-ad) = 2f7128b851950a5e68340ef05f6994bb88a895b7
+SHA1 (patch-ac) = 12304069d394b56bb6294701ff30fe811a91abed
 SHA1 (patch-af) = ef9a9363420f519c45baaf98badff4c885a7595c
-SHA1 (patch-aq) = ac325bfa0def93fac36aa1b72b269306fe0a262e
+SHA1 (patch-aq) = 6078cb5ac979c339a787e48cfe949e76613987e7
diff --git a/meta-pkgs/boost/patches/patch-aa b/meta-pkgs/boost/patches/patch-aa
index 2739b5471da..0fd2eec18bd 100644
--- a/meta-pkgs/boost/patches/patch-aa
+++ b/meta-pkgs/boost/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2009/09/20 10:29:07 tnn Exp $
+$NetBSD: patch-aa,v 1.7 2009/10/14 06:40:08 adam Exp $
 
---- Jamroot.orig
+--- Jamroot.orig	2009-08-23 18:17:37.000000000 +0200
 +++ Jamroot
-@@ -253,6 +255,10 @@
+@@ -251,6 +251,10 @@ rule libraries-to-install ( existing-lib
         ECHO "error: both --with-<library> and --without-<library> specified" ;
         EXIT ;
     }
@@ -13,11 +13,11 @@ $NetBSD: patch-aa,v 1.6 2009/09/20 10:29:07 tnn Exp $
  
     local wrong = [ set.difference $(with-parameter) : $(existing-libraries) ] ;
     if $(wrong)
-@@ -398,6 +404,7 @@
-     :   <location>$(stage-locate)/lib
-         <install-dependencies>on <install-type>LIB 
-         <install-no-version-symlinks>on
-+	<dll-path>@PREFIX@/lib
+@@ -439,6 +443,7 @@ install stage-proper
+     : <location>$(stage-locate)/lib
+       <install-dependencies>on <install-type>LIB
+       <install-no-version-symlinks>on
++      <dll-path>@PREFIX@/lib
      ;
  explicit stage-proper ;
  
diff --git a/meta-pkgs/boost/patches/patch-ac b/meta-pkgs/boost/patches/patch-ac
index cd2ac96cc73..4a57191c7aa 100644
--- a/meta-pkgs/boost/patches/patch-ac
+++ b/meta-pkgs/boost/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2009/08/21 14:54:30 adam Exp $
+$NetBSD: patch-ac,v 1.5 2009/10/14 06:40:08 adam Exp $
 
---- boost/config/suffix.hpp.orig	2009-08-20 19:36:39.000000000 +0200
+--- boost/config/suffix.hpp.orig	2009-06-06 15:48:57.000000000 +0200
 +++ boost/config/suffix.hpp
-@@ -224,7 +224,7 @@
+@@ -226,7 +226,7 @@
  //
  #if (defined(__MT__) || defined(_MT) || defined(_REENTRANT) \
      || defined(_PTHREADS) || defined(__APPLE__) || defined(__DragonFly__)) \
diff --git a/meta-pkgs/boost/patches/patch-ad b/meta-pkgs/boost/patches/patch-ad
deleted file mode 100644
index 494aa613fac..00000000000
--- a/meta-pkgs/boost/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2009/08/21 15:12:19 jdc Exp $
-
---- boost/detail/sp_counted_base.hpp.dist	2009-08-19 14:52:25.000000000 +0000
-+++ boost/detail/sp_counted_base.hpp	2009-08-20 10:13:01.000000000 +0000
-@@ -46,7 +46,7 @@
- #elif defined( __GNUC__ ) && ( defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc ) )
- # include <boost/detail/sp_counted_base_gcc_ppc.hpp>
- 
--#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ ) && !defined( __hppa ) && ( !defined( __INTEL_COMPILER ) || defined( __ia64__ ) )
-+#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ ) && !defined( __hppa ) && ( !defined( __INTEL_COMPILER ) || defined( __ia64__ ) ) && !defined( __sparc__ )
- # include <boost/detail/sp_counted_base_sync.hpp>
- 
- #elif defined(__GNUC__) && ( defined( __sparcv9 ) || ( defined( __sparcv8 ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 ) ) )
diff --git a/meta-pkgs/boost/patches/patch-aq b/meta-pkgs/boost/patches/patch-aq
index 077f908c20e..2f87c377c51 100644
--- a/meta-pkgs/boost/patches/patch-aq
+++ b/meta-pkgs/boost/patches/patch-aq
@@ -1,11 +1,8 @@
-$NetBSD: patch-aq,v 1.4 2009/03/13 07:48:57 hasso Exp $
+$NetBSD: patch-aq,v 1.5 2009/10/14 06:40:08 adam 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
+--- boost/test/impl/execution_monitor.ipp.orig	2009-07-04 08:36:59.000000000 +0200
++++ boost/test/impl/execution_monitor.ipp
+@@ -178,7 +178,8 @@ namespace { void _set_se_translator( voi
  #  if defined(SIGPOLL) && !defined(__CYGWIN__)                              && \
        !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__))  && \
        !defined(__NetBSD__)                                                  && \
@@ -15,7 +12,7 @@ be fixed in DragonFly really.
  #    define BOOST_TEST_CATCH_SIGPOLL
  #  endif
  
-@@ -261,6 +262,7 @@ system_signal_exception::report() const
+@@ -290,6 +291,7 @@ system_signal_exception::report() const
      if( !m_sig_info )
          return; // no error actually occur?
  
@@ -23,7 +20,7 @@ be fixed in DragonFly really.
      switch( m_sig_info->si_code ) {
      case SI_USER:
          report_error( execution_exception::system_error,
-@@ -502,6 +504,7 @@ system_signal_exception::report() const
+@@ -571,6 +573,7 @@ system_signal_exception::report() const
      default:
          report_error( execution_exception::system_error, "unrecognized signal" );
      }
@@ -31,15 +28,3 @@ be fixed in DragonFly really.
  }
  
  //____________________________________________________________________________//
-@@ -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