- Support staging.

- Remove pkg-message about editing xorg.conf, this should not be needed at
  all.
- Stop calling fontconfig on installation and deinstallation: for one, we
  were not depending on fontconfig to begin with, and fontconfig should be
  smart enough to manage its cache automatically anyway.
- Stop depending on and using mkfont{dir,scale}, this is a TTF font.

x11-fonts/comfortaa-ttf/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	comfortaa-ttf
 PORTVERSION=	2.004
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/
 DISTNAME=	comfortaa
@@ -12,29 +12,15 @@ COMMENT=	Stylish, modern and free sans-serif true type font
 
 LICENSE=	OFL11
 
-BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
 USES=		zip
 
 FONTDIR=	lib/X11/fonts/Comfortaa
-PKGMESSAGE=	${WRKDIR}/pkg-message
+NO_BUILD=	yes
 PLIST_SUB=	FONTDIR=${FONTDIR}
-SUB_FILES=	pkg-message
-SUB_LIST=	FONTDIR=${FONTDIR}
 WRKSRC=		${WRKDIR}/Comfortaa
 
-NO_STAGE=	yes
-do-build:
-	@cd ${WRKSRC}/ && \
-		${LOCALBASE}/bin/mkfontscale && \
-		${LOCALBASE}/bin/mkfontdir
-
 do-install:
-	${MKDIR} ${PREFIX}/${FONTDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} *.ttf fonts.* ${PREFIX}/${FONTDIR}/
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} *.ttf ${STAGEDIR}${PREFIX}/${FONTDIR}/
 
 .include <bsd.port.mk>

x11-fonts/comfortaa-ttf/files/pkg-message.in

@@ -1,8 +0,0 @@
-
-You can start using the fonts by following these instructions:
-
-Add the following line to the "Files" section of your X.org configuration
-file:
-
-	FontPath	"%%PREFIX%%/%%FONTDIR%%/"
-

x11-fonts/comfortaa-ttf/pkg-plist

@@ -1,8 +1,4 @@
 %%FONTDIR%%/Comfortaa-Bold.ttf
 %%FONTDIR%%/Comfortaa-Light.ttf
 %%FONTDIR%%/Comfortaa-Regular.ttf
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
-@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || true
 @dirrm %%FONTDIR%%
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTDIR%% || /usr/bin/true