svn commit: r368067 - head/x11-fonts/alef

[Jason E. Hale]

Author: jhale
Date: Fri Sep 12 21:15:15 2014
New Revision: 368067
URL: http://svnweb.freebsd.org/changeset/ports/368067
QAT: https://qat.redports.org/buildarchive/r368067/

Log:
  - Drop indefinite article from COMMENT
  - Add LICENSE_FILE and remove it from PORTDOCS
  - Use NO_WRKSUBDIR to avoid redefining WRKSRC
  - Create and install font indexes
  - Simplify PORTDOCS installation
  - Bump PORTREVISION
  
  PR:		193542
  Submitted by:	Carlos Jacobo Puga Medina <cpm at fbsd.es> (maintainer)

Modified:
  head/x11-fonts/alef/Makefile
  head/x11-fonts/alef/pkg-plist

Modified: head/x11-fonts/alef/Makefile
==============================================================================
--- head/x11-fonts/alef/Makefile	Fri Sep 12 20:52:18 2014	(r368066)
+++ head/x11-fonts/alef/Makefile	Fri Sep 12 21:15:15 2014	(r368067)
@@ -2,40 +2,46 @@
 
 PORTNAME=	alef
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://alef.hagilda.com/
 DISTNAME=	Alef
 
 MAINTAINER=	cpm at fbsd.es
-COMMENT=	A free multi-lingual font designed for screens
+COMMENT=	Free multi-lingual font designed for screens
 
 LICENSE=	OFL11
+LICENSE_FILE=	${WRKSRC}/OFL-license.txt
 
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 USES=		zip
 USE_XORG=	x11
+
+NO_WRKSUBDIR=	yes
 FONTSDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-NO_BUILD=	yes
 
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 
-PORTDOCS=	COMING-SOON.txt OFL-license.txt readme.txt
+PORTDOCS=	COMING-SOON.txt readme.txt
+
+MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
+MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
-	@${MKDIR} ${WRKSRC}
-	cd ${WRKDIR} ; ${MV} TTF ${WRKSRC}
-	${MV} ${WRKDIR}/--COMING-SOON--.txt ${WRKDIR}/COMING-SOON.txt
+	${MV} ${WRKSRC}/--COMING-SOON--.txt ${WRKSRC}/COMING-SOON.txt
+
+do-build:
+	${MKFONTSCL_CMD} ${WRKSRC}/TTF
+	${MKFONTDIR_CMD} ${WRKSRC}/TTF
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/TTF/* ${STAGEDIR}${FONTSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/x11-fonts/alef/pkg-plist
==============================================================================
--- head/x11-fonts/alef/pkg-plist	Fri Sep 12 20:52:18 2014	(r368066)
+++ head/x11-fonts/alef/pkg-plist	Fri Sep 12 21:15:15 2014	(r368067)
@@ -1,3 +1,5 @@
 %%FONTSDIR%%/Alef-Bold.ttf
 %%FONTSDIR%%/Alef-Regular.ttf
+%%FONTSDIR%%/fonts.dir
+%%FONTSDIR%%/fonts.scale
 @dirrmtry %%FONTSDIR%%