diff --git a/x11-fonts/atkinson-hyperlegible/Makefile b/x11-fonts/atkinson-hyperlegible/Makefile
index d7dd8b7a249f..3015cc7c867a 100644
--- a/x11-fonts/atkinson-hyperlegible/Makefile
+++ b/x11-fonts/atkinson-hyperlegible/Makefile
@@ -1,58 +1,56 @@
 PORTNAME=	atkinson-hyperlegible
 PORTVERSION=	2020.0514
+PORTREVISION=	1
 CATEGORIES=	x11-fonts accessibility
 MASTER_SITES=	https://brailleinstitute.org/wp-content/uploads/${PORTNAME}-font/:source1 \
 		http://brailleinstitute.org/wp-content/uploads/2020/11/:source2
 DISTFILES=	${AHF}-Print-and-Web-${PORTVERSION:S/./-/}.zip:source1 \
 		${AHF}-License-2020-1104.pdf:source2
 EXTRACT_ONLY=	${AHF}-Print-and-Web-${PORTVERSION:S/./-/}.zip
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Braille Institute font for low vision readers
 WWW=		https://brailleinstitute.org/freefont
 
 LICENSE=	ATKINSON-HYPERLEGIBLE
 LICENSE_NAME=	ATKINSON HYPERLEGIBLE FONT LICENSE
 LICENSE_FILE=	${DISTDIR}/${AHF}-License-2020-1104.pdf
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 USES=		fonts zip
 
 OPTIONS_DEFINE=		OTF TTF WEB
 OPTIONS_DEFAULT=	OTF TTF
 OTF_DESC=		Install OTF fonts set
 TTF_DESC=		Install TTF fonts set
 WEB_DESC=		Install WEB fonts set
 
 AHF=		Atkinson-Hyperlegible-Font
 
 OPTIONS_SUB=	yes
 SUB_FILES=	pkg-message
 NO_ARCH=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${AHF}-Print-and-Web-${PORTVERSION:S/./-/}
 
 .include <bsd.port.options.mk>
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/allfonts
 	@${FIND} ${WRKSRC} -type f -exec ${MV} {} ${WRKSRC}/allfonts \;
 
 do-install:
-	@${DO_NADA}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 
 do-install-TTF-on:
-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/allfonts/*.ttf ${STAGEDIR}${FONTSDIR}
 
 do-install-OTF-on:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/allfonts/*.otf ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/allfonts/*.otf ${STAGEDIR}${FONTSDIR}
 
 post-install-WEB-on:
 .for ext in svg eot woff woff2
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/allfonts/*.${ext} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/allfonts/*.${ext} ${STAGEDIR}${FONTSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/atkinson-hyperlegible/pkg-plist b/x11-fonts/atkinson-hyperlegible/pkg-plist
index 6a467d1a4d58..701be838254c 100644
--- a/x11-fonts/atkinson-hyperlegible/pkg-plist
+++ b/x11-fonts/atkinson-hyperlegible/pkg-plist
@@ -1,24 +1,24 @@
-%%OTF%%%%DATADIR%%/Atkinson-Hyperlegible-Bold-102.otf
-%%OTF%%%%DATADIR%%/Atkinson-Hyperlegible-BoldItalic-102.otf
-%%OTF%%%%DATADIR%%/Atkinson-Hyperlegible-Italic-102.otf
-%%OTF%%%%DATADIR%%/Atkinson-Hyperlegible-Regular-102.otf
+%%OTF%%%%FONTSDIR%%/Atkinson-Hyperlegible-Bold-102.otf
+%%OTF%%%%FONTSDIR%%/Atkinson-Hyperlegible-BoldItalic-102.otf
+%%OTF%%%%FONTSDIR%%/Atkinson-Hyperlegible-Italic-102.otf
+%%OTF%%%%FONTSDIR%%/Atkinson-Hyperlegible-Regular-102.otf
 %%TTF%%%%FONTSDIR%%/Atkinson-Hyperlegible-Bold-102.ttf
 %%TTF%%%%FONTSDIR%%/Atkinson-Hyperlegible-BoldItalic-102.ttf
 %%TTF%%%%FONTSDIR%%/Atkinson-Hyperlegible-Italic-102.ttf
 %%TTF%%%%FONTSDIR%%/Atkinson-Hyperlegible-Regular-102.ttf
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-Bold-102.eot
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-Bold-102.svg
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-Bold-102.woff
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-Bold-102a.woff2
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-BoldItalic-102.eot
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-BoldItalic-102.svg
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-BoldItalic-102.woff
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-BoldItalic-102a.woff2
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-Italic-102.eot
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-Italic-102.svg
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-Italic-102.woff
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-Italic-102a.woff2
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-Regular-102.eot
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-Regular-102.svg
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-Regular-102.woff
-%%WEB%%%%DATADIR%%/Atkinson-Hyperlegible-Regular-102a.woff2
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-Bold-102.eot
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-Bold-102.svg
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-Bold-102.woff
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-Bold-102a.woff2
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-BoldItalic-102.eot
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-BoldItalic-102.svg
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-BoldItalic-102.woff
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-BoldItalic-102a.woff2
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-Italic-102.eot
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-Italic-102.svg
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-Italic-102.woff
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-Italic-102a.woff2
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-Regular-102.eot
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-Regular-102.svg
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-Regular-102.woff
+%%WEB%%%%FONTSDIR%%/Atkinson-Hyperlegible-Regular-102a.woff2