Index: head/devel/opencl/Makefile
===================================================================
--- head/devel/opencl/Makefile	(revision 471215)
+++ head/devel/opencl/Makefile	(revision 471216)
@@ -1,41 +1,43 @@
 # Created by: Oliver Hartmann <ohartman@zedat.fu-berlin.de>
 # $FreeBSD$
 
 PORTNAME=	opencl
-PORTVERSION=	2.1
+PORTVERSION=	2.2
 CATEGORIES=	devel
 
 MAINTAINER=	ohartman@zedat.fu-berlin.de
-COMMENT=	Open Computing Language (OpenCL) specifications V2.1 (header files)
+COMMENT=	Open Computing Language (OpenCL) specifications V2.2 (header files)
 
 LICENSE=	unknown
 LICENSE_NAME=	BSD-esque license agreement
 LICENSE_TEXT=	License is included in each of the header files of this port
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 CONFLICTS=	opencl-1.[0-2]
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	OpenCL-Headers OpenCL-CLHPP:clhpp
 GH_TAGNAME=	${HEADER_TAG} ${CLHPP_TAG}:clhpp
 
 # the header releases don't have tags yet, so use git commit for now
-HEADER_TAG=	2d06e09
-CLHPP_TAG=	v2.0.10
+HEADER_TAG=	f039db6
+CLHPP_TAG=	8b6a312
 
 USES=		python:build
 NO_CONFIGURE=	yes
+
+WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}/opencl${PORTVERSION:S/.//}/CL
 
 do-build:
 	@cd ${WRKSRC_clhpp} && ${PYTHON_CMD} gen_cl_hpp.py
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/CL
 	${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/CL
 	${INSTALL_DATA} ${WRKSRC_clhpp}/cl.hpp \
 		${STAGEDIR}${PREFIX}/include/CL/cl.hpp
 	${INSTALL_DATA} ${WRKSRC_clhpp}/input_cl2.hpp \
 		${STAGEDIR}${PREFIX}/include/CL/cl2.hpp
 
 .include <bsd.port.mk>
Index: head/devel/opencl/distinfo
===================================================================
--- head/devel/opencl/distinfo	(revision 471215)
+++ head/devel/opencl/distinfo	(revision 471216)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1477133498
-SHA256 (KhronosGroup-OpenCL-Headers-2.1-2d06e09_GH0.tar.gz) = 6e5d2fc99809fd963ac2ce3648e79fa7997262741992b7a4ccd923f8d1194f6f
-SIZE (KhronosGroup-OpenCL-Headers-2.1-2d06e09_GH0.tar.gz) = 30745
-SHA256 (KhronosGroup-OpenCL-CLHPP-v2.0.10_GH0.tar.gz) = fa27456295c3fa534ce824eb0314190a8b3ebd3ba4d93a0b1270fc65bf378f2b
-SIZE (KhronosGroup-OpenCL-CLHPP-v2.0.10_GH0.tar.gz) = 129954
+TIMESTAMP = 1508331981
+SHA256 (KhronosGroup-OpenCL-Headers-2.2-f039db6_GH0.tar.gz) = 2f74418100ebc1f6a1c8dfa8bf0dbb82956f6aa54b41cb414b61fce1a5785f46
+SIZE (KhronosGroup-OpenCL-Headers-2.2-f039db6_GH0.tar.gz) = 160909
+SHA256 (KhronosGroup-OpenCL-CLHPP-8b6a312_GH0.tar.gz) = 482d6ae6bbae5255e448bb2556a9fcbbe79370cf01405f868e0e56e57a54f9bb
+SIZE (KhronosGroup-OpenCL-CLHPP-8b6a312_GH0.tar.gz) = 131038
Index: head/devel/opencl/pkg-descr
===================================================================
--- head/devel/opencl/pkg-descr	(revision 471215)
+++ head/devel/opencl/pkg-descr	(revision 471216)
@@ -1,6 +1,6 @@
 OpenCL (Open Computing Language) is an open royalty-free standard
 for general purpose parallel programming across CPUs, GPUs and
 other processors, giving software developers portable and efficient
 access to the power of these heterogeneous processing platforms.
 
-These header are covering OpenCL API 2.1
+These header are covering OpenCL API 2.2