Index: head/devel/ocl-icd/Makefile
===================================================================
--- head/devel/ocl-icd/Makefile	(revision 435307)
+++ head/devel/ocl-icd/Makefile	(revision 435308)
@@ -1,39 +1,39 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ocl-icd
-PORTVERSION=	2.2.9
+PORTVERSION=	2.2.11
 CATEGORIES=	devel
 MASTER_SITES=	https://forge.imag.fr/frs/download.php/${REVID}/
-REVID=		716
+REVID=		814
 
 MAINTAINER=	ohartman@zedat.fu-berlin.de
 COMMENT=	OpenCL Installable Client Driver
 
 LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	opencl>=2.1:devel/opencl
 
 CONFLICTS=	freeocl-[0-9]* opencl-icd-[0-9]*
 
 USE_RUBY=	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
 
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 
 MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto \
 			asciidoc:textproc/asciidoc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/|${LOCALBASE}/etc/|g' \
-		${WRKSRC}/doc/libOpenCL.7.txt
+		${WRKSRC}/doc/libOpenCL.7.txt.in
 
 .include <bsd.port.mk>
Index: head/devel/ocl-icd/distinfo
===================================================================
--- head/devel/ocl-icd/distinfo	(revision 435307)
+++ head/devel/ocl-icd/distinfo	(revision 435308)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472594572
-SHA256 (ocl-icd-2.2.9.tar.gz) = 0c8ac13e2c5b737c34de49f9aca6cad3c4d33dd0bbb149b01238d76e798feae5
-SIZE (ocl-icd-2.2.9.tar.gz) = 453477
+TIMESTAMP = 1486067287
+SHA256 (ocl-icd-2.2.11.tar.gz) = 02fa41da98ae2807e92742196831d320e3fc2f4cb1118d0061d9f51dda867730
+SIZE (ocl-icd-2.2.11.tar.gz) = 455800
Index: head/devel/ocl-icd/files/patch-ocl__icd__debug.h
===================================================================
--- head/devel/ocl-icd/files/patch-ocl__icd__debug.h	(revision 435307)
+++ head/devel/ocl-icd/files/patch-ocl__icd__debug.h	(revision 435308)
@@ -1,15 +1,15 @@
---- ocl_icd_debug.h.orig	2015-08-06 20:54:47 UTC
+--- 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;
  	return ret; \
     } while(0)
  #  define RETURN_STR(val) do { \
--	char* ret=(char*)(val);			\
--	debug(D_TRACE, "return: %s", ret);	\
--	return ret; \
-+	char* _return_str=(char*)(val);			\
+-	char* _ret=(char*)(val);		\
+-	debug(D_TRACE, "return: %s", _ret);	\
+-	return _ret; \
++	char* _return_str=(char*)(val);		\
 +	debug(D_TRACE, "return: %s", _return_str);	\
 +	return _return_str; \
     } while(0)
  #  ifdef DEBUG_OCL_ICD_PROVIDE_DUMP_FIELD
  #    pragma GCC diagnostic push
Index: head/devel/ocl-icd/files/patch-ocl__icd__loader.c
===================================================================
--- head/devel/ocl-icd/files/patch-ocl__icd__loader.c	(revision 435307)
+++ head/devel/ocl-icd/files/patch-ocl__icd__loader.c	(revision 435308)
@@ -1,18 +1,11 @@
---- ocl_icd_loader.c.orig	2015-06-08 18:29:52 UTC
+--- ocl_icd_loader.c.orig	2017-01-19 13:55:12 UTC
 +++ ocl_icd_loader.c
-@@ -49,13 +49,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
- #define DEBUG_OCL_ICD_PROVIDE_DUMP_FIELD
- #include "ocl_icd_debug.h"
- 
--#define ETC_OPENCL_VENDORS "/etc/OpenCL/vendors"
-+#define ETC_OPENCL_VENDORS "/usr/local/etc/OpenCL/vendors"
- 
- int debug_ocl_icd_mask=0;
+@@ -53,7 +53,7 @@ int debug_ocl_icd_mask=0;
  
  typedef __typeof__(clGetPlatformInfo) *clGetPlatformInfo_fn;
  
 -inline void dump_vendor_icd(const char* info, const struct vendor_icd *v) {
 +static inline void dump_vendor_icd(const char* info, const struct vendor_icd *v) {
    debug(D_DUMP, "%s %p={ num=%i, handle=%p, f=%p}\n", info,
  	v, v->num_platforms, v->dl_handle, v->ext_fn_ptr);
  }