Index: head/science/bagel/Makefile
===================================================================
--- head/science/bagel/Makefile	(revision 490396)
+++ head/science/bagel/Makefile	(revision 490397)
@@ -1,54 +1,55 @@
 # $FreeBSD$
 
 PORTNAME=	bagel
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.1
-PORTREVISION=	2
+DISTVERSION=	1.2.2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Brilliantly Advanced General Electronic-structure Library
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_i386=	error: static_assert failed "size_t is assumed to be the same size as unsigned long long"
 
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
 		libcblas.so:math/cblas
 
 USES=		autoreconf compiler:c++11-lang fortran gmake libtool localbase python:build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datarootdir=${DATADIR}
 USE_GITHUB=	yes
 GH_ACCOUNT=	nubakery
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=			MPI LIBXC SCALAPACK SMITH # SLATER (needs a separate lib)
 OPTIONS_DEFAULT=		MPI LIBXC SCALAPACK SMITH
 
 MPI_CONFIGURE_ON=		--with-mpi=openmpi
 MPI_CONFIGURE_OFF=		--with-mpi=no
 MPI_LIB_DEPENDS=		libmpicxx.so:net/mpich # openmpi option erroneously links to mpich (due to a name clash)
 
 LIBXC_DESC=			Build DFT with libxc
 LIBXC_CONFIGURE_WITH=		libxc
 LIBXC_LIB_DEPENDS=		libxc.so:science/libxc
 
 SCALAPACK_DESC=			Use ScaLapack library for parallelized linear algebra
-SCALAPACK_CONFIGURE_ENABLE=	libxc
-SCALAPACK_MAKE_ARGS=		EXTRA_LIBS="-lcblas"
-SCALAPACK_MAKE_ARGS_OFF=	EXTRA_LIBS="-lcblas -llapack -lblas" # -llapack -lblas are a replacement of libscalapack
+SCALAPACK_CONFIGURE_ENABLE=	scalapack
+SCALAPACK_VARS=			LDFLAGS+="-lcblas -lscalapack"
+SCALAPACK_VARS_OFF=		LDFLAGS+="-lcblas -llapack -lblas" # -llapack -lblas are a replacement of libscalapack
 SCALAPACK_LIB_DEPENDS=		libscalapack.so:math/scalapack
 SCALAPACK_LIB_DEPENDS_OFF=	liblapack.so:math/lapack \
 				libblas.so:math/blas
 SCALAPACK_IMPLIES=		MPI
 
 SMITH_DESC=			Compile SMITH generated code
 SMITH_CONFIGURE_ENABLE=		smith
 SMITH_IMPLIES=			MPI
 
 TEST_TARGET=			check # tests fail to build: https://github.com/nubakery/bagel/issues/145
+#TEST_ENV=			${MAKE_ARGS}
+#TEST_ARGS=			${MAKE_ARGS}
 
 .include <bsd.port.mk>
Index: head/science/bagel/distinfo
===================================================================
--- head/science/bagel/distinfo	(revision 490396)
+++ head/science/bagel/distinfo	(revision 490397)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1544159002
-SHA256 (nubakery-bagel-v1.2.1_GH0.tar.gz) = b9051ed068f99bbf04dd7b40df260f2dab07f4231829462207bbf70d3e65e4f0
-SIZE (nubakery-bagel-v1.2.1_GH0.tar.gz) = 41549726
+TIMESTAMP = 1547548872
+SHA256 (nubakery-bagel-v1.2.2_GH0.tar.gz) = b9ef9ad5ad9b836b5393badb5a3e5b162d6ff32da497f69d05ef9e4d091b558a
+SIZE (nubakery-bagel-v1.2.2_GH0.tar.gz) = 41551016