diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2014-07-23 21:17:28 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2014-07-23 21:17:28 +0800 |
| commit | 6fa3de7456de6674555ed67ca417679a55db5e83 (patch) | |
| tree | c8bc242a7fd0da2b3533e33e0f287157cef75800 /x11-fonts | |
| parent | 27be8f665166db19ec62e2dfd0dc0b44a7dc5da2 (diff) | |
| download | freebsd-ports-graphics-6fa3de7456de6674555ed67ca417679a55db5e83.tar.gz freebsd-ports-graphics-6fa3de7456de6674555ed67ca417679a55db5e83.tar.zst freebsd-ports-graphics-6fa3de7456de6674555ed67ca417679a55db5e83.zip | |
- Use @fcfontsdir
- Bump PORTREVISION for package change
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/dejavu/Makefile | 12 | ||||
| -rw-r--r-- | x11-fonts/dejavu/pkg-plist | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/x11-fonts/dejavu/Makefile b/x11-fonts/dejavu/Makefile index 3e2df620854..1deee79ef65 100644 --- a/x11-fonts/dejavu/Makefile +++ b/x11-fonts/dejavu/Makefile @@ -3,7 +3,7 @@ PORTNAME= dejavu PORTVERSION= 2.34 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fonts MASTER_SITES= SF DISTNAME= ${PORTNAME}-fonts-ttf-${PORTVERSION} @@ -11,7 +11,8 @@ DISTNAME= ${PORTNAME}-fonts-ttf-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Bitstream Vera Fonts clone with a wider range of characters -BUILD_DEPENDS= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ +BUILD_DEPENDS= ${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig \ + ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ ${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale OPTIONS_DEFINE= DOCS LINKS @@ -19,6 +20,7 @@ OPTIONS_DEFAULT=LINKS OPTIONS_SUB= yes LINKS_DESC= Install links of configuration files in conf.d +NO_BUILD= yes USES= tar:bzip2 PLIST_SUB= FCDIR=${FCDIR} FCDIR_LINKS=${FCDIR_LINKS} FONTSDIR=${FONTSDIR} @@ -30,15 +32,11 @@ FCDIR?= etc/fonts/conf.avail FCDIR_LINKS= ${FCDIR:S|conf.avail|conf.d|} FONTSDIR?= lib/X11/fonts/${PORTNAME} -do-build: - @cd ${WRKSRC}/ttf/ && ${LOCALBASE}/bin/mkfontscale - @cd ${WRKSRC}/ttf/ && ${LOCALBASE}/bin/mkfontdir - do-install: cd ${STAGEDIR}${PREFIX}/ && ${MKDIR} ${FCDIR}/ ${FCDIR_LINKS}/ ${FONTSDIR}/ ${INSTALL_DATA} ${WRKSRC}/fontconfig/*.conf ${STAGEDIR}${PREFIX}/${FCDIR}/ cd ${STAGEDIR}${PREFIX}/${FCDIR_LINKS}/ && ${LN} -fs ../conf.avail/*dejavu*.conf . - ${INSTALL_DATA} ${WRKSRC}/ttf/fonts.* ${WRKSRC}/ttf/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}/ ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ diff --git a/x11-fonts/dejavu/pkg-plist b/x11-fonts/dejavu/pkg-plist index f050d519f8c..8db43449e23 100644 --- a/x11-fonts/dejavu/pkg-plist +++ b/x11-fonts/dejavu/pkg-plist @@ -31,9 +31,7 @@ %%FONTSDIR%%/DejaVuSerifCondensed-BoldItalic.ttf %%FONTSDIR%%/DejaVuSerifCondensed-Italic.ttf %%FONTSDIR%%/DejaVuSerifCondensed.ttf -%%FONTSDIR%%/fonts.dir -%%FONTSDIR%%/fonts.scale -@dirrm %%FONTSDIR%% +@fcfontsdir %%FONTSDIR%% %%LINKS%%@dirrmtry %%FCDIR_LINKS%% @dirrmtry %%FCDIR%% @dirrmtry etc/fonts |