On Friday 02 March 2012 08:53:43 Baptiste Daroussin wrote: > Thank you very very much, looks great, push it to x11@, just before 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 tried building some ports without modification, and they don't change (mostly... well, they still work). So, it's time to see if it can be submitted to x11@ 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 easy enough. Your feedback is important to understand if we need changes to the system: http://pastebin.kde.org/432458 Just for reference, the attached patch shows a couple of examples of what most ports will go through. -- Alberto Villa, FreeBSD committer <[email protected]> http://people.FreeBSD.org/~avilla It seems to make an auto driver mad if he misses you.
Index: paratype/Makefile =================================================================== RCS file: /home/pcvs/ports/x11-fonts/paratype/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- paratype/Makefile 28 Feb 2012 18:08:34 -0000 1.6 +++ paratype/Makefile 2 Mar 2012 18:56:06 -0000 @@ -7,10 +7,9 @@ PORTNAME= paratype PORTVERSION= 2.004 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fonts MASTER_SITES= http://paratype.0xdc.ru/ -MASTER_SITE_SUBDIR= #prevent bsd.xorg.mk from setting a default subdirectory DISTFILES= PTSansOFL-2.004.zip PTSerifOFL-1.000.zip PTMonoOFL-1.002.zip MAINTAINER= [email protected] @@ -21,27 +20,13 @@ LICENSE_FILE= ${WRKSRC}/PTSansPTSerifOFL.txt LICENSE_PERMS= auto-accept -INSTALLS_TTF= yes +INSTALLS_FONTS= yes +FONTDIR= ParaType NO_BUILD= yes NO_WRKSUBDIR= yes -USE_TGZ= yes USE_ZIP= yes -XORG_CAT= font - -FONTDIR= ParaType -FONTROOTDIR= ${PREFIX}/lib/X11/fonts -PLIST_SUB= FONTDIR="${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}" -SUB_FILES= pkg-message -SUB_LIST= FONTDIR="${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}" - -do-configure: - @${DO_NADA} do-install: - @${MKDIR} ${FONTROOTDIR}/${FONTDIR} @${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTROOTDIR}/${FONTDIR}/ - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} .include <bsd.port.mk> Index: ubuntu-font/Makefile =================================================================== RCS file: /home/pcvs/ports/x11-fonts/ubuntu-font/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- 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 @@ PORTNAME= ubuntu-font PORTVERSION= 0.80 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts MASTER_SITES= http://font.ubuntu.com/download/ @@ -21,16 +21,10 @@ LICENSE_NAME= Ubuntu Font License (UFL) LICENSE_PERMS= auto-accept -BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig -RUN_DEPENDS:= ${BUILD_DEPENDS} - +INSTALLS_FONTS= yes USE_ZIP= yes NO_BUILD= yes -PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" -FONTSDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME} -SUB_FILES= pkg-message -SUB_LIST= FONTSDIR=${FONTSDIR} WRKSRC= ${WRKDIR}/${DISTNAME} do-install: @@ -38,12 +32,6 @@ ${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} *.txt ${DOCSDIR} .endif - ${MKDIR} ${FONTSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} *.ttf ${FONTSDIR} - -post-install: - @${ECHO_MSG} "===> Running fc-cache" - -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR} - @${CAT} ${PKGMESSAGE} + cd ${WRKSRC} && ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR} .include <bsd.port.mk>
signature.asc
Description: This is a digitally signed message part.
