6 files changed, 19 insertions, 60 deletions

diff --git a/korean/aleefonts-ttf/Makefile b/korean/aleefonts-ttf/Makefile
index 2375e5ab3257..2b043a4a8029 100644
--- a/korean/aleefonts-ttf/Makefile
+++ b/korean/aleefonts-ttf/Makefile
@@ -15,36 +15,27 @@ COMMENT=	A-Lee's Hangul truetype fonts #'
 LICENSE=	ART10
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+BUILD_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 FONTSDIR=	lib/X11/fonts/alee${PKGNAMESUFFIX}
 FONTLIST=	Bandal Bangwool Eunjin EunjinNakseo Guseul
+FONTFILES=	${FONTLIST:S/$/.ttf/} fonts.dir fonts.scale
 
 PLIST_DIRS=	${FONTSDIR}
-.for f in ${FONTLIST}
-PLIST_FILES+=	${FONTSDIR}/${f}.ttf
-.endfor
-PLIST_FILES+=	${FONTSDIR}/fonts.dir \
-		${FONTSDIR}/fonts.scale
+PLIST_FILES=	${FONTFILES:S|^|${FONTSDIR}/|}
 
-NO_STAGE=	yes
 do-build:
 	${LOCALBASE}/bin/mkfontscale ${WRKSRC}
 	${LOCALBASE}/bin/mkfontdir ${WRKSRC}
 
 do-install:
-	${MKDIR} ${PREFIX}/${FONTSDIR}
-.for f in ${FONTLIST}
-	${INSTALL_DATA} ${WRKSRC}/${f}.ttf ${PREFIX}/${FONTSDIR}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/fonts.dir ${PREFIX}/${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts.scale ${PREFIX}/${FONTSDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
+	${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR}
 
 post-install:
 	@${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@-${LOCALBASE}/bin/fc-cache -s ${PREFIX}/${FONTSDIR} 2>/dev/null
 
 .include <bsd.port.mk>
diff --git a/korean/nanumcoding-ttf/Makefile b/korean/nanumcoding-ttf/Makefile
index ca9bc31c989a..ecd53943fa08 100644
--- a/korean/nanumcoding-ttf/Makefile
+++ b/korean/nanumcoding-ttf/Makefile
@@ -14,7 +14,7 @@ COMMENT=	NanumGothic Coding Hangul font (TrueType)
 
 LICENSE=	OFL11
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+BUILD_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 NO_WRKSUBDIR=	yes
@@ -22,15 +22,11 @@ USE_ZIP=	yes
 FONTSDIR=	lib/X11/fonts/nanum-coding${PKGNAMESUFFIX}
 FONTLIST=	NanumGothicCoding \
 		NanumGothicCoding-Bold
+FONTFILES=	${FONTLIST:S/$/.ttf/} fonts.dir fonts.scale
 
 PLIST_DIRS=	${FONTSDIR}
-.for f in ${FONTLIST}
-PLIST_FILES+=	${FONTSDIR}/${f}.ttf
-.endfor
-PLIST_FILES+=	${FONTSDIR}/fonts.dir \
-		${FONTSDIR}/fonts.scale
+PLIST_FILES=	${FONTFILES:S|^|${FONTSDIR}/|}
 
-NO_STAGE=	yes
 post-extract:
 	@# XXX File names are encoded in EUC-KR.
 	${MV} ${WRKSRC}/*-Bold.ttf ${WRKSRC}/NanumGothicCoding-Bold.tmp
@@ -42,16 +38,11 @@ do-build:
 	${LOCALBASE}/bin/mkfontdir ${WRKSRC}
 
 do-install:
-	${MKDIR} ${PREFIX}/${FONTSDIR}
-.for f in ${FONTLIST}
-	${INSTALL_DATA} ${WRKSRC}/${f}.ttf ${PREFIX}/${FONTSDIR}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/fonts.dir ${PREFIX}/${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts.scale ${PREFIX}/${FONTSDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
+	${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR}
 
 post-install:
 	@${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@-${LOCALBASE}/bin/fc-cache -s ${PREFIX}/${FONTSDIR} 2>/dev/null
 
 .include <bsd.port.mk>
diff --git a/korean/nanumfonts-otf/Makefile b/korean/nanumfonts-otf/Makefile
index e3dce63e8746..bbea0d8494bf 100644
--- a/korean/nanumfonts-otf/Makefile
+++ b/korean/nanumfonts-otf/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Nanum family Hangul fonts (${FONTFORMAT})
 
 LICENSE=	OFL11
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+BUILD_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 DISTINFO_FILE=	${PKGDIR}/distinfo.${FONTTYPE}
@@ -44,30 +44,21 @@ FONTLIST=	NanumBrush \
 		NanumMyeongjoEcoExtraBold \
 		NanumMyeongjoExtraBold \
 		NanumPen
+FONTFILES=	${FONTLIST:S/$/.${FONTTYPE}/} fonts.dir fonts.scale
 
 PLIST_DIRS=	${FONTSDIR}
-.for f in ${FONTLIST}
-PLIST_FILES+=	${FONTSDIR}/${f}.${FONTTYPE}
-.endfor
-PLIST_FILES+=	${FONTSDIR}/fonts.dir \
-		${FONTSDIR}/fonts.scale
+PLIST_FILES=	${FONTFILES:S|^|${FONTSDIR}/|}
 
-NO_STAGE=	yes
 do-build:
 	${LOCALBASE}/bin/mkfontscale ${WRKSRC}
 	${LOCALBASE}/bin/mkfontdir ${WRKSRC}
 
 do-install:
-	${MKDIR} ${PREFIX}/${FONTSDIR}
-.for f in ${FONTLIST}
-	${INSTALL_DATA} ${WRKSRC}/${f}.${FONTTYPE} ${PREFIX}/${FONTSDIR}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/fonts.dir ${PREFIX}/${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts.scale ${PREFIX}/${FONTSDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
+	${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR}
 
 post-install:
 	@${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@-${LOCALBASE}/bin/fc-cache -s ${PREFIX}/${FONTSDIR} 2>/dev/null
 
 .include <bsd.port.mk>
diff --git a/korean/nanumfonts-ttf/Makefile b/korean/nanumfonts-ttf/Makefile
index 9d0bccc2d425..526756dd3c19 100644
--- a/korean/nanumfonts-ttf/Makefile
+++ b/korean/nanumfonts-ttf/Makefile
@@ -5,5 +5,4 @@ MASTERDIR=	${.CURDIR}/../nanumfonts-otf
 FONTTYPE=	ttf
 FONTFORMAT=	TrueType
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/korean/unfonts-core/Makefile b/korean/unfonts-core/Makefile
index c79201b86aec..ea91bcd6e827 100644
--- a/korean/unfonts-core/Makefile
+++ b/korean/unfonts-core/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GPL'd Korean TrueType Fonts by UN Koaunghi (${FONTCAT})
 LICENSE=	GPLv2
 LICENSE_FILE=	${FILESDIR}/COPYING
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+BUILD_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 DISTINFO_FILE=	${PKGDIR}/distinfo.${FONTCAT}-ttf
@@ -34,30 +34,18 @@ FONTLIST?=	UnBatang \
 		UnGungseo \
 		UnPilgi \
 		UnPilgiBold
+FONTFILES=	${FONTLIST:S/$/.ttf/} fonts.dir fonts.scale
 
-PLIST_DIRS=	${FONTSDIR}
-.for f in ${FONTLIST}
-PLIST_FILES+=	${FONTSDIR}/${f}.ttf
-.endfor
-PLIST_FILES+=	${FONTSDIR}/fonts.dir \
-		${FONTSDIR}/fonts.scale
-
-NO_STAGE=	yes
 do-build:
 	${LOCALBASE}/bin/mkfontscale ${WRKSRC}
 	${LOCALBASE}/bin/mkfontdir ${WRKSRC}
 
 do-install:
-	${MKDIR} ${PREFIX}/${FONTSDIR}
-.for f in ${FONTLIST}
-	${INSTALL_DATA} ${WRKSRC}/${f}.ttf ${PREFIX}/${FONTSDIR}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/fonts.dir ${PREFIX}/${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts.scale ${PREFIX}/${FONTSDIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
+	${INSTALL_DATA} ${FONTFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/${FONTSDIR}
 
 post-install:
 	@${ECHO_CMD} "@exec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec fc-cache -s %D/${FONTSDIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@-${LOCALBASE}/bin/fc-cache -s ${PREFIX}/${FONTSDIR} 2>/dev/null
 
 .include <bsd.port.mk>
diff --git a/korean/unfonts-extra/Makefile b/korean/unfonts-extra/Makefile
index 6a1c722ff24e..017879883190 100644
--- a/korean/unfonts-extra/Makefile
+++ b/korean/unfonts-extra/Makefile
@@ -18,5 +18,4 @@ FONTLIST=	UnJamoBatang \
 
 MASTERDIR=	${.CURDIR}/../unfonts-core
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"