Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Dec 2012 07:42:35 +0000 (UTC)
From:      Ganael LAPLANCHE <martymac@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r308744 - in head: archivers/par2cmdline-tbb devel/tbb devel/tbb/files graphics/opencv graphics/openimageio lang/hiphop-php
Message-ID:  <201212120742.qBC7gZNK091147@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: martymac
Date: Wed Dec 12 07:42:34 2012
New Revision: 308744
URL: http://svnweb.freebsd.org/changeset/ports/308744

Log:
  - Update devel/tbb to 4.1.1 and bump dependent port's PORTREVISIONs
  - Remove hardcoded dependency on gcc [1]
  
  PR:		ports/171297 [1]
  Submitted by:	Christian Mangin <christian.mangin@gmail.com> [1]

Deleted:
  head/devel/tbb/files/patch-build-FreeBSD.gcc.inc
Modified:
  head/archivers/par2cmdline-tbb/Makefile   (contents, props changed)
  head/devel/tbb/Makefile
  head/devel/tbb/distinfo
  head/devel/tbb/files/patch-build-FreeBSD.inc   (contents, props changed)
  head/devel/tbb/files/version_info_FreeBSD.sh   (contents, props changed)
  head/devel/tbb/pkg-plist   (contents, props changed)
  head/graphics/opencv/Makefile
  head/graphics/openimageio/Makefile   (contents, props changed)
  head/lang/hiphop-php/Makefile   (contents, props changed)

Modified: head/archivers/par2cmdline-tbb/Makefile
==============================================================================
--- head/archivers/par2cmdline-tbb/Makefile	Wed Dec 12 07:34:17 2012	(r308743)
+++ head/archivers/par2cmdline-tbb/Makefile	Wed Dec 12 07:42:34 2012	(r308744)
@@ -7,7 +7,7 @@
 
 PORTNAME=	par2cmdline-tbb
 PORTVERSION=	20100203
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	archivers
 MASTER_SITES=	http://chuchusoft.com/par2_tbb/
 DISTNAME=	par2cmdline-0.4-tbb-${PORTVERSION}

Modified: head/devel/tbb/Makefile
==============================================================================
--- head/devel/tbb/Makefile	Wed Dec 12 07:34:17 2012	(r308743)
+++ head/devel/tbb/Makefile	Wed Dec 12 07:42:34 2012	(r308744)
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	tbb
-PORTVERSION=	4.0.0
+PORTVERSION=	4.1.1
 CATEGORIES=	devel
 MASTER_SITES=	http://threadingbuildingblocks.org/sites/default/files/software_releases/source/ \
 		LOCAL/martymac
-DISTNAME=	tbb40_20110809oss_src
+DISTNAME=	tbb41_20121003oss_src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	martymac@FreeBSD.org
@@ -20,19 +20,21 @@ LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64 i386 ia64
 ONLY_FOR_ARCHS_REASON=	has not been ported to this platform
+
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	default
-MAKE_ENV=	CPLUS=${CXX}
 
-WRKSRC=	${WRKDIR}/tbb40_20110809oss
+WRKSRC=	${WRKDIR}/tbb41_20121003oss
 
 post-extract:
+	@${CP} ${WRKSRC}/build/FreeBSD.gcc.inc ${WRKSRC}/build/FreeBSD.${CC}.inc
 	@${CP} ${FILESDIR}/version_info_FreeBSD.sh ${WRKSRC}/build/
 
 post-patch:
-	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/build/FreeBSD.gcc.inc
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
+		-e 's|gcc|${CC}|g' -e 's|g++|${CXX}|g' \
+		${WRKSRC}/build/FreeBSD.${CC}.inc
 
 do-install:
 	cd ${WRKSRC}; \

Modified: head/devel/tbb/distinfo
==============================================================================
--- head/devel/tbb/distinfo	Wed Dec 12 07:34:17 2012	(r308743)
+++ head/devel/tbb/distinfo	Wed Dec 12 07:42:34 2012	(r308744)
@@ -1,2 +1,2 @@
-SHA256 (tbb40_20110809oss_src.tgz) = 1df98b38ab0c3667cf8e51d6c2172585a2a75756e7ac87faacc0c349e88a3cd0
-SIZE (tbb40_20110809oss_src.tgz) = 2058034
+SHA256 (tbb41_20121003oss_src.tgz) = 5383727b9582a54cf4c4adbf22186b70e8eba276fcd3be81d746a937c5b47afc
+SIZE (tbb41_20121003oss_src.tgz) = 2250789

Modified: head/devel/tbb/files/patch-build-FreeBSD.inc
==============================================================================
--- head/devel/tbb/files/patch-build-FreeBSD.inc	Wed Dec 12 07:34:17 2012	(r308743)
+++ head/devel/tbb/files/patch-build-FreeBSD.inc	Wed Dec 12 07:42:34 2012	(r308744)
@@ -1,11 +1,29 @@
---- build/FreeBSD.inc.orig	2008-06-07 08:56:22.000000000 +0200
-+++ build/FreeBSD.inc	2008-12-16 09:32:21.710673762 +0100
+--- 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 @@
+ 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/ .*$$//')
+         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) 
++export compiler ?= $(CC)
+ debugger ?= gdb
+ 
+ CMD=$(SHELL) -c
 @@ -54,7 +54,7 @@
  MD?=mkdir -p
  NUL= /dev/null
  SLASH=/
--MAKE_VERSIONS=sh $(tbb_root)/build/version_info_linux.sh $(CPLUS) $(CPLUS_FLAGS) $(INCLUDES) >version_string.tmp
-+MAKE_VERSIONS=sh $(tbb_root)/build/version_info_FreeBSD.sh $(CPLUS) $(CPLUS_FLAGS) $(INCLUDES) >version_string.tmp
+-MAKE_VERSIONS=sh $(tbb_root)/build/version_info_linux.sh $(CPLUS) $(CPLUS_FLAGS) $(INCLUDES) >version_string.ver
++MAKE_VERSIONS=sh $(tbb_root)/build/version_info_FreeBSD.sh $(CPLUS) $(CPLUS_FLAGS) $(INCLUDES) >version_string.ver
  MAKE_TBBVARS=sh $(tbb_root)/build/generate_tbbvars.sh
  
  ifdef LD_LIBRARY_PATH

Modified: head/devel/tbb/files/version_info_FreeBSD.sh
==============================================================================
--- head/devel/tbb/files/version_info_FreeBSD.sh	Wed Dec 12 07:34:17 2012	(r308743)
+++ head/devel/tbb/files/version_info_FreeBSD.sh	Wed Dec 12 07:42:34 2012	(r308744)
@@ -1,15 +1,15 @@
 #!/bin/sh
 
-# Script used to generate version info string
-echo "#define __TBB_VERSION_STRINGS \\"
-echo '"TBB:' "BUILD_HOST\t\t"`hostname -s`" ("`uname -p`")"'" ENDL \'
-echo '"TBB:' "BUILD_OS\t\t"`uname -sr`'" ENDL \'
-echo '"TBB:' "BUILD_KERNEL\t"`uname -rv`'" ENDL \'
-echo '"TBB:' "BUILD_GCC\t\t"`g++ -v </dev/null 2>&1 | grep 'gcc.*version'`'" ENDL \'
-[ -z "$COMPILER_VERSION" ] || echo '"TBB:' "BUILD_COMPILER\t"$COMPILER_VERSION'" ENDL \'
-echo '"TBB:' "BUILD_GLIBC\t"`ldconfig -r | grep -oE '/lib/libc.so.[0-9]+' | sort -rn | head -n 1 | sed 's|/lib/libc\.so\.||'`'" ENDL \'
-echo '"TBB:' "BUILD_LD\t\t"`ld -v | grep 'version'`'" ENDL \'
-echo '"TBB:' "BUILD_TARGET\t$arch on $runtime"'" ENDL \'
-echo '"TBB:' "BUILD_COMMAND\t"$*'" ENDL \'
+# Script used to generate FreeBSD version info string
+echo "#define __TBB_VERSION_STRINGS(N) \\"
+echo '#N": BUILD_HOST'"\t\t"`hostname -s`" ("`uname -m`")"'" ENDL \'
+echo '#N": BUILD_OS'"\t\t"`uname -sr`'" ENDL \'
+echo '#N": BUILD_KERNEL'"\t"`uname -i`'" ENDL \'
+echo '#N": BUILD_GCC'"\t\t"`${CXX} --version </dev/null 2>&1 | head -n 1`'" ENDL \'
+[ -z "$COMPILER_VERSION" ] || echo '#N": BUILD_COMPILER'"\t"$COMPILER_VERSION'" ENDL \'
+echo '#N": BUILD_GLIBC'"\t"`ldconfig -r | grep -oE '/lib/libc.so.[0-9]+' | sort -rn | head -n 1 | sed 's|/lib/libc\.so\.||'`'" ENDL \'
+echo '#N": BUILD_LD'"\t\t"`ld -v 2>&1 | head -n 1`'" ENDL \'
+echo '#N": BUILD_TARGET'"\t$arch on $runtime"'" ENDL \'
+echo '#N": BUILD_COMMAND'"\t"$*'" ENDL \'
 echo ""
 echo "#define __TBB_DATETIME \""`date -u`"\""

Modified: head/devel/tbb/pkg-plist
==============================================================================
--- head/devel/tbb/pkg-plist	Wed Dec 12 07:34:17 2012	(r308743)
+++ head/devel/tbb/pkg-plist	Wed Dec 12 07:42:34 2012	(r308744)
@@ -23,6 +23,13 @@ include/tbb/concurrent_unordered_set.h
 include/tbb/memory_pool.h
 include/tbb/flow_graph.h
 include/tbb/runtime_loader.h
+include/tbb/concurrent_lru_cache.h
+include/tbb/aggregator.h
+include/tbb/task_arena.h
+include/tbb/machine/icc_generic.h
+include/tbb/machine/mic_common.h
+include/tbb/machine/gcc_ia32_common.h
+include/tbb/machine/msvc_ia32_common.h
 include/tbb/machine/gcc_generic.h
 include/tbb/machine/windows_api.h
 include/tbb/machine/macos_common.h

Modified: head/graphics/opencv/Makefile
==============================================================================
--- head/graphics/opencv/Makefile	Wed Dec 12 07:34:17 2012	(r308743)
+++ head/graphics/opencv/Makefile	Wed Dec 12 07:42:34 2012	(r308744)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	opencv
 PORTVERSION=	2.3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION}
 DISTNAME=	OpenCV-${DISTVERSION}a

Modified: head/graphics/openimageio/Makefile
==============================================================================
--- head/graphics/openimageio/Makefile	Wed Dec 12 07:34:17 2012	(r308743)
+++ head/graphics/openimageio/Makefile	Wed Dec 12 07:42:34 2012	(r308744)
@@ -7,6 +7,7 @@
 
 PORTNAME=	openimageio
 PORTVERSION=	1.0.9
+PORTREVISION=	1
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	https://github.com/OpenImageIO/oiio/tarball/
 DISTNAME=	Release-${PORTVERSION}

Modified: head/lang/hiphop-php/Makefile
==============================================================================
--- head/lang/hiphop-php/Makefile	Wed Dec 12 07:34:17 2012	(r308743)
+++ head/lang/hiphop-php/Makefile	Wed Dec 12 07:42:34 2012	(r308744)
@@ -7,7 +7,7 @@
 
 PORTNAME=	hiphop-php
 PORTVERSION=	0.0.20120716
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang devel www
 MASTER_SITES=	https://github.com/facebook/hiphop-php/tarball/${GITVERSION}/:main \
 		http://unicode.org/Public/UNIDATA/:unidata \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212120742.qBC7gZNK091147>