Date: Mon, 30 Dec 2019 19:14:36 +0900 (JST) From: Hiroki Sato <hrs@FreeBSD.org> To: mat@FreeBSD.org Cc: hrs@FreeBSD.org, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r521430 - in head: Mk/Uses x11-servers/xorg-server Message-ID: <20191230.191436.2115690376642167181.hrs@allbsd.org> In-Reply-To: <20191230091501.jmcrvcm7b62bm5yh@atuin.in.mat.cc> References: <201912300011.xBU0B6Vw013764@repo.freebsd.org> <20191230091501.jmcrvcm7b62bm5yh@atuin.in.mat.cc>
next in thread | previous in thread | raw e-mail | index | archive | help
----Security_Multipart(Mon_Dec_30_19_14_36_2019_226)-- Content-Type: Text/Plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Mathieu Arnold <mat@FreeBSD.org> wrote in <20191230091501.jmcrvcm7b62bm5yh@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=3Dfonts 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=3D<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=3D ${PORTNAME}:unscaled:pri=3D60 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> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D 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?=3D ${PREFIX}/share/fonts/${FONTNAME}= ma> > .if !empty(fonts_ARGS:Nnone) ma> > PLIST_FILES+=3D "@${fonts_ARGS} ${FONTSDIR}" ma> > .endif ma> > +.if defined(FONTPATHSPEC) && !empty(FONTPATHSPEC) ma> > +FONTPATHD?=3D ${LOCALBASE}/etc/X11/fontpath.d ma> > +PLIST_FILES+=3D "${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}=A0and 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 exampl= e, ma> and bsd.port.mk starting 5191. ma> = ma> > +.endif Thanks a lot! Fixed at r521478. -- Hiroki ----Security_Multipart(Mon_Dec_30_19_14_36_2019_226)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iMkEABMKAC4WIQRsDSNTJ8+Ax5Ae/dLbsH3Gbx9zfwUCXgnODBAcaHJzQGZyZWVi c2Qub3JnAAoJENuwfcZvH3N/xxkCCMyfmkpT79ne8reTDPLyYKgzj7zJ5/f74KvE F7ajuAO/GR04Y3hJRXO8/YXMhgJUWQ/CvqE3IfLnxwMcwS4T2zcKAgkBRWWLExwr N/bf4kzV+DweQjD4UkTcjnWW8dwPXjEBShlMCwPLf4uTmWtQPqS+fXTxe4CgAvhq y/1zZEwqZ4DmOx8= =ybYM -----END PGP SIGNATURE----- ----Security_Multipart(Mon_Dec_30_19_14_36_2019_226)----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191230.191436.2115690376642167181.hrs>