2 files changed, 39 insertions, 46 deletions

diff --git a/x11-fonts/fira/Makefile b/x11-fonts/fira/Makefile
index 903adc27113b..5f5f4806e7fc 100644
--- a/x11-fonts/fira/Makefile
+++ b/x11-fonts/fira/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	fira
 PORTVERSION=	3.111
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.carrois.com/wordpress/downloads/${PORTNAME}_3_1/ \
 		SF/horia/${CATEGORIES}/${PORTNAME}/
@@ -18,19 +19,12 @@ COMMENT=	Sans-serif and monospaced typeface for small screens
 
 LICENSE=	OFL11
 
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-USES=		zip
+USES=		fonts zip
 USE_XORG=	x11
-FONTLIBPATH=	lib/X11/fonts
-FONTROOTDIR=	${PREFIX}/${FONTLIBPATH}
-FONTDIR=	${FONTROOTDIR}/${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
-PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
 
 PORTDOCS=	Version_Report.rtf \
 		${PORTNAME:S|f|F|}*.pdf
@@ -41,9 +35,9 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 EXAMPLES_DESC=	UFO source files
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${FONTDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME:S|f|F|}*${PORTVERSION:S|.||}/OTF/${PORTNAME:S|f|F|}*.otf \
-		${STAGEDIR}${FONTDIR}
+		${STAGEDIR}${FONTSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} ${DISTDIR}/Version_Report.rtf ${WRKSRC}/
 	${CP} ${WRKDIR}/${PORTNAME:S|f|F|}PDF${PORTVERSION:S|.||}/${PORTNAME:S|f|F|}*.pdf ${WRKSRC}/
diff --git a/x11-fonts/fira/pkg-plist b/x11-fonts/fira/pkg-plist
index 3fb9d22d6208..a4c18418f835 100644
--- a/x11-fonts/fira/pkg-plist
+++ b/x11-fonts/fira/pkg-plist
@@ -1,36 +1,35 @@
-%%FONTDIR%%/FiraMono-Bold.otf
-%%FONTDIR%%/FiraMono-Medium.otf
-%%FONTDIR%%/FiraMono-Regular.otf
-%%FONTDIR%%/FiraSans-Bold.otf
-%%FONTDIR%%/FiraSans-BoldItalic.otf
-%%FONTDIR%%/FiraSans-Book.otf
-%%FONTDIR%%/FiraSans-BookItalic.otf
-%%FONTDIR%%/FiraSans-Eight.otf
-%%FONTDIR%%/FiraSans-EightItalic.otf
-%%FONTDIR%%/FiraSans-ExtraBold.otf
-%%FONTDIR%%/FiraSans-ExtraBoldItalic.otf
-%%FONTDIR%%/FiraSans-ExtraLight.otf
-%%FONTDIR%%/FiraSans-ExtraLightItalic.otf
-%%FONTDIR%%/FiraSans-Four.otf
-%%FONTDIR%%/FiraSans-FourItalic.otf
-%%FONTDIR%%/FiraSans-Hair.otf
-%%FONTDIR%%/FiraSans-HairItalic.otf
-%%FONTDIR%%/FiraSans-Heavy.otf
-%%FONTDIR%%/FiraSans-HeavyItalic.otf
-%%FONTDIR%%/FiraSans-Italic.otf
-%%FONTDIR%%/FiraSans-Light.otf
-%%FONTDIR%%/FiraSans-LightItalic.otf
-%%FONTDIR%%/FiraSans-Medium.otf
-%%FONTDIR%%/FiraSans-MediumItalic.otf
-%%FONTDIR%%/FiraSans-Regular.otf
-%%FONTDIR%%/FiraSans-SemiBold.otf
-%%FONTDIR%%/FiraSans-SemiBoldItalic.otf
-%%FONTDIR%%/FiraSans-Thin.otf
-%%FONTDIR%%/FiraSans-ThinItalic.otf
-%%FONTDIR%%/FiraSans-Two.otf
-%%FONTDIR%%/FiraSans-TwoItalic.otf
-%%FONTDIR%%/FiraSans-Ultra.otf
-%%FONTDIR%%/FiraSans-UltraItalic.otf
-%%FONTDIR%%/FiraSans-UltraLight.otf
-%%FONTDIR%%/FiraSans-UltraLightItalic.otf
-@fc %%FONTDIR%%
+%%FONTSDIR%%/FiraMono-Bold.otf
+%%FONTSDIR%%/FiraMono-Medium.otf
+%%FONTSDIR%%/FiraMono-Regular.otf
+%%FONTSDIR%%/FiraSans-Bold.otf
+%%FONTSDIR%%/FiraSans-BoldItalic.otf
+%%FONTSDIR%%/FiraSans-Book.otf
+%%FONTSDIR%%/FiraSans-BookItalic.otf
+%%FONTSDIR%%/FiraSans-Eight.otf
+%%FONTSDIR%%/FiraSans-EightItalic.otf
+%%FONTSDIR%%/FiraSans-ExtraBold.otf
+%%FONTSDIR%%/FiraSans-ExtraBoldItalic.otf
+%%FONTSDIR%%/FiraSans-ExtraLight.otf
+%%FONTSDIR%%/FiraSans-ExtraLightItalic.otf
+%%FONTSDIR%%/FiraSans-Four.otf
+%%FONTSDIR%%/FiraSans-FourItalic.otf
+%%FONTSDIR%%/FiraSans-Hair.otf
+%%FONTSDIR%%/FiraSans-HairItalic.otf
+%%FONTSDIR%%/FiraSans-Heavy.otf
+%%FONTSDIR%%/FiraSans-HeavyItalic.otf
+%%FONTSDIR%%/FiraSans-Italic.otf
+%%FONTSDIR%%/FiraSans-Light.otf
+%%FONTSDIR%%/FiraSans-LightItalic.otf
+%%FONTSDIR%%/FiraSans-Medium.otf
+%%FONTSDIR%%/FiraSans-MediumItalic.otf
+%%FONTSDIR%%/FiraSans-Regular.otf
+%%FONTSDIR%%/FiraSans-SemiBold.otf
+%%FONTSDIR%%/FiraSans-SemiBoldItalic.otf
+%%FONTSDIR%%/FiraSans-Thin.otf
+%%FONTSDIR%%/FiraSans-ThinItalic.otf
+%%FONTSDIR%%/FiraSans-Two.otf
+%%FONTSDIR%%/FiraSans-TwoItalic.otf
+%%FONTSDIR%%/FiraSans-Ultra.otf
+%%FONTSDIR%%/FiraSans-UltraItalic.otf
+%%FONTSDIR%%/FiraSans-UltraLight.otf
+%%FONTSDIR%%/FiraSans-UltraLightItalic.otf