--- Makefile	(revision 469266)
+++ Makefile	(working copy)
@@ -17,8 +17,7 @@ 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		fortran gmake perl5
-
+USES=		gmake perl5
 USE_GITHUB=	yes
 GH_ACCOUNT=	xianyi
 GH_PROJECT=	OpenBLAS
@@ -37,7 +36,7 @@ 
 
 OPTIONS_DEFINE=		INTERFACE64 OPENMP
 OPTIONS_DEFINE_i386=	DYNAMIC_ARCH AVX AVX2
-OPTIONS_DEFINE_amd64=	${OPTIONS_DEFINE_i386}
+OPTIONS_DEFINE_amd64=	${OPTIONS_DEFINE_i386} FLANG
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT_i386=	DYNAMIC_ARCH
@@ -49,6 +48,9 @@ 
 OPENMP_DESC=		Use OpenMP for threading
 AVX_DESC=		Support Advanced Vector Extensions (AVX)
 AVX2_DESC=		Support Advanced Vector Extensions 2 (AVX2)
+FLANG_DESC=             Use experimental flang instead of default Fortran compiler
+FLANG_USES=             fortran:flang
+FLANG_USES_OFF=         fortran
 
 .include <bsd.port.options.mk>
 
--- files/patch-Makefile.system	(revision 469266)
+++ files/patch-Makefile.system	(working copy)
@@ -1,14 +1,16 @@ 
---- Makefile.system.orig	2015-10-27 20:44:50 UTC
-+++ Makefile.system
-@@ -218,6 +218,7 @@ MD5SUM = md5 -r
+--- Makefile.system.orig	2017-07-23 21:03:35.000000000 -0700
++++ Makefile.system	2018-05-05 20:36:57.037963000 -0700
+@@ -230,6 +230,9 @@
  endif
  
  ifeq ($(OSNAME), FreeBSD)
++ifeq ($(F_COMPILER), GFORTRAN)
 +EXTRALIB	+= -lm %%LDFLAGS%%
++endif
  MD5SUM = md5 -r
  endif
  
-@@ -889,9 +890,17 @@ SYMBOLSUFFIX =
+@@ -948,9 +951,17 @@
  endif
  
  ifndef LIBNAMESUFFIX
@@ -26,7 +28,7 @@ 
  endif
  
  KERNELDIR	= $(TOPDIR)/kernel/$(ARCH)
-@@ -1020,24 +1029,8 @@ ifndef LIBSUFFIX
+@@ -1089,24 +1100,8 @@
  LIBSUFFIX = a
  endif
  
@@ -51,7 +53,7 @@ 
  
  LIBDLLNAME   = $(LIBPREFIX).dll
  LIBSONAME    = $(LIBNAME:.$(LIBSUFFIX)=.so)
-@@ -1067,7 +1060,7 @@ LIB_COMPONENTS = CBLAS
+@@ -1139,7 +1134,7 @@
  endif
  
  export OSNAME
--- files/patch-exports+Makefile	(revision 469266)
+++ files/patch-exports+Makefile	(nonexistent)
@@ -1,18 +0,0 @@ 
---- exports/Makefile.orig	2015-10-27 20:44:50 UTC
-+++ exports/Makefile
-@@ -140,6 +140,7 @@ endif
- #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
- ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
- 
-+EXTRALIB += -lgfortran
- so : ../$(LIBSONAME)
- 
- ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
-@@ -151,6 +152,7 @@ else
- endif
- 	$(CC) $(CFLAGS) $(LDFLAGS)  -shared -o ../$(LIBSONAME) \
- 	-Wl,--whole-archive $< -Wl,--no-whole-archive \
-+	-Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) \
- 	$(FEXTRALIB) $(EXTRALIB)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
- 	rm -f linktest