From owner-svn-ports-all@FreeBSD.ORG  Wed Jul  2 18:31:50 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 40EE2D95;
 Wed,  2 Jul 2014 18:31:50 +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 13DED23BC;
 Wed,  2 Jul 2014 18:31:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s62IVn29016079;
 Wed, 2 Jul 2014 18:31:49 GMT (envelope-from bsam@svn.freebsd.org)
Received: (from bsam@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s62IVng9015851;
 Wed, 2 Jul 2014 18:31:49 GMT (envelope-from bsam@svn.freebsd.org)
Message-Id: <201407021831.s62IVng9015851@svn.freebsd.org>
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Wed, 2 Jul 2014 18:31:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360242 - in head/x11-fonts: paratype profont
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: Wed, 02 Jul 2014 18:31:50 -0000

Author: bsam
Date: Wed Jul  2 18:31:49 2014
New Revision: 360242
URL: http://svnweb.freebsd.org/changeset/ports/360242
QAT: https://qat.redports.org/buildarchive/r360242/

Log:
  x11-fonts/paratype,x11-fonts/profont: STAGEify

Modified:
  head/x11-fonts/paratype/Makefile
  head/x11-fonts/profont/Makefile

Modified: head/x11-fonts/paratype/Makefile
==============================================================================
--- head/x11-fonts/paratype/Makefile	Wed Jul  2 18:28:04 2014	(r360241)
+++ head/x11-fonts/paratype/Makefile	Wed Jul  2 18:31:49 2014	(r360242)
@@ -17,7 +17,6 @@ LICENSE=	OFL11
 INSTALLS_TTF=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-USE_TGZ=	yes
 USES=		zip
 XORG_CAT=	font
 
@@ -27,15 +26,11 @@ PLIST_SUB=	FONTDIR="${FONTROOTDIR:S/${PR
 SUB_FILES=	pkg-message
 SUB_LIST=	FONTDIR="${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}"
 
-NO_STAGE=	yes
 do-configure:
 	@${DO_NADA}
 
 do-install:
-	@${MKDIR} ${FONTROOTDIR}/${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTROOTDIR}/${FONTDIR}/
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+	@${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}/
 
 .include <bsd.port.mk>

Modified: head/x11-fonts/profont/Makefile
==============================================================================
--- head/x11-fonts/profont/Makefile	Wed Jul  2 18:28:04 2014	(r360241)
+++ head/x11-fonts/profont/Makefile	Wed Jul  2 18:31:49 2014	(r360242)
@@ -3,30 +3,26 @@
 
 PORTNAME=	profont
 PORTVERSION=	400
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.tobiasjung.net/dl/
 DISTNAME=	${PORTNAME}-x11
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Profont - The ultimate programming font.
+COMMENT=	Ultimate programming font
 
 BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 FONTDIR=	lib/X11/fonts/${PORTNAME}
 PLIST_SUB+=	FONTDIR=${FONTDIR}
 
-NO_STAGE=	yes
 do-build:
 	${GZIP_CMD} ${WRKSRC}/*.pcf
 
 do-install:
-	${MKDIR} ${LOCALBASE}/${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${LOCALBASE}/${FONTDIR}
-
-post-install:
-	@cd ${LOCALBASE}/${FONTDIR}; mkfontdir
-	@${CP} ${LOCALBASE}/${FONTDIR}/fonts.dir ${LOCALBASE}/${FONTDIR}/fonts.scale || true
-	@command fc-cache -f -v ${LOCALBASE}/${FONTDIR} || true
+	@${MKDIR} ${STAGEDIR}${LOCALBASE}/${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${STAGEDIR}${LOCALBASE}/${FONTDIR}
+	(cd ${STAGEDIR}${LOCALBASE}/${FONTDIR}; mkfontdir; mkfontscale)
 
 .include <bsd.port.mk>