Index: head/devel/flang/Makefile
===================================================================
--- head/devel/flang/Makefile	(revision 513786)
+++ head/devel/flang/Makefile	(revision 513787)
@@ -1,54 +1,55 @@
 # Created by: Johannes M Dieterich <jmd@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	flang
 DISTVERSION=	6.0-g20180904
 PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	Fortran compiler targeting LLVM
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 ONLY_FOR_ARCHS=	amd64
 
-BUILD_DEPENDS=	llvm60>=0:devel/llvm60 \
+LLVM_VER=	60
+BUILD_DEPENDS=	llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER} \
 		flang-clang>=0:devel/flang-clang
-RUN_DEPENDS=	llvm60>=0:devel/llvm60 \
+RUN_DEPENDS=	llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER} \
 		flang-clang>=0:devel/flang-clang
 LIB_DEPENDS=	libpgmath.so:math/libpgmath
 
 USES=		cmake:noninja compiler:c++11-lib libedit perl5 tar:xz \
 		shebangfix
 _USES_PYTHON?=	python:build
 USES+=		${_USES_PYTHON}
 USE_LDCONFIG=	${PREFIX}/flang/lib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	flang-compiler
 GH_TAGNAME=	53e368b
 
-CMAKE_ARGS+=	-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config60 \
+CMAKE_ARGS+=	-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VER} \
 		-DCMAKE_CXX_COMPILER=${LOCALBASE}flang/bin/clang++ \
 		-DCMAKE_C_COMPILER=${LOCALBASE}/flang/bin/clang \
 		-DCMAKE_Fortran_COMPILER=${LOCALBASE}/flang/bin/flang \
-		-DFLANG_LIBOMP=${LOCALBASE}/llvm60/lib/libomp.so \
+		-DFLANG_LIBOMP=${LOCALBASE}/llvm${LLVM_VER}/lib/libomp.so \
 		-DLIBPGMATH="${LOCALBASE}/lib/libpgmath.a" \
 		-WWITH_ERROR=OFF
 
 CMAKE_INSTALL_PREFIX=	${PREFIX}/flang
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	TESTS
 
 TESTS_DESC=	build unit tests for flang
 
 TESTS_CMAKE_BOOL=	FLANG_INCLUDE_TESTS
 
 post-patch:
 	@${CP} -r  ${WRKSRC}/tools/flang2/flang2exe/x86_64-Linux ${WRKSRC}/tools/flang2/flang2exe/x86_64-FreeBSD
 
 .include <bsd.port.mk>
Index: head/devel/flang-clang/Makefile
===================================================================
--- head/devel/flang-clang/Makefile	(revision 513786)
+++ head/devel/flang-clang/Makefile	(revision 513787)
@@ -1,47 +1,48 @@
 # Created by: Johannes M Dieterich <jmd@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	flang-clang
 DISTVERSION=	6.0-g20180904
 PORTREVISION=	4
 CATEGORIES=	devel lang
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	Fortran compiler targeting LLVM (modified clang part)
 
 LICENSE=	LLVM
 LICENSE_NAME=	LLVM Release License
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64
 
-BUILD_DEPENDS=	llvm60>=0:devel/llvm60
-RUN_DEPENDS=	llvm60>=0:devel/llvm60
+LLVM_VER=	60
+BUILD_DEPENDS=	llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER}
+RUN_DEPENDS=	llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER}
 
 USES=		cmake compiler:c++11-lib libedit tar:xz perl5 \
 		python shebangfix
 USE_LDCONFIG=	${PREFIX}/flang/lib
 USE_GNOME=	libxml2
 
 SHEBANG_FILES=	tools/scan-view/bin/scan-view \
 		tools/clang-format/git-clang-format \
 		tools/clang-format/clang-format-diff.py
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	flang-compiler
 GH_PROJECT=	flang-driver
 GH_TAGNAME=	742de5f
 
-CMAKE_ARGS+=	-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config60
+CMAKE_ARGS+=	-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VER}
 
 CMAKE_INSTALL_PREFIX=	${PREFIX}/flang
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/lib/Driver/ToolChains/FreeBSD.cpp
 
 post-install:
 	@${GZIP_CMD} ${STAGEDIR}/${PREFIX}/flang/man/man1/scan-build.1
 	${RLN} ${STAGEDIR}${PREFIX}/flang/bin/flang ${STAGEDIR}${PREFIX}/bin/flang
 
 .include <bsd.port.mk>