diff -urN flang.orig/Makefile flang/Makefile
--- flang.orig/Makefile	2017-06-26 06:30:59.316156000 +0200
+++ flang/Makefile	2017-07-18 15:05:31.701981000 +0200
@@ -2,8 +2,7 @@
 # $FreeBSD: head/devel/flang/Makefile 444324 2017-06-25 21:07:58Z tcberner $
 
 PORTNAME=	flang
-DISTVERSION=	3.9-20170522
-PORTREVISION=	1
+DISTVERSION=	4.0-20170717
 CATEGORIES=	devel
 
 MAINTAINER=	jmd@FreeBSD.org
@@ -12,10 +11,10 @@
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	llvm39>=0:devel/llvm39 \
+BUILD_DEPENDS=	llvm40>=0:devel/llvm40 \
 		openmp>=0:devel/openmp \
 		flang-clang>=0:devel/flang-clang
-RUN_DEPENDS=	llvm39>=0:devel/llvm39 \
+RUN_DEPENDS=	llvm40>=0:devel/llvm40 \
 		openmp>=0:devel/openmp \
 		flang-clang>=0:devel/flang-clang
 
@@ -33,9 +32,9 @@
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	flang-compiler
-GH_TAGNAME=	5af07d4
+GH_TAGNAME=	cd44bcd
 
-CMAKE_ARGS+=	-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config39 \
+CMAKE_ARGS+=	-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config40 \
 		-DCMAKE_CXX_COMPILER=${LOCALBASE}flang/bin/clang++ \
 		-DCMAKE_C_COMPILER=${LOCALBASE}/flang/bin/clang \
 		-DCMAKE_Fortran_COMPILER=${LOCALBASE}/flang/bin/flang
diff -urN flang.orig/distinfo flang/distinfo
--- flang.orig/distinfo	2017-05-24 08:31:06.630390000 +0200
+++ flang/distinfo	2017-07-18 15:05:49.662146000 +0200
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495501996
-SHA256 (flang-compiler-flang-3.9-20170522-5af07d4_GH0.tar.gz) = e0398ba2e01d14dbd23b6cd9f07b66c0072a23468a48490003bbb3dff49895e5
-SIZE (flang-compiler-flang-3.9-20170522-5af07d4_GH0.tar.gz) = 3578945
+TIMESTAMP = 1500383149
+SHA256 (flang-compiler-flang-4.0-20170717-cd44bcd_GH0.tar.gz) = 6d88a8a04fa3897c2d90d556a1018eaed607b7cdb9242fbf54f1282e2d25d6c9
+SIZE (flang-compiler-flang-4.0-20170717-cd44bcd_GH0.tar.gz) = 3582194
diff -urN flang.orig/files/patch-CMakeLists.txt flang/files/patch-CMakeLists.txt
--- flang.orig/files/patch-CMakeLists.txt	2017-05-19 06:24:18.941606000 +0200
+++ flang/files/patch-CMakeLists.txt	2017-07-18 15:11:46.175252000 +0200
@@ -1,14 +1,5 @@
---- CMakeLists.txt.orig	2017-05-17 00:40:01 UTC
+--- CMakeLists.txt.orig	2017-07-17 19:12:06 UTC
 +++ CMakeLists.txt
-@@ -23,7 +23,7 @@ cmake_minimum_required(VERSION 2.8)
- SET(CMAKE_Fortran_COMPILER_WORKS 1)
- 
- if( NOT DEFINED TARGET_ARCHITECTURE )
--  execute_process(COMMAND uname -i OUTPUT_STRIP_TRAILING_WHITESPACE
-+  execute_process(COMMAND uname -m OUTPUT_STRIP_TRAILING_WHITESPACE
-                   OUTPUT_VARIABLE TARGET_ARCHITECTURE)
-   execute_process(COMMAND uname -s OUTPUT_STRIP_TRAILING_WHITESPACE
-                   OUTPUT_VARIABLE TARGET_OS)
 @@ -48,6 +48,19 @@ if( ${TARGET_OS} STREQUAL "Linux" )
      message("Unsupported architecture: ${TARGET_ARCHITECTURE}" )
      return()