From 97ace078fa7b4916f3dcaf4c282e979f835216c2 Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sun, 11 May 2014 12:22:43 +0000
Subject: - Support staging. - Stop calling fontconfig on installation and
 deinstallation: fontconfig   should be smart enough to manage its cache
 automatically. - Stop depending on and using mkfont{dir,scale}. Even though
 this is not a   TTF font, most programs already use freetype and fontconfig.

---
 x11-fonts/gohufont/Makefile  | 16 ++++------------
 x11-fonts/gohufont/pkg-plist |  4 ----
 2 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'x11-fonts/gohufont')

diff --git a/x11-fonts/gohufont/Makefile b/x11-fonts/gohufont/Makefile
index bbb6a1aa52b3..202f847451a4 100644
--- a/x11-fonts/gohufont/Makefile
+++ b/x11-fonts/gohufont/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gohufont
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://font.gohu.org/
 
@@ -13,21 +14,12 @@ LICENSE_NAME=	Do What The Fuck You Want To Public License, Version 2
 LICENSE_FILE=	${WRKSRC}/COPYING-LICENSE
 LICENSE_PERMS=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
 
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-
 FONTDIR=	lib/X11/fonts/${PORTNAME}
 NO_BUILD=	yes
-PLIST_SUB+=	FONTDIR=${FONTDIR}
+PLIST_SUB=	FONTDIR=${FONTDIR}
 
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${LOCALBASE}/${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${LOCALBASE}/${FONTDIR}
-
-post-install:
-	@cd ${LOCALBASE}/${FONTDIR} && mkfontdir
-	@${CP} ${LOCALBASE}/${FONTDIR}/fonts.dir ${LOCALBASE}/${FONTDIR}/fonts.scale
-	@command fc-cache -f -v ${LOCALBASE}/${FONTDIR}
+	${MKDIR} ${STAGEDIR}${LOCALBASE}/${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${LOCALBASE}/${FONTDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/gohufont/pkg-plist b/x11-fonts/gohufont/pkg-plist
index d0c54c1828f5..1e74b8ae2e2d 100644
--- a/x11-fonts/gohufont/pkg-plist
+++ b/x11-fonts/gohufont/pkg-plist
@@ -1,5 +1,3 @@
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
 %%FONTDIR%%/gohufont-11.pcf.gz
 %%FONTDIR%%/gohufont-11b.pcf.gz
 %%FONTDIR%%/gohufont-14.pcf.gz
@@ -8,6 +6,4 @@
 %%FONTDIR%%/gohufont-uni-11b.pcf.gz
 %%FONTDIR%%/gohufont-uni-14.pcf.gz
 %%FONTDIR%%/gohufont-uni-14b.pcf.gz
-@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
 @dirrm %%FONTDIR%%
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true
-- 
cgit v1.2.3