diff --git a/x11-fonts/dejavu/Makefile b/x11-fonts/dejavu/Makefile
index 46182056802d..1c215ae5b282 100644
--- a/x11-fonts/dejavu/Makefile
+++ b/x11-fonts/dejavu/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	dejavu
 PORTVERSION=	2.37
-PORTREVISION=	1
 DISTVERSIONPREFIX=	fonts-ttf-
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://github.com/dejavu-fonts/dejavu-fonts/releases/download/version_${PORTVERSION:R}_${PORTVERSION:E}/
 
@@ -21,14 +21,10 @@ LICENSE_PERMS_AMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_AREV=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_BITSTREAM=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-OPTIONS_DEFINE=	DOCS LINKS
-OPTIONS_DEFAULT=LINKS
-OPTIONS_SUB=	yes
-LINKS_DESC=	Install links of configuration files in conf.d
+USES=		fonts tar:bzip2
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-USES=		fonts tar:bzip2
 
 PLIST_SUB=	FCDIR=${FCDIR} FCDIR_LINKS=${FCDIR_LINKS}
 PORTDOCS=	README.md langcover.txt status.txt unicover.txt
@@ -37,11 +33,18 @@ SUB_FILES=	pkg-message
 FCDIR?=		etc/fonts/conf.avail
 FCDIR_LINKS=	${FCDIR:S|conf.avail|conf.d|}
 
+OPTIONS_DEFINE=	DOCS LINKS
+OPTIONS_DEFAULT=LINKS
+OPTIONS_SUB=	yes
+LINKS_DESC=	Install links of configuration files in conf.d
+
 do-install:
 	cd ${STAGEDIR}${PREFIX}/ && ${MKDIR} ${FCDIR}/ ${FCDIR_LINKS}/ ${STAGEDIR}${FONTSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/fontconfig/*.conf ${STAGEDIR}${PREFIX}/${FCDIR}/
 	cd ${STAGEDIR}${PREFIX}/${FCDIR_LINKS}/ && ${LN} -fs ../conf.avail/*dejavu*.conf .
 	${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${STAGEDIR}${FONTSDIR}/
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/