diff --git a/x11-fonts/aporetic/Makefile b/x11-fonts/aporetic/Makefile
index b39feee7832b..cc5f91b9229e 100644
--- a/x11-fonts/aporetic/Makefile
+++ b/x11-fonts/aporetic/Makefile
@@ -1,24 +1,29 @@
 PORTNAME=	aporetic
 DISTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	ports@zoltankiraly.com
 COMMENT=	Custom Iosevka fonts with modified style and metrics
 
 LICENSE=	OFL11
-LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 USES=		fonts
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	protesilaos
 
+EXTRACT_AFTER_ARGS=	--include ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/${PORTNAME}-*/TTF \
+			--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/${PORTNAME}-*/TTF-Unhinted \
+			--strip-components 3 \
+			--no-same-owner --no-same-permissions
+
 NO_ARCH=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	(cd ${WRKSRC} && \
-		${COPYTREE_SHARE} aporetic\* ${STAGEDIR}${FONTSDIR})
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/aporetic/pkg-plist b/x11-fonts/aporetic/pkg-plist
index 17b67084a739..a53cfb76d588 100644
--- a/x11-fonts/aporetic/pkg-plist
+++ b/x11-fonts/aporetic/pkg-plist
@@ -1,32 +1,16 @@
-%%FONTSDIR%%/aporetic-sans-mono/TTF-Unhinted/aporetic-sans-mono-normalbolditalic.ttf
-%%FONTSDIR%%/aporetic-sans-mono/TTF-Unhinted/aporetic-sans-mono-normalboldupright.ttf
-%%FONTSDIR%%/aporetic-sans-mono/TTF-Unhinted/aporetic-sans-mono-normalregularitalic.ttf
-%%FONTSDIR%%/aporetic-sans-mono/TTF-Unhinted/aporetic-sans-mono-normalregularupright.ttf
-%%FONTSDIR%%/aporetic-sans-mono/TTF/aporetic-sans-mono-normalbolditalic.ttf
-%%FONTSDIR%%/aporetic-sans-mono/TTF/aporetic-sans-mono-normalboldupright.ttf
-%%FONTSDIR%%/aporetic-sans-mono/TTF/aporetic-sans-mono-normalregularitalic.ttf
-%%FONTSDIR%%/aporetic-sans-mono/TTF/aporetic-sans-mono-normalregularupright.ttf
-%%FONTSDIR%%/aporetic-sans/TTF-Unhinted/aporetic-sans-normalbolditalic.ttf
-%%FONTSDIR%%/aporetic-sans/TTF-Unhinted/aporetic-sans-normalboldupright.ttf
-%%FONTSDIR%%/aporetic-sans/TTF-Unhinted/aporetic-sans-normalregularitalic.ttf
-%%FONTSDIR%%/aporetic-sans/TTF-Unhinted/aporetic-sans-normalregularupright.ttf
-%%FONTSDIR%%/aporetic-sans/TTF/aporetic-sans-normalbolditalic.ttf
-%%FONTSDIR%%/aporetic-sans/TTF/aporetic-sans-normalboldupright.ttf
-%%FONTSDIR%%/aporetic-sans/TTF/aporetic-sans-normalregularitalic.ttf
-%%FONTSDIR%%/aporetic-sans/TTF/aporetic-sans-normalregularupright.ttf
-%%FONTSDIR%%/aporetic-serif-mono/TTF-Unhinted/aporetic-serif-mono-normalbolditalic.ttf
-%%FONTSDIR%%/aporetic-serif-mono/TTF-Unhinted/aporetic-serif-mono-normalboldupright.ttf
-%%FONTSDIR%%/aporetic-serif-mono/TTF-Unhinted/aporetic-serif-mono-normalregularitalic.ttf
-%%FONTSDIR%%/aporetic-serif-mono/TTF-Unhinted/aporetic-serif-mono-normalregularupright.ttf
-%%FONTSDIR%%/aporetic-serif-mono/TTF/aporetic-serif-mono-normalbolditalic.ttf
-%%FONTSDIR%%/aporetic-serif-mono/TTF/aporetic-serif-mono-normalboldupright.ttf
-%%FONTSDIR%%/aporetic-serif-mono/TTF/aporetic-serif-mono-normalregularitalic.ttf
-%%FONTSDIR%%/aporetic-serif-mono/TTF/aporetic-serif-mono-normalregularupright.ttf
-%%FONTSDIR%%/aporetic-serif/TTF-Unhinted/aporetic-serif-normalbolditalic.ttf
-%%FONTSDIR%%/aporetic-serif/TTF-Unhinted/aporetic-serif-normalboldupright.ttf
-%%FONTSDIR%%/aporetic-serif/TTF-Unhinted/aporetic-serif-normalregularitalic.ttf
-%%FONTSDIR%%/aporetic-serif/TTF-Unhinted/aporetic-serif-normalregularupright.ttf
-%%FONTSDIR%%/aporetic-serif/TTF/aporetic-serif-normalbolditalic.ttf
-%%FONTSDIR%%/aporetic-serif/TTF/aporetic-serif-normalboldupright.ttf
-%%FONTSDIR%%/aporetic-serif/TTF/aporetic-serif-normalregularitalic.ttf
-%%FONTSDIR%%/aporetic-serif/TTF/aporetic-serif-normalregularupright.ttf
+%%FONTSDIR%%/aporetic-sans-mono-normalbolditalic.ttf
+%%FONTSDIR%%/aporetic-sans-mono-normalboldupright.ttf
+%%FONTSDIR%%/aporetic-sans-mono-normalregularitalic.ttf
+%%FONTSDIR%%/aporetic-sans-mono-normalregularupright.ttf
+%%FONTSDIR%%/aporetic-sans-normalbolditalic.ttf
+%%FONTSDIR%%/aporetic-sans-normalboldupright.ttf
+%%FONTSDIR%%/aporetic-sans-normalregularitalic.ttf
+%%FONTSDIR%%/aporetic-sans-normalregularupright.ttf
+%%FONTSDIR%%/aporetic-serif-mono-normalbolditalic.ttf
+%%FONTSDIR%%/aporetic-serif-mono-normalboldupright.ttf
+%%FONTSDIR%%/aporetic-serif-mono-normalregularitalic.ttf
+%%FONTSDIR%%/aporetic-serif-mono-normalregularupright.ttf
+%%FONTSDIR%%/aporetic-serif-normalbolditalic.ttf
+%%FONTSDIR%%/aporetic-serif-normalboldupright.ttf
+%%FONTSDIR%%/aporetic-serif-normalregularitalic.ttf
+%%FONTSDIR%%/aporetic-serif-normalregularupright.ttf