svn commit: r532101 - head/cad/fidocadj

[Mathieu Arnold]

On Sun, Apr 19, 2020 at 10:53:04AM +0000, Rene Ladan wrote:
> Author: rene
> Date: Sun Apr 19 10:53:03 2020
> New Revision: 532101
> URL: https://svnweb.freebsd.org/changeset/ports/532101
> 
> Log:
>   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)
>   MFH:		2020Q2
> 
> Modified:
>   head/cad/fidocadj/Makefile
>   head/cad/fidocadj/distinfo
>   head/cad/fidocadj/pkg-plist
> 
> Modified: head/cad/fidocadj/Makefile
> ==============================================================================
> --- head/cad/fidocadj/Makefile	Sun Apr 19 10:34:21 2020	(r532100)
> +++ head/cad/fidocadj/Makefile	Sun Apr 19 10:53:03 2020	(r532101)
> @@ -3,19 +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

USE_GITHUB is used when no releases archives are provided, one is
provided here, so I am unsure about the comment, it basically says "not
using USE_GITHUB because we are not using USE_GITHUB."

> +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
> -DEPRECATED=	Broken for more than 6 months
> -EXPIRATION_DATE=	2020-05-05
> -
>  LICENSE=	GPLv3
>  
>  DATADIR=	${JAVASHAREDIR}/${PORTNAME}
> @@ -29,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: head/cad/fidocadj/distinfo
> ==============================================================================
> --- head/cad/fidocadj/distinfo	Sun Apr 19 10:34:21 2020	(r532100)
> +++ head/cad/fidocadj/distinfo	Sun Apr 19 10:53:03 2020	(r532101)
> @@ -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: head/cad/fidocadj/pkg-plist
> ==============================================================================
> --- head/cad/fidocadj/pkg-plist	Sun Apr 19 10:34:21 2020	(r532100)
> +++ head/cad/fidocadj/pkg-plist	Sun Apr 19 10:53:03 2020	(r532101)
> @@ -1,3 +1,3 @@
>  bin/fidocadj
>  %%DATADIR%%/fidocadj.jar
> -%%PORTDOCS%%%%DOCSDIR%%/fidocadj_manual_en.pdf
> +%%PORTDOCS%%%%DOCSDIR%%/manual_en.pdf
> 

-- 
Mathieu Arnold
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20200420/1f3c88bc/attachment.sig>