3 files changed, 15 insertions, 36 deletions

diff --git a/japanese/font-takao/Makefile b/japanese/font-takao/Makefile
index dd46e2ab7280..7b41d540028d 100644
--- a/japanese/font-takao/Makefile
+++ b/japanese/font-takao/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	takao
 PORTVERSION=	003.02.01
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://launchpadlibrarian.net/40218948/
 PKGNAMEPREFIX=	ja-font-
@@ -11,24 +11,18 @@ DISTNAME=	${PORTNAME}-fonts-ttf-${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Improved IPA Japanese fonts
 
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
+USES=		fonts
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
-SUB_LIST=	X_FONTSDIR=${PREFIX}/${X_FONTSDIR}
-PLIST_SUB=	X_FONTSDIR=${X_FONTSDIR} \
-		LOCAL_FONTSDIR=${LOCAL_FONTSDIR}
 DATADIR=	${PREFIX}/share/font-${PORTNAME}
 PORTDOCS=	IPA_Font_License_Agreement_v1.0.txt \
 		README \
 		README.ja \
 		ChangeLog
 
-LOCAL_FONTSDIR=	share/fonts
-X_FONTSDIR=	lib/X11/fonts
-
+FONTNAME=	OTF
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
@@ -39,12 +33,9 @@ post-extract:
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.otf ${STAGEDIR}${DATADIR}
-	${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF
-	cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/OTF && ${LN} -s -f \
-	    ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/Takao*.otf .
-	${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF
-	cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/OTF && ${LN} -s -f \
-	    ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/Takao*.otf .
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
+	    ../../../${DATADIR_REL}/Takao*.otf .
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
@@ -54,11 +45,7 @@ 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
-
-.if ${PORT_OPTIONS:MDOCS}
-post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/font-takao/files/pkg-install.in b/japanese/font-takao/files/pkg-install.in
index f2ccc314072a..bd7c7c5d592b 100644
--- a/japanese/font-takao/files/pkg-install.in
+++ b/japanese/font-takao/files/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 
-X_FONTSDIR=%%X_FONTSDIR%%/OTF
+FONTSDIR=%%FONTSDIR%%
 
 catfontsdir ()
 {
@@ -76,7 +76,7 @@ nfonts ()
 
 case "$2" in
 POST-INSTALL)
-	cd ${X_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 ${X_FONTSDIR}
+	cd ${FONTSDIR}
 	catfontsdir < fonts.dir > fonts.dir.tmp
 	nfonts < fonts.dir.tmp > fonts.dir
 	cat fonts.dir.tmp >> fonts.dir
@@ -92,6 +92,5 @@ POST-DEINSTALL)
 	if [ -r fonts.dir -a `wc -l < fonts.dir` = 1 ]; then
 		rm -f fonts.dir
 	fi
-	rmdir ${X_FONTSDIR} > /dev/null 2>&1 || true
 	;;
 esac
diff --git a/japanese/font-takao/pkg-plist b/japanese/font-takao/pkg-plist
index 28f9df253b21..f28770158397 100644
--- a/japanese/font-takao/pkg-plist
+++ b/japanese/font-takao/pkg-plist
@@ -4,20 +4,13 @@
 %%DATADIR%%/TakaoPGothic.otf
 %%DATADIR%%/TakaoGothic.otf
 %%DATADIR%%/TakaoExGothic.otf
-%%LOCAL_FONTSDIR%%/OTF/TakaoGothic.otf
-%%LOCAL_FONTSDIR%%/OTF/TakaoPGothic.otf
-%%LOCAL_FONTSDIR%%/OTF/TakaoExGothic.otf
-%%LOCAL_FONTSDIR%%/OTF/TakaoMincho.otf
-%%LOCAL_FONTSDIR%%/OTF/TakaoPMincho.otf
-%%LOCAL_FONTSDIR%%/OTF/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
-%%X_FONTSDIR%%/OTF/TakaoGothic.otf
-%%X_FONTSDIR%%/OTF/TakaoPGothic.otf
-%%X_FONTSDIR%%/OTF/TakaoExGothic.otf
-%%X_FONTSDIR%%/OTF/TakaoMincho.otf
-%%X_FONTSDIR%%/OTF/TakaoPMincho.otf
-%%X_FONTSDIR%%/OTF/TakaoExMincho.otf
-@fc %%X_FONTSDIR%%/OTF
+%%FONTSDIR%%/TakaoGothic.otf
+%%FONTSDIR%%/TakaoPGothic.otf
+%%FONTSDIR%%/TakaoExGothic.otf
+%%FONTSDIR%%/TakaoMincho.otf
+%%FONTSDIR%%/TakaoPMincho.otf
+%%FONTSDIR%%/TakaoExMincho.otf