- Update to 2.2

PR:		138133
Submitted by:	Ganael Laplanche <ganael.laplanche@martymac.com> (maintainer)

3 files changed, 54 insertions, 40 deletions

diff --git a/devel/tbb/Makefile b/devel/tbb/Makefile
index 40a980ff71bf..6f2716d425c8 100644
--- a/devel/tbb/Makefile
+++ b/devel/tbb/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	tbb
-PORTVERSION=	2.1
+PORTVERSION=	2.2
 CATEGORIES=	devel
-MASTER_SITES=	http://www.threadingbuildingblocks.org/uploads/77/111/2.1/
-DISTNAME=	tbb21_20080605oss_src
+MASTER_SITES=	http://www.threadingbuildingblocks.org/uploads/78/140/2.2/
+DISTNAME=	tbb22_004oss_src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ganael.laplanche@martymac.com
@@ -21,7 +21,7 @@ USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	default
 
-WRKSRC=	${WRKDIR}/tbb21_20080605oss
+WRKSRC=	${WRKDIR}/tbb22_004oss
 
 post-extract:
 	@${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/
diff --git a/devel/tbb/distinfo b/devel/tbb/distinfo
index 424f92d6f370..60969e012e02 100644
--- a/devel/tbb/distinfo
+++ b/devel/tbb/distinfo
@@ -1,3 +1,3 @@
-MD5 (tbb21_20080605oss_src.tgz) = 6accb7e86dff355cd8cfbc9de1225c8d
-SHA256 (tbb21_20080605oss_src.tgz) = c326c9f718d3fe45bd678e6cee4bafbf5194b1483e0f5697993060e4b6586927
-SIZE (tbb21_20080605oss_src.tgz) = 1107680
+MD5 (tbb22_004oss_src.tgz) = 98b46b075f96f13d2695476b8de058a2
+SHA256 (tbb22_004oss_src.tgz) = d4f8227af4d9f65241ab9d9b441f4ac1e17e13ca4b36a2dc2b4111920635e04d
+SIZE (tbb22_004oss_src.tgz) = 1471837
diff --git a/devel/tbb/pkg-plist b/devel/tbb/pkg-plist
index b45db464c259..cffe64a22a53 100644
--- a/devel/tbb/pkg-plist
+++ b/devel/tbb/pkg-plist
@@ -1,47 +1,61 @@
 include/tbb/machine/linux_ia32.h
-include/tbb/machine/linux_em64t.h
-include/tbb/machine/linux_itanium.h
-include/tbb/machine/mac_ppc.h
 include/tbb/machine/windows_ia32.h
-include/tbb/machine/windows_ia32_inline.h
-include/tbb/machine/windows_em64t.h
-include/tbb/machine/ibm_aix51.h
 include/tbb/machine/linux_common.h
-include/tbb/aligned_space.h
-include/tbb/atomic.h
-include/tbb/blocked_range.h
+include/tbb/machine/ibm_aix51.h
+include/tbb/machine/linux_intel64.h
+include/tbb/machine/windows_intel64.h
+include/tbb/machine/linux_ia64.h
+include/tbb/machine/mac_ppc.h
+include/tbb/task_scheduler_init.h
+include/tbb/tbbmalloc_proxy.h
+include/tbb/combinable.h
+include/tbb/tbb_exception.h
+include/tbb/tbb_stddef.h
 include/tbb/blocked_range2d.h
-include/tbb/blocked_range3d.h
-include/tbb/cache_aligned_allocator.h
-include/tbb/concurrent_hash_map.h
-include/tbb/concurrent_queue.h
 include/tbb/concurrent_vector.h
+include/tbb/tbb.h
+include/tbb/tbb_machine.h
+include/tbb/parallel_for_each.h
+include/tbb/tbb_config.h
+include/tbb/scalable_allocator.h
 include/tbb/mutex.h
-include/tbb/parallel_for.h
-include/tbb/parallel_reduce.h
-include/tbb/parallel_scan.h
-include/tbb/parallel_sort.h
-include/tbb/parallel_while.h
-include/tbb/parallel_do.h
-include/tbb/pipeline.h
+include/tbb/compat/ppl.h
+include/tbb/blocked_range3d.h
+include/tbb/task_scheduler_observer.h
+include/tbb/index.html
+include/tbb/_tbb_windef.h
 include/tbb/queuing_mutex.h
-include/tbb/queuing_rw_mutex.h
-include/tbb/scalable_allocator.h
+include/tbb/tbb_allocator.h
+include/tbb/cache_aligned_allocator.h
+include/tbb/tick_count.h
+include/tbb/parallel_sort.h
+include/tbb/parallel_invoke.h
 include/tbb/spin_mutex.h
 include/tbb/spin_rw_mutex.h
-include/tbb/recursive_mutex.h
+include/tbb/null_rw_mutex.h
+include/tbb/parallel_reduce.h
+include/tbb/_concurrent_queue_internal.h
+include/tbb/blocked_range.h
+include/tbb/parallel_scan.h
+include/tbb/parallel_for.h
 include/tbb/task.h
-include/tbb/task_scheduler_init.h
-include/tbb/tbb_stddef.h
-include/tbb/tick_count.h
-include/tbb/_tbb_windef.h
+include/tbb/queuing_rw_mutex.h
+include/tbb/parallel_do.h
+include/tbb/concurrent_queue.h
+include/tbb/null_mutex.h
+include/tbb/pipeline.h
 include/tbb/partitioner.h
-include/tbb/task_scheduler_observer.h
-include/tbb/tbb_allocator.h
-include/tbb/tbb_exception.h
-include/tbb/tbb_machine.h
+include/tbb/recursive_mutex.h
+include/tbb/task_group.h
+include/tbb/tbb_profiling.h
+include/tbb/enumerable_thread_specific.h
 include/tbb/tbb_thread.h
-lib/libtbb.so
-lib/libtbbmalloc.so
+include/tbb/aligned_space.h
+include/tbb/atomic.h
+include/tbb/concurrent_hash_map.h
+include/tbb/parallel_while.h
 @dirrm include/tbb/machine
+@dirrm include/tbb/compat
 @dirrm include/tbb
+lib/libtbb.so
+lib/libtbbmalloc.so