svn commit: r458811 - head/x11-fonts/encodings

[Baptiste Daroussin]

On Fri, Jan 12, 2018 at 09:16:20AM +0000, Kurt Jaeger wrote:
> Author: pi
> Date: Fri Jan 12 09:16:20 2018
> New Revision: 458811
> URL: https://svnweb.freebsd.org/changeset/ports/458811
> 
> Log:
>   x11-fonts/encodings: run mkfontscale to fix encodings.dir post-install
>   
>   - Since only *.enc.gz files are installed while the encodings.dir file is
>     genareted for directories containing both *.enc and *.enc.gz files,
>     the installed encodings.dir file includes bogus entries for *.enc.
>   - It causes libfontenc to fail to find encoding files, then X to fail to
>     open TrueType fonts with some encodings such as ascii-0 or jisx0208.1990-0.
>   
>   PR:		170852
>   Submitted by:	hiroto.kagotani at gmail.com, Jia-Shiun Li <jiashiun at gmail.com>
> 
> Modified:
>   head/x11-fonts/encodings/Makefile
>   head/x11-fonts/encodings/pkg-descr
> 
> Modified: head/x11-fonts/encodings/Makefile
> ==============================================================================
> --- head/x11-fonts/encodings/Makefile	Fri Jan 12 09:03:49 2018	(r458810)
> +++ head/x11-fonts/encodings/Makefile	Fri Jan 12 09:16:20 2018	(r458811)
> @@ -2,18 +2,24 @@
>  
>  PORTNAME=	encodings
>  PORTVERSION=	1.0.4
> -PORTREVISION=	3
> +PORTREVISION=	4
>  PORTEPOCH=	1
> -MASTER_SITES=	XORG/individual/font
>  CATEGORIES=	x11-fonts
> +MASTER_SITES=	XORG/individual/font
>  
>  MAINTAINER=	x11 at FreeBSD.org
>  COMMENT=	X.Org Encoding fonts
>  
> +LICENSE=	PD
> +
> +BUILD_DEPENDS=	mkfontscale:x11-fonts/mkfontscale
> +
>  USES=		tar:bzip2
>  USE_XORG=	fontutil
> -BUILD_DEPENDS=	mkfontscale:x11-fonts/mkfontscale
>  GNU_CONFIGURE=	yes
>  CONFIGURE_ARGS=	--with-fontrootdir=${PREFIX}/share/fonts
> +
> +post-install:
> +	cd ${STAGEDIR}/usr/local/share/fonts/encodings && /usr/local/bin/mkfontscale -b -s -l -n -r -p /usr/local/share/fonts/encodings -e . -e large .
>  

No no no no no

never ever hard code /usr/local

It should be either:

cd ${STAGEDIR}${PREFIX}/share/fonts/encodings && ${LOCALBASE}/bin/mkfontscale -b
-s -l -n -r -p ${PREFIX}/share/fonts/encodings -e . -e large .

Also why not trusting PATH here? Given how the BUILD dependency is looked up you
are sure mkfontscale is in the path anyway

cd ${STAGEDIR}${PREFIX}/share/fonts/encodings && mkfontscale -b
-s -l -n -r -p ${PREFIX}/share/fonts/encodings -e . -e large .

Best regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20180112/dcedc44d/attachment.sig>