svn commit: r396784 - in head/japanese/font-ipa: . files

[Hiroki Sato]

Author: hrs
Date: Sat Sep 12 23:13:05 2015
New Revision: 396784
URL: https://svnweb.freebsd.org/changeset/ports/396784

Log:
  Fix fonts.dir.  It was totally broken since r381876.

Modified:
  head/japanese/font-ipa/Makefile
  head/japanese/font-ipa/files/pkg-install.in

Modified: head/japanese/font-ipa/Makefile
==============================================================================
--- head/japanese/font-ipa/Makefile	Sat Sep 12 22:26:35 2015	(r396783)
+++ head/japanese/font-ipa/Makefile	Sat Sep 12 23:13:05 2015	(r396784)
@@ -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-

Modified: head/japanese/font-ipa/files/pkg-install.in
==============================================================================
--- head/japanese/font-ipa/files/pkg-install.in	Sat Sep 12 22:26:35 2015	(r396783)
+++ head/japanese/font-ipa/files/pkg-install.in	Sat Sep 12 23:13:05 2015	(r396784)
@@ -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