Attachment 107154 Details for Bug 147870 – file.diff

[patch] file.diff

file.diff (text/plain), 6.03 KB, created by Ganael LAPLANCHE on 2010-06-15 12:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ganael LAPLANCHE

Created: 2010-06-15 12:40:01 UTC

Size: 6.03 KB

patch

obsolete

>diff -aurN devel/tbb.orig/Makefile devel/tbb/Makefile
>--- devel/tbb.orig/Makefile	2010-06-14 15:34:58.715144662 +0000
>+++ devel/tbb/Makefile	2010-06-15 12:03:25.938611750 +0000
>@@ -6,10 +6,10 @@
> #
> 
> PORTNAME=	tbb
>-PORTVERSION=	2.2
>+PORTVERSION=	3.0
> CATEGORIES=	devel
>-MASTER_SITES=	http://www.threadingbuildingblocks.org/uploads/78/140/2.2/
>-DISTNAME=	tbb22_004oss_src
>+MASTER_SITES=	http://www.threadingbuildingblocks.org/uploads/78/154/3.0/
>+DISTNAME=	tbb30_018oss_src
> EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	ganael.laplanche@martymac.com
>@@ -21,7 +21,7 @@
> USE_GMAKE=	yes
> ALL_TARGET=	default
> 
>-WRKSRC=	${WRKDIR}/tbb22_004oss
>+WRKSRC=	${WRKDIR}/tbb30_018oss
> 
> post-extract:
> 	@${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/
>@@ -32,9 +32,11 @@
> do-install:
> 	cd ${WRKSRC}; \
> 	${INSTALL_DATA} build/FreeBSD*release/libtbb.so \
>-		${PREFIX}/lib/libtbb.so; \
>+		${PREFIX}/lib/libtbb.so.3; \
>+	${LN} -fs ${PREFIX}/lib/libtbb.so.3 ${PREFIX}/lib/libtbb.so; \
> 	${INSTALL_DATA} build/FreeBSD*release/libtbbmalloc.so \
>-		${PREFIX}/lib/libtbbmalloc.so; \
>+		${PREFIX}/lib/libtbbmalloc.so.3; \
>+	${LN} -fs ${PREFIX}/lib/libtbbmalloc.so.3 ${PREFIX}/lib/libtbbmalloc.so; \
> 	${MKDIR} ${PREFIX}/include/tbb/; \
> 	cd include/tbb/ && ${COPYTREE_SHARE} \* ${PREFIX}/include/tbb/
> 
>diff -aurN devel/tbb.orig/distinfo devel/tbb/distinfo
>--- devel/tbb.orig/distinfo	2010-06-14 15:34:58.706157137 +0000
>+++ devel/tbb/distinfo	2010-06-14 15:36:34.249261568 +0000
>@@ -1,3 +1,3 @@
>-MD5 (tbb22_004oss_src.tgz) = 98b46b075f96f13d2695476b8de058a2
>-SHA256 (tbb22_004oss_src.tgz) = d4f8227af4d9f65241ab9d9b441f4ac1e17e13ca4b36a2dc2b4111920635e04d
>-SIZE (tbb22_004oss_src.tgz) = 1471837
>+MD5 (tbb30_018oss_src.tgz) = 3907331f6b978f15c5fdf1047bdaafcc
>+SHA256 (tbb30_018oss_src.tgz) = 6a6e79ae3866ddaea664ae0e93e31563f16024a950c11be52a441c0c91ef62e7
>+SIZE (tbb30_018oss_src.tgz) = 1550402
>diff -aurN devel/tbb.orig/pkg-plist devel/tbb/pkg-plist
>--- devel/tbb.orig/pkg-plist	2010-06-14 15:34:58.689138982 +0000
>+++ devel/tbb/pkg-plist	2010-06-15 12:05:54.560338533 +0000
>@@ -1,61 +1,71 @@
>-include/tbb/machine/linux_ia32.h
>-include/tbb/machine/windows_ia32.h
>-include/tbb/machine/linux_common.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.h
>+include/tbb/parallel_while.h
> include/tbb/task_scheduler_init.h
>-include/tbb/tbbmalloc_proxy.h
>-include/tbb/combinable.h
>+include/tbb/tbb_config.h
> include/tbb/tbb_exception.h
>+include/tbb/critical_section.h
>+include/tbb/index.html
>+include/tbb/parallel_invoke.h
>+include/tbb/combinable.h
>+include/tbb/parallel_reduce.h
> include/tbb/tbb_stddef.h
>-include/tbb/blocked_range2d.h
>+include/tbb/concurrent_queue.h
>+include/tbb/partitioner.h
>+include/tbb/parallel_do.h
>+include/tbb/mutex.h
>+include/tbb/atomic.h
>+include/tbb/queuing_rw_mutex.h
>+include/tbb/tick_count.h
>+include/tbb/parallel_for.h
>+include/tbb/recursive_mutex.h
>+include/tbb/machine/sunos_sparc.h
>+include/tbb/machine/xbox360_ppc.h
>+include/tbb/machine/mac_ppc.h
>+include/tbb/machine/ibm_aix51.h
>+include/tbb/machine/linux_ia32.h
>+include/tbb/machine/linux_ia64.h
>+include/tbb/machine/linux_common.h
>+include/tbb/machine/windows_intel64.h
>+include/tbb/machine/linux_intel64.h
>+include/tbb/machine/windows_ia32.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/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/tbb_allocator.h
>-include/tbb/cache_aligned_allocator.h
>-include/tbb/tick_count.h
>+include/tbb/queuing_mutex.h
>+include/tbb/_concurrent_unordered_internal.h
>+include/tbb/blocked_range2d.h
> include/tbb/parallel_sort.h
>-include/tbb/parallel_invoke.h
>-include/tbb/spin_mutex.h
>-include/tbb/spin_rw_mutex.h
>-include/tbb/null_rw_mutex.h
>-include/tbb/parallel_reduce.h
>-include/tbb/_concurrent_queue_internal.h
>+include/tbb/task_scheduler_observer.h
> include/tbb/blocked_range.h
> include/tbb/parallel_scan.h
>-include/tbb/parallel_for.h
>-include/tbb/task.h
>-include/tbb/queuing_rw_mutex.h
>-include/tbb/parallel_do.h
>-include/tbb/concurrent_queue.h
>-include/tbb/null_mutex.h
>+include/tbb/null_rw_mutex.h
>+include/tbb/spin_rw_mutex.h
>+include/tbb/blocked_range3d.h
>+include/tbb/_concurrent_queue_internal.h
> include/tbb/pipeline.h
>-include/tbb/partitioner.h
>-include/tbb/recursive_mutex.h
>-include/tbb/task_group.h
>+include/tbb/compat/ppl.h
>+include/tbb/compat/thread
>+include/tbb/compat/condition_variable
>+include/tbb/spin_mutex.h
>+include/tbb/tbbmalloc_proxy.h
>+include/tbb/concurrent_unordered_map.h
>+include/tbb/cache_aligned_allocator.h
>+include/tbb/_tbb_windef.h
>+include/tbb/tbb.h
>+include/tbb/tbb_machine.h
>+include/tbb/scalable_allocator.h
>+include/tbb/tbb_thread.h
> include/tbb/tbb_profiling.h
> include/tbb/enumerable_thread_specific.h
>-include/tbb/tbb_thread.h
> include/tbb/aligned_space.h
>-include/tbb/atomic.h
> include/tbb/concurrent_hash_map.h
>-include/tbb/parallel_while.h
>+include/tbb/null_mutex.h
>+include/tbb/reader_writer_lock.h
>+include/tbb/task_group.h
> @dirrm include/tbb/machine
> @dirrm include/tbb/compat
> @dirrm include/tbb
> lib/libtbb.so
>+lib/libtbb.so.3
> lib/libtbbmalloc.so
>+lib/libtbbmalloc.so.3
>diff -aurN archivers/par2cmdline-tbb.orig/Makefile archivers/par2cmdline-tbb/Makefile
>--- archivers/par2cmdline-tbb.orig/Makefile	2010-06-15 12:18:27.143562379 +0000
>+++ archivers/par2cmdline-tbb/Makefile	2010-06-15 12:19:19.268205594 +0000
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	par2cmdline-tbb
> PORTVERSION=	20100203
>+PORTREVISION=	1
> CATEGORIES=	archivers
> MASTER_SITES=	http://chuchusoft.com/par2_tbb/
> DISTNAME=	par2cmdline-0.4-tbb-${PORTVERSION}
>@@ -14,7 +15,7 @@
> MAINTAINER=	ganael.laplanche@martymac.com
> COMMENT=	Tools for using Parity v2 Archive files (tbb version)
> 
>-BUILD_DEPENDS=	${LOCALBASE}/lib/libtbb.so:${PORTSDIR}/devel/tbb
>+LIB_DEPENDS=	tbb.3:${PORTSDIR}/devel/tbb
> 
> ONLY_FOR_ARCHS=	i386 amd64 ia64
> GNU_CONFIGURE=	yes

Actions: View | Diff

Attachments on bug 147870: 107154