From owner-svn-ports-all@FreeBSD.ORG  Sun May 11 14:24:21 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 899C71FC;
 Sun, 11 May 2014 14:24:21 +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 76CFB270A;
 Sun, 11 May 2014 14:24:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4BEOLQs005345;
 Sun, 11 May 2014 14:24:21 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4BEOLje005343;
 Sun, 11 May 2014 14:24:21 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201405111424.s4BEOLje005343@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sun, 11 May 2014 14:24:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r353696 - head/x11-fonts/terminus-font
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
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: Sun, 11 May 2014 14:24:21 -0000

Author: amdmi3
Date: Sun May 11 14:24:20 2014
New Revision: 353696
URL: http://svnweb.freebsd.org/changeset/ports/353696
QAT: https://qat.redports.org/buildarchive/r353696/

Log:
  - Support staging
  
  Approved by:	portmgr blanket

Modified:
  head/x11-fonts/terminus-font/Makefile
  head/x11-fonts/terminus-font/pkg-plist

Modified: head/x11-fonts/terminus-font/Makefile
==============================================================================
--- head/x11-fonts/terminus-font/Makefile	Sun May 11 14:19:51 2014	(r353695)
+++ head/x11-fonts/terminus-font/Makefile	Sun May 11 14:24:20 2014	(r353696)
@@ -31,7 +31,6 @@ TD1_DESC=	Variant with centered '~'
 SUB_LIST=	FONTDIR="${PREFIX}/${FONTDIR}"
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 ALL_TARGET=	pcf
@@ -77,13 +76,7 @@ post-build:
 	@${GZIP_CMD} ${WRKSRC}/*.pcf
 
 do-install:
-	@${MKDIR} ${PREFIX}/${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${PREFIX}/${FONTDIR}
-
-post-install:
-	@cd ${PREFIX}/${FONTDIR}; mkfontdir
-	@${CP} ${PREFIX}/${FONTDIR}/fonts.dir ${PREFIX}/${FONTDIR}/fonts.scale || true
-	@command fc-cache -f -v ${PREFIX}/${FONTDIR} || true
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}
+	@${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${PREFIX}/${FONTDIR}
 
 .include <bsd.port.mk>

Modified: head/x11-fonts/terminus-font/pkg-plist
==============================================================================
--- head/x11-fonts/terminus-font/pkg-plist	Sun May 11 14:19:51 2014	(r353695)
+++ head/x11-fonts/terminus-font/pkg-plist	Sun May 11 14:24:20 2014	(r353696)
@@ -1,5 +1,3 @@
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
 %%FONTDIR%%/ter-524b.pcf.gz
 %%FONTDIR%%/ter-k12b.pcf.gz
 %%FONTDIR%%/ter-216b.pcf.gz
@@ -234,4 +232,4 @@
 %%FONTDIR%%/ter-u18n.pcf.gz
 %%FONTDIR%%/ter-x18b.pcf.gz
 %%FONTDIR%%/ter-x18n.pcf.gz
-@dirrm %%FONTDIR%%
+@fcfontsdir %%FONTDIR%%