Update devel/tbb to 2017.5

Also bring the following changes:
- Fetch distfiles from Github
- Bump dependent ports' PORTREVISIONs

10 files changed, 23 insertions, 48 deletions

diff --git a/archivers/par2cmdline-tbb/Makefile b/archivers/par2cmdline-tbb/Makefile
index a01151a1bf0d..81c5a2fdbe3c 100644
--- a/archivers/par2cmdline-tbb/Makefile
+++ b/archivers/par2cmdline-tbb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	par2cmdline-tbb
 PORTVERSION=	20100203
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	archivers
 MASTER_SITES=	http://chuchusoft.com/par2_tbb/
 DISTNAME=	par2cmdline-0.4-tbb-${PORTVERSION}
diff --git a/biology/bowtie2/Makefile b/biology/bowtie2/Makefile
index 8ef489a65a53..eb825ae613dc 100644
--- a/biology/bowtie2/Makefile
+++ b/biology/bowtie2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bowtie2
 PORTVERSION=	2.3.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	biology
 
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index a4e0e27d98f4..8621da2873ec 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencascade
 PORTVERSION=	6.9.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	cad science
 MASTER_SITES=	LOCAL/thierry
 
diff --git a/devel/tbb/Makefile b/devel/tbb/Makefile
index 873e295d1ed1..930d32aeae2e 100644
--- a/devel/tbb/Makefile
+++ b/devel/tbb/Makefile
@@ -2,18 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	tbb
-PORTVERSION=	2017.1
-PORTREVISION=	3
+PORTVERSION=	2017.5
 CATEGORIES=	devel
-MASTER_SITES=	http://threadingbuildingblocks.org/sites/default/files/software_releases/source/ \
-		LOCAL/martymac
-DISTNAME=	${PORTNAME}${PORTVERSION:R:S/.//g}_20160916oss_src
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Library that provides thread building blocks
 
 LICENSE=	GPLv2
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	01org
+GH_TAGNAME=	${PORTVERSION:S/./_U/}
+
 SUB_FILES=	tbb.pc
 SUB_LIST=	prefix="${PREFIX}" \
 		name="${PORTNAME}" \
@@ -30,7 +30,6 @@ USE_LDCONFIG=	yes
 USES=	compiler gmake tar:tgz
 ALL_TARGET=	default
 
-WRKSRC=	${WRKDIR}/${DISTNAME:S/_src//}
 CC_BASENAME=	${CC:C,^.*/,,}
 
 .include <bsd.port.pre.mk>
diff --git a/devel/tbb/distinfo b/devel/tbb/distinfo
index 7e4a3e53a144..d50e6766df32 100644
--- a/devel/tbb/distinfo
+++ b/devel/tbb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476787057
-SHA256 (tbb2017_20160916oss_src.tgz) = 600c67f1c5a730e411b3bf2e792cfe5808f40c4f0354a9b613827fff0ef27fc4
-SIZE (tbb2017_20160916oss_src.tgz) = 2938546
+TIMESTAMP = 1488802415
+SHA256 (01org-tbb-2017.5-2017_U5_GH0.tar.gz) = 780baf0ad520f23b54dd20dc97bf5aae4bc562019e0a70f53bfc4c1afec6e545
+SIZE (01org-tbb-2017.5-2017_U5_GH0.tar.gz) = 2856407
diff --git a/devel/tbb/files/patch-build-FreeBSD.inc b/devel/tbb/files/patch-build-FreeBSD.inc
index 14a32a9abf75..c72a2d23adf3 100644
--- a/devel/tbb/files/patch-build-FreeBSD.inc
+++ b/devel/tbb/files/patch-build-FreeBSD.inc
@@ -1,24 +1,24 @@
---- build/FreeBSD.inc.orig	2015-06-11 14:18:55 UTC
-+++ build/FreeBSD.inc
-@@ -29,14 +29,14 @@ ifndef arch
+--- build/FreeBSD.inc.orig	2017-03-06 12:36:15.780368000 +0000
++++ build/FreeBSD.inc	2017-03-06 12:37:56.563219000 +0000
+@@ -29,14 +29,14 @@
  endif
  
  ifndef runtime
--        gcc_version:=$(shell gcc -dumpversion)
-+        gcc_version:=$(shell $(CC) -dumpversion)
+-        clang_version:=$(shell clang -v 2>&1 | grep version | sed "s/.*version \([0-9]*\.[0-9]*\).*/\1/")
++        clang_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)
+         export runtime:=cc$(clang_version)_kernel$(os_kernel_version)
  endif
  
--native_compiler := gcc
--export compiler ?= gcc
+-native_compiler := clang
+-export compiler ?= clang
 +native_compiler := $(CC)
 +export compiler ?= $(CC)
  debugger ?= gdb
  
  CMD=$(SHELL) -c
-@@ -46,7 +46,7 @@ RD?=rmdir
+@@ -46,7 +46,7 @@
  MD?=mkdir -p
  NUL= /dev/null
  SLASH=/
diff --git a/devel/tbb/files/patch-common.inc b/devel/tbb/files/patch-common.inc
deleted file mode 100644
index 1c28b28cd9cf..000000000000
--- a/devel/tbb/files/patch-common.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-Accept absolute paths for $compiler variable (and so for $CC)
-
---- build/common.inc.orig	2016-09-22 10:28:03.000000000 +0000
-+++ build/common.inc	2017-01-05 21:44:56.121147000 +0000
-@@ -106,17 +106,17 @@
-   target:=$(tbb_os)
-  endif
-  # process host/target compiler-dependent build configuration
-- ifeq (,$(wildcard $(tbb_root)/build/$(target).$(compiler).inc))
--  $(error "$(compiler)" is not supported on $(target). Add build/$(target).$(compiler).inc file with compiler-specific settings. )
-+ ifeq (,$(wildcard $(tbb_root)/build/$(target).$(notdir $(compiler)).inc))
-+  $(error "$(notdir $(compiler))" is not supported on $(target). Add build/$(target).$(notdir $(compiler)).inc file with compiler-specific settings. )
-  endif
-- include $(tbb_root)/build/$(target).$(compiler).inc
-+ include $(tbb_root)/build/$(target).$(notdir $(compiler)).inc
- endif
- 
- ifneq ($(BUILDING_PHASE),1)
-  # definitions for top-level Makefiles
-  origin_build_dir:=$(origin tbb_build_dir)
-  tbb_build_dir?=$(tbb_root)$(SLASH)build
-- export tbb_build_prefix?=$(tbb_os)_$(arch)_$(compiler)_$(runtime)$(CPF_SUFFIX)
-+ export tbb_build_prefix?=$(tbb_os)_$(arch)_$(notdir $(compiler))_$(runtime)$(CPF_SUFFIX)
-  work_dir=$(tbb_build_dir)$(SLASH)$(tbb_build_prefix)
- endif  # BUILDING_PHASE != 1
- 
diff --git a/devel/tbb/pkg-plist b/devel/tbb/pkg-plist
index c19de1e3a48f..36ad6b1141e1 100644
--- a/devel/tbb/pkg-plist
+++ b/devel/tbb/pkg-plist
@@ -23,6 +23,7 @@ include/tbb/flow_graph.h
 include/tbb/flow_graph_abstractions.h
 include/tbb/flow_graph_opencl_node.h
 include/tbb/global_control.h
+include/tbb/gfx_factory.h
 include/tbb/index.html
 include/tbb/internal/_aggregator_impl.h
 include/tbb/internal/_concurrent_queue_impl.h
@@ -64,7 +65,6 @@ 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
diff --git a/graphics/opencv2/Makefile b/graphics/opencv2/Makefile
index a13b49c7e83c..10d6bf1ca0ef 100644
--- a/graphics/opencv2/Makefile
+++ b/graphics/opencv2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	opencv
 PORTVERSION=	2.4.13.1
-PORTREVISION?=	5
+PORTREVISION?=	6
 CATEGORIES=	graphics
 PKGNAMESUFFIX?=	2
 
diff --git a/math/saga/Makefile b/math/saga/Makefile
index bda083a9705c..9faf9ae5dbb9 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	saga
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}