diff --git a/math/ggobi/Makefile b/math/ggobi/Makefile
index 8314bc97502d..00e2df0a13e4 100644
--- a/math/ggobi/Makefile
+++ b/math/ggobi/Makefile
@@ -1,40 +1,39 @@
 PORTNAME=	ggobi
-PORTVERSION=	2.1.11
-PORTREVISION=	6
+DISTVERSION=	2.1.12
 CATEGORIES=	math graphics
-MASTER_SITES=	http://www.ggobi.org/downloads/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Data visualization system
 WWW=		http://www.ggobi.org/
 
 LICENSE=	EPL
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
-		libcgraph.so:graphics/graphviz \
-		libltdl.so:devel/libltdl
+		libcgraph.so:graphics/graphviz
 
-USES=		desktop-file-utils gnome libtool pathfix pkgconfig tar:bzip2
+USES=		autoreconf desktop-file-utils gmake gnome libtool pathfix pkgconfig tex
+USE_GITHUB=	yes
+GH_TAGNAME=	93a7148  # The 'official' tarball misses last commit with pstricks removal!
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20 libxml2
-USE_GCC=	yes
 USE_LDCONFIG=	yes
+USE_TEX=	web2c:build dvipdfmx:build
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-all-plugins
-
-SUB_FILES=	pkg-message
+CONFIGURE_ARGS+=	--with-all-plugins MAKE=gmake
 
 ALL_TARGET=	all ggobirc
 INSTALL_TARGET=	install-strip
 
+SUB_FILES=	pkg-message
+
 OPTIONS_DEFINE=	DOCS
 
 post-build:
 	@${REINPLACE_CMD} -e 's|plugin.la|plugin.so|g' ${WRKSRC}/ggobirc
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/ggobi
 	${INSTALL_DATA} ${WRKSRC}/ggobirc ${STAGEDIR}${PREFIX}/etc/xdg/ggobi/ggobirc.sample
 
 .include <bsd.port.mk>
diff --git a/math/ggobi/distinfo b/math/ggobi/distinfo
index 7d14aac87d70..1338a5a635a9 100644
--- a/math/ggobi/distinfo
+++ b/math/ggobi/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ggobi-2.1.11.tar.bz2) = 2c4ddc3ab71877ba184523e47b0637526e6f3701bd9afb6472e6dfc25646aed7
-SIZE (ggobi-2.1.11.tar.bz2) = 2787709
+TIMESTAMP = 1722781980
+SHA256 (ggobi-ggobi-2.1.12-93a7148_GH0.tar.gz) = 376c36ef2a65f9e290dfb3503696e78ba70e45bfd39d0ab87bff06bba89cdb3a
+SIZE (ggobi-ggobi-2.1.12-93a7148_GH0.tar.gz) = 13311963