Add staging support.

- Fix COMMENT.
- Use the @fc keyword in pkg-plist.
- General cleanup.

2 files changed, 33 insertions, 39 deletions

diff --git a/x11-fonts/moveable-type-fonts/Makefile b/x11-fonts/moveable-type-fonts/Makefile
index b403bc6fe18d..c1c9d35e2475 100644
--- a/x11-fonts/moveable-type-fonts/Makefile
+++ b/x11-fonts/moveable-type-fonts/Makefile
@@ -16,27 +16,23 @@ DISTFILES=	junction.zip \
 		goudy-bookletter-1911.zip
 
 MAINTAINER=	olgeni@FreeBSD.org
-COMMENT=	A collection of open source fonts
+COMMENT=	Collection of open source fonts
 
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 NO_BUILD=	yes
 USES=		zip
-FONTSDIR?=	${PREFIX}/lib/X11/fonts/${PORTNAME}
-PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 
-NO_STAGE=	yes
+FONTDIR=	${PREFIX}/lib/X11/fonts/${PORTNAME}
+PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
+
 post-extract:
 	@${FIND} ${WRKDIR} -name __MACOSX | ${XARGS} ${RM} -r
 
 do-install:
-	@${MKDIR} ${FONTSDIR}
-	@${FIND} ${WRKDIR} -name \*.ttf -exec ${INSTALL_DATA} {} ${FONTSDIR} \;
-	@${FIND} ${WRKDIR} -name \*.otf -exec ${INSTALL_DATA} {} ${FONTSDIR} \;
-
-post-install:
-	@${ECHO_MSG} "===> Running fc-cache"
-	-${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR}
+	@${MKDIR} ${STAGEDIR}${FONTDIR}
+	${FIND} ${WRKDIR} -name \*.ttf -exec ${INSTALL_DATA} {} ${STAGEDIR}${FONTDIR} \;
+	${FIND} ${WRKDIR} -name \*.otf -exec ${INSTALL_DATA} {} ${STAGEDIR}${FONTDIR} \;
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/moveable-type-fonts/pkg-plist b/x11-fonts/moveable-type-fonts/pkg-plist
index 875d1858911f..815f564aa651 100644
--- a/x11-fonts/moveable-type-fonts/pkg-plist
+++ b/x11-fonts/moveable-type-fonts/pkg-plist
@@ -1,28 +1,26 @@
-%%FONTSDIR%%/Blackout-2am.ttf
-%%FONTSDIR%%/Blackout-Midnight.ttf
-%%FONTSDIR%%/Chunk.otf
-%%FONTSDIR%%/Chunk.ttf
-%%FONTSDIR%%/GoudyBookletter1911.otf
-%%FONTSDIR%%/Junction 02.otf
-%%FONTSDIR%%/Junction 02.ttf
-%%FONTSDIR%%/League Gothic.otf
-%%FONTSDIR%%/OFLGoudyStM-Italic.otf
-%%FONTSDIR%%/OFLGoudyStM.otf
-%%FONTSDIR%%/OFLGoudyStMTT-Italic.ttf
-%%FONTSDIR%%/OFLGoudyStMTT.ttf
-%%FONTSDIR%%/Prociono.otf
-%%FONTSDIR%%/ProcionoTT.ttf
-%%FONTSDIR%%/Sniglet.ttf
-%%FONTSDIR%%/orbitron-black.otf
-%%FONTSDIR%%/orbitron-black.ttf
-%%FONTSDIR%%/orbitron-bold.otf
-%%FONTSDIR%%/orbitron-bold.ttf
-%%FONTSDIR%%/orbitron-light.otf
-%%FONTSDIR%%/orbitron-light.ttf
-%%FONTSDIR%%/orbitron-medium.otf
-%%FONTSDIR%%/orbitron-medium.ttf
-%%FONTSDIR%%/raleway_thin.otf
-%%FONTSDIR%%/raleway_thin.ttf
-@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
-@dirrm %%FONTSDIR%%
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
+%%FONTDIR%%/Blackout-2am.ttf
+%%FONTDIR%%/Blackout-Midnight.ttf
+%%FONTDIR%%/Chunk.otf
+%%FONTDIR%%/Chunk.ttf
+%%FONTDIR%%/GoudyBookletter1911.otf
+%%FONTDIR%%/Junction 02.otf
+%%FONTDIR%%/Junction 02.ttf
+%%FONTDIR%%/League Gothic.otf
+%%FONTDIR%%/OFLGoudyStM-Italic.otf
+%%FONTDIR%%/OFLGoudyStM.otf
+%%FONTDIR%%/OFLGoudyStMTT-Italic.ttf
+%%FONTDIR%%/OFLGoudyStMTT.ttf
+%%FONTDIR%%/Prociono.otf
+%%FONTDIR%%/ProcionoTT.ttf
+%%FONTDIR%%/Sniglet.ttf
+%%FONTDIR%%/orbitron-black.otf
+%%FONTDIR%%/orbitron-black.ttf
+%%FONTDIR%%/orbitron-bold.otf
+%%FONTDIR%%/orbitron-bold.ttf
+%%FONTDIR%%/orbitron-light.otf
+%%FONTDIR%%/orbitron-light.ttf
+%%FONTDIR%%/orbitron-medium.otf
+%%FONTDIR%%/orbitron-medium.ttf
+%%FONTDIR%%/raleway_thin.otf
+%%FONTDIR%%/raleway_thin.ttf
+@fc %%FONTDIR%%