svn commit: r532137 - branches/2020Q2/cad/fidocadj

[Rene Ladan]

Author: rene
Date: Sun Apr 19 17:26:10 2020
New Revision: 532137
URL: https://svnweb.freebsd.org/changeset/ports/532137

Log:
  MFH: r532101
  
  cad/fidocadj: unbreak and unexpire by switching to GitHub.
  
  - update the accompanying PDF to version 0.24.6 too
  - use DIST_SUBDIR
  - clean up Makefile
  
  PR:		245368
  Submitted by:	rene
  Approved by:	maintainer timeout (nivit, 14 days)
  
  Approved by:	ports-secteam (joneum)

Modified:
  branches/2020Q2/cad/fidocadj/Makefile
  branches/2020Q2/cad/fidocadj/distinfo
  branches/2020Q2/cad/fidocadj/pkg-plist
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/cad/fidocadj/Makefile
==============================================================================
--- branches/2020Q2/cad/fidocadj/Makefile	Sun Apr 19 17:21:07 2020	(r532136)
+++ branches/2020Q2/cad/fidocadj/Makefile	Sun Apr 19 17:26:10 2020	(r532137)
@@ -3,17 +3,17 @@
 
 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 at FreeBSD.org
 COMMENT=	Easy to use graphical editor for electronics
 
-BROKEN=		unfetchable
-
 LICENSE=	GPLv3
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
@@ -27,16 +27,14 @@ 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>

Modified: branches/2020Q2/cad/fidocadj/distinfo
==============================================================================
--- branches/2020Q2/cad/fidocadj/distinfo	Sun Apr 19 17:21:07 2020	(r532136)
+++ branches/2020Q2/cad/fidocadj/distinfo	Sun Apr 19 17:26:10 2020	(r532137)
@@ -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

Modified: branches/2020Q2/cad/fidocadj/pkg-plist
==============================================================================
--- branches/2020Q2/cad/fidocadj/pkg-plist	Sun Apr 19 17:21:07 2020	(r532136)
+++ branches/2020Q2/cad/fidocadj/pkg-plist	Sun Apr 19 17:26:10 2020	(r532137)
@@ -1,3 +1,3 @@
 bin/fidocadj
 %%DATADIR%%/fidocadj.jar
-%%PORTDOCS%%%%DOCSDIR%%/fidocadj_manual_en.pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual_en.pdf