Index: head/devel/libclc/Makefile
===================================================================
--- head/devel/libclc/Makefile	(revision 407522)
+++ head/devel/libclc/Makefile	(revision 407523)
@@ -1,39 +1,40 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libclc
 DISTVERSION=	0.1.0.20150710
 CATEGORIES=	devel
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Required library functions for OpenCL C programming language
 
-BUILD_DEPENDS=	clang${LLVMVER}:${PORTSDIR}/lang/clang${LLVMVER}
+BUILD_DEPENDS=	clang${LLVMVER}:${PORTSDIR}/lang/clang${LLVMVER} \
+		libedit>=0:${PORTSDIR}/devel/libedit
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	llvm-mirror
 GH_TAGNAME=	eed524f2a9
 
 GNU_CONFIGURE=	yes
 USES=		gmake python:2,build ninja
 USE_LDCONFIG=	yes
 MAKE_ENV=	MAKE=${GMAKE} DESTDIR=${STAGEDIR}
 
 LLVMVER=	36
 
 ALL_TARGET=
 
 BROKEN_FreeBSD_9=	missing <system_error> header
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \
 		-e 's|"python |"${PYTHON_VERSION} |g' \
 		${WRKSRC}/build/ninja_syntax.py \
 		${WRKSRC}/configure.py
 
 do-configure:
 	@cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} -g ninja \
 		--with-llvm-config=${LOCALBASE}/bin/llvm-config${LLVMVER} \
 		--pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
 .include <bsd.port.mk>
Index: head/devel/libclc/files/patch-configure.py
===================================================================
--- head/devel/libclc/files/patch-configure.py	(revision 407522)
+++ head/devel/libclc/files/patch-configure.py	(revision 407523)
@@ -1,11 +1,27 @@
---- configure.py.orig	2014-02-14 21:33:53.000000000 +0100
-+++ configure.py	2014-08-20 13:42:06.162076745 +0200
-@@ -228,7 +228,7 @@
+The LLVM_TOOL_LINK builds a helper tool named utils/prepare-builtins that
+requires libedit which in turn pulls in libtinfo (part of libncurses).
+In order to support builds on platforms without base ncurses (e.g. DF),
+require base libedit.  This requires an additional -L LDFLAGS to search
+${LOCALBASE}/lib for the needed libs.  (prepare-builtins is not installed)
+
+--- configure.py.orig	2015-07-10 13:37:04 UTC
++++ configure.py
+@@ -118,7 +118,8 @@ b.rule("OPT", command = llvm_opt + " -O3
+        description = 'OPT $out')
+ 
+ c_compiler_rule(b, "LLVM_TOOL_CXX", 'CXX', cxx_compiler, llvm_cxxflags)
+-b.rule("LLVM_TOOL_LINK", cxx_compiler + " -o $out $in %s" % llvm_core_libs + " -Wl,-rpath %s" % llvm_libdir, 'LINK $out')
++b.rule("LLVM_TOOL_LINK", cxx_compiler + " -o $out $in %s" % llvm_core_libs + 
++  " -L" + prefix + "/lib -Wl,-rpath %s" % llvm_libdir, 'LINK $out')
+ 
+ prepare_builtins = os.path.join('utils', 'prepare-builtins')
+ b.build(os.path.join('utils', 'prepare-builtins.o'), "LLVM_TOOL_CXX",
+@@ -264,7 +265,7 @@ install_cmd = ' && '.join(['mkdir -p ${D
                             {'src': file,
                              'dst': libexecdir}
                             for (file, dest) in install_files_bc])
 -install_cmd = ' && '.join(['%(old)s && mkdir -p ${DESTDIR}/%(dst)s && cp -r %(srcdir)s/generic/include/clc ${DESTDIR}/%(dst)s' %
 +install_cmd = ' && '.join(['%(old)s && mkdir -p ${DESTDIR}/%(dst)s && cp -r generic/include/clc ${DESTDIR}/%(dst)s' %
                             {'old': install_cmd,
                              'dst': includedir,
                              'srcdir': srcdir}])