Index: devel/ocl-icd/Makefile
===================================================================
--- devel/ocl-icd/Makefile	(revision 467034)
+++ devel/ocl-icd/Makefile	(working copy)
@@ -1,31 +1,36 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	ocl-icd
-PORTVERSION=	2.2.11
-PORTREVISION=	1
-CATEGORIES=	devel
+PORTNAME=		ocl-icd
+PORTVERSION=	2.2.12
+#DISTVERSIONPREFIX=	v
+CATEGORIES=		devel
+#GH_ACCOUNT=		OCL-dev
 MASTER_SITES=	https://forge.imag.fr/frs/download.php/${REVID}/
-REVID=		814
+REVID=			836
 
-MAINTAINER=	ohartman@zedat.fu-berlin.de
-COMMENT=	OpenCL Installable Client Driver
+MAINTAINER=		ohartmann@walstatt.org
+COMMENT=		OpenCL Installable Client Driver
 
-LICENSE=	BSD2CLAUSE
+LICENSE=		BSD2CLAUSE
 
 BUILD_DEPENDS=	opencl>=2.1:devel/opencl
 
-CONFLICTS=	freeocl-[0-9]* opencl-icd-[0-9]*
+CONFLICTS=		freeocl-[0-9]* opencl-icd-[0-9]*
 
-USE_RUBY=	yes
+USES=			gmake libtool localbase:ldflags pathfix
+
+USE_GITHUB=		yes
+USE_RUBY=		yes
+RUBY_NO_RUN_DEPENDS=yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-RUBY_NO_RUN_DEPENDS=yes
-USES=		gmake libtool localbase pathfix
+
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS+=--disable-official-khronos-headers \
-		--enable-custom-vendordir
+				--enable-custom-vendordir \
+				--enable-pthread-once
 
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
@@ -32,7 +37,7 @@
 OPTIONS_SUB=	yes
 
 MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto \
-			asciidoc:textproc/asciidoc
+				asciidoc:textproc/asciidoc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/|${LOCALBASE}/etc/|g' \
Index: devel/ocl-icd/distinfo
===================================================================
--- devel/ocl-icd/distinfo	(revision 467034)
+++ devel/ocl-icd/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486067287
-SHA256 (ocl-icd-2.2.11.tar.gz) = 02fa41da98ae2807e92742196831d320e3fc2f4cb1118d0061d9f51dda867730
-SIZE (ocl-icd-2.2.11.tar.gz) = 455800
+TIMESTAMP = 1520760392
+SHA256 (ocl-icd-ocl-icd-2.2.12_GH0.tar.gz) = 7665f368354e3d2b7787ba4a23c6f061db1181195ba1914dd1cdcd462eca4df4
+SIZE (ocl-icd-ocl-icd-2.2.12_GH0.tar.gz) = 456646
Index: devel/ocl-icd/files/patch-ocl__icd__debug.h
===================================================================
--- devel/ocl-icd/files/patch-ocl__icd__debug.h	(revision 467034)
+++ devel/ocl-icd/files/patch-ocl__icd__debug.h	(working copy)
@@ -1,6 +1,6 @@
---- ocl_icd_debug.h.orig	2016-04-24 12:11:57 UTC
-+++ ocl_icd_debug.h
-@@ -61,9 +61,9 @@ extern int debug_ocl_icd_mask;
+--- ocl_icd_debug.h.orig	2016-04-24 14:11:57.281333306 +0200
++++ ocl_icd_debug.h	2017-02-02 21:31:54.312526000 +0100
+@@ -61,9 +61,9 @@
  	return ret; \
     } while(0)
  #  define RETURN_STR(val) do { \
Index: devel/ocl-icd/files/patch-ocl__icd__loader.c
===================================================================
--- devel/ocl-icd/files/patch-ocl__icd__loader.c	(revision 467034)
+++ devel/ocl-icd/files/patch-ocl__icd__loader.c	(working copy)
@@ -1,6 +1,6 @@
---- ocl_icd_loader.c.orig	2017-01-19 13:55:12 UTC
-+++ ocl_icd_loader.c
-@@ -53,7 +53,7 @@ int debug_ocl_icd_mask=0;
+--- ocl_icd_loader.c.orig	2017-01-19 14:55:12.355263750 +0100
++++ ocl_icd_loader.c	2017-02-02 21:36:14.579958000 +0100
+@@ -53,7 +53,7 @@
  
  typedef __typeof__(clGetPlatformInfo) *clGetPlatformInfo_fn;