Index: files/patch-tools-build-src-engine-build.sh.diff
===================================================================
--- files/patch-tools-build-src-engine-build.sh.diff	(revision 151566)
+++ files/patch-tools-build-src-engine-build.sh.diff	(working copy)
@@ -1,6 +1,6 @@
---- tools/build/src/engine/build.sh.orig	2014-06-19 12:15:38.000000000 -0500
-+++ tools/build/src/engine/build.sh	2014-08-14 07:43:48.000000000 -0500
-@@ -134,7 +134,7 @@
+--- tools/build/src/engine/build.sh.orig
++++ tools/build/src/engine/build.sh
+@@ -142,7 +142,7 @@
      ;;
  
      darwin)
Index: files/patch-export_serialization_explicit_template_instantiations.diff
===================================================================
--- files/patch-export_serialization_explicit_template_instantiations.diff	(revision 151566)
+++ files/patch-export_serialization_explicit_template_instantiations.diff	(working copy)
@@ -96,7 +96,7 @@
  
 --- libs/serialization/src/binary_iarchive.cpp.orig
 +++ libs/serialization/src/binary_iarchive.cpp
-@@ -8,10 +8,14 @@
+@@ -8,11 +8,15 @@
  
  //  See http://www.boost.org for updates, documentation, and revision history.
  
@@ -105,13 +105,14 @@
 +#pragma GCC visibility pop
  
  #define BOOST_ARCHIVE_SOURCE
+ #include <boost/serialization/config.hpp>
 +#pragma GCC visibility push(default)
  #include <boost/archive/binary_iarchive.hpp>
 +#pragma GCC visibility pop
  #include <boost/archive/detail/archive_serializer_map.hpp>
  
  #include <boost/archive/impl/archive_serializer_map.ipp>
-@@ -22,14 +26,14 @@
+@@ -23,14 +27,14 @@
  namespace archive {
  
  // explicitly instantiate for this type of stream
@@ -132,7 +133,7 @@
      std::istream::traits_type
 --- libs/serialization/src/binary_oarchive.cpp.orig
 +++ libs/serialization/src/binary_oarchive.cpp
-@@ -8,10 +8,14 @@
+@@ -8,11 +8,15 @@
  
  //  See http://www.boost.org for updates, documentation, and revision history.
  
@@ -141,13 +142,14 @@
 +#pragma GCC visibility pop
  
  #define BOOST_ARCHIVE_SOURCE
+ #include <boost/serialization/config.hpp>
 +#pragma GCC visibility push(default)
  #include <boost/archive/binary_oarchive.hpp>
 +#pragma GCC visibility pop
  #include <boost/archive/detail/archive_serializer_map.hpp>
  
  // explicitly instantiate for this type of binary stream
-@@ -22,14 +26,14 @@
+@@ -23,14 +27,14 @@
  namespace boost {
  namespace archive {
  
@@ -268,17 +270,17 @@
  } // archive
 --- libs/serialization/src/text_iarchive.cpp.orig
 +++ libs/serialization/src/text_iarchive.cpp
-@@ -13,7 +13,9 @@
- #endif
+@@ -14,7 +14,9 @@
  
  #define BOOST_ARCHIVE_SOURCE
+ #include <boost/serialization/config.hpp>
 +#pragma GCC visibility push(default)
  #include <boost/archive/text_iarchive.hpp>
 +#pragma GCC visibility pop
  #include <boost/archive/detail/archive_serializer_map.hpp>
  
  // explicitly instantiate for this type of text stream
-@@ -24,9 +26,9 @@
+@@ -25,9 +27,9 @@
  namespace boost {
  namespace archive {
  
@@ -293,17 +295,17 @@
  } // namespace boost
 --- libs/serialization/src/text_oarchive.cpp.orig
 +++ libs/serialization/src/text_oarchive.cpp
-@@ -13,7 +13,9 @@
- #endif
+@@ -14,7 +14,9 @@
  
  #define BOOST_ARCHIVE_SOURCE
+ #include <boost/serialization/config.hpp>
 +#pragma GCC visibility push(default)
  #include <boost/archive/text_oarchive.hpp>
 +#pragma GCC visibility pop
  #include <boost/archive/detail/archive_serializer_map.hpp>
  
  // explicitly instantiate for this type of text stream
-@@ -25,9 +27,9 @@
+@@ -26,9 +28,9 @@
  namespace archive {
  
  //template class basic_text_oprimitive<std::ostream> ;
@@ -318,17 +320,17 @@
  } // namespace boost
 --- libs/serialization/src/text_wiarchive.cpp.orig
 +++ libs/serialization/src/text_wiarchive.cpp
-@@ -15,7 +15,9 @@
- #else
+@@ -16,7 +16,9 @@
  
  #define BOOST_WARCHIVE_SOURCE
+ #include <boost/serialization/config.hpp>
 +#pragma GCC visibility push(default)
  #include <boost/archive/text_wiarchive.hpp>
 +#pragma GCC visibility pop
  #include <boost/archive/detail/archive_serializer_map.hpp>
  
  // explicitly instantiate for this type of text stream
-@@ -26,9 +28,9 @@
+@@ -27,9 +29,9 @@
  namespace boost {
  namespace archive {
  
@@ -343,17 +345,17 @@
  } // namespace boost
 --- libs/serialization/src/text_woarchive.cpp.orig
 +++ libs/serialization/src/text_woarchive.cpp
-@@ -14,7 +14,9 @@
- #else
+@@ -15,7 +15,9 @@
  
  #define BOOST_WARCHIVE_SOURCE
+ #include <boost/serialization/config.hpp>
 +#pragma GCC visibility push(default)
  #include <boost/archive/text_woarchive.hpp>
 +#pragma GCC visibility pop
  #include <boost/archive/detail/archive_serializer_map.hpp>
  
  // explicitly instantiate for this type of text stream
-@@ -25,9 +27,9 @@
+@@ -26,9 +28,9 @@
  namespace boost {
  namespace archive {
  
@@ -368,17 +370,17 @@
  } // namespace boost
 --- libs/serialization/src/xml_grammar.cpp.orig
 +++ libs/serialization/src/xml_grammar.cpp
-@@ -13,7 +13,9 @@
- #endif
+@@ -16,7 +16,9 @@
  
  #define BOOST_ARCHIVE_SOURCE
+ #include <boost/serialization/config.hpp>
 +#pragma GCC visibility push(default)
  #include <boost/archive/impl/basic_xml_grammar.hpp>
 +#pragma GCC visibility pop
  
  using namespace boost::spirit::classic;
  
-@@ -66,7 +68,7 @@
+@@ -67,7 +69,7 @@
  namespace archive {
  
  // explicit instantiation of xml for 8 bit characters
@@ -389,17 +391,17 @@
  } // namespace boost
 --- libs/serialization/src/xml_iarchive.cpp.orig
 +++ libs/serialization/src/xml_iarchive.cpp
-@@ -17,7 +17,9 @@
- #include <boost/config.hpp>
- #include <boost/detail/workaround.hpp>
+@@ -14,7 +14,9 @@
  
+ #define BOOST_ARCHIVE_SOURCE
+ #include <boost/serialization/config.hpp>
 +#pragma GCC visibility push(default)
  #include <boost/archive/xml_iarchive.hpp>
 +#pragma GCC visibility pop
  #include <boost/archive/detail/archive_serializer_map.hpp>
  
  // explicitly instantiate for this type of xml stream
-@@ -28,9 +30,9 @@
+@@ -25,9 +27,9 @@
  namespace boost {
  namespace archive {
  
@@ -414,17 +416,17 @@
  } // namespace boost
 --- libs/serialization/src/xml_oarchive.cpp.orig
 +++ libs/serialization/src/xml_oarchive.cpp
-@@ -13,7 +13,9 @@
- #endif
+@@ -14,7 +14,9 @@
  
  #define BOOST_ARCHIVE_SOURCE
+ #include <boost/serialization/config.hpp>
 +#pragma GCC visibility push(default)
  #include <boost/archive/xml_oarchive.hpp>
 +#pragma GCC visibility pop
  #include <boost/archive/detail/archive_serializer_map.hpp>
  
  // explicitly instantiate for this type of xml stream
-@@ -24,9 +26,9 @@
+@@ -25,9 +27,9 @@
  namespace boost {
  namespace archive {
  
@@ -439,10 +441,10 @@
  } // namespace boost
 --- libs/serialization/src/xml_wgrammar.cpp.orig
 +++ libs/serialization/src/xml_wgrammar.cpp
-@@ -15,7 +15,9 @@
- #else
+@@ -16,7 +16,9 @@
  
  #define BOOST_WARCHIVE_SOURCE
+ #include <boost/serialization/config.hpp>
 +#pragma GCC visibility push(default)
  #include <boost/archive/impl/basic_xml_grammar.hpp>
 +#pragma GCC visibility pop
@@ -460,17 +462,17 @@
  } // namespace boost
 --- libs/serialization/src/xml_wiarchive.cpp.orig
 +++ libs/serialization/src/xml_wiarchive.cpp
-@@ -21,7 +21,9 @@
+@@ -19,7 +19,9 @@
  
  #define BOOST_WARCHIVE_SOURCE
- 
+ #include <boost/serialization/config.hpp>
 +#pragma GCC visibility push(default)
  #include <boost/archive/xml_wiarchive.hpp>
 +#pragma GCC visibility pop
  #include <boost/archive/detail/archive_serializer_map.hpp>
  
  // explicitly instantiate for this type of xml stream
-@@ -32,9 +34,9 @@
+@@ -30,9 +32,9 @@
  namespace boost {
  namespace archive {
  
@@ -485,17 +487,17 @@
  } // namespace boost
 --- libs/serialization/src/xml_woarchive.cpp.orig
 +++ libs/serialization/src/xml_woarchive.cpp
-@@ -14,7 +14,9 @@
- #else
+@@ -19,7 +19,9 @@
  
  #define BOOST_WARCHIVE_SOURCE
+ #include <boost/serialization/config.hpp>
 +#pragma GCC visibility push(default)
  #include <boost/archive/xml_woarchive.hpp>
 +#pragma GCC visibility pop
  #include <boost/archive/detail/archive_serializer_map.hpp>
  
  // explicitly instantiate for this type of text stream
-@@ -25,9 +27,9 @@
+@@ -30,9 +32,9 @@
  namespace boost {
  namespace archive {
  
@@ -507,4 +509,4 @@
 +template class BOOST_SYMBOL_VISIBLE xml_woarchive_impl<xml_woarchive> ;
  
  } // namespace archive
- } // namespace boost
\ No newline at end of file
+ } // namespace boost
Index: files/patch-apple-clang-no-libcxx.diff
===================================================================
--- files/patch-apple-clang-no-libcxx.diff	(revision 151566)
+++ files/patch-apple-clang-no-libcxx.diff	(working copy)
@@ -1,9 +1,7 @@
 diff --git boost/config/compiler/clang.hpp boost/config/compiler/clang.hpp
 --- boost/config/compiler/clang.hpp
 +++ boost/config/compiler/clang.hpp
-@@ -199,10 +199,20 @@
- 
- #if !__has_feature(cxx_inline_namespaces)
+@@ -207,6 +207,16 @@
  #  define BOOST_NO_CXX11_INLINE_NAMESPACES
  #endif
  
@@ -20,8 +18,6 @@
  #if !__has_feature(cxx_override_control)
  #  define BOOST_NO_CXX11_FINAL
  #endif
- 
- #if !(__has_feature(cxx_binary_literals) || __has_extension(cxx_binary_literals))
 diff --git boost/multi_index/detail/vartempl_support.hpp boost/multi_index/detail/vartempl_support.hpp
 --- boost/multi_index/detail/vartempl_support.hpp
 +++ boost/multi_index/detail/vartempl_support.hpp
Index: files/patch-libs-mpi-build-Jamfile.v2.diff
===================================================================
--- files/patch-libs-mpi-build-Jamfile.v2.diff	(revision 151566)
+++ files/patch-libs-mpi-build-Jamfile.v2.diff	(working copy)
@@ -1,5 +1,5 @@
---- libs/mpi/build/Jamfile.v2.orig	2010-10-18 02:22:09.000000000 -0400
-+++ libs/mpi/build/Jamfile.v2	2010-11-23 13:28:09.000000000 -0500
+--- libs/mpi/build/Jamfile.v2.orig
++++ libs/mpi/build/Jamfile.v2
 @@ -68,6 +68,7 @@
      <link>shared:<define>BOOST_MPI_DYN_LINK=1
    : # Default build
Index: files/patch-tools-build-src-tools-python-2.jam.diff
===================================================================
--- files/patch-tools-build-src-tools-python-2.jam.diff	(revision 151566)
+++ files/patch-tools-build-src-tools-python-2.jam.diff	(working copy)
@@ -1,6 +1,6 @@
---- tools/build/src/tools/python.jam.orig	2009-10-06 15:56:18.000000000 +0200
-+++ tools/build/src/tools/python.jam	2009-10-06 15:53:48.000000000 +0200
-@@ -546,6 +546,13 @@
+--- tools/build/src/tools/python.jam.orig
++++ tools/build/src/tools/python.jam
+@@ -537,6 +537,13 @@
          libraries ?= $(default-library-path) ;
          includes ?= $(default-include-path) ;
      }
Index: files/patch-tools-build-src-tools-python.jam.diff
===================================================================
--- files/patch-tools-build-src-tools-python.jam.diff	(revision 151566)
+++ files/patch-tools-build-src-tools-python.jam.diff	(working copy)
@@ -1,6 +1,6 @@
---- tools/build/src/tools/python.jam.orig	2009-10-06 15:56:18.000000000 +0200
-+++ tools/build/src/tools/python.jam	2009-10-06 15:53:48.000000000 +0200
-@@ -427,7 +427,7 @@
+--- tools/build/src/tools/python.jam.orig
++++ tools/build/src/tools/python.jam
+@@ -426,7 +426,7 @@
      version ?= $(.version-countdown) ;
  
      local prefix
Index: files/patch-libs-context-src-asm-make_ppc32_sysv_macho_gas.S.diff
===================================================================
--- files/patch-libs-context-src-asm-make_ppc32_sysv_macho_gas.S.diff	(revision 151566)
+++ files/patch-libs-context-src-asm-make_ppc32_sysv_macho_gas.S.diff	(working copy)
@@ -1,14 +0,0 @@
-Fix build on PowerPC
-https://svn.boost.org/trac/boost/ticket/11603
-https://github.com/boostorg/context/commit/8c60232f5f372be9a47e26dbf7f000e9c21cc4a2
---- libs/context/src/asm/make_ppc32_sysv_macho_gas.S.orig
-+++ libs/context/src/asm/make_ppc32_sysv_macho_gas.S
-@@ -82,7 +82,7 @@ _make_fcontext:
-     subi  r3, r3, 304
- 
-     ; third arg of make_fcontext() == address of context-function
--    stw  r5, 236(%r3)
-+    stw  r5, 236(r3)
- 
-     ; load LR
-     mflr  r0
Index: files/patch-boost-python3.diff
===================================================================
--- files/patch-boost-python3.diff	(revision 151566)
+++ files/patch-boost-python3.diff	(working copy)
@@ -1,6 +1,5 @@
-diff -Naur libs/mpi/src/python/datatypes.cpp libs/mpi/src/python/datatypes.cpp
---- libs/mpi/src/python/datatypes.cpp	2007-11-25 13:38:02.000000000 -0500
-+++ libs/mpi/src/python/datatypes.cpp	2013-03-11 20:59:57.171732691 -0400
+--- libs/mpi/src/python/datatypes.cpp.orig
++++ libs/mpi/src/python/datatypes.cpp
 @@ -13,6 +13,10 @@
  #include <boost/mpi/python/serialize.hpp>
  #include <boost/mpi.hpp>
@@ -12,9 +11,8 @@
  namespace boost { namespace mpi { namespace python {
  
  void export_datatypes()
-diff -Naur libs/mpi/build/__init__.py llibs/mpi/build/__init__.py
---- libs/mpi/build/__init__.py	2013-11-27 12:52:37.000000000 -0600
-+++ libs/mpi/build/__init__.py	2013-11-27 12:52:55.000000000 -0600
+--- libs/mpi/build/__init__.py.orig
++++ libs/mpi/build/__init__.py
 @@ -6,5 +6,5 @@
      import mpi
      sys.setdlopenflags(flags)
Index: files/patch-tools-build-src-engine-build.jam.diff
===================================================================
--- files/patch-tools-build-src-engine-build.jam.diff	(revision 151566)
+++ files/patch-tools-build-src-engine-build.jam.diff	(working copy)
@@ -1,6 +1,6 @@
---- tools/build/src/engine/build.jam.orig	2014-06-19 12:15:38.000000000 -0500
-+++ tools/build/src/engine/build.jam	2014-08-14 07:43:48.000000000 -0500
-@@ -199,7 +199,7 @@
+--- tools/build/src/engine/build.jam.orig
++++ tools/build/src/engine/build.jam
+@@ -205,7 +205,7 @@
      -I$(--python-include) -I$(--extra-include)
      : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
  ## MacOSX Darwin, using GCC 2.9.x, 3.x
Index: files/patch-log-setup-link.diff
===================================================================
--- files/patch-log-setup-link.diff	(revision 151566)
+++ files/patch-log-setup-link.diff	(working copy)
@@ -1,48 +0,0 @@
-https://github.com/boostorg/log/pull/10
-https://github.com/crmoore/log/commit/870284ed31792708a6139925d00a0aadf46bf09f
---- boost/log/detail/setup_config.hpp
-+++ boost/log/detail/setup_config.hpp
-@@ -30,11 +30,17 @@
- #        define BOOST_LOG_SETUP_DLL
- #   endif
- 
--#   if defined(BOOST_HAS_DECLSPEC) && defined(BOOST_LOG_SETUP_DLL)
--#       define BOOST_LOG_SETUP_API __declspec(dllimport)
--#   else
-+#   if defined(BOOST_LOG_SETUP_DLL)
-+#       if defined(BOOST_SYMBOL_IMPORT)
-+#           define BOOST_LOG_SETUP_API BOOST_SYMBOL_IMPORT
-+#       elif defined(BOOST_HAS_DECLSPEC)
-+#           define BOOST_LOG_SETUP_API __declspec(dllimport)
-+#       endif
-+#   endif
-+#   ifndef BOOST_LOG_SETUP_API
- #       define BOOST_LOG_SETUP_API
--#   endif // defined(BOOST_HAS_DECLSPEC)
-+#   endif
-+
- //
- // Automatically link to the correct build variant where possible.
- //
-@@ -48,12 +54,15 @@
- 
- #else // !defined(BOOST_LOG_SETUP_BUILDING_THE_LIB)
- 
--#   if defined(BOOST_HAS_DECLSPEC) && defined(BOOST_LOG_SETUP_DLL)
--#       define BOOST_LOG_SETUP_API __declspec(dllexport)
--#   elif defined(__GNUC__) && __GNUC__ >= 4 && (defined(linux) || defined(__linux) || defined(__linux__))
--#       define BOOST_LOG_SETUP_API __attribute__((visibility("default")))
--#   else
--#       define BOOST_LOG_SETUP_API
-+#   if defined(BOOST_LOG_SETUP_DLL)
-+#       if defined(BOOST_SYMBOL_EXPORT)
-+#           define BOOST_LOG_SETUP_API BOOST_SYMBOL_EXPORT
-+#       elif defined(BOOST_HAS_DECLSPEC)
-+#           define BOOST_LOG_SETUP_API __declspec(dllexport)
-+#       endif
-+#   endif
-+#   ifndef BOOST_LOG_SETUP_API
-+#       define BOOST_LOG_SETUP_API BOOST_SYMBOL_VISIBLE
- #   endif
- 
- #endif // !defined(BOOST_LOG_SETUP_BUILDING_THE_LIB)
Index: Portfile
===================================================================
--- Portfile	(revision 151566)
+++ Portfile	(working copy)
@@ -6,8 +6,7 @@
 PortGroup       mpi 1.0
 
 name            boost
-version         1.59.0
-revision        2
+version         1.61.0
 license         Boost-1
 categories      devel
 platforms       darwin
@@ -26,8 +25,9 @@
 distname        ${name}_${distver}
 use_bzip2       yes
 
-checksums       rmd160  a106b3cd1dbda2323e5e84c7106cedee327db03c \
-                sha256  727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca
+checksums \
+    rmd160  1ceb250fcece242b54a999dbadbe2f3f1922541b \
+    sha256  a547bd06c2fd9a71ba1d169d9cf0339da7ebf4753849a8f7d6fdb8feee99b640
 
 depends_lib     port:zlib \
                 port:expat \
@@ -45,9 +45,7 @@
 
 patchfiles      patch-tools-build-src-engine-build.sh.diff \
                 patch-tools-build-src-engine-build.jam.diff \
-                patch-apple-clang-no-libcxx.diff \
-                patch-libs-context-src-asm-make_ppc32_sysv_macho_gas.S.diff \
-                patch-log-setup-link.diff
+                patch-apple-clang-no-libcxx.diff
                 # patch-apple-clang-no-libcxx.diff fixes a clang configuration
                 # error that occurs on OS X 10.7 and 10.8 due to the assumption
                 # that if clang is the compiler in use it must be using libc++.
