aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhrs <hrs@FreeBSD.org>2015-09-13 07:13:05 +0800
committerhrs <hrs@FreeBSD.org>2015-09-13 07:13:05 +0800
commitee9b75f06da6452c72e695a3ada93a383fe44a7a (patch)
tree6cf82796d51091b2920e4b0426df299172d0ef2b
parent6393f6ad951458d66dbc228c77c27ad852cfc8b1 (diff)
downloadfreebsd-ports-gnome-ee9b75f06da6452c72e695a3ada93a383fe44a7a.tar.gz
freebsd-ports-gnome-ee9b75f06da6452c72e695a3ada93a383fe44a7a.tar.zst
freebsd-ports-gnome-ee9b75f06da6452c72e695a3ada93a383fe44a7a.zip
Fix fonts.dir. It was totally broken since r381876.
-rw-r--r--japanese/font-ipa/Makefile2
-rw-r--r--japanese/font-ipa/files/pkg-install.in6
2 files changed, 3 insertions, 5 deletions
diff --git a/japanese/font-ipa/Makefile b/japanese/font-ipa/Makefile
index b165ca144e1b..80ebffaddc06 100644
--- a/japanese/font-ipa/Makefile
+++ b/japanese/font-ipa/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ipa
PORTVERSION= 00303
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= japanese x11-fonts
MASTER_SITES= http://info.openlab.ipa.go.jp/ipafont/fontdata/
PKGNAMEPREFIX= ja-font-
diff --git a/japanese/font-ipa/files/pkg-install.in b/japanese/font-ipa/files/pkg-install.in
index 7ae9e47a80bc..3df544eff523 100644
--- a/japanese/font-ipa/files/pkg-install.in
+++ b/japanese/font-ipa/files/pkg-install.in
@@ -1,8 +1,6 @@
#!/bin/sh
# $FreeBSD$
-FONTSDIR=%%FONTSDIR%%/OTF
-
catfontsdir ()
{
while read _IN
@@ -77,7 +75,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
@@ -85,7 +83,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