diff --git a/devel/boost/Makefile b/devel/boost/Makefile index 67992206866..27993636c8b 100644 --- a/devel/boost/Makefile +++ b/devel/boost/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2006/12/11 21:42:30 deanna Exp $ +# $OpenBSD: Makefile,v 1.6 2006/12/28 10:46:20 deanna Exp $ COMMENT-main= "free peer-reviewed portable C++ source libraries (headers)" COMMENT-libs= "free peer-reviewed portable C++ source libraries (libraries)" -PKGNAME-main= boost-headers-${VERSION}p1 -PKGNAME-libs= boost-libs-${VERSION}p0 +PKGNAME-main= boost-headers-${VERSION}p2 +PKGNAME-libs= boost-libs-${VERSION}p1 VERSION= 1.33.1 DISTNAME= boost_${VERSION:S/./_/g} @@ -45,22 +45,13 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boost/} -# this lib does not support BOOST_NO_EXCEPTIONS -.if ${MACHINE_ARCH} == "alpha" -PKG_ARGS+=-Dserialization=0 -CONFIGURE_ARGS=--without-libraries=serialization -.else -PKG_ARGS+=-Dserialization=1 -.endif - -CONFIGURE_ARGS+=--without-libraries=python - MAKE_ENV= GCC="${CC}" GXX="${CXX}" REGRESS_TARGET= check MULTI_PACKAGES= -main -libs +PKG_ARCH-main= * WANTLIB-libs= z c do-configure: @@ -70,7 +61,7 @@ do-configure: post-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} /bin/sh ./configure \ - ${CONFIGURE_ARGS} + --without-libraries=python do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/jam_src/bin.*/bjam \ diff --git a/devel/boost/pkg/PFRAG.serialization-libs b/devel/boost/pkg/PFRAG.serialization-libs deleted file mode 100644 index 0e544ae1b2f..00000000000 --- a/devel/boost/pkg/PFRAG.serialization-libs +++ /dev/null @@ -1,4 +0,0 @@ -@comment $OpenBSD: PFRAG.serialization-libs,v 1.1 2006/12/11 21:42:30 deanna Exp $ -%%SHARED%% -lib/libboost_serialization-mt.a -lib/libboost_serialization.a diff --git a/devel/boost/pkg/PFRAG.serialization-main b/devel/boost/pkg/PFRAG.serialization-main deleted file mode 100644 index b7637d2ac00..00000000000 --- a/devel/boost/pkg/PFRAG.serialization-main +++ /dev/null @@ -1,49 +0,0 @@ -@comment $OpenBSD: PFRAG.serialization-main,v 1.1 2006/12/11 21:42:30 deanna Exp $ -include/boost/serialization/ -include/boost/serialization/access.hpp -include/boost/serialization/base_object.hpp -include/boost/serialization/binary_object.hpp -include/boost/serialization/collection_traits.hpp -include/boost/serialization/collections_load_imp.hpp -include/boost/serialization/collections_save_imp.hpp -include/boost/serialization/config.hpp -include/boost/serialization/deque.hpp -include/boost/serialization/detail/ -include/boost/serialization/detail/shared_count_132.hpp -include/boost/serialization/detail/shared_ptr_132.hpp -include/boost/serialization/detail/shared_ptr_nmt_132.hpp -include/boost/serialization/detail/stack_constructor.hpp -include/boost/serialization/export.hpp -include/boost/serialization/extended_type_info.hpp -include/boost/serialization/extended_type_info_no_rtti.hpp -include/boost/serialization/extended_type_info_typeid.hpp -include/boost/serialization/force_include.hpp -include/boost/serialization/hash_map.hpp -include/boost/serialization/hash_set.hpp -include/boost/serialization/is_abstract.hpp -include/boost/serialization/level.hpp -include/boost/serialization/level_enum.hpp -include/boost/serialization/list.hpp -include/boost/serialization/map.hpp -include/boost/serialization/nvp.hpp -include/boost/serialization/optional.hpp -include/boost/serialization/scoped_ptr.hpp -include/boost/serialization/serialization.hpp -include/boost/serialization/set.hpp -include/boost/serialization/shared_ptr.hpp -include/boost/serialization/shared_ptr_132.hpp -include/boost/serialization/slist.hpp -include/boost/serialization/split_free.hpp -include/boost/serialization/split_member.hpp -include/boost/serialization/string.hpp -include/boost/serialization/tracking.hpp -include/boost/serialization/tracking_enum.hpp -include/boost/serialization/traits.hpp -include/boost/serialization/type_info_implementation.hpp -include/boost/serialization/utility.hpp -include/boost/serialization/variant.hpp -include/boost/serialization/vector.hpp -include/boost/serialization/version.hpp -include/boost/serialization/void_cast.hpp -include/boost/serialization/void_cast_fwd.hpp -include/boost/serialization/weak_ptr.hpp diff --git a/devel/boost/pkg/PFRAG.shared-libs b/devel/boost/pkg/PFRAG.shared-libs index d269cd2f01a..eaa6bcf1eb6 100644 --- a/devel/boost/pkg/PFRAG.shared-libs +++ b/devel/boost/pkg/PFRAG.shared-libs @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared-libs,v 1.2 2006/12/11 21:42:30 deanna Exp $ +@comment $OpenBSD: PFRAG.shared-libs,v 1.3 2006/12/28 10:46:20 deanna Exp $ @lib lib/libboost_date_time-mt.so.${LIBboost_date_time-mt_VERSION} @lib lib/libboost_date_time.so.${LIBboost_date_time_VERSION} @lib lib/libboost_filesystem-mt.so.${LIBboost_filesystem-mt_VERSION} @@ -11,6 +11,8 @@ @lib lib/libboost_program_options.so.${LIBboost_program_options_VERSION} @lib lib/libboost_regex-mt.so.${LIBboost_regex-mt_VERSION} @lib lib/libboost_regex.so.${LIBboost_regex_VERSION} +@lib lib/libboost_serialization-mt.so.${LIBboost_serialization-mt_VERSION} +@lib lib/libboost_serialization.so.${LIBboost_serialization_VERSION} @lib lib/libboost_signals-mt.so.${LIBboost_signals-mt_VERSION} @lib lib/libboost_signals.so.${LIBboost_signals_VERSION} @lib lib/libboost_test_exec_monitor-mt.so.${LIBboost_test_exec_monitor-mt_VERSION} diff --git a/devel/boost/pkg/PFRAG.shared-serialization-libs b/devel/boost/pkg/PFRAG.shared-serialization-libs deleted file mode 100644 index 2b673c1165c..00000000000 --- a/devel/boost/pkg/PFRAG.shared-serialization-libs +++ /dev/null @@ -1,3 +0,0 @@ -@comment $OpenBSD: PFRAG.shared-serialization-libs,v 1.1 2006/12/11 21:42:30 deanna Exp $ -@lib lib/libboost_serialization-mt.so.${LIBboost_serialization-mt_VERSION} -@lib lib/libboost_serialization.so.${LIBboost_serialization_VERSION} diff --git a/devel/boost/pkg/PLIST-libs b/devel/boost/pkg/PLIST-libs index ce86b824843..b98e73b9aa1 100644 --- a/devel/boost/pkg/PLIST-libs +++ b/devel/boost/pkg/PLIST-libs @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-libs,v 1.2 2006/12/11 21:42:30 deanna Exp $ +@comment $OpenBSD: PLIST-libs,v 1.3 2006/12/28 10:46:20 deanna Exp $ @conflict boost-* %%SHARED%% bin/bjam @@ -14,6 +14,8 @@ lib/libboost_program_options-mt.a lib/libboost_program_options.a lib/libboost_regex-mt.a lib/libboost_regex.a +lib/libboost_serialization-mt.a +lib/libboost_serialization.a lib/libboost_signals-mt.a lib/libboost_signals.a lib/libboost_test_exec_monitor-mt.a @@ -23,4 +25,3 @@ lib/libboost_unit_test_framework-mt.a lib/libboost_unit_test_framework.a lib/libboost_wave-mt.a lib/libboost_wave.a -%%serialization%% diff --git a/devel/boost/pkg/PLIST-main b/devel/boost/pkg/PLIST-main index bf810f89888..800e08ef3e4 100644 --- a/devel/boost/pkg/PLIST-main +++ b/devel/boost/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.2 2006/12/11 21:42:30 deanna Exp $ +@comment $OpenBSD: PLIST-main,v 1.3 2006/12/28 10:46:20 deanna Exp $ @pkgpath devel/boost @conflict boost-* include/boost/ @@ -2802,6 +2802,54 @@ include/boost/regex/v4/w32_regex_traits.hpp include/boost/regex_fwd.hpp include/boost/scoped_array.hpp include/boost/scoped_ptr.hpp +include/boost/serialization/ +include/boost/serialization/access.hpp +include/boost/serialization/base_object.hpp +include/boost/serialization/binary_object.hpp +include/boost/serialization/collection_traits.hpp +include/boost/serialization/collections_load_imp.hpp +include/boost/serialization/collections_save_imp.hpp +include/boost/serialization/config.hpp +include/boost/serialization/deque.hpp +include/boost/serialization/detail/ +include/boost/serialization/detail/shared_count_132.hpp +include/boost/serialization/detail/shared_ptr_132.hpp +include/boost/serialization/detail/shared_ptr_nmt_132.hpp +include/boost/serialization/detail/stack_constructor.hpp +include/boost/serialization/export.hpp +include/boost/serialization/extended_type_info.hpp +include/boost/serialization/extended_type_info_no_rtti.hpp +include/boost/serialization/extended_type_info_typeid.hpp +include/boost/serialization/force_include.hpp +include/boost/serialization/hash_map.hpp +include/boost/serialization/hash_set.hpp +include/boost/serialization/is_abstract.hpp +include/boost/serialization/level.hpp +include/boost/serialization/level_enum.hpp +include/boost/serialization/list.hpp +include/boost/serialization/map.hpp +include/boost/serialization/nvp.hpp +include/boost/serialization/optional.hpp +include/boost/serialization/scoped_ptr.hpp +include/boost/serialization/serialization.hpp +include/boost/serialization/set.hpp +include/boost/serialization/shared_ptr.hpp +include/boost/serialization/shared_ptr_132.hpp +include/boost/serialization/slist.hpp +include/boost/serialization/split_free.hpp +include/boost/serialization/split_member.hpp +include/boost/serialization/string.hpp +include/boost/serialization/tracking.hpp +include/boost/serialization/tracking_enum.hpp +include/boost/serialization/traits.hpp +include/boost/serialization/type_info_implementation.hpp +include/boost/serialization/utility.hpp +include/boost/serialization/variant.hpp +include/boost/serialization/vector.hpp +include/boost/serialization/version.hpp +include/boost/serialization/void_cast.hpp +include/boost/serialization/void_cast_fwd.hpp +include/boost/serialization/weak_ptr.hpp include/boost/shared_array.hpp include/boost/shared_container_iterator.hpp include/boost/shared_ptr.hpp @@ -3548,4 +3596,3 @@ include/boost/wave/util/unput_queue_iterator.hpp include/boost/wave/wave_config.hpp include/boost/wave/wave_version.hpp include/boost/weak_ptr.hpp -%%serialization%%