Make fonts repecting XDG

Xorg is now looking in ${LOCALBASE}/share/fonts by default
Xorg now accepts symlinks in etc/X11/fontpath.d (as decribed in Xserver(1))
Large cleanup on lots of font ports
All fonts are now properly dynamically generating fonts.dir and fonts.scale
instead of sometime overwriting existing ones)
All fonts are generating fontconfig's cache
Improve consistency in fonts ports

16 files changed, 67 insertions, 124 deletions

diff --git a/korean/aleefonts-ttf/Makefile b/korean/aleefonts-ttf/Makefile
index be6919081f54..081a1a72be4e 100644
--- a/korean/aleefonts-ttf/Makefile
+++ b/korean/aleefonts-ttf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	aleefonts
 PORTVERSION=	12
+PORTREVISION=	1
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	DEBIAN
 MASTER_SITE_SUBDIR=	pool/main/t/ttf-alee
@@ -15,26 +16,17 @@ COMMENT=	A-Lee's Hangul truetype fonts #'
 LICENSE=	ART10
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+USES=		fonts
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
-FONTSDIR=	lib/X11/fonts/alee${PKGNAMESUFFIX}
 FONTLIST=	Bandal Bangwool Eunjin EunjinNakseo Guseul
-FONTFILES=	${FONTLIST:S/$/.ttf/} fonts.dir fonts.scale
+FONTFILES=	${FONTLIST:S/$/.ttf/}
+NO_BUILD=	yes
 
 PLIST_FILES=	${FONTFILES:S|^|${FONTSDIR}/|}
 
-do-build:
-	${LOCALBASE}/bin/mkfontscale ${WRKSRC}
-	${LOCALBASE}/bin/mkfontdir ${WRKSRC}
-
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
-	${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR}
-
-post-install:
-	@${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/korean/baekmukfonts-bdf/Makefile b/korean/baekmukfonts-bdf/Makefile
index b564bc239d86..46421b2e6439 100644
--- a/korean/baekmukfonts-bdf/Makefile
+++ b/korean/baekmukfonts-bdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	baekmukfonts
 PORTVERSION=	2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	ftp://ftp.mizi.com/pub/baekmuk/obsoletes/ \
 		ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
@@ -32,12 +32,9 @@ FONTLIST=	batang10 batang10b batang12 batang12b batang14 batang14b \
 FONTLIST_MANUAL=	batang10 batang10b gulim10 gulim10b
 
 BDFTOPCF=	${PREFIX}/bin/bdftopcf
-MKFONTDIR=	${PREFIX}/bin/mkfontdir
 CHARSETSUB=	s/ksx1001.1997/ksc5601.1987/g
-FONTSDIR=	lib/X11/fonts/local
-MAKE_ENV=	FONTSDIR=${FONTSDIR}
-PLIST_SUB=	FONTSDIR=${FONTSDIR}
-USES=		perl5
+MAKE_ENV=	FONTSDIR=${FONTSDIR:S,${PREFIX},,}
+USES=		fonts perl5
 USE_PERL5=	build
 
 # manually install hinted fonts
@@ -56,10 +53,10 @@ do-build:
 .endfor
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 .for FONTNAME in ${FONTLIST}
 	${INSTALL_DATA} ${WRKDIR}/${FONTNAME}.pcf.gz \
-			${STAGEDIR}${PREFIX}/${FONTSDIR}
+			${STAGEDIR}${FONTSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/korean/baekmukfonts-bdf/pkg-plist b/korean/baekmukfonts-bdf/pkg-plist
index 51e631f00dd2..f9017fac420f 100644
--- a/korean/baekmukfonts-bdf/pkg-plist
+++ b/korean/baekmukfonts-bdf/pkg-plist
@@ -40,6 +40,3 @@
 %%FONTSDIR%%/hline18.pcf.gz
 %%FONTSDIR%%/hline20.pcf.gz
 %%FONTSDIR%%/hline24.pcf.gz
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
diff --git a/korean/baekmukfonts-ttf/Makefile b/korean/baekmukfonts-ttf/Makefile
index 5f8d6484cdcb..44f6aaa02dd0 100644
--- a/korean/baekmukfonts-ttf/Makefile
+++ b/korean/baekmukfonts-ttf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	baekmukfonts
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	korean
 MASTER_SITES=	http://kldp.net/frs/download.php/1429/
 PKGNAMESUFFIX=	-ttf
@@ -17,16 +17,13 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 NO_BUILD=	yes
 
+USES=		fonts
 FONTNAME=	baekmuk
-FONTSDIR=	lib/X11/fonts/${FONTNAME}${PKGNAMESUFFIX}
-PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} COPYRIGHT COPYRIGHT.ks README \
-		contrib/hconfig.ps ttf/*.ttf ttf/fonts.dir \
-		${STAGEDIR}${PREFIX}/${FONTSDIR})
-	${INSTALL_DATA} ${WRKSRC}/ttf/fonts.scale.xtt \
-		${STAGEDIR}${PREFIX}/${FONTSDIR}/fonts.scale
+		contrib/hconfig.ps ttf/*.ttf \
+		${STAGEDIR}${FONTSDIR})
 
 .include <bsd.port.mk>
diff --git a/korean/baekmukfonts-ttf/pkg-plist b/korean/baekmukfonts-ttf/pkg-plist
index 10692d587ce7..b7f868680c4c 100644
--- a/korean/baekmukfonts-ttf/pkg-plist
+++ b/korean/baekmukfonts-ttf/pkg-plist
@@ -3,10 +3,6 @@
 %%FONTSDIR%%/README
 %%FONTSDIR%%/batang.ttf
 %%FONTSDIR%%/dotum.ttf
-%%FONTSDIR%%/fonts.dir
-%%FONTSDIR%%/fonts.scale
 %%FONTSDIR%%/gulim.ttf
 %%FONTSDIR%%/hconfig.ps
 %%FONTSDIR%%/hline.ttf
-@exec fc-cache -s %D/%%FONTSDIR%% 2>/dev/null || true
-@unexec fc-cache -s %D/%%FONTSDIR%% 2>/dev/null || true
diff --git a/korean/gtkcomm/Makefile b/korean/gtkcomm/Makefile
index 3ba279dd406d..917ba715bc00 100644
--- a/korean/gtkcomm/Makefile
+++ b/korean/gtkcomm/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Serial controlling software, with gtk+ widget
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/baekmukfonts/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
 
 USES=		gettext pathfix perl5 pkgconfig
 PATHFIX_MAKEFILEIN=	Makefile*in
diff --git a/korean/hanyangfonts/Makefile b/korean/hanyangfonts/Makefile
index f688b80611e5..85f86ec13fef 100644
--- a/korean/hanyangfonts/Makefile
+++ b/korean/hanyangfonts/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hanyangfonts
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	korean x11-fonts
 MASTER_SITES=	http://ftp.kaist.ac.kr/hangul/fonts/ \
 		ftp://ftp.kaist.ac.kr/hangul/fonts/ \
@@ -13,13 +13,11 @@ DISTNAME=	hanyang-font-pcf
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hanyang Hangul fonts for X11
 
-RUN_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
 SUB_FILES=	pkg-message
 
+USES=		fonts
 NO_WRKSUBDIR=	yes
+FONTNAME=	hanyang
 
 FONTS=		hgm10 hgm12 hgm14 hgm16 hgm18 hgm20 \
 		hmm10 hmm12 hmm14 hmm16 hmm18 hmm20
@@ -32,10 +30,10 @@ do-build:
 	done; \
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/local
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 .for f in ${FONTS}
 	${INSTALL_DATA} ${WRKSRC}/${f}.pcf.gz \
-		${STAGEDIR}${PREFIX}/lib/X11/fonts/local
+		${STAGEDIR}${FONTSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/korean/hanyangfonts/files/pkg-message.in b/korean/hanyangfonts/files/pkg-message.in
index 81fa8573b653..c33af528bff2 100644
--- a/korean/hanyangfonts/files/pkg-message.in
+++ b/korean/hanyangfonts/files/pkg-message.in
@@ -9,12 +9,12 @@ Please note:
 
  Section "Files"
      ...
-     FontPath   "%%PREFIX%%/lib/X11/fonts/local/"
+     FontPath   "%%FONTSDIR%%"
      ...
 
  Or, run this command at your X desktop:
 
- # xset +fp %%PREFIX%%/lib/X11/fonts/local/ && xset fp rehash
+ # xset +fp %%FONTSDIR%% && xset fp rehash
 
  Don't forget to add the directory to your /etc/XF86Config, for
  add the correct font path after you reboots X.
diff --git a/korean/hanyangfonts/pkg-plist b/korean/hanyangfonts/pkg-plist
index 1a659f351248..f5ffc052d823 100644
--- a/korean/hanyangfonts/pkg-plist
+++ b/korean/hanyangfonts/pkg-plist
@@ -1,15 +1,12 @@
-lib/X11/fonts/local/hmm10.pcf.gz
-lib/X11/fonts/local/hmm12.pcf.gz
-lib/X11/fonts/local/hmm14.pcf.gz
-lib/X11/fonts/local/hmm16.pcf.gz
-lib/X11/fonts/local/hmm18.pcf.gz
-lib/X11/fonts/local/hmm20.pcf.gz
-lib/X11/fonts/local/hgm10.pcf.gz
-lib/X11/fonts/local/hgm12.pcf.gz
-lib/X11/fonts/local/hgm14.pcf.gz
-lib/X11/fonts/local/hgm16.pcf.gz
-lib/X11/fonts/local/hgm18.pcf.gz
-lib/X11/fonts/local/hgm20.pcf.gz
-@exec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
-@unexec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
+%%FONTSDIR%%/hmm10.pcf.gz
+%%FONTSDIR%%/hmm12.pcf.gz
+%%FONTSDIR%%/hmm14.pcf.gz
+%%FONTSDIR%%/hmm16.pcf.gz
+%%FONTSDIR%%/hmm18.pcf.gz
+%%FONTSDIR%%/hmm20.pcf.gz
+%%FONTSDIR%%/hgm10.pcf.gz
+%%FONTSDIR%%/hgm12.pcf.gz
+%%FONTSDIR%%/hgm14.pcf.gz
+%%FONTSDIR%%/hgm16.pcf.gz
+%%FONTSDIR%%/hgm18.pcf.gz
+%%FONTSDIR%%/hgm20.pcf.gz
diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile
index 98dd38e2de6c..527433f3d79c 100644
--- a/korean/kaistfonts/Makefile
+++ b/korean/kaistfonts/Makefile
@@ -14,12 +14,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 KAIST font(ksc5601.1987-0 encoding) collection
 
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-USES=		gmake
+USES=		fonts gmake
 NO_WRKSUBDIR=	yes
-MAKE_ENV=	DISTDIR=${DISTDIR} DISTFILES="${DISTFILES}"
+MAKE_ENV=	DISTDIR=${DISTDIR} DISTFILES="${DISTFILES}" FONTSDIR="${FONTSDIR}"
 
 do-extract:
 	@${RM} -fr ${WRKDIR} && \
diff --git a/korean/kaistfonts/files/patch-Makefile b/korean/kaistfonts/files/patch-Makefile
index b387e1c1e64a..916074523093 100644
--- a/korean/kaistfonts/files/patch-Makefile
+++ b/korean/kaistfonts/files/patch-Makefile
@@ -10,9 +10,9 @@
 +all:	${PCF}
 +
 +install:
-+	-mkdir -p ${DESTDIR}${PREFIX}/lib/X11/fonts/local
++	-mkdir -p ${DESTDIR}${FONTSDIR}
 +	for i in ${PCF}; do \
-+		gzip -c < $$i > ${DESTDIR}${PREFIX}/lib/X11/fonts/local/$$i.gz; \
++		gzip -c < $$i > ${DESTDIR}${FONTSDIR}/$$i.gz; \
 +	done
 +
 +.bdf.pcf:
diff --git a/korean/kaistfonts/pkg-plist b/korean/kaistfonts/pkg-plist
index e9891fe2282f..29600bf4a861 100644
--- a/korean/kaistfonts/pkg-plist
+++ b/korean/kaistfonts/pkg-plist
@@ -1,7 +1,4 @@
-lib/X11/fonts/local/kaist-newmj16.pcf.gz
-lib/X11/fonts/local/kaist-newmj18.pcf.gz
-lib/X11/fonts/local/ks_iyagi16.pcf.gz
-lib/X11/fonts/local/ks_philgi16.pcf.gz
-@exec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
-@unexec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
+%%FONTSDIR%%/kaist-newmj16.pcf.gz
+%%FONTSDIR%%/kaist-newmj18.pcf.gz
+%%FONTSDIR%%/ks_iyagi16.pcf.gz
+%%FONTSDIR%%/ks_philgi16.pcf.gz
diff --git a/korean/nanumcoding-ttf/Makefile b/korean/nanumcoding-ttf/Makefile
index edf3eaf29976..5484abec5dc7 100644
--- a/korean/nanumcoding-ttf/Makefile
+++ b/korean/nanumcoding-ttf/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	nanumcoding
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	korean
 MASTER_SITES=	http://dev.naver.com/frs/download.php/441/ \
 		LOCAL
@@ -14,15 +15,13 @@ COMMENT=	NanumGothic Coding Hangul font (TrueType)
 
 LICENSE=	OFL11
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
 NO_WRKSUBDIR=	yes
-USES=		zip
-FONTSDIR=	lib/X11/fonts/nanum-coding${PKGNAMESUFFIX}
+NO_BUILD=	yes
+USES=		fonts zip
+FONTNAME=	nanum-coding${PKGNAMESUFFIX}
 FONTLIST=	NanumGothicCoding \
 		NanumGothicCoding-Bold
-FONTFILES=	${FONTLIST:S/$/.ttf/} fonts.dir fonts.scale
+FONTFILES=	${FONTLIST:S/$/.ttf/}
 
 PLIST_FILES=	${FONTFILES:S|^|${FONTSDIR}/|}
 
@@ -32,16 +31,8 @@ post-extract:
 	${MV} ${WRKSRC}/*.ttf ${WRKSRC}/NanumGothicCoding.ttf
 	${MV} ${WRKSRC}/*-Bold.tmp ${WRKSRC}/NanumGothicCoding-Bold.ttf
 
-do-build:
-	${LOCALBASE}/bin/mkfontscale ${WRKSRC}
-	${LOCALBASE}/bin/mkfontdir ${WRKSRC}
-
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
-	${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR}
-
-post-install:
-	@${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/korean/nanumfonts-otf/Makefile b/korean/nanumfonts-otf/Makefile
index e3f50d41fe59..afbd2871dd98 100644
--- a/korean/nanumfonts-otf/Makefile
+++ b/korean/nanumfonts-otf/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	nanumfonts
 PORTVERSION=	3.1
+PORTREVISION=	1
 CATEGORIES=	korean
 MASTER_SITES=	http://cdn.naver.com/naver/NanumFont/fontfiles/ \
 		LOCAL
@@ -17,18 +18,16 @@ COMMENT=	Nanum family Hangul fonts (${FONTFORMAT})
 
 LICENSE=	OFL11
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
 DISTINFO_FILE=	${PKGDIR}/distinfo.${FONTTYPE}
 
 NO_WRKSUBDIR=	yes
-USES=		zip
+NO_BUILD=	yes
+USES=		fonts zip
 
 FONTTYPE?=	otf
 FONTFORMAT?=	OpenType
 
-FONTSDIR=	lib/X11/fonts/nanum-${FONTTYPE}
+FONTNAME=	nanum-${FONTTYPE}
 FONTLIST=	NanumBrush \
 		NanumGothic \
 		NanumGothicBold \
@@ -44,20 +43,12 @@ FONTLIST=	NanumBrush \
 		NanumMyeongjoEcoExtraBold \
 		NanumMyeongjoExtraBold \
 		NanumPen
-FONTFILES=	${FONTLIST:S/$/.${FONTTYPE}/} fonts.dir fonts.scale
+FONTFILES=	${FONTLIST:S/$/.${FONTTYPE}/}
 
 PLIST_FILES=	${FONTFILES:S|^|${FONTSDIR}/|}
 
-do-build:
-	${LOCALBASE}/bin/mkfontscale ${WRKSRC}
-	${LOCALBASE}/bin/mkfontdir ${WRKSRC}
-
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
-	${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR}
-
-post-install:
-	@${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/korean/unfonts-core/Makefile b/korean/unfonts-core/Makefile
index 72bf6b290e1c..7a8cc27a2f30 100644
--- a/korean/unfonts-core/Makefile
+++ b/korean/unfonts-core/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	unfonts
 PORTVERSION?=	1.0.2.080608
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	korean x11-fonts
 MASTER_SITES?=	http://kldp.net/frs/download.php/4695/
 PKGNAMESUFFIX=	-${FONTCAT}
@@ -15,13 +15,13 @@ COMMENT=	GPL'd Korean TrueType Fonts by UN Koaunghi (${FONTCAT})
 LICENSE=	GPLv2
 LICENSE_FILE=	${FILESDIR}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+USES=		fonts
+NO_BUILD=	yes
 
 DISTINFO_FILE=	${PKGDIR}/distinfo.${FONTCAT}-ttf
 
 WRKSRC=		${WRKDIR}/un-fonts
-FONTSDIR=	lib/X11/fonts/${PORTNAME}-${FONTCAT}
+FONTNAME=	${PORTNAME}-${FONTCAT}
 FONTCAT?=	core
 FONTLIST?=	UnBatang \
 		UnBatangBold \
@@ -35,20 +35,12 @@ FONTLIST?=	UnBatang \
 		UnGungseo \
 		UnPilgi \
 		UnPilgiBold
-FONTFILES=	${FONTLIST:S/$/.ttf/} fonts.dir fonts.scale
+FONTFILES=	${FONTLIST:S/$/.ttf/}
 
 PLIST_FILES=	${FONTFILES:S|^|${FONTSDIR}/|}
 
-do-build:
-	${LOCALBASE}/bin/mkfontscale ${WRKSRC}
-	${LOCALBASE}/bin/mkfontdir ${WRKSRC}
-
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
-	${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR}
-
-post-install:
-	@${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/korean/xpdf/Makefile b/korean/xpdf/Makefile
index 46e6caaf39b1..861a2d4cb6b5 100644
--- a/korean/xpdf/Makefile
+++ b/korean/xpdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.03
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	korean
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 PKGNAMESUFFIX=	-kofont
@@ -23,7 +23,7 @@ SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR} \
 		FONTSDIR=${FONTSDIR}
 PLIST_SUB=	EXTRARC=${EXTRARC}
 
-FONTSDIR=	${LOCALBASE}/lib/X11/fonts/unfonts-core
+FONTSDIR=	${LOCALBASE}/share/fonts/unfonts-core
 EXTRARC=	${DATADIR}/korean/dot.xpdfrc
 ADOBECMAPDIR=	${LOCALBASE}/share/fonts/adobe-cmaps
 INSTALL_FILES=	Adobe-Korea1.cidToUnicode ISO-2022-KR.unicodeMap \