Index: branches/2020Q2/cad/fidocadj/Makefile
===================================================================
--- branches/2020Q2/cad/fidocadj/Makefile	(revision 532136)
+++ branches/2020Q2/cad/fidocadj/Makefile	(revision 532137)
@@ -1,42 +1,40 @@
 # Created by: Nicola Vitale <nivit@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	fidocadj
 PORTVERSION=	0.24.6
-PORTREVISION=	1
-CATEGORIES=	cad
-MASTER_SITES=	SF/${PORTNAME}/:src SF/${PORTNAME}/manuals/:docs
-DISTFILES=	${PORTNAME}.jar:src
+PORTREVISION=	2
+CATEGORIES=	cad java
+# No USE_GITHUB here because GITHUB_EXTRACT_SUFX is hardcoded to .tar.gz
+MASTER_SITES=	https://github.com/DarwinNE/FidoCadJ/releases/download/v${PORTVERSION}/
+DISTFILES=	${PORTNAME}.jar
+DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Easy to use graphical editor for electronics
 
-BROKEN=		unfetchable
-
 LICENSE=	GPLv3
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 SUB_FILES=	${PORTNAME}.sh
 
 USE_JAVA=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_DISTFILES=	${PORTNAME}_manual_en.pdf:docs
+DOCS_DISTFILES=	manual_en.pdf
 
-FDCJ_MANUAL=	${PORTNAME}_manual_en.pdf
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${DATADIR}; \
-	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}.jar ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}.jar ${STAGEDIR}${DATADIR}/
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
-	${INSTALL_DATA} ${DISTDIR}/${FDCJ_MANUAL} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DOCS_DISTFILES} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: branches/2020Q2/cad/fidocadj/distinfo
===================================================================
--- branches/2020Q2/cad/fidocadj/distinfo	(revision 532136)
+++ branches/2020Q2/cad/fidocadj/distinfo	(revision 532137)
@@ -1,4 +1,5 @@
-SHA256 (fidocadj.jar) = 43317930b20af0f2491cb22f03df6cc61f8367ccfffe4c4bbc946390f78235aa
-SIZE (fidocadj.jar) = 689142
-SHA256 (fidocadj_manual_en.pdf) = 148a926d96b7c91afbefcc6af13f0f973601342d9a2dcc8bdc3d4612b1b223d1
-SIZE (fidocadj_manual_en.pdf) = 2570172
+TIMESTAMP = 1586040218
+SHA256 (fidocadj/fidocadj.jar) = 43317930b20af0f2491cb22f03df6cc61f8367ccfffe4c4bbc946390f78235aa
+SIZE (fidocadj/fidocadj.jar) = 689142
+SHA256 (fidocadj/manual_en.pdf) = 8da975735cd4a62350387984fec682d4e6de8c6a261c0422f6d65d8b80857dde
+SIZE (fidocadj/manual_en.pdf) = 2772362
Index: branches/2020Q2/cad/fidocadj/pkg-plist
===================================================================
--- branches/2020Q2/cad/fidocadj/pkg-plist	(revision 532136)
+++ branches/2020Q2/cad/fidocadj/pkg-plist	(revision 532137)
@@ -1,3 +1,3 @@
 bin/fidocadj
 %%DATADIR%%/fidocadj.jar
-%%PORTDOCS%%%%DOCSDIR%%/fidocadj_manual_en.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual_en.pdf
Index: branches/2020Q2
===================================================================
--- branches/2020Q2	(revision 532136)
+++ branches/2020Q2	(revision 532137)

Property changes on: branches/2020Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r532101