svn commit: r353677 - in head/x11-fonts/consolamono-ttf: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Sun May 11 11:47:31 2014
New Revision: 353677
URL: http://svnweb.freebsd.org/changeset/ports/353677
QAT: https://qat.redports.org/buildarchive/r353677/

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

Deleted:
  head/x11-fonts/consolamono-ttf/files/
Modified:
  head/x11-fonts/consolamono-ttf/Makefile
  head/x11-fonts/consolamono-ttf/pkg-descr
  head/x11-fonts/consolamono-ttf/pkg-plist

Modified: head/x11-fonts/consolamono-ttf/Makefile
==============================================================================
--- head/x11-fonts/consolamono-ttf/Makefile	Sun May 11 11:42:15 2014	(r353676)
+++ head/x11-fonts/consolamono-ttf/Makefile	Sun May 11 11:47:31 2014	(r353677)
@@ -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 prog
 
 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>

Modified: head/x11-fonts/consolamono-ttf/pkg-descr
==============================================================================
--- head/x11-fonts/consolamono-ttf/pkg-descr	Sun May 11 11:42:15 2014	(r353676)
+++ head/x11-fonts/consolamono-ttf/pkg-descr	Sun May 11 11:47:31 2014	(r353677)
@@ -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

Modified: head/x11-fonts/consolamono-ttf/pkg-plist
==============================================================================
--- head/x11-fonts/consolamono-ttf/pkg-plist	Sun May 11 11:42:15 2014	(r353676)
+++ head/x11-fonts/consolamono-ttf/pkg-plist	Sun May 11 11:47:31 2014	(r353677)
@@ -1,6 +1,3 @@
 %%FONTDIR%%/ConsolaMono.ttf
 %%FONTDIR%%/ConsolaMono-Bold.ttf
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
- at unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || true
 @dirrm %%FONTDIR%%