4 files changed, 28 insertions, 37 deletions

diff --git a/devel/boost/Makefile b/devel/boost/Makefile
index 186740615fc8..8ac904cd60cb 100644
--- a/devel/boost/Makefile
+++ b/devel/boost/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 
 PORTNAME=	boost
-PORTVERSION=	1.34.0
+PORTVERSION=	1.34.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
@@ -24,8 +24,12 @@ MAKE_ENV+=	CXX=${CXX} CC=${CC}
 .if defined(WITH_PYTHON) || defined (WITH_PYSTE)
 USE_PYTHON=	2.4+
 
+CONFLICTS=	boost-1*
+
 # Python implies threads
 WITH_THREADS=IMPLIED_BY_PYTHON
+.else
+CONFLICTS=	boost-python-1*
 .endif
 
 OPTIONS=	VERBOSE_BUILD	"Show compiler messages"	off \
diff --git a/devel/boost/distinfo b/devel/boost/distinfo
index e24084152847..c0873fcbd8ed 100644
--- a/devel/boost/distinfo
+++ b/devel/boost/distinfo
@@ -1,3 +1,3 @@
-MD5 (boost_1_34_0.tar.bz2) = ed5b9291ffad776f8757a916e1726ad0
-SHA256 (boost_1_34_0.tar.bz2) = 455cb8fa41b759272768257c2e7bdc5c47ec113245dfa533f275e787a855efd2
-SIZE (boost_1_34_0.tar.bz2) = 13021700
+MD5 (boost_1_34_1.tar.bz2) = 2d938467e8a448a2c9763e0a9f8ca7e5
+SHA256 (boost_1_34_1.tar.bz2) = 0f866c75b025a4f1340117a106595cc0675f48ba1e5a9b5c221ec7f19e96ec4c
+SIZE (boost_1_34_1.tar.bz2) = 12986931
diff --git a/devel/boost/files/patch-boost_detail_atomic_count_gcc.hpp b/devel/boost/files/patch-boost_detail_atomic_count_gcc.hpp
deleted file mode 100644
index 6c1575499fc5..000000000000
--- a/devel/boost/files/patch-boost_detail_atomic_count_gcc.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- boost/detail/atomic_count_gcc.hpp.orig	2005/04/02 11:37:53	1.5
-+++ boost/detail/atomic_count_gcc.hpp	2007/05/21 01:34:43	1.5.8.1
-@@ -17,7 +17,11 @@
- //  http://www.boost.org/LICENSE_1_0.txt)
- //
- 
--#include <bits/atomicity.h>
-+#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
-+# include <ext/atomicity.h>
-+#else
-+# include <bits/atomicity.h>
-+#endif
- 
- namespace boost
- {
diff --git a/devel/boost/pkg-plist b/devel/boost/pkg-plist
index a1907f3fa6f1..7f9fc4239384 100644
--- a/devel/boost/pkg-plist
+++ b/devel/boost/pkg-plist
@@ -4018,6 +4018,8 @@ lib/libboost_wserialization.so.4
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/boost/algorithm/is_upper.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/boost/algorithm/is_xdigit.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/boost/algorithm/istarts_with.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/boost/algorithm/iter_find.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/boost/algorithm/iter_split.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/boost/algorithm/join.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/boost/algorithm/last_finder.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/boost/algorithm/lexicographical_compare.html
@@ -4525,27 +4527,25 @@ lib/libboost_wserialization.so.4
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id1004920-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id1009524-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id1010153-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1037117-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1038227-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1212680-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1246273-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1253606-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1255668-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1278063-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1279143-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1280066-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1284394-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1315432-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1592601-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1592794-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1630106-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1033032-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1044106-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1280007-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1284059-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1287701-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1288172-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1599586-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1603147-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id1668860-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id620092-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id623002-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id628962-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id655400-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id681933-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id683435-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id686531-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id689931-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id691162-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id691749-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id695691-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id696602-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id698813-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id723875-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id723956-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id728420-bb.html
@@ -4568,6 +4568,7 @@ lib/libboost_wserialization.so.4
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id858014-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id860619-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id862480-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id863102-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id868506-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id871134-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id892073-bb.html
@@ -4580,6 +4581,7 @@ lib/libboost_wserialization.so.4
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id902542-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id903458-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id903853-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id904872-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id907003-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id907590-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id930320-bb.html
@@ -4587,11 +4589,11 @@ lib/libboost_wserialization.so.4
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id937515-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id937544-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id938372-bb.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/html/id963389-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id963428-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id972288-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id973256-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/id999350-bb.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/html/id999800-bb.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/images/blank.png
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/images/caution.png
 %%PORTDOCS%%%%DOCSDIR%%/doc/html/images/draft.png