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

[Hiroki Sato]

Mathieu Arnold <mat at FreeBSD.org> wrote
  in <20191230091501.jmcrvcm7b62bm5yh at atuin.in.mat.cc>:

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

 Thanks a lot!  Fixed at r521478.

-- Hiroki
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 342 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20191230/669df501/attachment.sig>