Index: head/devel/f18/Makefile
===================================================================
--- head/devel/f18/Makefile	(revision 514873)
+++ head/devel/f18/Makefile	(revision 514874)
@@ -1,35 +1,38 @@
 # Created by: Johannes M Dieterich <jmd@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	f18
-DISTVERSION=	g20190422
-PORTREVISION=	1
+DISTVERSION=	g20191019
 CATEGORIES=	devel
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	Fortran compiler targeting LLVM
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
-BROKEN_FreeBSD_11=	could not read symbols: File format not recognized
 
 BUILD_DEPENDS=	llvm80>=0:devel/llvm80
-RUN_DEPENDS=	llvm80>=0:devel/llvm80
+RUN_DEPENDS=	llvm80>=0:devel/llvm60
 
 USES=		cmake:noninja compiler:c++11-lib libedit perl5 tar:xz \
 		shebangfix
 _USES_PYTHON?=	python:build
 USES+=		${_USES_PYTHON}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	flang-compiler
-GH_TAGNAME=	9e178f2
+GH_TAGNAME=	1688bef
+
+SHEBANG_FILES=	tools/f18/flang.sh
+
+CC=		${LOCALBASE}/llvm80/bin/clang
+CXX=		${LOCALBASE}/llvm80/bin/clang++
 
 CMAKE_ARGS+=	-DLLVM_DIR=${LOCALBASE}/llvm80/lib/cmake/llvm \
 		-DBUILD_WITH_CLANG=${LOCALBASE}/llvm80
 
 MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.mk>
Index: head/devel/f18/distinfo
===================================================================
--- head/devel/f18/distinfo	(revision 514873)
+++ head/devel/f18/distinfo	(revision 514874)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555981638
-SHA256 (flang-compiler-f18-g20190422-9e178f2_GH0.tar.gz) = 4140ac6647733f2fa13936f4efcef44ef8abc3bbc00c77fbee3791069576296d
-SIZE (flang-compiler-f18-g20190422-9e178f2_GH0.tar.gz) = 582704
+TIMESTAMP = 1571522391
+SHA256 (flang-compiler-f18-g20191019-1688bef_GH0.tar.gz) = e5e264bf6151e276ca1812284e93a2909ddbd2c65a177375c6044a650e9141cd
+SIZE (flang-compiler-f18-g20191019-1688bef_GH0.tar.gz) = 793017
Index: head/devel/f18/pkg-plist
===================================================================
--- head/devel/f18/pkg-plist	(revision 514873)
+++ head/devel/f18/pkg-plist	(revision 514874)
@@ -1,7 +1,21 @@
 bin/f18
 bin/f18-parse-demo
+bin/flang
+include/ieee_arithmetic.f18.mod
+include/ieee_arithmetic.mod
+include/ieee_exceptions.f18.mod
+include/ieee_exceptions.mod
+include/ieee_features.f18.mod
+include/ieee_features.mod
+include/iso_c_binding.f18.mod
+include/iso_c_binding.mod
+include/iso_fortran_env.f18.mod
+include/iso_fortran_env.mod
+include/omp_lib.f18.mod
+include/omp_lib.mod
+lib/libFortranBurnside.a
 lib/libFortranCommon.a
+lib/libFortranDecimal.a
 lib/libFortranEvaluate.a
-lib/libFortranFIR.a
 lib/libFortranParser.a
 lib/libFortranSemantics.a