From 12ae62842ca36f3a6b1d61d8da1b7177ca8cd779 Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Fri, 4 Jul 2014 15:00:33 +0000 Subject: [PATCH] 1: Stagify. 2: use @fcfontsdir. --- x11-fonts/kaputa/Makefile | 12 +++--------- x11-fonts/kaputa/pkg-plist | 7 +------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/x11-fonts/kaputa/Makefile b/x11-fonts/kaputa/Makefile index ebec5a3efdd1..48914c7a2ae7 100644 --- a/x11-fonts/kaputa/Makefile +++ b/x11-fonts/kaputa/Makefile @@ -19,12 +19,8 @@ USES= zip PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" FONTNAME= ${PORTNAME} FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME} +NO_BUILD= yes -MKFONTSCL_CMD= ${LOCALBASE}/bin/mkfontscale -MKFONTDIR_CMD= ${LOCALBASE}/bin/mkfontdir -FCCACHE_CMD= ${LOCALBASE}/bin/fc-cache -f -v - -NO_STAGE= yes post-extract: @${MKDIR} ${WRKSRC}/ @${MV} ${WRKDIR}/kaputaunicode.ttf ${WRKSRC}/kaputa.ttf @@ -33,9 +29,7 @@ do-build: @cd ${WRKSRC}/ && ${MKFONTSCL_CMD} && ${MKFONTDIR_CMD} do-install: - @${INSTALL} -d ${FONTSDIR}/ - @${INSTALL_DATA} ${WRKSRC}/* ${FONTSDIR}/ - @${ECHO_MSG} "===> Running fc-cache" - -${FCCACHE_CMD} ${FONTSDIR} + @${INSTALL} -d ${STAGEDIR}${FONTSDIR}/ + @${INSTALL_DATA} ${WRKSRC}/* ${STAGEDIR}${FONTSDIR}/ .include diff --git a/x11-fonts/kaputa/pkg-plist b/x11-fonts/kaputa/pkg-plist index 16c0347f690b..185ecf604146 100644 --- a/x11-fonts/kaputa/pkg-plist +++ b/x11-fonts/kaputa/pkg-plist @@ -1,7 +1,2 @@ -%%FONTSDIR%%/fonts.dir -%%FONTSDIR%%/fonts.scale %%FONTSDIR%%/kaputa.ttf -@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true -@unexec rm -f %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || true -@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true -@dirrm %%FONTSDIR%% +@fcfontsdir %%FONTSDIR%%