svn commit: r521430 - in head: Mk/Uses x11-servers/xorg-server

[Mathieu Arnold]

On Mon, Dec 30, 2019 at 12:11:05AM +0000, Hiroki Sato wrote:
> Author: hrs
> Date: Mon Dec 30 00:11:05 2019
> New Revision: 521430
> URL: https://svnweb.freebsd.org/changeset/ports/521430
> 
> Log:
>   Add etc/X11/fontpath.d as a catalogue fontpath by default.
>   
>   This allows a port/package to install a symlink pointing
>   the real font directory managed by core XLFD (aka fonts.dir).
>   Adding a new entry of "FontPath" into the system-wide
>   xorg.conf or "xset fp" by users manually is no longer needed.
>   
>   When both USES=fonts and ${FONTPATHSPEC} are defined,
>   the post-install target will install ${FONTPATHSPEC} into
>   ${FONTPATHD} directory as a symlink to ${FONTSDIR}.
>   The symlink name has the following syntax:
>   
>     <identifier>:[attribute:]pri=<priority>
>   
>   Details can be found in xorg.conf(5).  A typical example
>   for a bitmap font is as follows:
>   
>     FONTPATHSPEC=	${PORTNAME}:unscaled:pri=60
>   
>   No objection on:	x11
> 
> Modified:
>   head/Mk/Uses/fonts.mk
>   head/x11-servers/xorg-server/Makefile
>   head/x11-servers/xorg-server/pkg-plist
> 
> Modified: head/Mk/Uses/fonts.mk
> ==============================================================================
> --- head/Mk/Uses/fonts.mk	Sun Dec 29 21:05:36 2019	(r521429)
> +++ head/Mk/Uses/fonts.mk	Mon Dec 30 00:11:05 2019	(r521430)
> @@ -62,6 +62,15 @@ FONTSDIR?=	${PREFIX}/share/fonts/${FONTNAME}
>  .if !empty(fonts_ARGS:Nnone)
>  PLIST_FILES+=	"@${fonts_ARGS} ${FONTSDIR}"
>  .endif
> +.if defined(FONTPATHSPEC) && !empty(FONTPATHSPEC)
> +FONTPATHD?=	${LOCALBASE}/etc/X11/fontpath.d
> +PLIST_FILES+=	"${FONTPATHD}/${FONTPATHSPEC}"
> +post-install-fontpathd:
> +	@${MKDIR} ${STAGEDIR}${FONTPATHD}
> +	${LN} -s -f ../../../${FONTSDIR:S,^${PREFIX}/,,} \
> +	    ${STAGEDIR}${FONTPATHD}/${FONTPATHSPEC}

This should be using ${RLN} and not hand crafting relative paths.

> +post-install: post-install-fontpathd

This is not how targets are hooked up in USES.

You append to the _USES_install variable, see perl.mk for an example,
and bsd.port.mk starting 5191.

> +.endif

-- 
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-all/attachments/20191230/4deb9eb1/attachment.sig>