aboutsummaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2019-12-30 05:04:19 +0000
committerHiroki Sato <hrs@FreeBSD.org>2019-12-30 05:04:19 +0000
commitf3f7c2c27a91cd5bb9a79af2bbf3b2ddbe80bd35 (patch)
tree675d49f0388e2ad76f20a2a5bdf4639dd50223ab /japanese
parentff38fdf63cf12a8d1ecac83e81a6949fcf5937d5 (diff)
downloadports-f3f7c2c27a91cd5bb9a79af2bbf3b2ddbe80bd35.tar.gz
ports-f3f7c2c27a91cd5bb9a79af2bbf3b2ddbe80bd35.zip
- Use FONTPATHSPEC.
- Use FONTSDIR consistently.
Notes
Notes: svn path=/head/; revision=521463
Diffstat (limited to 'japanese')
-rw-r--r--japanese/font-vlgothic/Makefile28
-rw-r--r--japanese/font-vlgothic/pkg-plist6
2 files changed, 14 insertions, 20 deletions
diff --git a/japanese/font-vlgothic/Makefile b/japanese/font-vlgothic/Makefile
index 42616a8684a5..7dc7a001aab4 100644
--- a/japanese/font-vlgothic/Makefile
+++ b/japanese/font-vlgothic/Makefile
@@ -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>
diff --git a/japanese/font-vlgothic/pkg-plist b/japanese/font-vlgothic/pkg-plist
index 790e9ed72c59..5dfd53c89e99 100644
--- a/japanese/font-vlgothic/pkg-plist
+++ b/japanese/font-vlgothic/pkg-plist
@@ -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