svn commit: r360242 - in head/x11-fonts: paratype profont

[Boris Samorodov]

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 at 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>