Update to 2.22

PR:		ports/118522
Submitted By:	Xin LI

3 files changed, 26 insertions, 28 deletions

diff --git a/x11-fonts/dejavu/Makefile b/x11-fonts/dejavu/Makefile
index 954f2f625574..934f797f4620 100644
--- a/x11-fonts/dejavu/Makefile
+++ b/x11-fonts/dejavu/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	dejavu
-DISTVERSION=	2.21
+DISTVERSION=	2.22
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-ttf-${DISTVERSION}
+DISTNAME=	${PORTNAME}-fonts-ttf-${DISTVERSION}
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Bitstream Vera Fonts clone with a wider range of characters
@@ -22,7 +22,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 PORTDOCS=	README status.txt unicover.txt langcover.txt
-PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
+PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}/"
 MSG_FILE=	${PKGDIR}/pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 FONTNAME=	${PORTNAME}
@@ -33,7 +33,7 @@ post-patch:
 
 do-install:
 	${MKDIR} ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${FONTSDIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
diff --git a/x11-fonts/dejavu/distinfo b/x11-fonts/dejavu/distinfo
index d134630f999d..812f2f907007 100644
--- a/x11-fonts/dejavu/distinfo
+++ b/x11-fonts/dejavu/distinfo
@@ -1,3 +1,3 @@
-MD5 (dejavu-ttf-2.21.tar.bz2) = 0f80de7f30c16a12997a0f7b2e207db8
-SHA256 (dejavu-ttf-2.21.tar.bz2) = ee27f4d4d3675f6e25d1c37b5d87710f6292ad5dcb9992b6ea04736bb86648ae
-SIZE (dejavu-ttf-2.21.tar.bz2) = 3568331
+MD5 (dejavu-fonts-ttf-2.22.tar.bz2) = 95fcce4244a786cee3ce49debe17ef34
+SHA256 (dejavu-fonts-ttf-2.22.tar.bz2) = e7af0c21fd4ebdd471378a31d7bc579fd14b879992bf35198e3207e169948de7
+SIZE (dejavu-fonts-ttf-2.22.tar.bz2) = 4071054
diff --git a/x11-fonts/dejavu/pkg-plist b/x11-fonts/dejavu/pkg-plist
index b4beaaf3628e..731128d35de1 100644
--- a/x11-fonts/dejavu/pkg-plist
+++ b/x11-fonts/dejavu/pkg-plist
@@ -1,24 +1,22 @@
-%%FONTSDIR%%/DejaVuCondensedSans.ttf
-%%FONTSDIR%%/DejaVuCondensedSansBold.ttf
-%%FONTSDIR%%/DejaVuCondensedSansBoldOblique.ttf
-%%FONTSDIR%%/DejaVuCondensedSansOblique.ttf
-%%FONTSDIR%%/DejaVuCondensedSerif.ttf
-%%FONTSDIR%%/DejaVuCondensedSerifBold.ttf
-%%FONTSDIR%%/DejaVuCondensedSerifBoldItalic.ttf
-%%FONTSDIR%%/DejaVuCondensedSerifItalic.ttf
-%%FONTSDIR%%/DejaVuMonoSans.ttf
-%%FONTSDIR%%/DejaVuMonoSansBold.ttf
-%%FONTSDIR%%/DejaVuMonoSansBoldOblique.ttf
-%%FONTSDIR%%/DejaVuMonoSansOblique.ttf
+%%FONTSDIR%%/DejaVuSans-Bold.ttf
+%%FONTSDIR%%/DejaVuSans-BoldOblique.ttf
+%%FONTSDIR%%/DejaVuSans-ExtraLight.ttf
+%%FONTSDIR%%/DejaVuSans-Oblique.ttf
 %%FONTSDIR%%/DejaVuSans.ttf
-%%FONTSDIR%%/DejaVuSansBold.ttf
-%%FONTSDIR%%/DejaVuSansBoldOblique.ttf
-%%FONTSDIR%%/DejaVuSansExtraLight.ttf
-%%FONTSDIR%%/DejaVuSansOblique.ttf
+%%FONTSDIR%%/DejaVuSansCondensed-Bold.ttf
+%%FONTSDIR%%/DejaVuSansCondensed-BoldOblique.ttf
+%%FONTSDIR%%/DejaVuSansCondensed-Oblique.ttf
+%%FONTSDIR%%/DejaVuSansCondensed.ttf
+%%FONTSDIR%%/DejaVuSansMono-Bold.ttf
+%%FONTSDIR%%/DejaVuSansMono-BoldOblique.ttf
+%%FONTSDIR%%/DejaVuSansMono-Oblique.ttf
+%%FONTSDIR%%/DejaVuSansMono.ttf
+%%FONTSDIR%%/DejaVuSerif-Bold.ttf
+%%FONTSDIR%%/DejaVuSerif-BoldItalic.ttf
+%%FONTSDIR%%/DejaVuSerif-Italic.ttf
 %%FONTSDIR%%/DejaVuSerif.ttf
-%%FONTSDIR%%/DejaVuSerifBold.ttf
-%%FONTSDIR%%/DejaVuSerifBoldItalic.ttf
-%%FONTSDIR%%/DejaVuSerifItalic.ttf
-@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
+%%FONTSDIR%%/DejaVuSerifCondensed-Bold.ttf
+%%FONTSDIR%%/DejaVuSerifCondensed-BoldItalic.ttf
+%%FONTSDIR%%/DejaVuSerifCondensed-Italic.ttf
+%%FONTSDIR%%/DejaVuSerifCondensed.ttf
 @dirrm %%FONTSDIR%%