From owner-svn-ports-head@FreeBSD.ORG  Fri Jul  4 14:46:38 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 5AEF7425;
 Fri,  4 Jul 2014 14:46:38 +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 2DD8B215F;
 Fri,  4 Jul 2014 14:46:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s64Ekc0g098005;
 Fri, 4 Jul 2014 14:46:38 GMT (envelope-from vanilla@svn.freebsd.org)
Received: (from vanilla@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s64EkbIZ098003;
 Fri, 4 Jul 2014 14:46:37 GMT (envelope-from vanilla@svn.freebsd.org)
Message-Id: <201407041446.s64EkbIZ098003@svn.freebsd.org>
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Fri, 4 Jul 2014 14:46:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360629 - head/x11-fonts/proggy_fonts-ttf
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Jul 2014 14:46:38 -0000

Author: vanilla
Date: Fri Jul  4 14:46:37 2014
New Revision: 360629
URL: http://svnweb.freebsd.org/changeset/ports/360629
QAT: https://qat.redports.org/buildarchive/r360629/

Log:
  Stagify, use @fcfontsdir.

Modified:
  head/x11-fonts/proggy_fonts-ttf/Makefile
  head/x11-fonts/proggy_fonts-ttf/pkg-plist

Modified: head/x11-fonts/proggy_fonts-ttf/Makefile
==============================================================================
--- head/x11-fonts/proggy_fonts-ttf/Makefile	Fri Jul  4 14:41:05 2014	(r360628)
+++ head/x11-fonts/proggy_fonts-ttf/Makefile	Fri Jul  4 14:46:37 2014	(r360629)
@@ -16,19 +16,17 @@ COMMENT=	The perfect monospaced bitmap p
 LICENSE=	MIT
 
 BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
+		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 USES=		zip
 NO_WRKSUBDIR=	yes
-INSTALLDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
-
-NO_STAGE=	yes
-do-build:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/mkfontscale
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/mkfontdir
+FONTDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
+NO_BUILD=	yes
+PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
 
 do-install:
-	@${MKDIR} ${INSTALLDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} fonts.dir fonts.scale *.ttf ${INSTALLDIR}
+	@${MKDIR} ${STAGEDIR}${FONTDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTDIR}
 
 .include <bsd.port.mk>

Modified: head/x11-fonts/proggy_fonts-ttf/pkg-plist
==============================================================================
--- head/x11-fonts/proggy_fonts-ttf/pkg-plist	Fri Jul  4 14:41:05 2014	(r360628)
+++ head/x11-fonts/proggy_fonts-ttf/pkg-plist	Fri Jul  4 14:46:37 2014	(r360629)
@@ -1,13 +1,10 @@
-lib/X11/fonts/proggy_fonts-ttf/ProggyClean.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggyCleanCE.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggyCleanSZ.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggyCleanSZBP.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggySmall.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggySquare.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggySquareSZ.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggyTiny.ttf
-lib/X11/fonts/proggy_fonts-ttf/ProggyTinySZ.ttf
-lib/X11/fonts/proggy_fonts-ttf/fonts.dir
-lib/X11/fonts/proggy_fonts-ttf/fonts.scale
-@dirrm lib/X11/fonts/proggy_fonts-ttf
-@exec fc-cache -v %D/lib/X11/fonts/proggy_fonts-ttf 2>/dev/null || true
+%%FONTDIR%%/ProggyClean.ttf
+%%FONTDIR%%/ProggyCleanCE.ttf
+%%FONTDIR%%/ProggyCleanSZ.ttf
+%%FONTDIR%%/ProggyCleanSZBP.ttf
+%%FONTDIR%%/ProggySmall.ttf
+%%FONTDIR%%/ProggySquare.ttf
+%%FONTDIR%%/ProggySquareSZ.ttf
+%%FONTDIR%%/ProggyTiny.ttf
+%%FONTDIR%%/ProggyTinySZ.ttf
+@fcfontsdir %%FONTDIR%%