svn commit: r353676 - in head/x11-fonts/comfortaa-ttf: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Sun May 11 11:42:15 2014
New Revision: 353676
URL: http://svnweb.freebsd.org/changeset/ports/353676
QAT: https://qat.redports.org/buildarchive/r353676/

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/comfortaa-ttf/files/
Modified:
  head/x11-fonts/comfortaa-ttf/Makefile
  head/x11-fonts/comfortaa-ttf/pkg-plist

Modified: head/x11-fonts/comfortaa-ttf/Makefile
==============================================================================
--- head/x11-fonts/comfortaa-ttf/Makefile	Sun May 11 11:24:26 2014	(r353675)
+++ head/x11-fonts/comfortaa-ttf/Makefile	Sun May 11 11:42:15 2014	(r353676)
@@ -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-s
 
 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>

Modified: head/x11-fonts/comfortaa-ttf/pkg-plist
==============================================================================
--- head/x11-fonts/comfortaa-ttf/pkg-plist	Sun May 11 11:24:26 2014	(r353675)
+++ head/x11-fonts/comfortaa-ttf/pkg-plist	Sun May 11 11:42:15 2014	(r353676)
@@ -1,8 +1,4 @@
 %%FONTDIR%%/Comfortaa-Bold.ttf
 %%FONTDIR%%/Comfortaa-Light.ttf
 %%FONTDIR%%/Comfortaa-Regular.ttf
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
- at unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || true
 @dirrm %%FONTDIR%%
- at exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTDIR%% || /usr/bin/true