5 files changed, 35 insertions, 16 deletions

diff --git a/x11-fonts/gnu-unifont-ttf/Makefile b/x11-fonts/gnu-unifont-ttf/Makefile
index cc733f958a70..8d10d5973f30 100644
--- a/x11-fonts/gnu-unifont-ttf/Makefile
+++ b/x11-fonts/gnu-unifont-ttf/Makefile
@@ -2,24 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	gnu-unifont-ttf
-PORTVERSION=	20131020
+PORTVERSION=	20140214
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://unifoundry.com/pub/unifont-6.3.${PORTVERSION}/font-builds/
-DISTNAME=	unifont-6.3.${PORTVERSION}.ttf
-EXTRACT_SUFX=	.gz
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=unifont/unifont-6.3.${PORTVERSION}
+DISTNAME=	unifont-6.3.${PORTVERSION}
 
 MAINTAINER=	bsdports@gmail.com
 COMMENT=	Unicode TrueType Font
 
-EXTRACT_CMD=	${GZIP_CMD}
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	> ${WRKDIR}/${DISTNAME}
+BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
-NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-PLIST_FILES=	lib/X11/fonts/local/unifont.ttf
+FONTSDIR=	lib/X11/fonts/unifont
+INSTALLDIR=	${STAGEDIR}${PREFIX}/${FONTSDIR}
+PLIST_SUB=	FONTSDIR="${FONTSDIR}"
+WRKSRC_SUBDIR=	font/precompiled
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/lib/X11/fonts/local/unifont.ttf
+	@${MKDIR} ${INSTALLDIR}
+	${INSTALL_DATA} ${WRKSRC}/unifont-6.3.${PORTVERSION}.ttf \
+		${INSTALLDIR}/unifont.ttf
+	${INSTALL_DATA} ${WRKSRC}/unifont_csur-6.3.${PORTVERSION}.ttf \
+		${INSTALLDIR}/unifont_csur.ttf
+	${INSTALL_DATA} ${WRKSRC}/unifont_upper-6.3.${PORTVERSION}.ttf \
+		${INSTALLDIR}/unifont_upper.ttf
+	${INSTALL_DATA} ${WRKSRC}/unifont_upper_csur-6.3.${PORTVERSION}.ttf \
+		${INSTALLDIR}/unifont_upper_csur.ttf
+	${LOCALBASE}/bin/mkfontscale ${INSTALLDIR}
+	${LOCALBASE}/bin/mkfontdir ${INSTALLDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/gnu-unifont-ttf/distinfo b/x11-fonts/gnu-unifont-ttf/distinfo
index afaf23e8eb1c..99dbdd97606e 100644
--- a/x11-fonts/gnu-unifont-ttf/distinfo
+++ b/x11-fonts/gnu-unifont-ttf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (unifont-6.3.20131020.ttf.gz) = 2ed6b629cb03ae0f58cdf6c3a8538499d20c1618abfcfbcdabf9649067c4d251
-SIZE (unifont-6.3.20131020.ttf.gz) = 3080523
+SHA256 (unifont-6.3.20140214.tar.gz) = 8238b21c105b0af9574c2eac647073513e6c008710a116c7c9e271743cbfd5a7
+SIZE (unifont-6.3.20140214.tar.gz) = 17337004
diff --git a/x11-fonts/gnu-unifont-ttf/pkg-plist b/x11-fonts/gnu-unifont-ttf/pkg-plist
new file mode 100644
index 000000000000..4db84a4cdae3
--- /dev/null
+++ b/x11-fonts/gnu-unifont-ttf/pkg-plist
@@ -0,0 +1,7 @@
+%%FONTSDIR%%/fonts.dir
+%%FONTSDIR%%/fonts.scale
+%%FONTSDIR%%/unifont.ttf
+%%FONTSDIR%%/unifont_csur.ttf
+%%FONTSDIR%%/unifont_upper.ttf
+%%FONTSDIR%%/unifont_upper_csur.ttf
+@dirrm %%FONTSDIR%%
diff --git a/x11-fonts/gnu-unifont/Makefile b/x11-fonts/gnu-unifont/Makefile
index e69d73480c7c..301df1d8c2d5 100644
--- a/x11-fonts/gnu-unifont/Makefile
+++ b/x11-fonts/gnu-unifont/Makefile
@@ -2,9 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	gnu-unifont
-PORTVERSION=	20131020
+PORTVERSION=	20140214
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://unifoundry.com/pub/unifont-6.3.${PORTVERSION}/font-builds/
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=unifont/unifont-6.3.${PORTVERSION}
 DISTNAME=	unifont-6.3.${PORTVERSION}.pcf
 EXTRACT_SUFX=	.gz
 EXTRACT_ONLY=
diff --git a/x11-fonts/gnu-unifont/distinfo b/x11-fonts/gnu-unifont/distinfo
index ca4adf5e9028..d2d8ce030a1c 100644
--- a/x11-fonts/gnu-unifont/distinfo
+++ b/x11-fonts/gnu-unifont/distinfo
@@ -1,2 +1,2 @@
-SHA256 (unifont-6.3.20131020.pcf.gz) = 6510709cb485a1393852b7e3540787a31f55137126d679fde47344bbf1349c53
-SIZE (unifont-6.3.20131020.pcf.gz) = 1353939
+SHA256 (unifont-6.3.20140214.pcf.gz) = 60c5954fcfcaf26c27392c6337dfd8f23353378090a5f918e4c776a0cb4a095d
+SIZE (unifont-6.3.20140214.pcf.gz) = 1357499