Index: head/java/jgraphx/Makefile
===================================================================
--- head/java/jgraphx/Makefile	(revision 395226)
+++ head/java/jgraphx/Makefile	(revision 395227)
@@ -1,55 +1,40 @@
 # $FreeBSD$
 
 PORTNAME=	jgraphx
 PORTVERSION=	2.5.1.0
 CATEGORIES=	java graphics
-MASTER_SITES=	https://codeload.github.com/jgraph/jgraphx/tar.gz/v${PORTVERSION}?dummy=/
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	The Java Graph Diagram Component version X (jgraph v6+)
 
-LICENSE=	jgraph
-LICENSE_PERMS=	# none
-LICENSE_NAME=	JGraph Ltd License
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
-MANUAL_PACKAGE_BUILD=	needs interactive license confirmation
 
-OPTIONS_DEFINE=	COMPILE DOCS
-
-COMPILE_DESC=	Compile from source instead of using provided binary
-
+USE_GITHUB=	yes
+GH_ACCOUNT=	jgraph
 USE_JAVA=	yes
-JAVA_RUN=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCOMPILE} || ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	${ANT_CMD}:${PORTSDIR}/devel/apache-ant
-ANT_CMD?=	${LOCALBASE}/bin/ant
-ANT=		${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT_CMD}
-.  if ${PORT_OPTIONS:MCOMPILE}
-JAVA_BUILD=	yes
-.  endif
-.endif
-
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
 PORTDOCS=	*
 
+OPTIONS_DEFINE=	COMPILE DOCS
+
+COMPILE_DESC=	Compile from source instead of using provided binary
+COMPILE_USE=	ANT=yes
+
 do-build:
-.if ${PORT_OPTIONS:MCOMPILE} || ${PORT_OPTIONS:MDOCS}
-	cd ${WRKSRC} && ${ANT} ${ANT_TARGETS}
-.endif
+	@${DO_NADA}
 
-do-install: do-install-jar do-install-javadoc
+do-build-COMPILE-on:
+	@(cd ${BUILD_WRKSRC}; \
+		${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${ALL_TARGET})
 
-do-install-jar:
+do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 
-do-install-javadoc:
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
Index: head/java/jgraphx/distinfo
===================================================================
--- head/java/jgraphx/distinfo	(revision 395226)
+++ head/java/jgraphx/distinfo	(revision 395227)
@@ -1,2 +1,2 @@
-SHA256 (jgraphx-2.5.1.0.tar.gz) = 6638e100af80c3885c4e87b3f951060fa6c5111d34fc17b44ba2da05963111b7
-SIZE (jgraphx-2.5.1.0.tar.gz) = 3181415
+SHA256 (jgraph-jgraphx-2.5.1.0_GH0.tar.gz) = 6638e100af80c3885c4e87b3f951060fa6c5111d34fc17b44ba2da05963111b7
+SIZE (jgraph-jgraphx-2.5.1.0_GH0.tar.gz) = 3181415