svn commit: r419066 - in head: chinese/CJKUnifonts chinese/CNS11643-font chinese/arphicttf chinese/fireflyttf chinese/moettf chinese/opendesktop-fonts chinese/ttfm vietnamese/urwvn vietnamese/vietu...

[Tijl Coosemans]

On Mon, 25 Jul 2016 21:10:25 +0000 (UTC) Jan Beich <jbeich at FreeBSD.org> wrote:
> Author: jbeich
> Date: Mon Jul 25 21:10:25 2016
> New Revision: 419066
> URL: https://svnweb.freebsd.org/changeset/ports/419066
> 
> Log:
>   chinese/ttfm: don't touch user font cache on install
>   
>   This matches USES=fonts (@fc, @fcfontsdir) behavior.
>   
>   PR:		207263
>   MFH:		2016Q3
> 
> Modified:
>   head/chinese/CJKUnifonts/Makefile   (contents, props changed)
>   head/chinese/CNS11643-font/Makefile   (contents, props changed)
>   head/chinese/arphicttf/Makefile   (contents, props changed)
>   head/chinese/fireflyttf/Makefile   (contents, props changed)
>   head/chinese/moettf/Makefile   (contents, props changed)
>   head/chinese/opendesktop-fonts/Makefile   (contents, props changed)
>   head/chinese/ttfm/Makefile.ttf   (contents, props changed)
>   head/vietnamese/urwvn/Makefile   (contents, props changed)
>   head/vietnamese/vietunicode-hannom/Makefile   (contents, props changed)
>   head/vietnamese/vietunicode-trichlor/Makefile   (contents, props changed)
>   head/vietnamese/vietunicode-web1/Makefile   (contents, props changed)
> 
> Modified: head/chinese/ttfm/Makefile.ttf
> ==============================================================================
> --- head/chinese/ttfm/Makefile.ttf	Mon Jul 25 21:10:11 2016	(r419065)
> +++ head/chinese/ttfm/Makefile.ttf	Mon Jul 25 21:10:25 2016	(r419066)
> @@ -63,7 +63,7 @@ do-install-ttf:
>  .endfor
>  .if ${PORT_OPTIONS:MX11}
>  	@${ECHO_MSG} "===>  Running fc-cache"
> -	-@${LOCALBASE}/bin/fc-cache -f -v ${STAGEDIR}${XFONTSDIR}
> +	-@${LOCALBASE}/bin/fc-cache -f -s -v ${STAGEDIR}${XFONTSDIR}
>  .endif


Is it really necessary to run fc-cache in STAGEDIR?


>  add-plist-post: add-plist-ttf
> @@ -82,8 +82,8 @@ add-plist-ttf:
>  .	endfor
>  .endfor
>  .if ${PORT_OPTIONS:MX11}
> -	@${ECHO_CMD} "@unexec ${LOCALBASE}/bin/fc-cache -f -v ${XFONTSDIR} || true" >> ${TMPPLIST}
> -	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/fc-cache -f -v ${XFONTSDIR} || true" >> ${TMPPLIST}
> +	@${ECHO_CMD} "@unexec ${LOCALBASE}/bin/fc-cache -f -s -v ${XFONTSDIR} || true" >> ${TMPPLIST}
> +	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/fc-cache -f -s -v ${XFONTSDIR} || true" >> ${TMPPLIST}
>  	@${ECHO_CMD} "@unexec find ${XFONTSDIR} -size -3c -delete || true" >> ${TMPPLIST}
>  .endif