Update to 2.20

4 files changed, 4 insertions, 283 deletions

diff --git a/x11-fonts/dejavu/Makefile b/x11-fonts/dejavu/Makefile
index bd3a97e5e0db..a67e3404bc30 100644
--- a/x11-fonts/dejavu/Makefile
+++ b/x11-fonts/dejavu/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	dejavu
-DISTVERSION=	2.19
+DISTVERSION=	2.20
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -34,7 +34,6 @@ post-patch:
 do-install:
 	${MKDIR} ${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR}
-	${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
diff --git a/x11-fonts/dejavu/distinfo b/x11-fonts/dejavu/distinfo
index 339ec1cd10ce..a9c6dc93b532 100644
--- a/x11-fonts/dejavu/distinfo
+++ b/x11-fonts/dejavu/distinfo
@@ -1,3 +1,3 @@
-MD5 (dejavu-ttf-2.19.tar.bz2) = 7b3b3a0bb916926a9392c3daf9e70f84
-SHA256 (dejavu-ttf-2.19.tar.bz2) = 7d39aa30a3faa2b0cc941c635aa39c0ca5a6a5466951c62609b1913c65a3bea3
-SIZE (dejavu-ttf-2.19.tar.bz2) = 3360351
+MD5 (dejavu-ttf-2.20.tar.bz2) = e98667ded13dbb3c1b17f3d79916ed4b
+SHA256 (dejavu-ttf-2.20.tar.bz2) = 261b505d398a6b89511affd2cf9c352523373097de8da0df18204674af8892e8
+SIZE (dejavu-ttf-2.20.tar.bz2) = 3419291
diff --git a/x11-fonts/dejavu/files/fonts.dir b/x11-fonts/dejavu/files/fonts.dir
deleted file mode 100644
index bff2980333d7..000000000000
--- a/x11-fonts/dejavu/files/fonts.dir
+++ /dev/null
@@ -1,277 +0,0 @@
-276
-DejaVuSans-Bold.ttf -misc-DejaVu Sans-bold-r-normal--0-0-0-0-p-0-ascii-0
-DejaVuSans-Bold.ttf -misc-DejaVu Sans-bold-r-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSans-Bold.ttf -misc-DejaVu Sans-bold-r-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSans-Bold.ttf -misc-DejaVu Sans-bold-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSans-Bold.ttf -misc-DejaVu Sans-bold-r-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSans-Bold.ttf -misc-DejaVu Sans-bold-r-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSans-Bold.ttf -misc-DejaVu Sans-bold-r-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSans-Bold.ttf -misc-DejaVu Sans-bold-r-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSans-Bold.ttf -misc-DejaVu Sans-bold-r-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSans-Bold.ttf -misc-DejaVu Sans-bold-r-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSans-Bold.ttf -misc-DejaVu Sans-bold-r-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSans-Bold.ttf -misc-DejaVu Sans-bold-r-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSans-Bold.ttf -misc-DejaVu Sans-bold-r-normal--0-0-0-0-p-0-koi8-r
-DejaVuSans-Bold.ttf -misc-DejaVu Sans-bold-r-normal--0-0-0-0-p-0-koi8-ru
-DejaVuSans-BoldOblique.ttf -misc-DejaVu Sans-bold-i-normal--0-0-0-0-p-0-ascii-0
-DejaVuSans-BoldOblique.ttf -misc-DejaVu Sans-bold-i-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSans-BoldOblique.ttf -misc-DejaVu Sans-bold-i-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSans-BoldOblique.ttf -misc-DejaVu Sans-bold-i-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSans-BoldOblique.ttf -misc-DejaVu Sans-bold-i-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSans-BoldOblique.ttf -misc-DejaVu Sans-bold-i-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSans-BoldOblique.ttf -misc-DejaVu Sans-bold-i-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSans-BoldOblique.ttf -misc-DejaVu Sans-bold-i-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSans-BoldOblique.ttf -misc-DejaVu Sans-bold-i-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSans-BoldOblique.ttf -misc-DejaVu Sans-bold-i-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSans-BoldOblique.ttf -misc-DejaVu Sans-bold-i-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSans-BoldOblique.ttf -misc-DejaVu Sans-bold-i-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSans-BoldOblique.ttf -misc-DejaVu Sans-bold-i-normal--0-0-0-0-p-0-koi8-r
-DejaVuSans-BoldOblique.ttf -misc-DejaVu Sans-bold-i-normal--0-0-0-0-p-0-koi8-ru
-DejaVuSans-Oblique.ttf -misc-DejaVu Sans-medium-i-normal--0-0-0-0-p-0-ascii-0
-DejaVuSans-Oblique.ttf -misc-DejaVu Sans-medium-i-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSans-Oblique.ttf -misc-DejaVu Sans-medium-i-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSans-Oblique.ttf -misc-DejaVu Sans-medium-i-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSans-Oblique.ttf -misc-DejaVu Sans-medium-i-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSans-Oblique.ttf -misc-DejaVu Sans-medium-i-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSans-Oblique.ttf -misc-DejaVu Sans-medium-i-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSans-Oblique.ttf -misc-DejaVu Sans-medium-i-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSans-Oblique.ttf -misc-DejaVu Sans-medium-i-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSans-Oblique.ttf -misc-DejaVu Sans-medium-i-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSans-Oblique.ttf -misc-DejaVu Sans-medium-i-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSans-Oblique.ttf -misc-DejaVu Sans-medium-i-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSans-Oblique.ttf -misc-DejaVu Sans-medium-i-normal--0-0-0-0-p-0-koi8-r
-DejaVuSans-Oblique.ttf -misc-DejaVu Sans-medium-i-normal--0-0-0-0-p-0-koi8-ru
-DejaVuSans.ttf -misc-DejaVu Sans-medium-r-normal--0-0-0-0-p-0-ascii-0
-DejaVuSans.ttf -misc-DejaVu Sans-medium-r-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSans.ttf -misc-DejaVu Sans-medium-r-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSans.ttf -misc-DejaVu Sans-medium-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSans.ttf -misc-DejaVu Sans-medium-r-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSans.ttf -misc-DejaVu Sans-medium-r-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSans.ttf -misc-DejaVu Sans-medium-r-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSans.ttf -misc-DejaVu Sans-medium-r-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSans.ttf -misc-DejaVu Sans-medium-r-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSans.ttf -misc-DejaVu Sans-medium-r-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSans.ttf -misc-DejaVu Sans-medium-r-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSans.ttf -misc-DejaVu Sans-medium-r-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSans.ttf -misc-DejaVu Sans-medium-r-normal--0-0-0-0-p-0-koi8-r
-DejaVuSans.ttf -misc-DejaVu Sans-medium-r-normal--0-0-0-0-p-0-koi8-ru
-DejaVuSansCondensed-Bold.ttf -misc-DejaVu Sans Condensed-bold-r-normal--0-0-0-0-p-0-ascii-0
-DejaVuSansCondensed-Bold.ttf -misc-DejaVu Sans Condensed-bold-r-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSansCondensed-Bold.ttf -misc-DejaVu Sans Condensed-bold-r-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSansCondensed-Bold.ttf -misc-DejaVu Sans Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSansCondensed-Bold.ttf -misc-DejaVu Sans Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSansCondensed-Bold.ttf -misc-DejaVu Sans Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSansCondensed-Bold.ttf -misc-DejaVu Sans Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSansCondensed-Bold.ttf -misc-DejaVu Sans Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSansCondensed-Bold.ttf -misc-DejaVu Sans Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSansCondensed-Bold.ttf -misc-DejaVu Sans Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSansCondensed-Bold.ttf -misc-DejaVu Sans Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSansCondensed-Bold.ttf -misc-DejaVu Sans Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSansCondensed-Bold.ttf -misc-DejaVu Sans Condensed-bold-r-normal--0-0-0-0-p-0-koi8-r
-DejaVuSansCondensed-Bold.ttf -misc-DejaVu Sans Condensed-bold-r-normal--0-0-0-0-p-0-koi8-ru
-DejaVuSansCondensed-BoldOblique.ttf -misc-DejaVu Sans Condensed-bold-i-normal--0-0-0-0-p-0-ascii-0
-DejaVuSansCondensed-BoldOblique.ttf -misc-DejaVu Sans Condensed-bold-i-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSansCondensed-BoldOblique.ttf -misc-DejaVu Sans Condensed-bold-i-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSansCondensed-BoldOblique.ttf -misc-DejaVu Sans Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSansCondensed-BoldOblique.ttf -misc-DejaVu Sans Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSansCondensed-BoldOblique.ttf -misc-DejaVu Sans Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSansCondensed-BoldOblique.ttf -misc-DejaVu Sans Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSansCondensed-BoldOblique.ttf -misc-DejaVu Sans Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSansCondensed-BoldOblique.ttf -misc-DejaVu Sans Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSansCondensed-BoldOblique.ttf -misc-DejaVu Sans Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSansCondensed-BoldOblique.ttf -misc-DejaVu Sans Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSansCondensed-BoldOblique.ttf -misc-DejaVu Sans Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSansCondensed-BoldOblique.ttf -misc-DejaVu Sans Condensed-bold-i-normal--0-0-0-0-p-0-koi8-r
-DejaVuSansCondensed-BoldOblique.ttf -misc-DejaVu Sans Condensed-bold-i-normal--0-0-0-0-p-0-koi8-ru
-DejaVuSansCondensed-Oblique.ttf -misc-DejaVu Sans Condensed-medium-i-normal--0-0-0-0-p-0-ascii-0
-DejaVuSansCondensed-Oblique.ttf -misc-DejaVu Sans Condensed-medium-i-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSansCondensed-Oblique.ttf -misc-DejaVu Sans Condensed-medium-i-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSansCondensed-Oblique.ttf -misc-DejaVu Sans Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSansCondensed-Oblique.ttf -misc-DejaVu Sans Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSansCondensed-Oblique.ttf -misc-DejaVu Sans Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSansCondensed-Oblique.ttf -misc-DejaVu Sans Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSansCondensed-Oblique.ttf -misc-DejaVu Sans Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSansCondensed-Oblique.ttf -misc-DejaVu Sans Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSansCondensed-Oblique.ttf -misc-DejaVu Sans Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSansCondensed-Oblique.ttf -misc-DejaVu Sans Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSansCondensed-Oblique.ttf -misc-DejaVu Sans Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSansCondensed-Oblique.ttf -misc-DejaVu Sans Condensed-medium-i-normal--0-0-0-0-p-0-koi8-r
-DejaVuSansCondensed-Oblique.ttf -misc-DejaVu Sans Condensed-medium-i-normal--0-0-0-0-p-0-koi8-ru
-DejaVuSansCondensed.ttf -misc-DejaVu Sans Condensed-medium-r-normal--0-0-0-0-p-0-ascii-0
-DejaVuSansCondensed.ttf -misc-DejaVu Sans Condensed-medium-r-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSansCondensed.ttf -misc-DejaVu Sans Condensed-medium-r-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSansCondensed.ttf -misc-DejaVu Sans Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSansCondensed.ttf -misc-DejaVu Sans Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSansCondensed.ttf -misc-DejaVu Sans Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSansCondensed.ttf -misc-DejaVu Sans Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSansCondensed.ttf -misc-DejaVu Sans Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSansCondensed.ttf -misc-DejaVu Sans Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSansCondensed.ttf -misc-DejaVu Sans Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSansCondensed.ttf -misc-DejaVu Sans Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSansCondensed.ttf -misc-DejaVu Sans Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSansCondensed.ttf -misc-DejaVu Sans Condensed-medium-r-normal--0-0-0-0-p-0-koi8-r
-DejaVuSansCondensed.ttf -misc-DejaVu Sans Condensed-medium-r-normal--0-0-0-0-p-0-koi8-ru
-DejaVuSansMono-Bold.ttf -misc-DejaVu Sans Mono-bold-r-normal--0-0-0-0-m-0-ascii-0
-DejaVuSansMono-Bold.ttf -misc-DejaVu Sans Mono-bold-r-normal--0-0-0-0-m-0-fcd8859-15
-DejaVuSansMono-Bold.ttf -misc-DejaVu Sans Mono-bold-r-normal--0-0-0-0-m-0-iso10646-1
-DejaVuSansMono-Bold.ttf -misc-DejaVu Sans Mono-bold-r-normal--0-0-0-0-m-0-iso8859-1
-DejaVuSansMono-Bold.ttf -misc-DejaVu Sans Mono-bold-r-normal--0-0-0-0-m-0-iso8859-10
-DejaVuSansMono-Bold.ttf -misc-DejaVu Sans Mono-bold-r-normal--0-0-0-0-m-0-iso8859-15
-DejaVuSansMono-Bold.ttf -misc-DejaVu Sans Mono-bold-r-normal--0-0-0-0-m-0-iso8859-2
-DejaVuSansMono-Bold.ttf -misc-DejaVu Sans Mono-bold-r-normal--0-0-0-0-m-0-iso8859-3
-DejaVuSansMono-Bold.ttf -misc-DejaVu Sans Mono-bold-r-normal--0-0-0-0-m-0-iso8859-4
-DejaVuSansMono-Bold.ttf -misc-DejaVu Sans Mono-bold-r-normal--0-0-0-0-m-0-iso8859-5
-DejaVuSansMono-Bold.ttf -misc-DejaVu Sans Mono-bold-r-normal--0-0-0-0-m-0-iso8859-9
-DejaVuSansMono-Bold.ttf -misc-DejaVu Sans Mono-bold-r-normal--0-0-0-0-m-0-koi8-r
-DejaVuSansMono-Bold.ttf -misc-DejaVu Sans Mono-bold-r-normal--0-0-0-0-m-0-koi8-ru
-DejaVuSansMono-BoldOblique.ttf -misc-DejaVu Sans Mono-bold-i-normal--0-0-0-0-m-0-ascii-0
-DejaVuSansMono-BoldOblique.ttf -misc-DejaVu Sans Mono-bold-i-normal--0-0-0-0-m-0-fcd8859-15
-DejaVuSansMono-BoldOblique.ttf -misc-DejaVu Sans Mono-bold-i-normal--0-0-0-0-m-0-iso10646-1
-DejaVuSansMono-BoldOblique.ttf -misc-DejaVu Sans Mono-bold-i-normal--0-0-0-0-m-0-iso8859-1
-DejaVuSansMono-BoldOblique.ttf -misc-DejaVu Sans Mono-bold-i-normal--0-0-0-0-m-0-iso8859-10
-DejaVuSansMono-BoldOblique.ttf -misc-DejaVu Sans Mono-bold-i-normal--0-0-0-0-m-0-iso8859-15
-DejaVuSansMono-BoldOblique.ttf -misc-DejaVu Sans Mono-bold-i-normal--0-0-0-0-m-0-iso8859-2
-DejaVuSansMono-BoldOblique.ttf -misc-DejaVu Sans Mono-bold-i-normal--0-0-0-0-m-0-iso8859-3
-DejaVuSansMono-BoldOblique.ttf -misc-DejaVu Sans Mono-bold-i-normal--0-0-0-0-m-0-iso8859-4
-DejaVuSansMono-BoldOblique.ttf -misc-DejaVu Sans Mono-bold-i-normal--0-0-0-0-m-0-iso8859-5
-DejaVuSansMono-BoldOblique.ttf -misc-DejaVu Sans Mono-bold-i-normal--0-0-0-0-m-0-iso8859-9
-DejaVuSansMono-BoldOblique.ttf -misc-DejaVu Sans Mono-bold-i-normal--0-0-0-0-m-0-koi8-r
-DejaVuSansMono-BoldOblique.ttf -misc-DejaVu Sans Mono-bold-i-normal--0-0-0-0-m-0-koi8-ru
-DejaVuSansMono-Oblique.ttf -misc-DejaVu Sans Mono-medium-i-normal--0-0-0-0-m-0-ascii-0
-DejaVuSansMono-Oblique.ttf -misc-DejaVu Sans Mono-medium-i-normal--0-0-0-0-m-0-fcd8859-15
-DejaVuSansMono-Oblique.ttf -misc-DejaVu Sans Mono-medium-i-normal--0-0-0-0-m-0-iso10646-1
-DejaVuSansMono-Oblique.ttf -misc-DejaVu Sans Mono-medium-i-normal--0-0-0-0-m-0-iso8859-1
-DejaVuSansMono-Oblique.ttf -misc-DejaVu Sans Mono-medium-i-normal--0-0-0-0-m-0-iso8859-10
-DejaVuSansMono-Oblique.ttf -misc-DejaVu Sans Mono-medium-i-normal--0-0-0-0-m-0-iso8859-15
-DejaVuSansMono-Oblique.ttf -misc-DejaVu Sans Mono-medium-i-normal--0-0-0-0-m-0-iso8859-2
-DejaVuSansMono-Oblique.ttf -misc-DejaVu Sans Mono-medium-i-normal--0-0-0-0-m-0-iso8859-3
-DejaVuSansMono-Oblique.ttf -misc-DejaVu Sans Mono-medium-i-normal--0-0-0-0-m-0-iso8859-4
-DejaVuSansMono-Oblique.ttf -misc-DejaVu Sans Mono-medium-i-normal--0-0-0-0-m-0-iso8859-5
-DejaVuSansMono-Oblique.ttf -misc-DejaVu Sans Mono-medium-i-normal--0-0-0-0-m-0-iso8859-9
-DejaVuSansMono-Oblique.ttf -misc-DejaVu Sans Mono-medium-i-normal--0-0-0-0-m-0-koi8-r
-DejaVuSansMono-Oblique.ttf -misc-DejaVu Sans Mono-medium-i-normal--0-0-0-0-m-0-koi8-ru
-DejaVuSansMono.ttf -misc-DejaVu Sans Mono-medium-r-normal--0-0-0-0-m-0-ascii-0
-DejaVuSansMono.ttf -misc-DejaVu Sans Mono-medium-r-normal--0-0-0-0-m-0-fcd8859-15
-DejaVuSansMono.ttf -misc-DejaVu Sans Mono-medium-r-normal--0-0-0-0-m-0-iso10646-1
-DejaVuSansMono.ttf -misc-DejaVu Sans Mono-medium-r-normal--0-0-0-0-m-0-iso8859-1
-DejaVuSansMono.ttf -misc-DejaVu Sans Mono-medium-r-normal--0-0-0-0-m-0-iso8859-10
-DejaVuSansMono.ttf -misc-DejaVu Sans Mono-medium-r-normal--0-0-0-0-m-0-iso8859-15
-DejaVuSansMono.ttf -misc-DejaVu Sans Mono-medium-r-normal--0-0-0-0-m-0-iso8859-2
-DejaVuSansMono.ttf -misc-DejaVu Sans Mono-medium-r-normal--0-0-0-0-m-0-iso8859-3
-DejaVuSansMono.ttf -misc-DejaVu Sans Mono-medium-r-normal--0-0-0-0-m-0-iso8859-4
-DejaVuSansMono.ttf -misc-DejaVu Sans Mono-medium-r-normal--0-0-0-0-m-0-iso8859-5
-DejaVuSansMono.ttf -misc-DejaVu Sans Mono-medium-r-normal--0-0-0-0-m-0-iso8859-9
-DejaVuSansMono.ttf -misc-DejaVu Sans Mono-medium-r-normal--0-0-0-0-m-0-koi8-r
-DejaVuSansMono.ttf -misc-DejaVu Sans Mono-medium-r-normal--0-0-0-0-m-0-koi8-ru
-DejaVuSerif-Bold.ttf -misc-DejaVu Serif-bold-r-normal--0-0-0-0-p-0-ascii-0
-DejaVuSerif-Bold.ttf -misc-DejaVu Serif-bold-r-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSerif-Bold.ttf -misc-DejaVu Serif-bold-r-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSerif-Bold.ttf -misc-DejaVu Serif-bold-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSerif-Bold.ttf -misc-DejaVu Serif-bold-r-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSerif-Bold.ttf -misc-DejaVu Serif-bold-r-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSerif-Bold.ttf -misc-DejaVu Serif-bold-r-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSerif-Bold.ttf -misc-DejaVu Serif-bold-r-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSerif-Bold.ttf -misc-DejaVu Serif-bold-r-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSerif-Bold.ttf -misc-DejaVu Serif-bold-r-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSerif-Bold.ttf -misc-DejaVu Serif-bold-r-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSerif-Bold.ttf -misc-DejaVu Serif-bold-r-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSerif-Bold.ttf -misc-DejaVu Serif-bold-r-normal--0-0-0-0-p-0-koi8-r
-DejaVuSerif-Bold.ttf -misc-DejaVu Serif-bold-r-normal--0-0-0-0-p-0-koi8-ru
-DejaVuSerif-BoldOblique.ttf -misc-DejaVu Serif-bold-i-normal--0-0-0-0-p-0-ascii-0
-DejaVuSerif-BoldOblique.ttf -misc-DejaVu Serif-bold-i-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSerif-BoldOblique.ttf -misc-DejaVu Serif-bold-i-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSerif-BoldOblique.ttf -misc-DejaVu Serif-bold-i-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSerif-BoldOblique.ttf -misc-DejaVu Serif-bold-i-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSerif-BoldOblique.ttf -misc-DejaVu Serif-bold-i-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSerif-BoldOblique.ttf -misc-DejaVu Serif-bold-i-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSerif-BoldOblique.ttf -misc-DejaVu Serif-bold-i-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSerif-BoldOblique.ttf -misc-DejaVu Serif-bold-i-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSerif-BoldOblique.ttf -misc-DejaVu Serif-bold-i-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSerif-BoldOblique.ttf -misc-DejaVu Serif-bold-i-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSerif-BoldOblique.ttf -misc-DejaVu Serif-bold-i-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSerif-BoldOblique.ttf -misc-DejaVu Serif-bold-i-normal--0-0-0-0-p-0-koi8-r
-DejaVuSerif-BoldOblique.ttf -misc-DejaVu Serif-bold-i-normal--0-0-0-0-p-0-koi8-ru
-DejaVuSerif-Oblique.ttf -misc-DejaVu Serif-medium-i-normal--0-0-0-0-p-0-ascii-0
-DejaVuSerif-Oblique.ttf -misc-DejaVu Serif-medium-i-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSerif-Oblique.ttf -misc-DejaVu Serif-medium-i-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSerif-Oblique.ttf -misc-DejaVu Serif-medium-i-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSerif-Oblique.ttf -misc-DejaVu Serif-medium-i-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSerif-Oblique.ttf -misc-DejaVu Serif-medium-i-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSerif-Oblique.ttf -misc-DejaVu Serif-medium-i-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSerif-Oblique.ttf -misc-DejaVu Serif-medium-i-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSerif-Oblique.ttf -misc-DejaVu Serif-medium-i-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSerif-Oblique.ttf -misc-DejaVu Serif-medium-i-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSerif-Oblique.ttf -misc-DejaVu Serif-medium-i-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSerif-Oblique.ttf -misc-DejaVu Serif-medium-i-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSerif-Oblique.ttf -misc-DejaVu Serif-medium-i-normal--0-0-0-0-p-0-koi8-r
-DejaVuSerif-Oblique.ttf -misc-DejaVu Serif-medium-i-normal--0-0-0-0-p-0-koi8-ru
-DejaVuSerif.ttf -misc-DejaVu Serif-medium-r-normal--0-0-0-0-p-0-ascii-0
-DejaVuSerif.ttf -misc-DejaVu Serif-medium-r-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSerif.ttf -misc-DejaVu Serif-medium-r-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSerif.ttf -misc-DejaVu Serif-medium-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSerif.ttf -misc-DejaVu Serif-medium-r-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSerif.ttf -misc-DejaVu Serif-medium-r-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSerif.ttf -misc-DejaVu Serif-medium-r-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSerif.ttf -misc-DejaVu Serif-medium-r-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSerif.ttf -misc-DejaVu Serif-medium-r-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSerif.ttf -misc-DejaVu Serif-medium-r-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSerif.ttf -misc-DejaVu Serif-medium-r-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSerif.ttf -misc-DejaVu Serif-medium-r-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSerif.ttf -misc-DejaVu Serif-medium-r-normal--0-0-0-0-p-0-koi8-r
-DejaVuSerif.ttf -misc-DejaVu Serif-medium-r-normal--0-0-0-0-p-0-koi8-ru
-DejaVuSerifCondensed-Bold.ttf -misc-DejaVu Serif Condensed-bold-r-normal--0-0-0-0-p-0-ascii-0
-DejaVuSerifCondensed-Bold.ttf -misc-DejaVu Serif Condensed-bold-r-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSerifCondensed-Bold.ttf -misc-DejaVu Serif Condensed-bold-r-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSerifCondensed-Bold.ttf -misc-DejaVu Serif Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSerifCondensed-Bold.ttf -misc-DejaVu Serif Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSerifCondensed-Bold.ttf -misc-DejaVu Serif Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSerifCondensed-Bold.ttf -misc-DejaVu Serif Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSerifCondensed-Bold.ttf -misc-DejaVu Serif Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSerifCondensed-Bold.ttf -misc-DejaVu Serif Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSerifCondensed-Bold.ttf -misc-DejaVu Serif Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSerifCondensed-Bold.ttf -misc-DejaVu Serif Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSerifCondensed-Bold.ttf -misc-DejaVu Serif Condensed-bold-r-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSerifCondensed-Bold.ttf -misc-DejaVu Serif Condensed-bold-r-normal--0-0-0-0-p-0-koi8-r
-DejaVuSerifCondensed-Bold.ttf -misc-DejaVu Serif Condensed-bold-r-normal--0-0-0-0-p-0-koi8-ru
-DejaVuSerifCondensed-BoldOblique.ttf -misc-DejaVu Serif Condensed-bold-i-normal--0-0-0-0-p-0-ascii-0
-DejaVuSerifCondensed-BoldOblique.ttf -misc-DejaVu Serif Condensed-bold-i-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSerifCondensed-BoldOblique.ttf -misc-DejaVu Serif Condensed-bold-i-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSerifCondensed-BoldOblique.ttf -misc-DejaVu Serif Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSerifCondensed-BoldOblique.ttf -misc-DejaVu Serif Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSerifCondensed-BoldOblique.ttf -misc-DejaVu Serif Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSerifCondensed-BoldOblique.ttf -misc-DejaVu Serif Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSerifCondensed-BoldOblique.ttf -misc-DejaVu Serif Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSerifCondensed-BoldOblique.ttf -misc-DejaVu Serif Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSerifCondensed-BoldOblique.ttf -misc-DejaVu Serif Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSerifCondensed-BoldOblique.ttf -misc-DejaVu Serif Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSerifCondensed-BoldOblique.ttf -misc-DejaVu Serif Condensed-bold-i-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSerifCondensed-BoldOblique.ttf -misc-DejaVu Serif Condensed-bold-i-normal--0-0-0-0-p-0-koi8-r
-DejaVuSerifCondensed-BoldOblique.ttf -misc-DejaVu Serif Condensed-bold-i-normal--0-0-0-0-p-0-koi8-ru
-DejaVuSerifCondensed-Oblique.ttf -misc-DejaVu Serif Condensed-medium-i-normal--0-0-0-0-p-0-ascii-0
-DejaVuSerifCondensed-Oblique.ttf -misc-DejaVu Serif Condensed-medium-i-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSerifCondensed-Oblique.ttf -misc-DejaVu Serif Condensed-medium-i-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSerifCondensed-Oblique.ttf -misc-DejaVu Serif Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSerifCondensed-Oblique.ttf -misc-DejaVu Serif Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSerifCondensed-Oblique.ttf -misc-DejaVu Serif Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSerifCondensed-Oblique.ttf -misc-DejaVu Serif Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSerifCondensed-Oblique.ttf -misc-DejaVu Serif Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSerifCondensed-Oblique.ttf -misc-DejaVu Serif Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSerifCondensed-Oblique.ttf -misc-DejaVu Serif Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSerifCondensed-Oblique.ttf -misc-DejaVu Serif Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSerifCondensed-Oblique.ttf -misc-DejaVu Serif Condensed-medium-i-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSerifCondensed-Oblique.ttf -misc-DejaVu Serif Condensed-medium-i-normal--0-0-0-0-p-0-koi8-r
-DejaVuSerifCondensed-Oblique.ttf -misc-DejaVu Serif Condensed-medium-i-normal--0-0-0-0-p-0-koi8-ru
-DejaVuSerifCondensed.ttf -misc-DejaVu Serif Condensed-medium-r-normal--0-0-0-0-p-0-ascii-0
-DejaVuSerifCondensed.ttf -misc-DejaVu Serif Condensed-medium-r-normal--0-0-0-0-p-0-fcd8859-15
-DejaVuSerifCondensed.ttf -misc-DejaVu Serif Condensed-medium-r-normal--0-0-0-0-p-0-iso10646-1
-DejaVuSerifCondensed.ttf -misc-DejaVu Serif Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-1
-DejaVuSerifCondensed.ttf -misc-DejaVu Serif Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-10
-DejaVuSerifCondensed.ttf -misc-DejaVu Serif Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-15
-DejaVuSerifCondensed.ttf -misc-DejaVu Serif Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-2
-DejaVuSerifCondensed.ttf -misc-DejaVu Serif Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-3
-DejaVuSerifCondensed.ttf -misc-DejaVu Serif Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-4
-DejaVuSerifCondensed.ttf -misc-DejaVu Serif Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-5
-DejaVuSerifCondensed.ttf -misc-DejaVu Serif Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-7
-DejaVuSerifCondensed.ttf -misc-DejaVu Serif Condensed-medium-r-normal--0-0-0-0-p-0-iso8859-9
-DejaVuSerifCondensed.ttf -misc-DejaVu Serif Condensed-medium-r-normal--0-0-0-0-p-0-koi8-r
-DejaVuSerifCondensed.ttf -misc-DejaVu Serif Condensed-medium-r-normal--0-0-0-0-p-0-koi8-ru
diff --git a/x11-fonts/dejavu/pkg-plist b/x11-fonts/dejavu/pkg-plist
index 0a28ea1eeccd..f7f7b2d73ae2 100644
--- a/x11-fonts/dejavu/pkg-plist
+++ b/x11-fonts/dejavu/pkg-plist
@@ -19,7 +19,6 @@
 %%FONTSDIR%%/DejaVuSerifCondensed-BoldItalic.ttf
 %%FONTSDIR%%/DejaVuSerifCondensed-Italic.ttf
 %%FONTSDIR%%/DejaVuSerifCondensed.ttf
-%%FONTSDIR%%/fonts.dir
 @exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
 @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
 @dirrm %%FONTSDIR%%