From 04467ee141808db23015e42219040bb2dd350eab Mon Sep 17 00:00:00 2001 From: rm Date: Tue, 4 Mar 2014 20:50:14 +0000 Subject: - update to 20140227 - install "docs" into staging area unconditionally and remove no more needed inclusion of bsd.port.options.mk, while here PR: 187244 Submitted by: Koichiro IWAO (maintainer) --- japanese/font-koruri/Makefile | 12 ++++-------- japanese/font-koruri/distinfo | 4 ++-- japanese/font-koruri/pkg-plist | 30 +++++++++++++++--------------- 3 files changed, 21 insertions(+), 25 deletions(-) (limited to 'japanese') diff --git a/japanese/font-koruri/Makefile b/japanese/font-koruri/Makefile index e52b69d0c4d7..9ab4804bd5c3 100644 --- a/japanese/font-koruri/Makefile +++ b/japanese/font-koruri/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= koruri -PORTVERSION= 20131228 +PORTVERSION= 20140227 CATEGORIES= japanese x11-fonts -MASTER_SITES= SFJP/koruri/60169 +MASTER_SITES= SFJP/koruri/60670 PKGNAMEPREFIX= ja-font- DISTNAME= Koruri-${PORTVERSION} @@ -24,15 +24,13 @@ SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR} PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \ LOCAL_FONTSDIR=${LOCAL_FONTSDIR} DATADIR= ${PREFIX}/share/font-${PORTNAME} -PORTDOCS= README +PORTDOCS= README.md LOCAL_FONTSDIR= share/fonts X_FONTSDIR= lib/X11/fonts OPTIONS_DEFINE= DOCS -.include - do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR} @@ -55,10 +53,8 @@ do-install: post-su-install: ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include diff --git a/japanese/font-koruri/distinfo b/japanese/font-koruri/distinfo index 271939c785ae..39e761c67dc8 100644 --- a/japanese/font-koruri/distinfo +++ b/japanese/font-koruri/distinfo @@ -1,2 +1,2 @@ -SHA256 (Koruri-20131228.tar.xz) = 815c4f53ee63fda58c03b73fe6ed7101fe563477a8ff2e8a48ff8c11a20c8ecb -SIZE (Koruri-20131228.tar.xz) = 23724396 +SHA256 (Koruri-20140227.tar.xz) = 167cc90fdfb93a0b74e6e814c85f9ccdabfaf982b7cebf051e39760eb5f9079d +SIZE (Koruri-20140227.tar.xz) = 14016144 diff --git a/japanese/font-koruri/pkg-plist b/japanese/font-koruri/pkg-plist index 19420c82a10d..b8d2dfc8f26a 100644 --- a/japanese/font-koruri/pkg-plist +++ b/japanese/font-koruri/pkg-plist @@ -1,25 +1,25 @@ -%%DATADIR%%/Koruri-Bold.ttf -%%DATADIR%%/Koruri-Extrabold.ttf -%%DATADIR%%/Koruri-Light.ttf -%%DATADIR%%/Koruri-Semibold.ttf -%%DATADIR%%/Koruri.ttf +%%DATADIR%%/koruri-bold.ttf +%%DATADIR%%/koruri-extrabold.ttf +%%DATADIR%%/koruri-light.ttf +%%DATADIR%%/koruri-semibold.ttf +%%DATADIR%%/koruri-regular.ttf @dirrmtry %%DATADIR%% -%%LOCAL_FONTSDIR%%/TTF/Koruri-Bold.ttf -%%LOCAL_FONTSDIR%%/TTF/Koruri-Extrabold.ttf -%%LOCAL_FONTSDIR%%/TTF/Koruri-Light.ttf -%%LOCAL_FONTSDIR%%/TTF/Koruri-Semibold.ttf -%%LOCAL_FONTSDIR%%/TTF/Koruri.ttf +%%LOCAL_FONTSDIR%%/TTF/koruri-bold.ttf +%%LOCAL_FONTSDIR%%/TTF/koruri-extrabold.ttf +%%LOCAL_FONTSDIR%%/TTF/koruri-light.ttf +%%LOCAL_FONTSDIR%%/TTF/koruri-semibold.ttf +%%LOCAL_FONTSDIR%%/TTF/koruri-regular.ttf @dirrmtry %%LOCAL_FONTSDIR%%/TTF @dirrmtry %%LOCAL_FONTSDIR%% etc/fonts/conf.avail/20-unhint-koruri.conf etc/fonts/conf.avail/62-fonts-koruri.conf etc/fonts/conf.d/20-unhint-koruri.conf etc/fonts/conf.d/62-fonts-koruri.conf -%%X_FONTSDIR%%/TTF/Koruri-Bold.ttf -%%X_FONTSDIR%%/TTF/Koruri-Extrabold.ttf -%%X_FONTSDIR%%/TTF/Koruri-Light.ttf -%%X_FONTSDIR%%/TTF/Koruri-Semibold.ttf -%%X_FONTSDIR%%/TTF/Koruri.ttf +%%X_FONTSDIR%%/TTF/koruri-bold.ttf +%%X_FONTSDIR%%/TTF/koruri-extrabold.ttf +%%X_FONTSDIR%%/TTF/koruri-light.ttf +%%X_FONTSDIR%%/TTF/koruri-semibold.ttf +%%X_FONTSDIR%%/TTF/koruri-regular.ttf @exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true @unexec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true @unexec rm -f %D/%%X_FONTSDIR%%/TTF/fonts.cache-1 -- cgit