2 files changed, 20 insertions, 37 deletions

diff --git a/x11-fonts/liberation-fonts-ttf/Makefile b/x11-fonts/liberation-fonts-ttf/Makefile
index 989b9441b91f..34997b93287a 100644
--- a/x11-fonts/liberation-fonts-ttf/Makefile
+++ b/x11-fonts/liberation-fonts-ttf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	liberation-fonts-ttf
 PORTVERSION=	2.00.1
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://fedorahosted.org/releases/l/i/liberation-fonts/	\
 		${MASTER_SITE_LOCAL}
@@ -14,32 +14,19 @@ COMMENT=	Liberation fonts from Red Hat to replace MS TTF fonts
 
 LICENSE=	OFL11
 
-BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale	\
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
-
+USES=		fonts
 USE_XORG=	x11
 
-PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
-
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_LIST=	FONTDIR=${FONTDIR}
 
 FONTNAME=	Liberation
 FONTDIR=	${PREFIX}/lib/X11/fonts/${FONTNAME}
-INSTDAT=	AUTHORS fonts.dir fonts.scale
-
-MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
-MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
-
-do-build:
-	cd ${WRKSRC} && ${MKFONTSCL_CMD}
-	${REINPLACE_CMD} -e 's|-misc-|-redhat-|' ${WRKSRC}/fonts.scale
-	cd ${WRKSRC} && ${MKFONTDIR_CMD}
+INSTDAT=	AUTHORS
+NO_BUILD=	yes
 
 do-install:
-	${MKDIR} ${STAGEDIR}${FONTDIR}
-	cd ${WRKSRC} &&	\
-	${INSTALL_DATA} ${INSTDAT} *.ttf ${STAGEDIR}${FONTDIR}
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+	cd ${WRKSRC} && \
+		${INSTALL_DATA} ${INSTDAT} *.ttf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/liberation-fonts-ttf/pkg-plist b/x11-fonts/liberation-fonts-ttf/pkg-plist
index 2e60766547e1..1ca76d4b77f3 100644
--- a/x11-fonts/liberation-fonts-ttf/pkg-plist
+++ b/x11-fonts/liberation-fonts-ttf/pkg-plist
@@ -1,17 +1,13 @@
-%%FONTDIR%%/AUTHORS
-%%FONTDIR%%/LiberationMono-Bold.ttf
-%%FONTDIR%%/LiberationMono-BoldItalic.ttf
-%%FONTDIR%%/LiberationMono-Italic.ttf
-%%FONTDIR%%/LiberationMono-Regular.ttf
-%%FONTDIR%%/LiberationSans-Bold.ttf
-%%FONTDIR%%/LiberationSans-BoldItalic.ttf
-%%FONTDIR%%/LiberationSans-Italic.ttf
-%%FONTDIR%%/LiberationSans-Regular.ttf
-%%FONTDIR%%/LiberationSerif-Bold.ttf
-%%FONTDIR%%/LiberationSerif-BoldItalic.ttf
-%%FONTDIR%%/LiberationSerif-Italic.ttf
-%%FONTDIR%%/LiberationSerif-Regular.ttf
-%%FONTDIR%%/fonts.dir
-%%FONTDIR%%/fonts.scale
-@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
-@dirrm %%FONTDIR%%
+%%FONTSDIR%%/AUTHORS
+%%FONTSDIR%%/LiberationMono-Bold.ttf
+%%FONTSDIR%%/LiberationMono-BoldItalic.ttf
+%%FONTSDIR%%/LiberationMono-Italic.ttf
+%%FONTSDIR%%/LiberationMono-Regular.ttf
+%%FONTSDIR%%/LiberationSans-Bold.ttf
+%%FONTSDIR%%/LiberationSans-BoldItalic.ttf
+%%FONTSDIR%%/LiberationSans-Italic.ttf
+%%FONTSDIR%%/LiberationSans-Regular.ttf
+%%FONTSDIR%%/LiberationSerif-Bold.ttf
+%%FONTSDIR%%/LiberationSerif-BoldItalic.ttf
+%%FONTSDIR%%/LiberationSerif-Italic.ttf
+%%FONTSDIR%%/LiberationSerif-Regular.ttf