Changes 1.47.0:

New Libraries
* Chrono: Useful time utilities
* Geometry: Geometry Library
* Phoenix: Define small unnamed function objects at the actual call site, and
  more
* Ratio: Compile time rational arithmetic
More: http://www.boost.org/users/history/version_1_47_0.html

6 files changed, 40 insertions, 69 deletions

diff --git a/meta-pkgs/boost/Makefile.common b/meta-pkgs/boost/Makefile.common
index c4f06711fec..e5db8b4d8fe 100644
--- a/meta-pkgs/boost/Makefile.common
+++ b/meta-pkgs/boost/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2011/09/22 12:53:29 adam Exp $
+# $NetBSD: Makefile.common,v 1.30 2011/10/11 10:02:08 adam Exp $
 #
 # used by devel/boost-build/Makefile
 # used by devel/boost-docs/Makefile
@@ -9,28 +9,24 @@
 
 BOOST_PACKAGE?=		undefined
 BOOST_COMMENT?=		undefined
-
-BOOST_VERSION=		1.46.1
+BOOST_VERSION=		1.47.0
 BOOST_SHORT_VERSION=	${BOOST_VERSION:S/./_/:C/\..*$//}
 
 DISTNAME=		boost_${BOOST_VERSION:S/./_/g}
 CATEGORIES=		devel
 
 .if ${BOOST_PACKAGE} == "meta-pkg"
-
-PKGNAME=		boost-${BOOST_VERSION}
-
+PKGNAME=	boost-${BOOST_VERSION}
 .else # ${BOOST_PACKAGE} != "meta-pkg"
+PKGNAME=	boost-${BOOST_PACKAGE}-${BOOST_VERSION}
 
-PKGNAME=		boost-${BOOST_PACKAGE}-${BOOST_VERSION}
-
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=boost/}
-EXTRACT_SUFX=		.tar.bz2
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=boost/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		jmmv@NetBSD.org
-HOMEPAGE=		http://www.boost.org/
-COMMENT=		Free, peer-reviewed portable C++ source libraries ${BOOST_COMMENT}
-LICENSE=		boost-license
+MAINTAINER=	jmmv@NetBSD.org
+HOMEPAGE=	http://www.boost.org/
+COMMENT=	Free, peer-reviewed portable C++ source libraries ${BOOST_COMMENT}
+LICENSE=	boost-license
 
 CONFLICTS+=		boost<1.36.0
 
@@ -46,7 +42,7 @@ PLIST_SUBST+=		BOOST_VERSION="${BOOST_VERSION}"
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-configure
 SUBST_MESSAGE.prefix=	Fixing prefix.
-SUBST_FILES.prefix=	Jamroot
+SUBST_FILES.prefix=	boostcpp.jam
 SUBST_VARS.prefix=	PREFIX
 
 SUBST_CLASSES+=		darwin
@@ -68,14 +64,13 @@ post-wrapper:
 .  endif
 .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.
+# 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}
 
-# Generate a new user.hpp or use the installed one, depending on the
-# package we are building.
+# Generate a new user.hpp or use the installed one, depending on the package
+# we are building.
 .if ${BOOST_CONFIG} == "installed"
 .  include "../../devel/boost-headers/buildlink3.mk"
 do-configure:
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo
index 919660e196d..19a07dc0625 100644
--- a/meta-pkgs/boost/distinfo
+++ b/meta-pkgs/boost/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.34 2011/10/02 21:23:50 sbd Exp $
+$NetBSD: distinfo,v 1.35 2011/10/11 10:02:08 adam Exp $
 
-SHA1 (boost_1_46_1.tar.bz2) = 3ca6e173ec805e5126868d8a03618e587aa26aef
-RMD160 (boost_1_46_1.tar.bz2) = bb43b39f7c4b683b80bafa3042b95e65a242d9c3
-Size (boost_1_46_1.tar.bz2) = 42001335 bytes
-SHA1 (patch-aa) = b42e255c8ad2138f226ec14633aedeb9b9a9fd32
+SHA1 (boost_1_47_0.tar.bz2) = 6e3eb548b9d955c0bc6f71c51042b713b678136a
+RMD160 (boost_1_47_0.tar.bz2) = 511144eb5ade340115971c372a3c849bd55181f1
+Size (boost_1_47_0.tar.bz2) = 45952657 bytes
+SHA1 (patch-aa) = 62bb260fce3bca6dd5f61dd9b179fd40593d31b4
 SHA1 (patch-ab) = f1c95ae229465a4d2da76ce6ff88d76ace52fdd8
 SHA1 (patch-ac) = 54d40e6a62cdf40c4155c64d9f02df475fbe111d
 SHA1 (patch-ad) = d36799e40e1f7e6f62768e1144859f22ce76a265
-SHA1 (patch-ae) = 0acb8eaa1b5096d86ef0cd1320363f9ae75b7090
-SHA1 (patch-ag) = badf96038d7ac5bc566c6ce685116e756d976b13
+SHA1 (patch-ae) = 2fb49c90bbb3fd797ccdfaaf44c93494a5988f52
+SHA1 (patch-ag) = b19bf29b0c08ede6470e0a697f99d4ea796ab987
 SHA1 (patch-ah) = c32b43bdbbe3cecc15ad56172083ee6ed926b45b
 SHA1 (patch-aq) = e5c7b72ffa2942ce401f3d9bf05498fd761df17a
 SHA1 (patch-ar) = 91981e2edb93666de78c203a6cef3d5011b2b26a
-SHA1 (patch-libs_config_test_boost__no__fenv__h.ipp) = 240d87c048c1e846a31a944e68d3d9b112f4600d
diff --git a/meta-pkgs/boost/patches/patch-aa b/meta-pkgs/boost/patches/patch-aa
index d4f01607ed4..679f057b02b 100644
--- a/meta-pkgs/boost/patches/patch-aa
+++ b/meta-pkgs/boost/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.8 2010/11/26 20:47:01 adam Exp $
+$NetBSD: patch-aa,v 1.9 2011/10/11 10:02:08 adam Exp $
 
---- Jamroot.orig	2010-11-17 09:51:56.000000000 +0000
-+++ Jamroot
-@@ -269,6 +269,10 @@ rule libraries-to-install ( existing-lib
+--- boostcpp.jam.orig	2011-06-06 20:39:27.000000000 +0000
++++ boostcpp.jam
+@@ -276,6 +276,7 @@ rule declare_install_and_stage_proper_ta
+       : <location>$(stage-locate)/lib
+         <install-dependencies>on <install-type>LIB
+         <install-no-version-symlinks>on
++        <dll-path>@PREFIX@/lib
+       ;
+     $(p).mark-target-as-explicit stage-proper ;
+ 
+@@ -529,6 +530,10 @@ rule libraries-to-install ( existing-lib
         ECHO "error: both --with-<library> and --without-<library> specified" ;
         EXIT ;
     }
@@ -13,11 +21,3 @@ $NetBSD: patch-aa,v 1.8 2010/11/26 20:47:01 adam Exp $
  
     local wrong = [ set.difference $(with-parameter) : $(existing-libraries) ] ;
     if $(wrong)
-@@ -464,6 +468,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-ae b/meta-pkgs/boost/patches/patch-ae
index b5f416ab360..922566006b3 100644
--- a/meta-pkgs/boost/patches/patch-ae
+++ b/meta-pkgs/boost/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.6 2011/02/24 11:05:36 adam Exp $
+$NetBSD: patch-ae,v 1.7 2011/10/11 10:02:08 adam Exp $
 
 Pass CFLAGS to the compiler.
 
---- tools/build/v2/engine/src/build.sh.orig	2011-02-24 08:42:55.000000000 +0000
-+++ tools/build/v2/engine/src/build.sh
+--- tools/build/v2/engine/build.sh.orig	2011-02-24 08:42:55.000000000 +0000
++++ tools/build/v2/engine/build.sh
 @@ -237,6 +237,7 @@ case $BOOST_JAM_TOOLSET in
      error_exit "Unknown toolset: $BOOST_JAM_TOOLSET"
      ;;
diff --git a/meta-pkgs/boost/patches/patch-ag b/meta-pkgs/boost/patches/patch-ag
index b6aa5e2ff79..1d8a7b10418 100644
--- a/meta-pkgs/boost/patches/patch-ag
+++ b/meta-pkgs/boost/patches/patch-ag
@@ -1,9 +1,9 @@
-$NetBSD: patch-ag,v 1.5 2011/02/24 11:05:36 adam Exp $
+$NetBSD: patch-ag,v 1.6 2011/10/11 10:02:08 adam Exp $
 
 Pass CFLAGS to the compiler.
 
---- tools/build/v2/engine/src/build.jam.orig	2011-02-24 08:50:34.000000000 +0000
-+++ tools/build/v2/engine/src/build.jam
+--- tools/build/v2/engine/build.jam.orig	2011-02-24 08:50:34.000000000 +0000
++++ tools/build/v2/engine/build.jam
 @@ -195,7 +195,7 @@ toolset como como : "-o " : -D
      : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
  ## Clang Linux 2.8+
diff --git a/meta-pkgs/boost/patches/patch-libs_config_test_boost__no__fenv__h.ipp b/meta-pkgs/boost/patches/patch-libs_config_test_boost__no__fenv__h.ipp
deleted file mode 100644
index b63cb849b7f..00000000000
--- a/meta-pkgs/boost/patches/patch-libs_config_test_boost__no__fenv__h.ipp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-libs_config_test_boost__no__fenv__h.ipp,v 1.1 2011/10/02 10:20:28 sbd Exp $
-
-The fenv.h test normaly fails with:
-./../../libs/config/test/boost_no_fenv_h.ipp: In function 'int boost_no_fenv_h::test()':
-./../../libs/config/test/boost_no_fenv_h.ipp:67:49: error: invalid conversion from 'int (*)()throw ()' to 'int (*)(fexcept_t*, int)'
-
-This causes BOOST_NO_FENV_H to be set (breaking boost-libs).
-
---- libs/config/test/boost_no_fenv_h.ipp.orig	2010-12-31 17:08:07.000000000 +0000
-+++ libs/config/test/boost_no_fenv_h.ipp
-@@ -61,7 +61,11 @@ int test()
- 
-   int (*has_feclearexcept)(int) = ::feclearexcept;
-   int (*has_fegetenv)(fenv_t*) = ::fegetenv;
--  int (*has_fegetexcept)(fexcept_t*, int) = ::fegetexcept;
-+  #ifdef __linux__
-+    int (*has_fegetexcept)(void) = ::fegetexcept;
-+  #else
-+    int (*has_fegetexcept)(fexcept_t*, int) = ::fegetexcept;
-+  #endif
-   int (*has_fegetround)(void) = ::fegetround;
-   int (*has_feholdexcept)(fenv_t*) = ::feholdexcept;
-   int (*has_feraiseexcept)(int) = ::feraiseexcept;