- 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.

4 files changed, 5 insertions, 29 deletions

diff --git a/x11-fonts/consolamono-ttf/Makefile b/x11-fonts/consolamono-ttf/Makefile
index 7198e531eb10..5e3ff800bffc 100644
--- a/x11-fonts/consolamono-ttf/Makefile
+++ b/x11-fonts/consolamono-ttf/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	consolamono-ttf
 PORTVERSION=	20130127
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://openfontlibrary.org/assets/downloads/consolamono/61cc2afcc4eca96efe7c6ebf178d39df/
 DISTNAME=	consolamono
@@ -11,29 +12,15 @@ COMMENT=	Monospace font created for programming, text editors and terminal-use
 
 LICENSE=	OFL11
 
-BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-
 USES=		zip
 
 FONTDIR=	lib/X11/fonts/ConsolaMono
-PKGMESSAGE=	${WRKDIR}/pkg-message
+NO_BUILD=	yes
 PLIST_SUB=	FONTDIR=${FONTDIR}
-SUB_FILES=	pkg-message
-SUB_LIST=	FONTDIR=${FONTDIR}
 WRKSRC=		${WRKDIR}/Consola\ Mono
 
-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>
diff --git a/x11-fonts/consolamono-ttf/files/pkg-message.in b/x11-fonts/consolamono-ttf/files/pkg-message.in
deleted file mode 100644
index 798a45125c89..000000000000
--- a/x11-fonts/consolamono-ttf/files/pkg-message.in
+++ /dev/null
@@ -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%%/"
-
diff --git a/x11-fonts/consolamono-ttf/pkg-descr b/x11-fonts/consolamono-ttf/pkg-descr
index 6af173f30415..31d5dfc79db1 100644
--- a/x11-fonts/consolamono-ttf/pkg-descr
+++ b/x11-fonts/consolamono-ttf/pkg-descr
@@ -5,4 +5,4 @@ editors and for terminal-use.
 the Latin, Greek, Cyrillic script and its variants, and could be expanded to
 support other scripts.
 
-WWW:	http://openfontlibrary.org/en/font/consolamono
+WWW: http://openfontlibrary.org/en/font/consolamono
diff --git a/x11-fonts/consolamono-ttf/pkg-plist b/x11-fonts/consolamono-ttf/pkg-plist
index 5a45367f1457..877e9464cc3e 100644
--- a/x11-fonts/consolamono-ttf/pkg-plist
+++ b/x11-fonts/consolamono-ttf/pkg-plist
@@ -1,6 +1,3 @@
 %%FONTDIR%%/ConsolaMono.ttf
 %%FONTDIR%%/ConsolaMono-Bold.ttf
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
-@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || true
 @dirrm %%FONTDIR%%