svn commit: r396787 - in head/japanese/font-ipaex: . files

[Hiroki Sato]

Author: hrs
Date: Sat Sep 12 23:19:38 2015
New Revision: 396787
URL: https://svnweb.freebsd.org/changeset/ports/396787

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

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

Modified: head/japanese/font-ipaex/Makefile
==============================================================================
--- head/japanese/font-ipaex/Makefile	Sat Sep 12 23:17:12 2015	(r396786)
+++ head/japanese/font-ipaex/Makefile	Sat Sep 12 23:19:38 2015	(r396787)
@@ -2,7 +2,7 @@
 
 PORTNAME=	ipaex
 PORTVERSION=	00201
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://info.openlab.ipa.go.jp/ipafont/fontdata/7bf84182a04a9632268dbcb03f100d05/
 PKGNAMEPREFIX=	ja-font-
@@ -26,8 +26,6 @@ FONTNAME=	OTF
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	cd ${WRKSRC} && for F in *.ttf; do ${MV} $${F} $${F%.ttf}.otf; done
 
@@ -45,6 +43,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}
 

Modified: head/japanese/font-ipaex/files/pkg-install.in
==============================================================================
--- head/japanese/font-ipaex/files/pkg-install.in	Sat Sep 12 23:17:12 2015	(r396786)
+++ head/japanese/font-ipaex/files/pkg-install.in	Sat Sep 12 23:19:38 2015	(r396787)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 
-FONTSDIR=%%FONTSDIR%%/OTF
+FONTSDIR=%%FONTSDIR%%
 
 catfontsdir ()
 {
@@ -76,7 +76,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
@@ -84,7 +84,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