3 files changed, 45 insertions, 44 deletions

diff --git a/korean/nanumfonts-otf/Makefile b/korean/nanumfonts-otf/Makefile
index 802d0281dcb3..82d2c8b90272 100644
--- a/korean/nanumfonts-otf/Makefile
+++ b/korean/nanumfonts-otf/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	nanumfonts
-PORTVERSION=	20141022
+PORTVERSION=	20160201
 CATEGORIES=	korean
 MASTER_SITES=	http://appdown.naver.com/naver/font/NanumFont/setup/ \
 		LOCAL/jkim
@@ -14,54 +14,55 @@ COMMENT=	Nanum family Hangul fonts (${FONTFORMAT})
 
 LICENSE=	OFL11
 
-EXTRACT_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
-
-DISTFILE_LIST=	ALL GOTHICECO MYUNGJOECO
+DISTFILE_LIST=	ALL
 DISTFILE_PRFX=	NanumFontSetup_${FONTTYPE:tu}_
 DISTFILE_SUFX=	_hangeulcamp.exe
 DISTINFO_FILE=	${PKGDIR}/distinfo.${FONTTYPE}
 
-EXTRACT_CMD=	7z
-EXTRACT_BEFORE_ARGS=	e -y
-EXTRACT_AFTER_ARGS=	'$$WINDIR/Fonts'
+EXTRACT_AFTER_ARGS=	${EXTRACT_SUBDIR}
+EXTRACT_SUBDIR=	\$$WINDIR/Fonts
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-USES=		fonts
+USES=		7z:p7zip fonts
 
 FONTTYPE?=	otf
 FONTFORMAT?=	OpenType
 
 FONTNAME=	nanum-${FONTTYPE}
-FONTLIST=	NanumBarunGothic \
-		NanumBarunGothicBold \
-		NanumBarunGothicLight \
-		NanumBarunGothicUltraLight \
-		NanumBarunpenB \
-		NanumBarunpenR \
-		NanumBrush \
-		NanumGothic \
-		NanumGothicBold \
-		NanumGothicEco \
-		NanumGothicEcoBold \
-		NanumGothicEcoExtraBold \
-		NanumGothicExtraBold \
-		NanumGothicLight \
-		NanumMyeongjo \
-		NanumMyeongjoBold \
-		NanumMyeongjoEco \
-		NanumMyeongjoEcoBold \
-		NanumMyeongjoEcoExtraBold \
-		NanumMyeongjoExtraBold \
-		NanumPen
-FONTFILES=	${FONTLIST:S|$|.${FONTTYPE}|}
+FONTLIST=	BarunGothic \
+		BarunGothicBold \
+		BarunGothicLight \
+		BarunGothicUltraLight \
+		BarunpenB \
+		BarunpenR \
+		Brush \
+		Gothic \
+		GothicBold \
+		GothicExtraBold \
+		GothicLight \
+		Myeongjo \
+		MyeongjoBold \
+		MyeongjoExtraBold \
+		Pen
+FONTFILES=	${FONTLIST:S|^|Nanum|:S|$|.${FONTTYPE}|}
 
 PLIST_FILES=	${FONTFILES:S|^|${FONTSDIR}/|}
 
+OPTIONS_DEFINE=	ECO
+
+ECO_DESC=	Include Eco family fonts
+ECO_VARS=	DISTFILE_LIST+="GOTHICECO MYUNGJOECO"
+.for f in GothicEco MyeongjoEco
+ECO_VARS+=	FONTLIST+="${f} ${f}Bold ${f}ExtraBold"
+.endfor
+
+.include <bsd.port.pre.mk>
+
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
 .for f in ${FONTFILES}
-	${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKDIR}/${EXTRACT_SUBDIR}/${f} ${STAGEDIR}${FONTSDIR}
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/korean/nanumfonts-otf/distinfo.otf b/korean/nanumfonts-otf/distinfo.otf
index 09f6ee1c33f8..1b5bea19bc22 100644
--- a/korean/nanumfonts-otf/distinfo.otf
+++ b/korean/nanumfonts-otf/distinfo.otf
@@ -1,6 +1,6 @@
-SHA256 (nanumfonts/20141022/NanumFontSetup_OTF_ALL_hangeulcamp.exe) = cfd3ff42361b7538f5a565285e769a6bca22b1e201bd4d9379c47f82ff1eb9af
-SIZE (nanumfonts/20141022/NanumFontSetup_OTF_ALL_hangeulcamp.exe) = 14614080
-SHA256 (nanumfonts/20141022/NanumFontSetup_OTF_GOTHICECO_hangeulcamp.exe) = ecfa78fd9d2c6284f5eea59ee3692c96c891985f8a5cb6b237e8f22fd9837a2b
-SIZE (nanumfonts/20141022/NanumFontSetup_OTF_GOTHICECO_hangeulcamp.exe) = 6160048
-SHA256 (nanumfonts/20141022/NanumFontSetup_OTF_MYUNGJOECO_hangeulcamp.exe) = 370f84ef8b5211e907880883e514165f2393a812d65d0069d215ee67163ec7c5
-SIZE (nanumfonts/20141022/NanumFontSetup_OTF_MYUNGJOECO_hangeulcamp.exe) = 3709536
+SHA256 (nanumfonts/20160201/NanumFontSetup_OTF_ALL_hangeulcamp.exe) = ca24f3ce0f7ae589afe94cbe0dc193b775efe6eafce124ca6cd9605526b50501
+SIZE (nanumfonts/20160201/NanumFontSetup_OTF_ALL_hangeulcamp.exe) = 14910552
+SHA256 (nanumfonts/20160201/NanumFontSetup_OTF_GOTHICECO_hangeulcamp.exe) = ecfa78fd9d2c6284f5eea59ee3692c96c891985f8a5cb6b237e8f22fd9837a2b
+SIZE (nanumfonts/20160201/NanumFontSetup_OTF_GOTHICECO_hangeulcamp.exe) = 6160048
+SHA256 (nanumfonts/20160201/NanumFontSetup_OTF_MYUNGJOECO_hangeulcamp.exe) = 370f84ef8b5211e907880883e514165f2393a812d65d0069d215ee67163ec7c5
+SIZE (nanumfonts/20160201/NanumFontSetup_OTF_MYUNGJOECO_hangeulcamp.exe) = 3709536
diff --git a/korean/nanumfonts-otf/distinfo.ttf b/korean/nanumfonts-otf/distinfo.ttf
index 703c02b1ac7e..debf2095fda0 100644
--- a/korean/nanumfonts-otf/distinfo.ttf
+++ b/korean/nanumfonts-otf/distinfo.ttf
@@ -1,6 +1,6 @@
-SHA256 (nanumfonts/20141022/NanumFontSetup_TTF_ALL_hangeulcamp.exe) = 0669152cae3dd8bdc6f9b5b66e47d7a7232b99b0e67321d90b1f3cfff546e3f6
-SIZE (nanumfonts/20141022/NanumFontSetup_TTF_ALL_hangeulcamp.exe) = 19648416
-SHA256 (nanumfonts/20141022/NanumFontSetup_TTF_GOTHICECO_hangeulcamp.exe) = 1da6284ef24bfdbbb8ddeb184716ba64be48f8d427860bcb3425ea34ee2c2efb
-SIZE (nanumfonts/20141022/NanumFontSetup_TTF_GOTHICECO_hangeulcamp.exe) = 8516120
-SHA256 (nanumfonts/20141022/NanumFontSetup_TTF_MYUNGJOECO_hangeulcamp.exe) = ddb8d1a2043bf4297964a1ec0456abb338f41b70a7185f5ce0540c0942ac6c07
-SIZE (nanumfonts/20141022/NanumFontSetup_TTF_MYUNGJOECO_hangeulcamp.exe) = 6323032
+SHA256 (nanumfonts/20160201/NanumFontSetup_TTF_ALL_hangeulcamp.exe) = 37f3ef43cf1e2edc1b3237b760a8798d51a8149cecb8915a4893384f6cce416d
+SIZE (nanumfonts/20160201/NanumFontSetup_TTF_ALL_hangeulcamp.exe) = 20238760
+SHA256 (nanumfonts/20160201/NanumFontSetup_TTF_GOTHICECO_hangeulcamp.exe) = 1da6284ef24bfdbbb8ddeb184716ba64be48f8d427860bcb3425ea34ee2c2efb
+SIZE (nanumfonts/20160201/NanumFontSetup_TTF_GOTHICECO_hangeulcamp.exe) = 8516120
+SHA256 (nanumfonts/20160201/NanumFontSetup_TTF_MYUNGJOECO_hangeulcamp.exe) = ddb8d1a2043bf4297964a1ec0456abb338f41b70a7185f5ce0540c0942ac6c07
+SIZE (nanumfonts/20160201/NanumFontSetup_TTF_MYUNGJOECO_hangeulcamp.exe) = 6323032