Date: Mon, 30 Dec 2019 05:04:19 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521463 - head/japanese/font-vlgothic Message-ID: <201912300504.xBU54JMZ092286@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Mon Dec 30 05:04:19 2019 New Revision: 521463 URL: https://svnweb.freebsd.org/changeset/ports/521463 Log: - Use FONTPATHSPEC. - Use FONTSDIR consistently. Modified: head/japanese/font-vlgothic/Makefile head/japanese/font-vlgothic/pkg-plist Modified: head/japanese/font-vlgothic/Makefile ============================================================================== --- head/japanese/font-vlgothic/Makefile Mon Dec 30 05:03:45 2019 (r521462) +++ head/japanese/font-vlgothic/Makefile Mon Dec 30 05:04:19 2019 (r521463) @@ -3,7 +3,7 @@ PORTNAME= vlgothic PORTVERSION= 20141206 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese x11-fonts MASTER_SITES= OSDN/vlgothic/62375 PKGNAMEPREFIX= ja-font- @@ -16,13 +16,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.en USES= fonts:fc tar:xz -FONTNAME= TTF +FONTPATHSPEC= ${FONTNAME}:pri=60 NO_ARCH= yes NO_BUILD= yes PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-install SUB_FILES= pkg-install -DATADIR= ${PREFIX}/share/font-${PORTNAME} PORTDOCS= Changelog LICENSE_E.mplus LICENSE_J.mplus \ README README.sazanami README_J.mplus WRKSRC= ${WRKDIR}/VLGothic @@ -30,23 +29,20 @@ WRKSRC= ${WRKDIR}/VLGothic OPTIONS_DEFINE= DOCS do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR} - ${MKDIR} ${STAGEDIR}${FONTSDIR} - cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \ - ../../../${DATADIR_REL}/*.ttf . - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + @${MKDIR} ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ ${STAGEDIR}${PREFIX}/etc/fonts/conf.d - ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ - ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${INSTALL_DATA} ${FILESDIR}/20-unhint-${FONTNAME}.conf \ + ${FILESDIR}/62-fonts-${FONTNAME}.conf \ ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail - ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ - ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf - ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ - ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf + ${LN} -s -f ../conf.avail/20-unhint-${FONTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${FONTNAME}.conf + ${LN} -s -f ../conf.avail/62-fonts-${FONTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${FONTNAME}.conf post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/japanese/font-vlgothic/pkg-plist ============================================================================== --- head/japanese/font-vlgothic/pkg-plist Mon Dec 30 05:03:45 2019 (r521462) +++ head/japanese/font-vlgothic/pkg-plist Mon Dec 30 05:04:19 2019 (r521463) @@ -1,8 +1,6 @@ -%%DATADIR%%/VL-PGothic-Regular.ttf -%%DATADIR%%/VL-Gothic-Regular.ttf +%%FONTSDIR%%/VL-PGothic-Regular.ttf +%%FONTSDIR%%/VL-Gothic-Regular.ttf etc/fonts/conf.avail/20-unhint-vlgothic.conf etc/fonts/conf.avail/62-fonts-vlgothic.conf etc/fonts/conf.d/20-unhint-vlgothic.conf etc/fonts/conf.d/62-fonts-vlgothic.conf -%%FONTSDIR%%/VL-PGothic-Regular.ttf -%%FONTSDIR%%/VL-Gothic-Regular.ttf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912300504.xBU54JMZ092286>