Index: devel/libclc/Makefile
===================================================================
--- devel/libclc/Makefile
+++ devel/libclc/Makefile
@@ -44,7 +44,7 @@
 .include <bsd.port.options.mk>
 
 # Keep in sync with lang/clover
-.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+.if ${LLVM_DEFAULT:C/[1-5]./${LLVM_DEFAULT:S,-devel,990,}0/:S,-devel,990,} >= 90
 LLVM_DEFAULT=	80
 .endif
 
Index: devel/oclgrind/Makefile
===================================================================
--- devel/oclgrind/Makefile
+++ devel/oclgrind/Makefile
@@ -33,7 +33,7 @@
 
 .include <bsd.port.options.mk>
 
-.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+.if ${LLVM_DEFAULT:C/[1-5]./${LLVM_DEFAULT:S,-devel,990,}0/:S,-devel,990,} >= 90
 LLVM_DEFAULT=	80
 .endif
 
Index: devel/py-llvmlite/Makefile
===================================================================
--- devel/py-llvmlite/Makefile
+++ devel/py-llvmlite/Makefile
@@ -30,9 +30,9 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${LLVM_DEFAULT:S,-devel,990,} < ${LLVM_SUPPORTED_MIN}
+.if ${LLVM_DEFAULT:C/[1-5]./${LLVM_DEFAULT:S,-devel,990,}0/:S,-devel,990,} < ${LLVM_SUPPORTED_MIN}
 LLVM_VER=	${LLVM_SUPPORTED_MIN}
-.elif ${LLVM_DEFAULT:S,-devel,990,} > ${LLVM_SUPPORTED_MAX}
+.elif ${LLVM_DEFAULT:C/[1-5]./${LLVM_DEFAULT:S,-devel,990,}0/:S,-devel,990,} > ${LLVM_SUPPORTED_MAX}
 LLVM_VER=	${LLVM_SUPPORTED_MAX}
 .else
 LLVM_VER=	${LLVM_DEFAULT}
Index: devel/qtcreator/Makefile
===================================================================
--- devel/qtcreator/Makefile
+++ devel/qtcreator/Makefile
@@ -86,7 +86,7 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+.if ${LLVM_DEFAULT:C/[1-5]./${LLVM_DEFAULT:S,-devel,990,}0/:S,-devel,990,} >= 90
 LLVM_DEFAULT=	80
 .endif
 
Index: graphics/mesa-dri/Makefile.common
===================================================================
--- graphics/mesa-dri/Makefile.common
+++ graphics/mesa-dri/Makefile.common
@@ -79,7 +79,7 @@
 
 .if ${ARCH} == powerpc64
 LLVM_DEFAULT=	90
-.elif ${LLVM_DEFAULT:S,-devel,990,} >= 90
+.elif ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90
 LLVM_DEFAULT=	80
 .endif
 
Index: security/afl/Makefile
===================================================================
--- security/afl/Makefile
+++ security/afl/Makefile
@@ -42,7 +42,7 @@
 
 .include <bsd.port.options.mk>
 
-.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+.if ${LLVM_DEFAULT:C/[1-5]./${LLVM_DEFAULT:S,-devel,990,}0/:S,-devel,990,} >= 90
 LLVM_DEFAULT=	80
 .endif