Index: head/japanese/font-takao/Makefile
===================================================================
--- head/japanese/font-takao/Makefile	(revision 521460)
+++ head/japanese/font-takao/Makefile	(revision 521461)
@@ -1,52 +1,52 @@
 # $FreeBSD$
 
 PORTNAME=	takao
 PORTVERSION=	003.02.01
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://launchpadlibrarian.net/40218948/
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	${PORTNAME}-fonts-ttf-${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Improved IPA Japanese fonts
 
+LICENSE=	IPAFONTLICv1.0
+LICENSE_NAME=	IPA Font License Agreement v1.0
+LICENSE_FILE=	${WRKSRC}/IPA_Font_License_Agreement_v1.0.txt
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 USES=		fonts:fc
-FONTNAME=	OTF
+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=	IPA_Font_License_Agreement_v1.0.txt \
-		README \
+PORTDOCS=	README \
 		README.ja \
 		ChangeLog
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	cd ${WRKSRC} && for F in *.ttf; do ${MV} $${F} $${F%.ttf}.otf; done
 
 do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${DATADIR}
-	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
-	    ../../../${DATADIR_REL}/Takao*.otf .
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.otf ${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>
Index: head/japanese/font-takao/pkg-plist
===================================================================
--- head/japanese/font-takao/pkg-plist	(revision 521460)
+++ head/japanese/font-takao/pkg-plist	(revision 521461)
@@ -1,16 +1,10 @@
-%%DATADIR%%/TakaoPMincho.otf
-%%DATADIR%%/TakaoMincho.otf
-%%DATADIR%%/TakaoExMincho.otf
-%%DATADIR%%/TakaoPGothic.otf
-%%DATADIR%%/TakaoGothic.otf
-%%DATADIR%%/TakaoExGothic.otf
-etc/fonts/conf.avail/20-unhint-takao.conf
-etc/fonts/conf.avail/62-fonts-takao.conf
-etc/fonts/conf.d/20-unhint-takao.conf
-etc/fonts/conf.d/62-fonts-takao.conf
 %%FONTSDIR%%/TakaoGothic.otf
 %%FONTSDIR%%/TakaoPGothic.otf
 %%FONTSDIR%%/TakaoExGothic.otf
 %%FONTSDIR%%/TakaoMincho.otf
 %%FONTSDIR%%/TakaoPMincho.otf
 %%FONTSDIR%%/TakaoExMincho.otf
+etc/fonts/conf.avail/20-unhint-takao.conf
+etc/fonts/conf.avail/62-fonts-takao.conf
+etc/fonts/conf.d/20-unhint-takao.conf
+etc/fonts/conf.d/62-fonts-takao.conf