diff --git a/math/petiga/Makefile b/math/petiga/Makefile
index 419f0525138e..d473c9d8907d 100644
--- a/math/petiga/Makefile
+++ b/math/petiga/Makefile
@@ -1,12 +1,10 @@
 PORTNAME=	petiga
-DISTVERSION=	g20210307
-PORTREVISION=	1
+DISTVERSION=	g20221208
 CATEGORIES=	math python
-MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for High Performance Isogeometric Analysis
-WWW=		https://bitbucket.org/dalcinl/petiga/
+WWW=		https://github.com/dalcinl/PetIGA
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
@@ -16,19 +14,21 @@ LIB_DEPENDS=	libblas.so:math/blas \
 		libmpich.so:net/mpich \
 		libpetsc.so:science/PETSc
 
-USES=		gmake compiler:c++14-lang fortran
+USES=		gmake compiler:c++14-lang fortran xorg
 USE_LDCONFIG=	yes
+USE_XORG=	x11
 
 MAKEFILE=	makefile
 
 MAKE_ENV=	PETSC_DIR=${LOCALBASE}
-MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX} # https://bitbucket.org/dalcinl/petiga/issues/6/installs-into-prefix-tmp-petiga-instead-of
+MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
 
-BB_ACCOUNT=	dalcinl
-BB_PROJECT=	${PORTNAME}
-BB_COMMIT=	063a0ad5f450
+USE_GITHUB=	yes
+GH_ACCOUNT=	dalcinl
+GH_PROJECT=	PetIGA
+GH_TAGNAME=	218fdfa
 
-WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
+TEST_TARGET=	check
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpetiga.so
diff --git a/math/petiga/distinfo b/math/petiga/distinfo
index eeb0d9d7f10f..afcf27d228e6 100644
--- a/math/petiga/distinfo
+++ b/math/petiga/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617136913
-SHA256 (petiga-g20210307.tar.gz) = 39f7a1924bc80e9697d6ed9daa7e26e20f0a8872d38e5073de3462ba6f4be750
-SIZE (petiga-g20210307.tar.gz) = 189378
+TIMESTAMP = 1672258937
+SHA256 (dalcinl-PetIGA-g20221208-218fdfa_GH0.tar.gz) = 41a89c1c39b5523ce542c1cc849be2e99fa1ef1d08d27382f8d82c62089b5fb8
+SIZE (dalcinl-PetIGA-g20221208-218fdfa_GH0.tar.gz) = 189743