Index: head/devel/llvm-devel/Makefile
===================================================================
--- head/devel/llvm-devel/Makefile
+++ head/devel/llvm-devel/Makefile
@@ -248,7 +248,8 @@
 	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
 	    ${GREP} -v 'lit$$' | ${GREP} -v 'FileCheck$$' | \
 	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
-	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' | \
+	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' \
+	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' | \
 	    ${SORT} >> ${PLIST}.tmp
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' | \
Index: head/devel/llvm-devel/pkg-plist
===================================================================
--- head/devel/llvm-devel/pkg-plist
+++ head/devel/llvm-devel/pkg-plist
@@ -2403,7 +2403,7 @@
 llvm-devel/share/llvm/cmake/LLVM-Config.cmake
 llvm-devel/share/llvm/cmake/LLVMConfig.cmake
 llvm-devel/share/llvm/cmake/LLVMConfigVersion.cmake
-llvm-devel/share/llvm/cmake/LLVMExports-release.cmake
+llvm-devel/share/llvm/cmake/LLVMExports-%%CMAKE_BUILD_TYPE%%.cmake
 llvm-devel/share/llvm/cmake/LLVMExports.cmake
 llvm-devel/share/llvm/cmake/LLVMProcessSources.cmake
 llvm-devel/share/llvm/cmake/TableGen.cmake
Index: head/devel/llvm37/Makefile
===================================================================
--- head/devel/llvm37/Makefile
+++ head/devel/llvm37/Makefile
@@ -244,14 +244,12 @@
 	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
 	    ${GREP} -v 'lit$$' | ${GREP} -v 'FileCheck$$' | \
 	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
-	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' | \
+	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' \
+	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' | \
 	    ${SORT} >> ${PLIST}.tmp
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' | \
 	    ${SORT} >> ${PLIST}.tmp
-#	${FIND} ${STAGEDIR}${DOCSDIR} -type f | \
-#	    ${SED} -e 's|${STAGEDIR}${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \
-#	    ${SORT} >> ${PLIST}.tmp
 	awk '{if ($$0 ~ /clang/ && $$0 !~ /omp.h/) {printf "%%%%CLANG%%%%"} if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} print}' ${PLIST}.tmp >> ${PLIST}
 	${RM} -f ${PLIST}.tmp
 
Index: head/devel/llvm37/pkg-plist
===================================================================
--- head/devel/llvm37/pkg-plist
+++ head/devel/llvm37/pkg-plist
@@ -2402,7 +2402,7 @@
 llvm37/share/llvm/cmake/LLVM-Config.cmake
 llvm37/share/llvm/cmake/LLVMConfig.cmake
 llvm37/share/llvm/cmake/LLVMConfigVersion.cmake
-llvm37/share/llvm/cmake/LLVMExports-release.cmake
+llvm37/share/llvm/cmake/LLVMExports-%%CMAKE_BUILD_TYPE%%.cmake
 llvm37/share/llvm/cmake/LLVMExports.cmake
 llvm37/share/llvm/cmake/LLVMProcessSources.cmake
 llvm37/share/llvm/cmake/TableGen.cmake