science/elk: Update 5.2.14 -> 6.8.4

Reported by:	portscout

science/elk/Makefile

@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	elk
-DISTVERSION=	5.2.14
-PORTREVISION=	3
+DISTVERSION=	6.8.4
 CATEGORIES=	science
 MASTER_SITES=	SF/${PORTNAME}/
 PKGNAMESUFFIX=	-chemistry
@@ -14,6 +13,10 @@ COMMENT=	All-electron full-potential linearised augmented-planewave code
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+LIB_DEPENDS=	libblis.so:math/blis \
+		libopenblas.so:math/openblas \
+		libwannier.so:science/wannier90
+
 USES=		fortran gmake tar:tgz
 
 BINARY_ALIAS=	make=${GMAKE}

science/elk/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1537690777
-SHA256 (elk-chemistry/elk-5.2.14.tgz) = fc74362c2f0899ea8c26a023e3fd6d8a37ac2092405c03244366a81ae7d9fe2d
-SIZE (elk-chemistry/elk-5.2.14.tgz) = 3910868
+TIMESTAMP = 1593445897
+SHA256 (elk-chemistry/elk-6.8.4.tgz) = 96e7a4803ada84ebb86e3c85c18abb9052d00ee32be8ad0b1ee674cbe3c8ff61
+SIZE (elk-chemistry/elk-6.8.4.tgz) = 4207810

science/elk/files/make.inc.in

@@ -5,10 +5,12 @@ F90_OPTS = -O3 -ffast-math -funroll-loops %%OPENMP_FLAGS%%
 F77 = %%FC%%
 F77_OPTS = -O3 -ffast-math -funroll-loops %%OPENMP_FLAGS%%
 AR = ar
-LIB_SYS = 
+LIB_SYS = -lopenblas -lblis
 LIB_LPK = lapack.a blas.a
 LIB_FFT = fftlib.a
+LIB_W90 = -lwannier
 SRC_OMP = 
+SRC_MKL = mkl_stub.f90
 SRC_MPI = mpi_stub.f90
 SRC_libxc = libxcifc_stub.f90
 SRC_FFT = zfftifc.f90

science/elk/files/patch-src_Makefile

@@ -1,11 +0,0 @@
---- src/Makefile.orig	2018-09-23 04:08:15 UTC
-+++ src/Makefile
-@@ -175,7 +175,7 @@ EXE = elk
- # Targets
- #-------------------------------------------------------------------------------
- elk:	$(OBJ)
--	$(F90) $(F90_OPTS) -o $(EXE) $(OBJ) $(LIB_LPK) $(LIB_FFT) $(LIB_libxc) \
-+	$(F90) $(F90_OPTS) -o $(EXE) $(LDFLAGS) $(OBJ) $(LIB_LPK) $(LIB_FFT) $(LIB_libxc) \
-          $(LIB_SYS)
- 
- blas:

science/elk/patch-Makefile

@@ -1,9 +0,0 @@
---- Makefile.orig	2018-09-23 03:56:50 UTC
-+++ Makefile
-@@ -1,5 +1,5 @@
- 
--MAKE = make
-+xMAKE = make
- 
- include make.inc
-