Date: Mon, 30 Dec 2019 10:15:01 +0100 From: Mathieu Arnold <mat@FreeBSD.org> To: Hiroki Sato <hrs@FreeBSD.org> Cc: 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: <20191230091501.jmcrvcm7b62bm5yh@atuin.in.mat.cc> In-Reply-To: <201912300011.xBU0B6Vw013764@repo.freebsd.org> References: <201912300011.xBU0B6Vw013764@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--mebneufcuc2uov7a Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > Add etc/X11/fontpath.d as a catalogue fontpath by default. > =20 > 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. > =20 > When both USES=3Dfonts 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: > =20 > <identifier>:[attribute:]pri=3D<priority> > =20 > Details can be found in xorg.conf(5). A typical example > for a bitmap font is as follows: > =20 > FONTPATHSPEC=3D ${PORTNAME}:unscaled:pri=3D60 > =20 > No objection on: x11 >=20 > Modified: > head/Mk/Uses/fonts.mk > head/x11-servers/xorg-server/Makefile > head/x11-servers/xorg-server/pkg-plist >=20 > Modified: head/Mk/Uses/fonts.mk > =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 > --- 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?=3D ${PREFIX}/share/fonts/${FONTNAME} > .if !empty(fonts_ARGS:Nnone) > PLIST_FILES+=3D "@${fonts_ARGS} ${FONTSDIR}" > .endif > +.if defined(FONTPATHSPEC) && !empty(FONTPATHSPEC) > +FONTPATHD?=3D ${LOCALBASE}/etc/X11/fontpath.d > +PLIST_FILES+=3D "${FONTPATHD}/${FONTPATHSPEC}" > +post-install-fontpathd: > + @${MKDIR} ${STAGEDIR}${FONTPATHD} > + ${LN} -s -f ../../../${FONTSDIR:S,^${PREFIX}/,,} \ > + ${STAGEDIR}${FONTPATHD}/${FONTPATHSPEC} This should be using ${RLN}=A0and 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 --=20 Mathieu Arnold --mebneufcuc2uov7a Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAl4JwBVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD zkgPTg/+LgafqrmXjekZ/WfmhCcWAjnSiEsfgvPHEEH5xMnCgGOt1y1LIhwzohLr r9Y6t2YNUbZ9rARuTaUDjqdugNTPUG0j2CiVKSJkH0RDQLZnQdg1qUZyRyFdl0TK 8AEdj9aCrVGBUNVC+SQhyypI1mgbtxlE7HvkoxSVAaed9xOK0hG++rIRY0OUqzWS IwBuReI+01b+5AfHaBJRpgLkuQt3aUpkOQtfQ7y4rmTGVOlXqWlxDKuSJacr1Xub rr93585Y0qhDIu1tgiiGK/3vzPsglbO2ryAmN7sQjdkhQRvpQAXi2HPe1qu4mA5t JPMmpihqSJH+bmfZbnEK0+7BRUBhEDv3w9pVHbX1bpo1Evjz3+TzhGfQnI348/6i xhbjeZpGG8hggaVkjVEN26CCA32XwBLBW6Fj1IfQ6bdwLjoEu8K0AMfLDuwaewc7 /KkA2eLNyIhUpue+5JMCXQq9mx6BnBV/NPVUgbjwiwtiR72DUr5lCWh4olZc7uLg ptee41ZZOWXlzYURVCwAsIkVaev7ML1KNVYsz6QlX6CZQAGDuQsuEaNkzvyTczIT LdAyPtlk5beqojq8Xoi3jQB5EHGKLHrsnB3QYzgVHUl5KdFgKBqc0vzqxzfOSRy5 YiEsZA+3xiSzrMB1YkS9xWE1UHLUFlSx6Agg0Gzy9GAX8jtoQQ8= =h3m/ -----END PGP SIGNATURE----- --mebneufcuc2uov7a--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191230091501.jmcrvcm7b62bm5yh>