diff --git a/devel/ga/Makefile b/devel/ga/Makefile
index 2db9207f758e..405f32bdff7f 100644
--- a/devel/ga/Makefile
+++ b/devel/ga/Makefile
@@ -1,43 +1,42 @@
 PORTNAME=	ga
-DISTVERSION=	5.8.1
-PORTREVISION=	1
+DISTVERSION=	5.8.2
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/GlobalArrays/ga/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Partitioned Global Address Space (PGAS) library for distributed arrays
 WWW=		https://hpc.pnl.gov//globalarrays/
 
-LICENSE=	BMIL
-LICENSE_NAME=	Battelle Memorial Institute License
-LICENSE_FILE=	${WRKSRC}/COPYRIGHT
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack \
 		libscalapack.so:math/scalapack
 
 USES=		autoreconf fortran gmake libtool localbase
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-peigs --enable-shared --disable-static --with-blas4 --with-scalapack
-INSTALL_TARGET=	install-strip
-USE_LDCONFIG=	yes
 
 LDFLAGS+=	-lscalapack
 
+INSTALL_TARGET=	install-strip
+TEST_TARGET=	check # test asserts, see https://github.com/GlobalArrays/ga/issues/312
+
 OPTIONS_RADIO=		MPI
 OPTIONS_RADIO_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH # the default should be the same as for the MPI option in math/scalapack
 
 MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
 
 OPENMPI_BUILD_DEPENDS=		openmpi>0:net/openmpi
 OPENMPI_RUN_DEPENDS=		openmpi>0:net/openmpi
 OPENMPI_CONFIGURE_ENV=		CC=${LOCALBASE}/mpi/openmpi/bin/mpicc MPICC=${LOCALBASE}/mpi/openmpi/bin/mpicc \
 				CXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ \
 				F77=${LOCALBASE}/mpi/openmpi/bin/mpif77 MPIF77=${LOCALBASE}/mpi/openmpi/bin/mpif77 \
 				FC=${LOCALBASE}/mpi/openmpi/bin/mpif90 MPIFC=${LOCALBASE}/mpi/openmpi/bin/mpif90 \
 				LDFLAGS="-L${LOCALBASE}/mpi/openmpi/lib -Wl,-rpath,${LOCALBASE}/mpi/openmpi/lib"
 OPENMPI_MAKE_ARGS=		FREEBSD_LINK_FLAGS="-L${LOCALBASE}/mpi/openmpi/lib -Wl,-rpath,${LOCALBASE}/mpi/openmpi/lib -lmpi"
 
 .include <bsd.port.mk>
diff --git a/devel/ga/distinfo b/devel/ga/distinfo
index 10af755435aa..092738ba246c 100644
--- a/devel/ga/distinfo
+++ b/devel/ga/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1643221874
-SHA256 (ga-5.8.1.tar.gz) = 844639b52444f839854cf9735203a76a9052fd485f2d4eae70d21d03a7ecaade
-SIZE (ga-5.8.1.tar.gz) = 6492890
+TIMESTAMP = 1690335247
+SHA256 (ga-5.8.2.tar.gz) = 51599e4abfe36f05cecfaffa33be19efbe9e9fa42d035fd3f866469b663c22a2
+SIZE (ga-5.8.2.tar.gz) = 9183106