From owner-svn-ports-all@FreeBSD.ORG  Fri Sep 12 21:15:16 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 24BCED8B;
 Fri, 12 Sep 2014 21:15:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EB260A9A;
 Fri, 12 Sep 2014 21:15:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8CLFFZN065593;
 Fri, 12 Sep 2014 21:15:15 GMT (envelope-from jhale@FreeBSD.org)
Received: (from jhale@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8CLFFpU065589;
 Fri, 12 Sep 2014 21:15:15 GMT (envelope-from jhale@FreeBSD.org)
Message-Id: <201409122115.s8CLFFpU065589@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhale set sender to
 jhale@FreeBSD.org using -f
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Fri, 12 Sep 2014 21:15:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r368067 - head/x11-fonts/alef
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Sep 2014 21:15:16 -0000

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@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@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%%