From fe5a7e4bee2fc7a40343278a44de77847b5c91c5 Mon Sep 17 00:00:00 2001
From: bapt <bapt@FreeBSD.org>
Date: Sat, 21 Mar 2015 23:05:19 +0000
Subject: 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
---
 japanese/kterm/Makefile  | 5 +++--
 japanese/kterm/pkg-plist | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'japanese/kterm')

diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index ccb01e5a9222..0ded7946dd8b 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -37,6 +37,7 @@ COMMENT=	Xterm variant with Japanese support
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 
 USES=		imake
+VGAFONT_USES=	fonts
 USE_XORG=	xaw
 CFLAGS+=	-Wno-return-type
 PORTDOCS=	README.kt README.wallpaper.ja dot.termcap
@@ -76,9 +77,9 @@ post-extract:
 	cd ${WRKDIR}/pcemu1.01alpha && \
 	    ${LOCALBASE}/bin/bdftopcf vga.bdf | ${GZIP_CMD} > vga.pcf.gz
 post-install-vgafont:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/misc
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKDIR}/pcemu1.01alpha/vga.pcf.gz \
-	    ${STAGEDIR}${PREFIX}/lib/X11/fonts/misc
+	    ${STAGEDIR}${FONTSDIR}
 post-install: post-install-vgafont
 .endif
 
diff --git a/japanese/kterm/pkg-plist b/japanese/kterm/pkg-plist
index 2bf3ab5539ae..f54a3f08f712 100644
--- a/japanese/kterm/pkg-plist
+++ b/japanese/kterm/pkg-plist
@@ -2,6 +2,4 @@ bin/kterm
 man/ja/man1/kterm.1.gz
 man/man1/kterm.1.gz
 lib/X11/app-defaults/KTerm
-%%VGAFONT%%lib/X11/fonts/misc/vga.pcf.gz
-%%VGAFONT%%@exec %D/bin/mkfontdir %D/lib/X11/fonts/misc
-%%VGAFONT%%@unexec %D/bin/mkfontdir %D/lib/X11/fonts/misc; if [ `/usr/bin/wc -c < %D/lib/X11/fonts/misc/fonts.dir` = 2 ]; then /bin/rm -f %D/lib/X11/fonts/misc/fonts.dir; fi
+%%VGAFONT%%%%FONTSDIR%%/vga.pcf.gz
-- 
cgit