Index: head/devel/tbb/Makefile =================================================================== --- head/devel/tbb/Makefile (revision 389993) +++ head/devel/tbb/Makefile (revision 389994) @@ -1,60 +1,60 @@ # Created by: Arun Sharma # $FreeBSD$ PORTNAME= tbb PORTVERSION= 4.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://threadingbuildingblocks.org/sites/default/files/software_releases/source/ \ LOCAL/martymac -DISTNAME= ${PORTNAME}${PORTVERSION:R:S/.//g}_20140724oss_src +DISTNAME= ${PORTNAME}${PORTVERSION:R:S/.//g}_20150611oss_src MAINTAINER= martymac@FreeBSD.org COMMENT= Library that provides thread building blocks LICENSE= GPLv2 OPTIONS_DEFINE= DOCS PORTDOCS= * ONLY_FOR_ARCHS= amd64 i386 ia64 ONLY_FOR_ARCHS_REASON= has not been ported to this platform USE_LDCONFIG= yes USES= compiler gmake tar:tgz ALL_TARGET= default WRKSRC= ${WRKDIR}/${DISTNAME:S/_src//} .include post-extract: .if ${CC} != "gcc" @${CP} ${WRKSRC}/build/FreeBSD.gcc.inc ${WRKSRC}/build/FreeBSD.${CC}.inc .endif @${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/ post-patch: @${REINPLACE_CMD} -e 's|gcc|${CC}|g' -e 's|g++|${CXX}|g' \ ${WRKSRC}/build/FreeBSD.${CC}.inc .if ${COMPILER_TYPE} != "gcc" @${REINPLACE_CMD} -e 's| -fno-schedule-insns2||g' \ ${WRKSRC}/build/FreeBSD.${CC}.inc .endif do-install: cd ${WRKSRC}; \ ${INSTALL_LIB} build/FreeBSD*release/libtbb.so \ ${STAGEDIR}${PREFIX}/lib/libtbb.so.4; \ ${LN} -sf ${PREFIX}/lib/libtbb.so.4 \ ${STAGEDIR}${PREFIX}/lib/libtbb.so; \ ${INSTALL_LIB} build/FreeBSD*release/libtbbmalloc.so \ ${STAGEDIR}${PREFIX}/lib/libtbbmalloc.so.4; \ ${LN} -sf ${PREFIX}/lib/libtbbmalloc.so.4 \ ${STAGEDIR}${PREFIX}/lib/libtbbmalloc.so; \ ${MKDIR} ${STAGEDIR}${PREFIX}/include/tbb/; \ cd include/tbb/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/tbb/ ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include Index: head/devel/tbb/distinfo =================================================================== --- head/devel/tbb/distinfo (revision 389993) +++ head/devel/tbb/distinfo (revision 389994) @@ -1,2 +1,2 @@ -SHA256 (tbb43_20140724oss_src.tgz) = fc15e84befe1acadad3589e7f2a461443bef77cc699038875ef2692e1ceb0bb4 -SIZE (tbb43_20140724oss_src.tgz) = 2790795 +SHA256 (tbb43_20150611oss_src.tgz) = 221f85fe64e11c9638e43b3c57d5750c26683905fc90827c0bcfefdb286e79c9 +SIZE (tbb43_20150611oss_src.tgz) = 2757631 Index: head/devel/tbb/files/patch-build-FreeBSD.inc =================================================================== --- head/devel/tbb/files/patch-build-FreeBSD.inc (revision 389993) +++ head/devel/tbb/files/patch-build-FreeBSD.inc (revision 389994) @@ -1,29 +1,29 @@ ---- build/FreeBSD.inc.orig 2012-09-03 13:10:45.423760088 -0400 -+++ build/FreeBSD.inc 2012-09-03 13:13:15.765760027 -0400 -@@ -37,14 +37,14 @@ +--- build/FreeBSD.inc.orig 2015-06-11 14:18:55 UTC ++++ build/FreeBSD.inc +@@ -29,14 +29,14 @@ ifndef arch endif ifndef runtime -- gcc_version:=$(shell gcc -v 2>&1 | grep 'gcc version' | sed -e 's/^gcc version //' | sed -e 's/ .*$$//') -+ gcc_version:=$(shell $(CC) -v 2>&1 | grep ' version' | sed -e 's/^.* version //' | sed -e 's/ .*$$//') +- gcc_version:=$(shell gcc -dumpversion) ++ gcc_version:=$(shell $(CC) -dumpversion) os_version:=$(shell uname -r) os_kernel_version:=$(shell uname -r | sed -e 's/-.*$$//') export runtime:=cc$(gcc_version)_kernel$(os_kernel_version) endif -native_compiler := gcc -export compiler ?= gcc -+native_compiler := $(CC) ++native_compiler := $(CC) +export compiler ?= $(CC) debugger ?= gdb CMD=$(SHELL) -c -@@ -54,7 +54,7 @@ +@@ -46,7 +46,7 @@ RD?=rmdir MD?=mkdir -p NUL= /dev/null SLASH=/ -MAKE_VERSIONS=sh $(tbb_root)/build/version_info_linux.sh $(VERSION_FLAGS) >version_string.ver +MAKE_VERSIONS=sh $(tbb_root)/build/version_info_FreeBSD.sh $(VERSION_FLAGS) >version_string.ver MAKE_TBBVARS=sh $(tbb_root)/build/generate_tbbvars.sh ifdef LD_LIBRARY_PATH Index: head/devel/tbb/pkg-plist =================================================================== --- head/devel/tbb/pkg-plist (revision 389993) +++ head/devel/tbb/pkg-plist (revision 389994) @@ -1,101 +1,103 @@ include/tbb/aggregator.h include/tbb/aligned_space.h include/tbb/atomic.h include/tbb/blocked_range.h include/tbb/blocked_range2d.h include/tbb/blocked_range3d.h include/tbb/cache_aligned_allocator.h include/tbb/combinable.h include/tbb/compat/condition_variable include/tbb/compat/ppl.h include/tbb/compat/thread include/tbb/compat/tuple include/tbb/concurrent_hash_map.h include/tbb/concurrent_lru_cache.h include/tbb/concurrent_priority_queue.h include/tbb/concurrent_queue.h include/tbb/concurrent_unordered_map.h include/tbb/concurrent_unordered_set.h include/tbb/concurrent_vector.h include/tbb/critical_section.h include/tbb/enumerable_thread_specific.h include/tbb/flow_graph.h +include/tbb/global_control.h include/tbb/index.html include/tbb/internal/_aggregator_impl.h include/tbb/internal/_concurrent_queue_impl.h include/tbb/internal/_concurrent_unordered_impl.h include/tbb/internal/_flow_graph_impl.h include/tbb/internal/_flow_graph_indexer_impl.h include/tbb/internal/_flow_graph_item_buffer_impl.h include/tbb/internal/_flow_graph_join_impl.h include/tbb/internal/_flow_graph_node_impl.h include/tbb/internal/_flow_graph_tagged_buffer_impl.h include/tbb/internal/_flow_graph_trace_impl.h include/tbb/internal/_flow_graph_types_impl.h include/tbb/internal/_mutex_padding.h include/tbb/internal/_range_iterator.h include/tbb/internal/_tbb_strings.h include/tbb/internal/_tbb_windef.h +include/tbb/internal/_template_helpers.h include/tbb/internal/_x86_eliding_mutex_impl.h include/tbb/internal/_x86_rtm_rw_mutex_impl.h include/tbb/machine/gcc_armv7.h include/tbb/machine/gcc_generic.h include/tbb/machine/gcc_ia32_common.h include/tbb/machine/gcc_itsx.h include/tbb/machine/ibm_aix51.h include/tbb/machine/icc_generic.h include/tbb/machine/linux_common.h include/tbb/machine/linux_ia32.h include/tbb/machine/linux_ia64.h include/tbb/machine/linux_intel64.h include/tbb/machine/mac_ppc.h include/tbb/machine/macos_common.h include/tbb/machine/mic_common.h include/tbb/machine/msvc_armv7.h include/tbb/machine/msvc_ia32_common.h include/tbb/machine/sunos_sparc.h include/tbb/machine/windows_api.h include/tbb/machine/windows_ia32.h include/tbb/machine/windows_intel64.h include/tbb/machine/xbox360_ppc.h include/tbb/memory_pool.h include/tbb/mutex.h include/tbb/null_mutex.h include/tbb/null_rw_mutex.h include/tbb/parallel_do.h include/tbb/parallel_for.h include/tbb/parallel_for_each.h include/tbb/parallel_invoke.h include/tbb/parallel_reduce.h include/tbb/parallel_scan.h include/tbb/parallel_sort.h include/tbb/parallel_while.h include/tbb/partitioner.h include/tbb/pipeline.h include/tbb/queuing_mutex.h include/tbb/queuing_rw_mutex.h include/tbb/reader_writer_lock.h include/tbb/recursive_mutex.h include/tbb/runtime_loader.h include/tbb/scalable_allocator.h include/tbb/spin_mutex.h include/tbb/spin_rw_mutex.h include/tbb/task.h include/tbb/task_arena.h include/tbb/task_group.h include/tbb/task_scheduler_init.h include/tbb/task_scheduler_observer.h include/tbb/tbb.h include/tbb/tbb_allocator.h include/tbb/tbb_config.h include/tbb/tbb_exception.h include/tbb/tbb_machine.h include/tbb/tbb_profiling.h include/tbb/tbb_stddef.h include/tbb/tbb_thread.h include/tbb/tbbmalloc_proxy.h include/tbb/tick_count.h lib/libtbb.so lib/libtbb.so.4 lib/libtbbmalloc.so lib/libtbbmalloc.so.4