summaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2015-09-12 23:21:50 +0000
committerHiroki Sato <hrs@FreeBSD.org>2015-09-12 23:21:50 +0000
commit55e854b1878aacaa3b6dfa168f884710bbc29d12 (patch)
tree34274b4e3d511eb36c050d9b6459e386c2b9ec23 /japanese
parentFix fonts.dir. It was totally broken since r381876. (diff)
- Use post-install-DOCS-on.
- Use %%FONTSDIR%% directly.
Notes
Notes: svn path=/head/; revision=396788
Diffstat (limited to 'japanese')
-rw-r--r--japanese/font-ipamjm/Makefile2
-rw-r--r--japanese/font-ipamjm/files/pkg-install.in6
2 files changed, 4 insertions, 4 deletions
diff --git a/japanese/font-ipamjm/Makefile b/japanese/font-ipamjm/Makefile
index d5d2cd0d951b..abdbdda8186b 100644
--- a/japanese/font-ipamjm/Makefile
+++ b/japanese/font-ipamjm/Makefile
@@ -42,6 +42,8 @@ do-install:
${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
+
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/japanese/font-ipamjm/files/pkg-install.in b/japanese/font-ipamjm/files/pkg-install.in
index f3125bbbb3d6..2cbc4fb8de4e 100644
--- a/japanese/font-ipamjm/files/pkg-install.in
+++ b/japanese/font-ipamjm/files/pkg-install.in
@@ -1,8 +1,6 @@
#!/bin/sh
# $FreeBSD$
-FONTSDIR=%%FONTSDIR%%
-
catfontsdir ()
{
while read _IN
@@ -73,7 +71,7 @@ nfonts ()
case "$2" in
POST-INSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
touch fonts.dir
(catfontsdir < fonts.dir; addentries) > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
@@ -81,7 +79,7 @@ POST-INSTALL)
rm -f fonts.dir.tmp
;;
POST-DEINSTALL)
- cd ${FONTSDIR}
+ cd %%FONTSDIR%%
catfontsdir < fonts.dir > fonts.dir.tmp
nfonts < fonts.dir.tmp > fonts.dir
cat fonts.dir.tmp >> fonts.dir