Date: Fri, 2 Mar 2012 19:57:32 +0100 From: Alberto Villa <avilla@freebsd.org> To: Baptiste Daroussin <bapt@freebsd.org> Cc: Mel Flynn <rflynn@acsalaska.net>, freebsd-desktop@freebsd.org Subject: Re: What about improving the desktop ports consistency: task 1, the fonts Message-ID: <201203021957.35314.avilla@freebsd.org> In-Reply-To: <20120302075343.GD50579@azathoth.lan> References: <20120120065141.GM4729@azathoth.lan> <201203020353.40643.avilla@freebsd.org> <20120302075343.GD50579@azathoth.lan>
next in thread | previous in thread | raw e-mail | index | archive | help
--nextPart2087447.ZKeGKdpGpn Content-Type: multipart/mixed; boundary="Boundary-01=_cgRUPVWfgmzzhIe" Content-Transfer-Encoding: 7bit --Boundary-01=_cgRUPVWfgmzzhIe Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Friday 02 March 2012 08:53:43 Baptiste Daroussin wrote: > Thank you very very much, looks great, push it to x11@, just before=20 pushing > it to x11@ can you just add some if defined(WITH_PKGNG) @fontdir and > append the fontdir.yaml? (it is already supported in beta7 of pkgng) if > you are not confident with that part I'll add it when it would be in the > tree. So, here it is. I tried converting some existing ports, and they work. I tr= ied=20 building some ports without modification, and they don't change (mostly...= =20 well, they still work). So, it's time to see if it can be submitted to x11@= =20 for review and exp-run. Can you guys have a quick look at it? http://people.freebsd.org/~avilla/files/fonts/bsd.xorg.mk http://people.freebsd.org/~avilla/files/fonts/bsd.port.mk http://people.freebsd.org/~avilla/files/fonts/fontdir.yaml Here's the documentation i've written in bsd.xorg.mk. Read it and see if it= 's=20 easy enough. Your feedback is important to understand if we need=20 changes to the system: http://pastebin.kde.org/432458 Just for reference, the attached patch shows a couple of examples of what=20 most ports will go through. =2D-=20 Alberto Villa, FreeBSD committer <avilla@FreeBSD.org> http://people.FreeBSD.org/~avilla It seems to make an auto driver mad if he misses you. --Boundary-01=_cgRUPVWfgmzzhIe Content-Type: text/x-patch; charset="UTF-8"; name="fonts.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="fonts.diff" Index: paratype/Makefile =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 RCS file: /home/pcvs/ports/x11-fonts/paratype/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile =2D-- paratype/Makefile 28 Feb 2012 18:08:34 -0000 1.6 +++ paratype/Makefile 2 Mar 2012 18:56:06 -0000 @@ -7,10 +7,9 @@ =20 PORTNAME=3D paratype PORTVERSION=3D 2.004 =2DPORTREVISION=3D 3 +PORTREVISION=3D 4 CATEGORIES=3D x11-fonts MASTER_SITES=3D http://paratype.0xdc.ru/ =2DMASTER_SITE_SUBDIR=3D #prevent bsd.xorg.mk from setting a default subdir= ectory DISTFILES=3D PTSansOFL-2.004.zip PTSerifOFL-1.000.zip PTMonoOFL-1.002.zip =20 MAINTAINER=3D littlesavage@rambler.ru @@ -21,27 +20,13 @@ LICENSE_FILE=3D ${WRKSRC}/PTSansPTSerifOFL.txt LICENSE_PERMS=3D auto-accept =20 =2DINSTALLS_TTF=3D yes +INSTALLS_FONTS=3D yes +FONTDIR=3D ParaType NO_BUILD=3D yes NO_WRKSUBDIR=3D yes =2DUSE_TGZ=3D yes USE_ZIP=3D yes =2DXORG_CAT=3D font =2D =2DFONTDIR=3D ParaType =2DFONTROOTDIR=3D ${PREFIX}/lib/X11/fonts =2DPLIST_SUB=3D FONTDIR=3D"${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}" =2DSUB_FILES=3D pkg-message =2DSUB_LIST=3D FONTDIR=3D"${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}" =2D =2Ddo-configure: =2D @${DO_NADA} =20 do-install: =2D @${MKDIR} ${FONTROOTDIR}/${FONTDIR} @${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTROOTDIR}/${FONTDIR}/ =2D @${ECHO_MSG} =2D @${CAT} ${PKGMESSAGE} =2D @${ECHO_MSG} =20 .include <bsd.port.mk> Index: ubuntu-font/Makefile =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 RCS file: /home/pcvs/ports/x11-fonts/ubuntu-font/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile =2D-- ubuntu-font/Makefile 21 Jan 2012 17:40:13 -0000 1.4 +++ ubuntu-font/Makefile 2 Mar 2012 18:56:06 -0000 @@ -7,7 +7,7 @@ =20 PORTNAME=3D ubuntu-font PORTVERSION=3D 0.80 =2DPORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D x11-fonts MASTER_SITES=3D http://font.ubuntu.com/download/ =20 @@ -21,16 +21,10 @@ LICENSE_NAME=3D Ubuntu Font License (UFL) LICENSE_PERMS=3D auto-accept =20 =2DBUILD_DEPENDS=3D fc-cache:${PORTSDIR}/x11-fonts/fontconfig =2DRUN_DEPENDS:=3D ${BUILD_DEPENDS} =2D +INSTALLS_FONTS=3D yes USE_ZIP=3D yes NO_BUILD=3D yes =20 =2DPLIST_SUB=3D FONTSDIR=3D"${FONTSDIR:S|${PREFIX}/||}" =2DFONTSDIR=3D ${PREFIX}/lib/X11/fonts/${PORTNAME} =2DSUB_FILES=3D pkg-message =2DSUB_LIST=3D FONTSDIR=3D${FONTSDIR} WRKSRC=3D ${WRKDIR}/${DISTNAME} =20 do-install: @@ -38,12 +32,6 @@ ${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} *.txt ${DOCSDIR} .endif =2D ${MKDIR} ${FONTSDIR} =2D cd ${WRKSRC} && ${INSTALL_DATA} *.ttf ${FONTSDIR} =2D =2Dpost-install: =2D @${ECHO_MSG} "=3D=3D=3D> Running fc-cache" =2D -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} =2D @${CAT} ${PKGMESSAGE} + cd ${WRKSRC} && ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR} =20 .include <bsd.port.mk> --Boundary-01=_cgRUPVWfgmzzhIe-- --nextPart2087447.ZKeGKdpGpn Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iJwEAAECAAYFAk9RGB8ACgkQ3xiC6kQ1CotiYQP8DK+Py40iG1EmYv+dYReSZ4DB iyUSZBMqlqGlCGeM0XjrB7JjwqchAN9Fv4Ko6/tX8uyf6MYyU7TziLxicDKlutqR cdhDI45dYUnSY8ZMAKPlA21pGLXGY+Azlj40syRJ9CuETXa12VKPMtVYRMWCUtoN npKa849JdD7tdMwIK48= =yYt/ -----END PGP SIGNATURE----- --nextPart2087447.ZKeGKdpGpn--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203021957.35314.avilla>