--- ./Makefile	2012-09-10 16:52:14.753732697 +0200
+++ ./Makefile	2012-09-10 17:32:01.204350862 +0200
@@ -6,9 +6,9 @@ 
 #
 
 PORTNAME=	boost-libs
-PORTREVISION=	1
+PORTREVISION=	2
+
 COMMENT=	Free portable C++ libraries (without Boost.Python)
-USE_BZIP2=	yes
 
 BUILD_DEPENDS+=	bjam:${PORTSDIR}/devel/boost-jam
 
@@ -23,6 +23,8 @@ 
 		serialization signals system thread unit_test_framework\
 		wave wserialization
 
+USE_BZIP2=	yes
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/boost-all/common.mk"
 .include "${PORTSDIR}/devel/boost-all/compiled.mk"
--- ./files/patch-boost-xpressive-traits-cpp_regex_traits.hpp	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-boost-xpressive-traits-cpp_regex_traits.hpp	2012-09-10 17:08:08.080854719 +0200
@@ -0,0 +1,28 @@ 
+--- boost/xpressive/traits/cpp_regex_traits.hpp.orig
++++ boost/xpressive/traits/cpp_regex_traits.hpp
+@@ -24,6 +24,7 @@
+ #include <boost/assert.hpp>
+ #include <boost/integer.hpp>
+ #include <boost/mpl/assert.hpp>
++#include <boost/static_assert.hpp>
+ #include <boost/detail/workaround.hpp>
+ #include <boost/type_traits/is_same.hpp>
+ #include <boost/xpressive/detail/detail_fwd.hpp>
+@@ -89,7 +90,7 @@ namespace detail
+     template<umaskex_t In, umaskex_t Out = highest_bit, bool Done = (0 == (Out & In))>
+     struct unused_mask
+     {
+-        BOOST_MPL_ASSERT_RELATION(1, !=, Out);
++        BOOST_STATIC_ASSERT(1 != Out);
+         BOOST_STATIC_CONSTANT(umaskex_t, value = (unused_mask<In, (Out >> 1)>::value));
+     };
+ 
+@@ -121,6 +122,8 @@ namespace detail
+     umaskex_t const std_ctype_reserved = 0x8000;
+     #elif defined(_CPPLIB_VER) && defined(BOOST_WINDOWS)
+     umaskex_t const std_ctype_reserved = 0x8200;
++    #elif defined(_LIBCPP_VERSION)
++    umaskex_t const std_ctype_reserved = 0x8000;
+     #else
+     umaskex_t const std_ctype_reserved = 0;
+     #endif
--- ./files/patch-libs-signals-src-named_slot_map.cpp	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-libs-signals-src-named_slot_map.cpp	2012-09-10 17:08:18.683921310 +0200
@@ -0,0 +1,20 @@ 
+--- libs/signals/src/named_slot_map.cpp.orig
++++ libs/signals/src/named_slot_map.cpp
+@@ -102,7 +102,7 @@ void named_slot_map::disconnect(const stored_group& name)
+       i->first.disconnect();
+       i = next;
+     }
+-    groups.erase(group);
++    groups.erase((const_group_iterator) group);
+   }
+ }
+ 
+@@ -125,7 +125,7 @@ void named_slot_map::remove_disconnected_slots()
+     }
+ 
+     // Clear out empty groups
+-    if (empty(g)) groups.erase(g++);
++    if (empty(g)) groups.erase((const_group_iterator) g++);
+     else ++g;
+   }
+ }
--- ./files/patch-libs-xpressive-doc-acknowledgements.qbk	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-libs-xpressive-doc-acknowledgements.qbk	2012-09-10 17:08:29.544828493 +0200
@@ -0,0 +1,12 @@ 
+--- libs/xpressive/doc/acknowledgements.qbk.orig
++++ libs/xpressive/doc/acknowledgements.qbk
+@@ -29,6 +29,9 @@ Xpressive's ternary search trie implementation is David's, as is the number
+ parser example in [^libs/xpressive/example/numbers.cpp] and the documentation
+ for symbol tables and attributes.
+ 
++Thanks to John Fletcher for helping track down a runtime assertion when using
++xpressive with Howard Hinnant's most excellent libc++.
++
+ Finally, I would like to thank [@http://boost.org/people/thomas_witt.html Thomas Witt]
+ for acting as xpressive's review manager.
+