diff --git a/devel/libclc/Makefile b/devel/libclc/Makefile
index 8fc8cbf6349c..e5568cff4974 100644
--- a/devel/libclc/Makefile
+++ b/devel/libclc/Makefile
@@ -44,7 +44,7 @@ do-configure:
 .include <bsd.port.options.mk>
 
 # Keep in sync with lang/clover
-.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90
 LLVM_DEFAULT=	80
 .endif
 
diff --git a/devel/oclgrind/Makefile b/devel/oclgrind/Makefile
index aca6e262cfb5..890fa0664986 100644
--- a/devel/oclgrind/Makefile
+++ b/devel/oclgrind/Makefile
@@ -33,7 +33,7 @@ CMAKE_ARGS+=	-DLLVM_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm
 
 .include <bsd.port.options.mk>
 
-.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90
 LLVM_DEFAULT=	80
 .endif
 
diff --git a/devel/py-llvmlite/Makefile b/devel/py-llvmlite/Makefile
index b10746b6dc34..343fbadb62e8 100644
--- a/devel/py-llvmlite/Makefile
+++ b/devel/py-llvmlite/Makefile
@@ -30,9 +30,9 @@ LLVM_SUPPORTED_MAX=	80
 
 .include <bsd.port.pre.mk>
 
-.if ${LLVM_DEFAULT:S,-devel,990,} < ${LLVM_SUPPORTED_MIN}
+.if ${LLVM_DEFAULT:C/[1-5]./&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]./&0/:S,-devel,990,} > ${LLVM_SUPPORTED_MAX}
 LLVM_VER=	${LLVM_SUPPORTED_MAX}
 .else
 LLVM_VER=	${LLVM_DEFAULT}
diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
index 50c1c8de6cd6..8e0a4eb20a68 100644
--- a/devel/qtcreator/Makefile
+++ b/devel/qtcreator/Makefile
@@ -84,7 +84,7 @@ SHEBANG_FILES=		tests/system/tools/objectsToTable.py \
 
 .include <bsd.port.pre.mk>
 
-.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90
 LLVM_DEFAULT=	80
 .endif
 
diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
index 1d27db51de28..73d74a1fac78 100644
--- a/graphics/mesa-dri/Makefile.common
+++ b/graphics/mesa-dri/Makefile.common
@@ -80,7 +80,7 @@ INSTALL_TARGET=	install-strip
 
 .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
 
diff --git a/security/afl/Makefile b/security/afl/Makefile
index 73280ebb604a..1569a0da0da0 100644
--- a/security/afl/Makefile
+++ b/security/afl/Makefile
@@ -42,7 +42,7 @@ LLVM_VARS=		CC=clang${LLVM_DEFAULT} \
 
 .include <bsd.port.options.mk>
 
-.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90
 LLVM_DEFAULT=	80
 .endif